diff --git a/doc/build.xml b/doc/build.xml
index e1d997d..0d090e5 100644
--- a/doc/build.xml
+++ b/doc/build.xml
@@ -92,7 +92,7 @@
           <arg value="-sourcepath" />
           <arg pathref="USER_SOURCE_PATH" />
           <arg value="-examplepackages" />
-          <arg value="com.google.gwt.examples;com.google.gwt.examples.i18n;com.google.gwt.examples.http.client;com.google.gwt.examples.rpc.server;com.google.gwt.examples.benchmarks" />
+          <arg value="com.google.gwt.examples;com.google.gwt.examples.i18n;com.google.gwt.examples.http.client;com.google.gwt.examples.rpc.server;com.google.gwt.examples.benchmarks;com.google.gwt.examples.cell;com.google.gwt.examples.cellview;com.google.gwt.examples.view" />
           <arg value="-packages" />
           <arg value="${USER_PKGS};${USER_CLASSES}" />
         </java>
diff --git a/user/src/com/google/gwt/cell/client/AbstractCell.java b/user/src/com/google/gwt/cell/client/AbstractCell.java
index 121d36b..d47edee 100644
--- a/user/src/com/google/gwt/cell/client/AbstractCell.java
+++ b/user/src/com/google/gwt/cell/client/AbstractCell.java
@@ -31,11 +31,11 @@
  * <h3>Examples</h3>
  * <dl>
  * <dt>Read only cell</dt>
- * <dd>TODO example com.google.gwt.examples.cell.CellExample</dd>
+ * <dd>{@example com.google.gwt.examples.cell.CellExample}</dd>
  * <dt>Interactive cell</dt>
- * <dd>TODO example com.google.gwt.examples.cell.InteractionCellExample</dd>
+ * <dd>{@example com.google.gwt.examples.cell.InteractionCellExample}</dd>
  * <dt>Editable cell</dt>
- * <dd>TODO example com.google.gwt.examples.cell.EditableCellExample</dd>
+ * <dd>{@example com.google.gwt.examples.cell.EditableCellExample}</dd>
  * </dl>
  * </p>
  *
diff --git a/user/src/com/google/gwt/cell/client/AbstractEditableCell.java b/user/src/com/google/gwt/cell/client/AbstractEditableCell.java
index 90c26f9..2bac676 100644
--- a/user/src/com/google/gwt/cell/client/AbstractEditableCell.java
+++ b/user/src/com/google/gwt/cell/client/AbstractEditableCell.java
@@ -27,7 +27,7 @@
  *
  * <p>
  * <h3>Example</h3>
- * TODO example com.google.gwt.examples.cell.EditableCellExample
+ * {@example com.google.gwt.examples.cell.EditableCellExample}
  * </p>
  *
  * @param <C> the type that this Cell represents
diff --git a/user/src/com/google/gwt/cell/client/Cell.java b/user/src/com/google/gwt/cell/client/Cell.java
index 12306f4..364780c 100644
--- a/user/src/com/google/gwt/cell/client/Cell.java
+++ b/user/src/com/google/gwt/cell/client/Cell.java
@@ -26,7 +26,7 @@
  *
  * <p>
  * <h3>Example</h3>
- * TODO example com.google.gwt.examples.cell.CellExample
+ * {@example com.google.gwt.examples.cell.CellExample}
  * </p>
  *
  * @param <C> the type that this Cell represents
diff --git a/user/src/com/google/gwt/user/cellview/client/CellBrowser.java b/user/src/com/google/gwt/user/cellview/client/CellBrowser.java
index 10664ca..28533cf 100644
--- a/user/src/com/google/gwt/user/cellview/client/CellBrowser.java
+++ b/user/src/com/google/gwt/user/cellview/client/CellBrowser.java
@@ -74,9 +74,9 @@
  * <h3>Example</h3>
  * <dl>
  * <dt>Trivial example</dt>
- * <dd>TODO example com.google.gwt.examples.cellview.CellBrowserExample</dd>
+ * <dd>{@example com.google.gwt.examples.cellview.CellBrowserExample}</dd>
  * <dt>Complex example</dt>
- * <dd>TODO example com.google.gwt.examples.cellview.CellBrowserExample2</dd>
+ * <dd>{@example com.google.gwt.examples.cellview.CellBrowserExample2}</dd>
  * </dl>
  */
 public class CellBrowser extends AbstractCellTree implements ProvidesResize,
diff --git a/user/src/com/google/gwt/user/cellview/client/CellList.java b/user/src/com/google/gwt/user/cellview/client/CellList.java
index 9412e6e..4128da9 100644
--- a/user/src/com/google/gwt/user/cellview/client/CellList.java
+++ b/user/src/com/google/gwt/user/cellview/client/CellList.java
@@ -47,15 +47,14 @@
  *
  * <p>
  * <h3>Examples</h3>
- * <p>
- * TODO example com.google.gwt.examples.cellview.CellListExample
- * </p>
- * <p>
- * TODO example com.google.gwt.examples.cellview.CellListValueUpdaterExample
- * </p>
- * <p>
- * TODO example com.google.gwt.examples.view.KeyProviderExample
- * </p>
+ * <dl>
+ * <dt>Trivial example</dt>
+ * <dd>{@example com.google.gwt.examples.cellview.CellListExample}</dd>
+ * <dt>ValueUpdater example</dt>
+ * <dd>{@example com.google.gwt.examples.cellview.CellListValueUpdaterExample}</dd>
+ * <dt>Key provider example</dt>
+ * <dd>{@example com.google.gwt.examples.view.KeyProviderExample}</dd>
+ * </dl>
  * </p>
  *
  * @param <T> the data type of list items
diff --git a/user/src/com/google/gwt/user/cellview/client/CellTable.java b/user/src/com/google/gwt/user/cellview/client/CellTable.java
index 8c354a4..e75f8c6 100644
--- a/user/src/com/google/gwt/user/cellview/client/CellTable.java
+++ b/user/src/com/google/gwt/user/cellview/client/CellTable.java
@@ -55,15 +55,14 @@
  *
  * <p>
  * <h3>Examples</h3>
- * <p>
- * TODO example com.google.gwt.examples.cellview.CellTableExample
- * </p>
- * <p>
- * TODO example com.google.gwt.examples.cellview.CellTableFieldUpdaterExample
- * </p>
- * <p>
- * TODO example com.google.gwt.examples.view.KeyProviderExample
- * </p>
+ * <dl>
+ * <dt>Trivial example</dt>
+ * <dd>{@example com.google.gwt.examples.cellview.CellTableExample}</dd>
+ * <dt>FieldUpdater example</dt>
+ * <dd>{@example com.google.gwt.examples.cellview.CellTableFieldUpdaterExample}</dd>
+ * <dt>Key provider example</dt>
+ * <dd>{@example com.google.gwt.examples.view.KeyProviderExample}</dd>
+ * </dl>
  * </p>
  *
  * @param <T> the data type of each row
diff --git a/user/src/com/google/gwt/user/cellview/client/CellTree.java b/user/src/com/google/gwt/user/cellview/client/CellTree.java
index 9c549bf..44b71f9 100644
--- a/user/src/com/google/gwt/user/cellview/client/CellTree.java
+++ b/user/src/com/google/gwt/user/cellview/client/CellTree.java
@@ -57,9 +57,9 @@
  * <h3>Examples</h3>
  * <dl>
  * <dt>Trivial example</dt>
- * <dd>TODO example com.google.gwt.examples.cellview.CellTreeExample</dd>
+ * <dd>{@example com.google.gwt.examples.cellview.CellTreeExample}</dd>
  * <dt>Complex example</dt>
- * <dd>TODO example com.google.gwt.examples.cellview.CellTreeExample2</dd>
+ * <dd>{@example com.google.gwt.examples.cellview.CellTreeExample2}</dd>
  * </dl>
  */
 public class CellTree extends AbstractCellTree implements HasAnimation,
diff --git a/user/src/com/google/gwt/user/cellview/client/SimplePager.java b/user/src/com/google/gwt/user/cellview/client/SimplePager.java
index dc16193..c409b38 100644
--- a/user/src/com/google/gwt/user/cellview/client/SimplePager.java
+++ b/user/src/com/google/gwt/user/cellview/client/SimplePager.java
@@ -37,7 +37,7 @@
  *
  * <p>
  * <h3>Example</h3>
- * TODO example com.google.gwt.examples.cellview.SimplePagerExample
+ * {@example com.google.gwt.examples.cellview.SimplePagerExample}
  * </p>
  */
 public class SimplePager extends AbstractPager {
diff --git a/user/src/com/google/gwt/view/client/AsyncDataProvider.java b/user/src/com/google/gwt/view/client/AsyncDataProvider.java
index 73cbf88..ebe5994 100644
--- a/user/src/com/google/gwt/view/client/AsyncDataProvider.java
+++ b/user/src/com/google/gwt/view/client/AsyncDataProvider.java
@@ -23,7 +23,7 @@
  *
  * <p>
  * <h3>Example</h3>
- * TODO example com.google.gwt.examples.view.AsyncDataProviderExample
+ * {@example com.google.gwt.examples.view.AsyncDataProviderExample}
  * </p>
  *
  * @param <T> the data type of records in the list
diff --git a/user/src/com/google/gwt/view/client/ListDataProvider.java b/user/src/com/google/gwt/view/client/ListDataProvider.java
index ca6df3b..18aa447 100644
--- a/user/src/com/google/gwt/view/client/ListDataProvider.java
+++ b/user/src/com/google/gwt/view/client/ListDataProvider.java
@@ -31,7 +31,7 @@
  *
  * <p>
  * <h3>Example</h3>
- * TODO example com.google.gwt.examples.view.ListDataProviderExample
+ * {@example com.google.gwt.examples.view.ListDataProviderExample}
  * </p>
  *
  * @param <T> the data type of the list