Mostly superficial/aesthetic improvements to the doc build and javadoc content:
- The doc build now produces no warnings (fixed up broken links, etc.)
- @deprecated javadoc comments changed to begin with capital letters, which looks a lot better in the rendered javadoc
- Shortened the text shown for some method @links because the overloaded signature create monster-huge hyperlinks in javadoc html
- Reworded a few things related to deprecations for GWT 1.6

Review by: scottb (TBR)



git-svn-id: https://google-web-toolkit.googlecode.com/svn/releases/1.6@4700 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/dev/core/src/com/google/gwt/core/ext/typeinfo/JParameterizedType.java b/dev/core/src/com/google/gwt/core/ext/typeinfo/JParameterizedType.java
index 994a427..19d59ee 100644
--- a/dev/core/src/com/google/gwt/core/ext/typeinfo/JParameterizedType.java
+++ b/dev/core/src/com/google/gwt/core/ext/typeinfo/JParameterizedType.java
@@ -184,7 +184,7 @@
   }
 
   /**
-   * @deprecated see {@link #getQualifiedSourceName()}
+   * @deprecated See {@link #getQualifiedSourceName()}
    */
   @Deprecated
   public String getNonParameterizedQualifiedSourceName() {
diff --git a/dev/core/src/com/google/gwt/dev/GWTCompiler.java b/dev/core/src/com/google/gwt/dev/GWTCompiler.java
index 5cbe5cd..7cdcf18 100644
--- a/dev/core/src/com/google/gwt/dev/GWTCompiler.java
+++ b/dev/core/src/com/google/gwt/dev/GWTCompiler.java
@@ -38,7 +38,7 @@
 /**
  * The main executable entry point for the GWT Java to JavaScript compiler.
  * 
- * @deprecated use {@link Compiler} instead
+ * @deprecated Use {@link Compiler} instead
  */
 @Deprecated
 public class GWTCompiler {
diff --git a/dev/core/src/com/google/gwt/dev/GWTShell.java b/dev/core/src/com/google/gwt/dev/GWTShell.java
index e0a510b..05b9b9e 100644
--- a/dev/core/src/com/google/gwt/dev/GWTShell.java
+++ b/dev/core/src/com/google/gwt/dev/GWTShell.java
@@ -33,7 +33,7 @@
 /**
  * The main executable class for the hosted mode shell.
  * 
- * @deprecated use {@link HostedMode} instead
+ * @deprecated Use {@link HostedMode} instead
  */
 @Deprecated
 public class GWTShell extends SwtHostedModeBase {
diff --git a/dev/core/src/com/google/gwt/dev/shell/BrowserWidgetHost.java b/dev/core/src/com/google/gwt/dev/shell/BrowserWidgetHost.java
index 74c2175..8e73ae9 100644
--- a/dev/core/src/com/google/gwt/dev/shell/BrowserWidgetHost.java
+++ b/dev/core/src/com/google/gwt/dev/shell/BrowserWidgetHost.java
@@ -36,7 +36,7 @@
    * 
    * @param modules the names of the modules to compile
    * @throws UnableToCompleteException
-   * @deprecated will be removed when legacy shell mode is removed
+   * @deprecated Will be removed when legacy shell mode is removed
    */
   @Deprecated
   void compile(String[] modules) throws UnableToCompleteException;
@@ -62,7 +62,7 @@
   /**
    * Returns <code>true</code> if running in legacy mode.
    * 
-   * @deprecated will be removed when legacy shell mode is removed
+   * @deprecated Will be removed when legacy shell mode is removed
    */
   @Deprecated
   boolean isLegacyMode();
diff --git a/doc/build.xml b/doc/build.xml
index 7241eaa..622d0cb 100644
--- a/doc/build.xml
+++ b/doc/build.xml
@@ -120,7 +120,7 @@
           <arg value="-classpath" />
           <arg pathref="USER_CLASS_PATH" />
           <arg value="-sourcepath" />
-          <arg path="${gwt.root}/user/super/com/google/gwt/emul" />
+          <arg path="${gwt.root}/user/super/com/google/gwt/emul:${gwt.root}/dev/core/super/com/google/gwt/dev/jjs/intrinsic" />
           <arg value="-packages" />
           <arg value="${LANG_PKGS}" />
         </java>
diff --git a/user/src/com/google/gwt/benchmarks/client/Benchmark.java b/user/src/com/google/gwt/benchmarks/client/Benchmark.java
index 32d69b7..43d7638 100644
--- a/user/src/com/google/gwt/benchmarks/client/Benchmark.java
+++ b/user/src/com/google/gwt/benchmarks/client/Benchmark.java
@@ -75,17 +75,15 @@
  * <h2>Examples of benchmarking in action</h2>
  * 
  * <h3>A simple benchmark example</h3>
- * {@link com.google.gwt.examples.benchmarks.AllocBenchmark} is a simple example
- * of a basic benchmark that doesn't take advantage of most of benchmarking's
- * advanced features.
+ * <code>AllocBenchmark</code> is an example of a basic benchmark that doesn't
+ * take advantage of most of benchmarking's advanced features.
  * 
  * {@example com.google.gwt.examples.benchmarks.AllocBenchmark}
  * 
  * <h3>An advanced benchmark example</h3>
- * {@link com.google.gwt.examples.benchmarks.ArrayListBenchmark} is a more
- * sophisticated example of benchmarking. It demonstrates the use of
- * {@code Setup} and {@code Teardown} test methods, parameterized test methods,
- * and time limits.
+ * <code>ArrayListBenchmark</code> is a more sophisticated example of
+ * benchmarking. It demonstrates the use of {@code Setup} and {@code Teardown}
+ * test methods, parameterized test methods, and time limits.
  * 
  * {@example com.google.gwt.examples.benchmarks.ArrayListBenchmark}
  */
diff --git a/user/src/com/google/gwt/core/client/GWT.java b/user/src/com/google/gwt/core/client/GWT.java
index c20e7ba..a1c5c0b 100644
--- a/user/src/com/google/gwt/core/client/GWT.java
+++ b/user/src/com/google/gwt/core/client/GWT.java
@@ -123,7 +123,7 @@
   }
 
   /**
-   * @deprecated Use {@link Object#getClass()}, {@link Class#getName()}.
+   * @deprecated Use {@link Object#getClass()}, {@link Class#getName()}
    */
   @Deprecated
   public static String getTypeName(Object o) {
diff --git a/user/src/com/google/gwt/core/client/JavaScriptException.java b/user/src/com/google/gwt/core/client/JavaScriptException.java
index 8bb9b72..ba1d750 100644
--- a/user/src/com/google/gwt/core/client/JavaScriptException.java
+++ b/user/src/com/google/gwt/core/client/JavaScriptException.java
@@ -117,7 +117,7 @@
   /**
    * Used for server-side instantiation during JUnit runs. Exceptions are
    * manually marshaled through
-   * {@link com.google.gwt.junit.client.impl.ExceptionWrapper} objects.
+   * <code>com.google.gwt.junit.client.impl.ExceptionWrapper</code> objects.
    * 
    * @param message the detail message
    */
diff --git a/user/src/com/google/gwt/dom/client/Document.java b/user/src/com/google/gwt/dom/client/Document.java
index b19540e..4c53f3a 100644
--- a/user/src/com/google/gwt/dom/client/Document.java
+++ b/user/src/com/google/gwt/dom/client/Document.java
@@ -574,7 +574,7 @@
    * @param shiftKey <code>true</code> if the shift key is depressed
    * @param metaKey <code>true</code> if the meta key is depressed
    * @param button the event's button property (values from
-   *          {@link Event#BUTTON_LEFT} et al)
+   *          {@link NativeEvent#BUTTON_LEFT} et al)
    * @return the event object
    */
   public final NativeEvent createMouseDownEvent(int detail, int screenX, int screenY,
@@ -613,7 +613,7 @@
    * @param shiftKey <code>true</code> if the shift key is depressed
    * @param metaKey <code>true</code> if the meta key is depressed
    * @param button the event's button property (values from
-   *          {@link Event#BUTTON_LEFT} et al)
+   *          {@link NativeEvent#BUTTON_LEFT} et al)
    * @param relatedTarget the event's related target (only relevant for
    *          mouseover and mouseout events)
    * @return the event object
@@ -640,7 +640,7 @@
    * @param shiftKey <code>true</code> if the shift key is depressed
    * @param metaKey <code>true</code> if the meta key is depressed
    * @param button the event's button property (values from
-   *          {@link Event#BUTTON_LEFT} et al)
+   *          {@link NativeEvent#BUTTON_LEFT} et al)
    * @return the event object
    */
   public final NativeEvent createMouseMoveEvent(int detail, int screenX, int screenY,
@@ -666,7 +666,7 @@
    * @param shiftKey <code>true</code> if the shift key is depressed
    * @param metaKey <code>true</code> if the meta key is depressed
    * @param button the event's button property (values from
-   *          {@link Event#BUTTON_LEFT} et al)
+   *          {@link NativeEvent#BUTTON_LEFT} et al)
    * @param relatedTarget the event's related target
    * @return the event object
    */
@@ -694,7 +694,7 @@
    * @param shiftKey <code>true</code> if the shift key is depressed
    * @param metaKey <code>true</code> if the meta key is depressed
    * @param button the event's button property (values from
-   *          {@link Event#BUTTON_LEFT} et al)
+   *          {@link NativeEvent#BUTTON_LEFT} et al)
    * @param relatedTarget the event's related target
    * @return the event object
    */
@@ -719,7 +719,7 @@
    * @param shiftKey <code>true</code> if the shift key is depressed
    * @param metaKey <code>true</code> if the meta key is depressed
    * @param button the event's button property (values from
-   *          {@link Event#BUTTON_LEFT} et al)
+   *          {@link NativeEvent#BUTTON_LEFT} et al)
    * @return the event object
    */
   public final NativeEvent createMouseUpEvent(int detail, int screenX, int screenY,
diff --git a/user/src/com/google/gwt/dom/client/Element.java b/user/src/com/google/gwt/dom/client/Element.java
index 0559099..5bcfd0c 100644
--- a/user/src/com/google/gwt/dom/client/Element.java
+++ b/user/src/com/google/gwt/dom/client/Element.java
@@ -39,7 +39,8 @@
    * Note: Because the browser's normal dispatch mechanism is used, exceptions
    * thrown from within handlers triggered by this method cannot be caught by
    * wrapping this method in a try/catch block. Such exceptions will be caught
-   * by the {@link GWT#setUncaughtExceptionHandler() uncaught exception handler}
+   * by the
+   * {@link com.google.gwt.core.client.GWT#setUncaughtExceptionHandler(com.google.gwt.core.client.GWT.UncaughtExceptionHandler) uncaught exception handler}
    * as usual.
    * 
    * @param evt the event to be dispatched
@@ -72,26 +73,28 @@
    *         does not have a specified or default value
    */
   public final native String getAttribute(String name) /*-{
-    return this.getAttribute(name) || '';
-  }-*/;
+     return this.getAttribute(name) || '';
+   }-*/;
 
   /**
    * The class attribute of the element. This attribute has been renamed due to
    * conflicts with the "class" keyword exposed by many languages.
    * 
-   * @see <a href="http://www.w3.org/TR/1999/REC-html401-19991224/struct/global.html#adef-class">W3C HTML Specification</a>
+   * @see <a
+   *      href="http://www.w3.org/TR/1999/REC-html401-19991224/struct/global.html#adef-class">W3C
+   *      HTML Specification</a>
    */
   public final native String getClassName() /*-{
-    return this.className;
-  }-*/;
+     return this.className;
+   }-*/;
 
   /**
    * Specifies the base direction of directionally neutral text and the
    * directionality of tables.
    */
   public final native String getDir() /*-{
-    return this.dir;
-  }-*/;
+     return this.dir;
+   }-*/;
 
   /**
    * Returns a NodeList of all descendant Elements with a given tag name, in the
@@ -103,8 +106,8 @@
    * @return A list of matching Element nodes
    */
   public final native NodeList<Element> getElementsByTagName(String name) /*-{
-    return this.getElementsByTagName(name);
-  }-*/;
+     return this.getElementsByTagName(name);
+   }-*/;
 
   /**
    * The first child of element this element. If there is no such element, this
@@ -117,11 +120,13 @@
   /**
    * The element's identifier.
    * 
-   * @see <a href="http://www.w3.org/TR/1999/REC-html401-19991224/struct/global.html#adef-id">W3C HTML Specification</a>
+   * @see <a
+   *      href="http://www.w3.org/TR/1999/REC-html401-19991224/struct/global.html#adef-id">W3C
+   *      HTML Specification</a>
    */
   public final native String getId() /*-{
-    return this.id;
-  }-*/;
+     return this.id;
+   }-*/;
 
   /**
    * All of the markup and content within a given element.
@@ -141,8 +146,8 @@
    * Language code defined in RFC 1766.
    */
   public final native String getLang() /*-{
-    return this.lang;
-  }-*/;
+     return this.lang;
+   }-*/;
 
   /**
    * The element immediately following this element. If there is no such
@@ -156,39 +161,39 @@
    * The height of an element relative to the layout.
    */
   public final native int getOffsetHeight() /*-{
-    return this.offsetHeight || 0;
-  }-*/;
+     return this.offsetHeight || 0;
+   }-*/;
 
   /**
    * The number of pixels that the upper left corner of the current element is
    * offset to the left within the offsetParent node.
    */
   public final native int getOffsetLeft() /*-{
-    return this.offsetLeft || 0;
-  }-*/;
+     return this.offsetLeft || 0;
+   }-*/;
 
   /**
    * Returns a reference to the object which is the closest (nearest in the
    * containment hierarchy) positioned containing element.
    */
   public final native Element getOffsetParent() /*-{
-    return this.offsetParent;
-  }-*/;
+     return this.offsetParent;
+   }-*/;
 
   /**
    * The number of pixels that the upper top corner of the current element is
    * offset to the top within the offsetParent node.
    */
   public final native int getOffsetTop() /*-{
-    return this.offsetTop || 0;
-  }-*/;
+     return this.offsetTop || 0;
+   }-*/;
 
   /**
    * The width of an element relative to the layout.
    */
   public final native int getOffsetWidth() /*-{
-    return this.offsetWidth || 0;
-  }-*/;
+     return this.offsetWidth || 0;
+   }-*/;
 
   /**
    * The parent element of this element.
@@ -204,8 +209,8 @@
    * @return the property value
    */
   public final native boolean getPropertyBoolean(String name) /*-{
-    return !!this[name];
-  }-*/;
+     return !!this[name];
+   }-*/;
 
   /**
    * Gets a double property from this element.
@@ -214,8 +219,8 @@
    * @return the property value
    */
   public final native double getPropertyDouble(String name) /*-{
-    return parseFloat(this[name]) || 0.0;
-  }-*/;
+     return parseFloat(this[name]) || 0.0;
+   }-*/;
 
   /**
    * Gets an integer property from this element.
@@ -224,8 +229,8 @@
    * @return the property value
    */
   public final native int getPropertyInt(String name) /*-{
-    return parseInt(this[name]) || 0;
-  }-*/;
+     return parseInt(this[name]) || 0;
+   }-*/;
 
   /**
    * Gets a property from this element.
@@ -234,36 +239,36 @@
    * @return the property value
    */
   public final native String getPropertyString(String name) /*-{
-    return (this[name] == null) ? null : String(this[name]);
-  }-*/;
+     return (this[name] == null) ? null : String(this[name]);
+   }-*/;
 
   /**
    * The height of the scroll view of an element.
    */
   public final native int getScrollHeight() /*-{
-    return this.scrollHeight || 0;
-  }-*/;
+     return this.scrollHeight || 0;
+   }-*/;
 
   /**
    * The number of pixels that an element's content is scrolled to the left.
    */
   public final native int getScrollLeft() /*-{
-    return this.scrollLeft || 0;
-  }-*/;
+     return this.scrollLeft || 0;
+   }-*/;
 
   /**
    * The number of pixels that an element's content is scrolled to the top.
    */
   public final native int getScrollTop() /*-{
-    return this.scrollTop || 0;
-  }-*/;
+     return this.scrollTop || 0;
+   }-*/;
 
   /**
    * The height of the scroll view of an element.
    */
   public final native int getScrollWidth() /*-{
-    return this.scrollWidth || 0;
-  }-*/;
+     return this.scrollWidth || 0;
+   }-*/;
 
   /**
    * Gets a string representation of this element (as outer HTML).
@@ -281,22 +286,22 @@
    * Gets this element's {@link Style} object.
    */
   public final native Style getStyle() /*-{
-    return this.style;
-  }-*/;
+     return this.style;
+   }-*/;
 
   /**
    * The name of the element.
    */
   public final native String getTagName() /*-{
-    return this.tagName;
-  }-*/;
+     return this.tagName;
+   }-*/;
 
   /**
    * The element's advisory title.
    */
   public final native String getTitle() /*-{
-    return this.title;
-  }-*/;
+     return this.title;
+   }-*/;
 
   /**
    * Determine whether an element is equal to, or the child of, this element.
@@ -312,8 +317,8 @@
    * Removes an attribute by name.
    */
   public final native void removeAttribute(String name) /*-{
-    this.removeAttribute(name);
-  }-*/;
+     this.removeAttribute(name);
+   }-*/;
 
   /**
    * Scrolls this element into view.
@@ -337,42 +342,46 @@
    * @param value Value to set in string form
    */
   public final native void setAttribute(String name, String value) /*-{
-    this.setAttribute(name, value);
-  }-*/;
+     this.setAttribute(name, value);
+   }-*/;
 
   /**
    * The class attribute of the element. This attribute has been renamed due to
    * conflicts with the "class" keyword exposed by many languages.
    * 
-   * @see <a href="http://www.w3.org/TR/1999/REC-html401-19991224/struct/global.html#adef-class">W3C HTML Specification</a>
+   * @see <a
+   *      href="http://www.w3.org/TR/1999/REC-html401-19991224/struct/global.html#adef-class">W3C
+   *      HTML Specification</a>
    */
   public final native void setClassName(String className) /*-{
-    this.className = className;
-  }-*/;
+     this.className = className;
+   }-*/;
 
   /**
    * Specifies the base direction of directionally neutral text and the
    * directionality of tables.
    */
   public final native void setDir(String dir) /*-{
-    this.dir = dir;
-  }-*/;
+     this.dir = dir;
+   }-*/;
 
   /**
    * The element's identifier.
    * 
-   * @see <a href="http://www.w3.org/TR/1999/REC-html401-19991224/struct/global.html#adef-id">W3C HTML Specification</a>
+   * @see <a
+   *      href="http://www.w3.org/TR/1999/REC-html401-19991224/struct/global.html#adef-id">W3C
+   *      HTML Specification</a>
    */
   public final native void setId(String id) /*-{
-    this.id = id;
-  }-*/;
+     this.id = id;
+   }-*/;
 
   /**
    * All of the markup and content within a given element.
    */
   public final native void setInnerHTML(String html) /*-{
-    this.innerHTML = html || '';
-  }-*/;
+     this.innerHTML = html || '';
+   }-*/;
 
   /**
    * The text between the start and end tags of the object.
@@ -385,8 +394,8 @@
    * Language code defined in RFC 1766.
    */
   public final native void setLang(String lang) /*-{
-    this.lang = lang;
-  }-*/;
+     this.lang = lang;
+   }-*/;
 
   /**
    * Sets a boolean property on this element.
@@ -395,8 +404,8 @@
    * @param value the new property value
    */
   public final native void setPropertyBoolean(String name, boolean value) /*-{
-    this[name] = value;
-  }-*/;
+     this[name] = value;
+   }-*/;
 
   /**
    * Sets a double property on this element.
@@ -405,8 +414,8 @@
    * @param value the new property value
    */
   public final native void setPropertyDouble(String name, double value) /*-{
-    this[name] = value;
-  }-*/;
+     this[name] = value;
+   }-*/;
 
   /**
    * Sets an integer property on this element.
@@ -415,8 +424,8 @@
    * @param value the new property value
    */
   public final native void setPropertyInt(String name, int value) /*-{
-    this[name] = value;
-  }-*/;
+     this[name] = value;
+   }-*/;
 
   /**
    * Sets a property on this element.
@@ -425,29 +434,29 @@
    * @param value the new property value
    */
   public final native void setPropertyString(String name, String value) /*-{
-    this[name] = value;
-  }-*/;
+     this[name] = value;
+   }-*/;
 
   /**
    * The number of pixels that an element's content is scrolled to the left.
    */
   public final native void setScrollLeft(int scrollLeft) /*-{
-    this.scrollLeft = scrollLeft;
-  }-*/;
+     this.scrollLeft = scrollLeft;
+   }-*/;
 
   /**
    * The number of pixels that an element's content is scrolled to the top.
    */
   public final native void setScrollTop(int scrollTop) /*-{
-    this.scrollTop = scrollTop;
-  }-*/;
+     this.scrollTop = scrollTop;
+   }-*/;
 
   /**
    * The element's advisory title.
    */
   public final native void setTitle(String title) /*-{
-    // Setting the title to null results in the string "null" being displayed
-    // on some browsers.
-    this.title = title || '';
-  }-*/;
+     // Setting the title to null results in the string "null" being displayed
+     // on some browsers.
+     this.title = title || '';
+   }-*/;
 }
diff --git a/user/src/com/google/gwt/event/logical/shared/HasHandlers.java b/user/src/com/google/gwt/event/logical/shared/HasHandlers.java
index f16eb52..62b6912 100644
--- a/user/src/com/google/gwt/event/logical/shared/HasHandlers.java
+++ b/user/src/com/google/gwt/event/logical/shared/HasHandlers.java
@@ -21,7 +21,7 @@
  * HasHandlers has moved to com.google.gwt.event.shared.HasHandlers. This

  * interface will be removed before the first GWT 1.6 milestone.

  * 

- * @deprecated use com.google.gwt.event.shared.HasHandlers instead.

+ * @deprecated Use {@link com.google.gwt.event.shared.HasHandlers} instead

  */

 @Deprecated

 public interface HasHandlers extends com.google.gwt.event.shared.HasHandlers {

diff --git a/user/src/com/google/gwt/event/shared/HandlerManager.java b/user/src/com/google/gwt/event/shared/HandlerManager.java
index f180f96..db8617e 100644
--- a/user/src/com/google/gwt/event/shared/HandlerManager.java
+++ b/user/src/com/google/gwt/event/shared/HandlerManager.java
@@ -236,9 +236,10 @@
    * 
    * @param type the event type
    * @param handler the handler
-   * @deprecated We currently believe this method will not be needed after
-   *             listeners are removed in GWT 2.0. If you have a use case for it
-   *             after that time, please add your comments to gwt issue 3102
+   * @deprecated This method is likely to be removed along with "listener"
+   *             interfaces in a future release. If you have a reason it should
+   *             be retained beyond that time, please add your comments to GWT
+   *             <a href="http://code.google.com/p/google-web-toolkit/issues/detail?id=3102">issue 3102</a>
    */
   @Deprecated
   public <H extends EventHandler> void removeHandler(GwtEvent.Type<H> type,
diff --git a/user/src/com/google/gwt/i18n/client/NumberFormat.java b/user/src/com/google/gwt/i18n/client/NumberFormat.java
index 56c2dda..a589e86 100644
--- a/user/src/com/google/gwt/i18n/client/NumberFormat.java
+++ b/user/src/com/google/gwt/i18n/client/NumberFormat.java
@@ -473,7 +473,6 @@
    * @param pattern pattern that specify how number should be formatted
    * @param cdata currency data that should be used
    * @param userSuppliedPattern true if the pattern was supplied by the user
-   * @skip
    */
   protected NumberFormat(NumberConstants numberConstants, String pattern, CurrencyData cdata,
       boolean userSuppliedPattern) {
@@ -500,7 +499,6 @@
    * @param pattern pattern that specify how number should be formatted
    * @param cdata currency data that should be used
    * @param userSuppliedPattern true if the pattern was supplied by the user
-   * @skip
    */
   protected NumberFormat(String pattern, CurrencyData cdata, boolean userSuppliedPattern) {
     this(defaultNumberConstants, pattern, cdata, userSuppliedPattern);
diff --git a/user/src/com/google/gwt/json/client/JSONNumber.java b/user/src/com/google/gwt/json/client/JSONNumber.java
index 2bd6682..1b9eea3 100644
--- a/user/src/com/google/gwt/json/client/JSONNumber.java
+++ b/user/src/com/google/gwt/json/client/JSONNumber.java
@@ -57,7 +57,7 @@
   /**
    * Gets the double value this JSONNumber represents.
    * 
-   * @deprecated use {@link #doubleValue()}
+   * @deprecated See {@link #doubleValue()}
    */
   @Deprecated
   public double getValue() {
diff --git a/user/src/com/google/gwt/junit/client/GWTTestCase.java b/user/src/com/google/gwt/junit/client/GWTTestCase.java
index 2158542..9c8fa25 100644
--- a/user/src/com/google/gwt/junit/client/GWTTestCase.java
+++ b/user/src/com/google/gwt/junit/client/GWTTestCase.java
@@ -89,9 +89,9 @@
    * Clears the accumulated list of checkpoint messages.
    * 
    * @see #addCheckpoint(String)
-   * @deprecated This method will be removed when web mode supports stack
+   * @deprecated This method will be removed if and when web mode supports stack
    *             traces. It can be useful for debugging web mode failures, but
-   *             production code should not depend on it.
+   *             production code should not depend on it
    */
   @Deprecated
   public final void clearCheckpoints() {
@@ -103,9 +103,9 @@
    * 
    * @return a non-<code>null</code> array of checkpoint messages
    * @see #addCheckpoint(String)
-   * @deprecated This method will be removed when web mode supports stack
+   * @deprecated This method will be removed if and when web mode supports stack
    *             traces. It can be useful for debugging web mode failures, but
-   *             production code should not depend on it.
+   *             production code should not depend on it
    */
   @Deprecated
   public final String[] getCheckpoints() {
diff --git a/user/src/com/google/gwt/user/client/rpc/SerializableException.java b/user/src/com/google/gwt/user/client/rpc/SerializableException.java
index eec580d..ab32851 100644
--- a/user/src/com/google/gwt/user/client/rpc/SerializableException.java
+++ b/user/src/com/google/gwt/user/client/rpc/SerializableException.java
@@ -21,7 +21,7 @@
  * 
  * @deprecated As of GWT 1.5, {@link Exception} implements
  *             {@link java.io.Serializable Serializable} and can be used in place
- *             of this class.
+ *             of this class
  */
 @Deprecated
 public class SerializableException extends Exception implements IsSerializable {
diff --git a/user/src/com/google/gwt/user/client/ui/Button.java b/user/src/com/google/gwt/user/client/ui/Button.java
index 3eb189f..0f7863c 100644
--- a/user/src/com/google/gwt/user/client/ui/Button.java
+++ b/user/src/com/google/gwt/user/client/ui/Button.java
@@ -95,7 +95,7 @@
    * 
    * @param html the HTML caption
    * @param listener the click listener
-   * @deprecated use {@link Button#Button(String, ClickHandler)} instead
+   * @deprecated Use {@link Button#Button(String, ClickHandler)} instead
    */
   @Deprecated
   public Button(String html, ClickListener listener) {
diff --git a/user/src/com/google/gwt/user/client/ui/ChangeListener.java b/user/src/com/google/gwt/user/client/ui/ChangeListener.java
index c93a7e1..d1b4ebf 100644
--- a/user/src/com/google/gwt/user/client/ui/ChangeListener.java
+++ b/user/src/com/google/gwt/user/client/ui/ChangeListener.java
@@ -20,10 +20,12 @@
 /**
  * Event listener interface for 'change' events.
  * 
- * @deprecated we have now separated dom and logical change events. Use {@link com.google.gwt.event.dom.client.ChangeHandler} if the
- *             change listener was triggered by a dom change event or
- *             {@link com.google.gwt.event.logical.shared.ValueChangeHandler} if
- *             it was based on a logical event
+ * @deprecated As of GWT 1.6, DOM and logical change events are separate. Use
+ *             {@link com.google.gwt.event.dom.client.ChangeHandler} for changes
+ *             triggered by a DOM-based change event and
+ *             {@link com.google.gwt.event.logical.shared.ValueChangeHandler}
+ *             for changes resulting from a logical event such as a method call
+ *             that changes state
  */
 @Deprecated
 public interface ChangeListener extends EventListener {
@@ -34,11 +36,7 @@
    * 
    * @param sender the widget that has changed
    * 
-   * @deprecated use
-   *             {@link com.google.gwt.event.dom.client.ChangeHandler#onChange(com.google.gwt.event.dom.client.ChangeEvent)}
-   *             if the change listener was triggered by a dom change event or
-   *             {@link com.google.gwt.event.logical.shared.ValueChangeHandler#onValueChange(com.google.gwt.event.logical.shared.ValueChangeEvent)}
-   *             if it was based on a logical event
+   * @deprecated See the deprecation message on the enclosing interface for details.
    */
   @Deprecated
   void onChange(Widget sender);
diff --git a/user/src/com/google/gwt/user/client/ui/ChangeListenerCollection.java b/user/src/com/google/gwt/user/client/ui/ChangeListenerCollection.java
index c0504e2..b095bac 100644
--- a/user/src/com/google/gwt/user/client/ui/ChangeListenerCollection.java
+++ b/user/src/com/google/gwt/user/client/ui/ChangeListenerCollection.java
@@ -22,11 +22,11 @@
  * subclass of {@link ArrayList} assumes that all objects added to it will be of
  * type {@link com.google.gwt.user.client.ui.ChangeListener}.
  * 
- * @deprecated use <code>addDomHandler(myHandler, ChangeEvent.getType())</code>
- *             for dom based change events and use
- *             <code>addHandler(myHandler, ValueChangeEvent.getType())</code>
- *             for logical change events instead to manage handlers for your
- *             widget
+ * @deprecated As of GWT 1.6, to manage handlers for your widget, call
+ *             <code>{@link Widget#addDomHandler(com.google.gwt.event.shared.EventHandler, com.google.gwt.event.dom.client.DomEvent.Type) addDomHandler}(myHandler, ChangeEvent.getType())</code>
+ *             for DOM-based change events, and call
+ *             <code>{@link Widget#addHandler(com.google.gwt.event.shared.EventHandler, com.google.gwt.event.shared.GwtEvent.Type) addHandler}(myHandler, ValueChangeEvent.getType())</code>
+ *             for logical change events
  */
 @Deprecated
 public class ChangeListenerCollection extends ArrayList<ChangeListener> {
diff --git a/user/src/com/google/gwt/user/client/ui/CheckBox.java b/user/src/com/google/gwt/user/client/ui/CheckBox.java
index 40386ff..549107c 100644
--- a/user/src/com/google/gwt/user/client/ui/CheckBox.java
+++ b/user/src/com/google/gwt/user/client/ui/CheckBox.java
@@ -134,8 +134,6 @@
    * <p>
    * Don't confuse this with {@link #getValue}, which returns true or false if
    * the widget is checked.
-   * 
-   * @return
    */
   public String getFormValue() {
     return inputElem.getValue();
@@ -182,7 +180,7 @@
    * Determines whether this check box is currently checked.
    * 
    * @return <code>true</code> if the check box is checked
-   * @deprecated use {@link #getValue} instead
+   * @deprecated Use {@link #getValue} instead
    */
   @Deprecated
   public boolean isChecked() {
@@ -278,8 +276,8 @@
    * input element wrapped by this widget. For access to that property, see
    * {@link #setFormValue(String)}
    * 
-   * @param value true to check, false to uncheck. Must not be null.
-   * @thows IllegalArgumentException if value is null
+   * @param value true to check, false to uncheck; must not be null
+   * @throws IllegalArgumentException if value is null
    */
   public void setValue(Boolean value) {
     setValue(value, false);
@@ -293,10 +291,10 @@
    * input element wrapped by this widget. For access to that property, see
    * {@link #setFormValue(String)}
    *
-   * @param value true to check, false to uncheck. Must not be null.
+   * @param value true to check, false to uncheck; must not be null
    * @param fireEvents If true, and value has changed, fire a
    *          {@link ValueChangeEvent}
-   * @thows IllegalArgumentException if value is null
+   * @throws IllegalArgumentException if value is null
    */
   public void setValue(Boolean value, boolean fireEvents) {
     if (value == null) {
diff --git a/user/src/com/google/gwt/user/client/ui/ClickListener.java b/user/src/com/google/gwt/user/client/ui/ClickListener.java
index 1c5e15d..6a2e222 100644
--- a/user/src/com/google/gwt/user/client/ui/ClickListener.java
+++ b/user/src/com/google/gwt/user/client/ui/ClickListener.java
@@ -20,7 +20,7 @@
 /**
  * Event listener interface for click events.
  * 
- * @deprecated use {@link com.google.gwt.event.dom.client.ClickHandler} instead
+ * @deprecated Use {@link com.google.gwt.event.dom.client.ClickHandler} instead
  */
 @Deprecated
 public interface ClickListener extends EventListener {
diff --git a/user/src/com/google/gwt/user/client/ui/ClickListenerCollection.java b/user/src/com/google/gwt/user/client/ui/ClickListenerCollection.java
index 9d13313..40c6ba0 100644
--- a/user/src/com/google/gwt/user/client/ui/ClickListenerCollection.java
+++ b/user/src/com/google/gwt/user/client/ui/ClickListenerCollection.java
@@ -22,7 +22,8 @@
  * subclass of {@link ArrayList} assumes that all objects added to it will be of
  * type {@link com.google.gwt.user.client.ui.ClickListener}.
  * 
- * @deprecated use <code>addDomHandler(myHandler, ClickEvent.getType())</code>
+ * @deprecated As of GWT 1.6, call
+ *             <code>{@link Widget#addDomHandler(com.google.gwt.event.shared.EventHandler, com.google.gwt.event.dom.client.DomEvent.Type) addDomHandler}(myHandler, ClickEvent.getType())</code>
  *             to manage handlers for your widget instead
  */
 @Deprecated
diff --git a/user/src/com/google/gwt/user/client/ui/Composite.java b/user/src/com/google/gwt/user/client/ui/Composite.java
index a628c78..4f2c795 100644
--- a/user/src/com/google/gwt/user/client/ui/Composite.java
+++ b/user/src/com/google/gwt/user/client/ui/Composite.java
@@ -127,8 +127,7 @@
    * This method was for initializing the Widget to be wrapped by this
    * Composite, but has been deprecated in favor of {@link #initWidget(Widget)}.
    * 
-   * @deprecated this method is deprecated, and will be removed (use
-   *             {@link #initWidget(Widget)} instead)
+   * @deprecated Use {@link #initWidget(Widget)} instead
    */
   @Deprecated
   protected void setWidget(Widget widget) {
diff --git a/user/src/com/google/gwt/user/client/ui/DelegatingChangeListenerCollection.java b/user/src/com/google/gwt/user/client/ui/DelegatingChangeListenerCollection.java
index c32c990..3cf91bc 100644
--- a/user/src/com/google/gwt/user/client/ui/DelegatingChangeListenerCollection.java
+++ b/user/src/com/google/gwt/user/client/ui/DelegatingChangeListenerCollection.java
@@ -39,7 +39,7 @@
  *  }
  *</pre>
  * 
- * @deprecated use <code>Widget#delegateEvent</code> instead
+ * @deprecated Use {@link Widget#delegateEvent Widget.delegateEvent} instead
  */
 @Deprecated
 public class DelegatingChangeListenerCollection extends
diff --git a/user/src/com/google/gwt/user/client/ui/DelegatingClickListenerCollection.java b/user/src/com/google/gwt/user/client/ui/DelegatingClickListenerCollection.java
index f6feae8..0374d2c 100644
--- a/user/src/com/google/gwt/user/client/ui/DelegatingClickListenerCollection.java
+++ b/user/src/com/google/gwt/user/client/ui/DelegatingClickListenerCollection.java
@@ -39,7 +39,7 @@
  *  }
  *</pre>
  * 
- * @deprecated use <code>Widget#delegateEvent</code> instead
+ * @deprecated Use <code>Widget#delegateEvent</code> instead
  */
 @Deprecated
 public class DelegatingClickListenerCollection extends ClickListenerCollection
diff --git a/user/src/com/google/gwt/user/client/ui/DelegatingFocusListenerCollection.java b/user/src/com/google/gwt/user/client/ui/DelegatingFocusListenerCollection.java
index 9d26eee..eca071d 100644
--- a/user/src/com/google/gwt/user/client/ui/DelegatingFocusListenerCollection.java
+++ b/user/src/com/google/gwt/user/client/ui/DelegatingFocusListenerCollection.java
@@ -39,7 +39,7 @@
  *  }
  *</pre>
  * 
- * @deprecated use <code>Widget#delegateEvent</code> instead
+ * @deprecated Use {@link Widget#delegateEvent Widget.delegateEvent} instead
  */
 @Deprecated
 public class DelegatingFocusListenerCollection extends FocusListenerCollection
diff --git a/user/src/com/google/gwt/user/client/ui/DelegatingKeyboardListenerCollection.java b/user/src/com/google/gwt/user/client/ui/DelegatingKeyboardListenerCollection.java
index ccae9d2..38b40cc 100644
--- a/user/src/com/google/gwt/user/client/ui/DelegatingKeyboardListenerCollection.java
+++ b/user/src/com/google/gwt/user/client/ui/DelegatingKeyboardListenerCollection.java
@@ -40,7 +40,7 @@
  *  }
  *</pre>
  * 
- * @deprecated use <code>Widget#delegateEvent</code> instead
+ * @deprecated Use {@link Widget#delegateEvent Widget.delegateEvent} instead
  */
 @Deprecated
 public class DelegatingKeyboardListenerCollection extends
diff --git a/user/src/com/google/gwt/user/client/ui/DisclosureEvent.java b/user/src/com/google/gwt/user/client/ui/DisclosureEvent.java
index 8488ed5..e19ecfe 100644
--- a/user/src/com/google/gwt/user/client/ui/DisclosureEvent.java
+++ b/user/src/com/google/gwt/user/client/ui/DisclosureEvent.java
@@ -20,7 +20,7 @@
 /**
  * Event object containing information about {@link DisclosurePanel} changes.
  * 
- * @deprecated use
+ * @deprecated Use
  *             {@link com.google.gwt.event.logical.shared.CloseEvent} and
  *             {@link  com.google.gwt.event.logical.shared.OpenEvent} instead
  */
diff --git a/user/src/com/google/gwt/user/client/ui/DisclosureHandler.java b/user/src/com/google/gwt/user/client/ui/DisclosureHandler.java
index 3145353..8f74daa 100644
--- a/user/src/com/google/gwt/user/client/ui/DisclosureHandler.java
+++ b/user/src/com/google/gwt/user/client/ui/DisclosureHandler.java
@@ -20,7 +20,7 @@
 /**
  * Event handler interface for {@link DisclosureEvent}.
  * 
- * @deprecated use {@link com.google.gwt.event.logical.shared.CloseHandler}
+ * @deprecated Use {@link com.google.gwt.event.logical.shared.CloseHandler}
  *             and/or {@link com.google.gwt.event.logical.shared.OpenHandler}
  *             instead
  * @see DisclosurePanel
@@ -31,7 +31,7 @@
    * Fired when the panel is closed.
    * 
    * @param event event representing this action.
-   * @deprecated use {@link com.google.gwt.event.logical.shared.CloseHandler}
+   * @deprecated Use {@link com.google.gwt.event.logical.shared.CloseHandler}
    *             instead
    */
   @Deprecated
@@ -41,7 +41,7 @@
    * Fired when the panel is opened.
    * 
    * @param event event representing this action.
-   * @deprecated use {@link com.google.gwt.event.logical.shared.OpenHandler} instead
+   * @deprecated Use {@link com.google.gwt.event.logical.shared.OpenHandler} instead
    */
   @Deprecated
   void onOpen(DisclosureEvent event);
diff --git a/user/src/com/google/gwt/user/client/ui/DisclosurePanel.java b/user/src/com/google/gwt/user/client/ui/DisclosurePanel.java
index 2c1cf74..621a57f 100644
--- a/user/src/com/google/gwt/user/client/ui/DisclosurePanel.java
+++ b/user/src/com/google/gwt/user/client/ui/DisclosurePanel.java
@@ -364,7 +364,7 @@
    * notification.
    * 
    * @param handler the handler to be added (should not be null)
-   * @deprecated use {@link DisclosurePanel#addOpenHandler(OpenHandler)} and
+   * @deprecated Use {@link DisclosurePanel#addOpenHandler(OpenHandler)} and
    * {@link DisclosurePanel#addCloseHandler(CloseHandler)} instead
    */
   @Deprecated
diff --git a/user/src/com/google/gwt/user/client/ui/FiresDisclosureEvents.java b/user/src/com/google/gwt/user/client/ui/FiresDisclosureEvents.java
index b91e4d0..7799054 100644
--- a/user/src/com/google/gwt/user/client/ui/FiresDisclosureEvents.java
+++ b/user/src/com/google/gwt/user/client/ui/FiresDisclosureEvents.java
@@ -19,7 +19,7 @@
  * A widget that implements this interface fires the events defined by the
  * {@link DisclosureHandler} interface.
  * 
- * @deprecated use {@link com.google.gwt.event.logical.shared.HasOpenHandlers}
+ * @deprecated Use {@link com.google.gwt.event.logical.shared.HasOpenHandlers}
  *             and {@link com.google.gwt.event.logical.shared.HasCloseHandlers}
  *             instead
  */
@@ -30,7 +30,7 @@
    * Adds a handler interface to receive open events.
    * 
    * @param handler the handler to add
-   * @deprecated add an open or close handler to the event source instead
+   * @deprecated Add an open or close handler to the event source instead
    */
   @Deprecated
   void addEventHandler(DisclosureHandler handler);
diff --git a/user/src/com/google/gwt/user/client/ui/FiresFormEvents.java b/user/src/com/google/gwt/user/client/ui/FiresFormEvents.java
index a99535e..47e1936 100644
--- a/user/src/com/google/gwt/user/client/ui/FiresFormEvents.java
+++ b/user/src/com/google/gwt/user/client/ui/FiresFormEvents.java
@@ -19,9 +19,9 @@
  * A widget that implements this interface fires the events defined by the
  * {@link com.google.gwt.user.client.ui.FormHandler} interface.
  * 
- * @deprecated Only {@link FormPanel} was expected to use this interface.
- *             Instead, it now uses {@link FormPanel.SubmitCompleteEvent} and
- *             {@link SubmitEvent}.
+ * @deprecated This interface was specific to {@link FormPanel}; it is not generally useful and will be removed in a future version.
+ *             Use {@link FormPanel#addSubmitHandler(com.google.gwt.user.client.ui.FormPanel.SubmitHandler) FormPanel.addSubmitHandler} and
+ *             {@link com.google.gwt.user.client.ui.FormPanel#addSubmitCompleteHandler(com.google.gwt.user.client.ui.FormPanel.SubmitCompleteHandler) FormPanel.addSubmitCompleteHandler} instead
  */
 @Deprecated
 public interface FiresFormEvents {
@@ -29,8 +29,8 @@
   /**
    * Adds a handler interface to receive click events.
    * 
-   * @deprecated use {@link FormPanel#addSubmitCompleteHandler} and
-   *             {@link FormPanel#addSubmitHandler} instead
+   * @deprecated Use {@link FormPanel#addSubmitCompleteHandler FormPanel.addSubmitCompleteHandler} and
+   *             {@link FormPanel#addSubmitHandler FormPanel.addSubmitHandler} instead
    * @param handler the handler interface to add
    */
   @Deprecated
diff --git a/user/src/com/google/gwt/user/client/ui/FiresSuggestionEvents.java b/user/src/com/google/gwt/user/client/ui/FiresSuggestionEvents.java
index 0627a6f..176b136 100644
--- a/user/src/com/google/gwt/user/client/ui/FiresSuggestionEvents.java
+++ b/user/src/com/google/gwt/user/client/ui/FiresSuggestionEvents.java
@@ -19,7 +19,7 @@
  * A widget that implements this interface fires the events defined by the
  * {@link SuggestionHandler} interface.
  * 
- * @deprecated use
+ * @deprecated Use
  *             {@link com.google.gwt.event.logical.shared.HasSelectionHandlers}
  *             instead.
  */
@@ -29,7 +29,7 @@
   /**
    * Adds a handler interface to receive suggestion events.
    * 
-   * @deprecated add a selection handler instead
+   * @deprecated Add a selection handler instead
    * @param handler the handler to add
    */
   @Deprecated
diff --git a/user/src/com/google/gwt/user/client/ui/FocusListener.java b/user/src/com/google/gwt/user/client/ui/FocusListener.java
index fa82aca..9f175fc 100644
--- a/user/src/com/google/gwt/user/client/ui/FocusListener.java
+++ b/user/src/com/google/gwt/user/client/ui/FocusListener.java
@@ -20,7 +20,7 @@
 /**
  * Event listener for focus events.
  * 
- * @deprecated use {@link com.google.gwt.event.dom.client.FocusHandler} and/or
+ * @deprecated Use {@link com.google.gwt.event.dom.client.FocusHandler} and/or
  *             {@link com.google.gwt.event.dom.client.BlurHandler} instead
  */
 @Deprecated
@@ -30,7 +30,7 @@
    * Fired when a widget receives keyboard focus.
    * 
    * @param sender the widget receiving focus.
-   * @deprecated use
+   * @deprecated Use
    *             {@link com.google.gwt.event.dom.client.FocusHandler#onFocus(com.google.gwt.event.dom.client.FocusEvent)}
    *             instead
    */
@@ -41,7 +41,7 @@
    * Fired when a widget loses keyboard focus.
    * 
    * @param sender the widget losing focus.
-   * @deprecated use
+   * @deprecated Use
    *             {@link com.google.gwt.event.dom.client.BlurHandler#onBlur(com.google.gwt.event.dom.client.BlurEvent)}
    *             instead
    */
diff --git a/user/src/com/google/gwt/user/client/ui/FocusListenerAdapter.java b/user/src/com/google/gwt/user/client/ui/FocusListenerAdapter.java
index c72d948..f82aa99 100644
--- a/user/src/com/google/gwt/user/client/ui/FocusListenerAdapter.java
+++ b/user/src/com/google/gwt/user/client/ui/FocusListenerAdapter.java
@@ -19,7 +19,7 @@
  * An adapter to simplify focus event listeners that do not need all events
  * defined on the FocusListener interface.
  * 
- * @deprecated use {@link com.google.gwt.event.dom.client.FocusHandler} and
+ * @deprecated Use {@link com.google.gwt.event.dom.client.FocusHandler} and
  *             {@link com.google.gwt.event.dom.client.BlurHandler} instead
  */
 @Deprecated
diff --git a/user/src/com/google/gwt/user/client/ui/FocusListenerCollection.java b/user/src/com/google/gwt/user/client/ui/FocusListenerCollection.java
index 5488f26..8ec58ad 100644
--- a/user/src/com/google/gwt/user/client/ui/FocusListenerCollection.java
+++ b/user/src/com/google/gwt/user/client/ui/FocusListenerCollection.java
@@ -26,8 +26,8 @@
  * subclass of {@link ArrayList} assumes that all objects added to it will be of
  * type {@link com.google.gwt.user.client.ui.FocusListener}
  * 
- * @deprecated use <code>addDomHandler(myHandler, FocusEvent.getType())</code>
- *             and <code>addDomHandler(myHandler, BlurEvent.getType())</code> to
+ * @deprecated Use <code>{@link Widget#addDomHandler(com.google.gwt.event.shared.EventHandler, com.google.gwt.event.dom.client.DomEvent.Type) addDomHandler}(myHandler, FocusEvent.getType())</code>
+ *             and <code>{@link Widget#addDomHandler(com.google.gwt.event.shared.EventHandler, com.google.gwt.event.dom.client.DomEvent.Type) addDomHandler}(myHandler, BlurEvent.getType())</code> to
  *             manage your widget's handlers instead
  */
 @Deprecated
diff --git a/user/src/com/google/gwt/user/client/ui/FormHandler.java b/user/src/com/google/gwt/user/client/ui/FormHandler.java
index cc18975..27d7f0c 100644
--- a/user/src/com/google/gwt/user/client/ui/FormHandler.java
+++ b/user/src/com/google/gwt/user/client/ui/FormHandler.java
@@ -20,7 +20,7 @@
 /**
  * Handler interface for form submit events.
  * 
- * @deprecated use {@link FormPanel.SubmitCompleteHandler} and/or
+ * @deprecated Use {@link FormPanel.SubmitCompleteHandler} and/or
  *             {@link FormPanel.SubmitHandler} instead
  */
 @Deprecated
@@ -37,7 +37,7 @@
    * 
    * @param event an event object containing information about the form
    *          submission
-   * @deprecated use {@link FormPanel.SubmitHandler} instead
+   * @deprecated Use {@link FormPanel.SubmitHandler} instead
    */
   @Deprecated
   void onSubmit(FormSubmitEvent event);
@@ -47,7 +47,7 @@
    * 
    * @param event an event object containing information about the form
    *          submission
-   * @deprecated use {@link FormPanel.SubmitCompleteHandler} instead
+   * @deprecated Use {@link FormPanel.SubmitCompleteHandler} instead
    */
   @Deprecated
   void onSubmitComplete(FormSubmitCompleteEvent event);
diff --git a/user/src/com/google/gwt/user/client/ui/FormHandlerCollection.java b/user/src/com/google/gwt/user/client/ui/FormHandlerCollection.java
index af6a126..7b74c9c 100644
--- a/user/src/com/google/gwt/user/client/ui/FormHandlerCollection.java
+++ b/user/src/com/google/gwt/user/client/ui/FormHandlerCollection.java
@@ -23,7 +23,7 @@
  * of ArrayList assumes that all items added to it will be of type
  * {@link com.google.gwt.user.client.ui.FormHandler}.
  * 
- * @deprecated {@link FormPanel} now handles all handler management internally
+ * @deprecated {@link FormPanel} now implements all handler management internally
  */
 @Deprecated
 public class FormHandlerCollection extends ArrayList<FormHandler> {
diff --git a/user/src/com/google/gwt/user/client/ui/FormPanel.java b/user/src/com/google/gwt/user/client/ui/FormPanel.java
index c1353c8..5af185e 100644
--- a/user/src/com/google/gwt/user/client/ui/FormPanel.java
+++ b/user/src/com/google/gwt/user/client/ui/FormPanel.java
@@ -184,7 +184,7 @@
      * This method is used for legacy support and should be removed when
      * {@link FormHandler} is removed.
      * 
-     * @deprecated use {@link FormPanel.SubmitEvent#cancel()} instead
+     * @deprecated Use {@link FormPanel.SubmitEvent#cancel()} instead
      */
     @Deprecated
     void setCanceled(boolean canceled) {
@@ -308,9 +308,9 @@
    * <p>
    * The back-end server is expected to respond with a content-type of
    * 'text/html', meaning that the text returned will be treated as HTML. If any
-   * other content-type is specified by the server, then the result html sent in
+   * other content-type is specified by the server, then the result HTML sent in
    * the onFormSubmit event will be unpredictable across browsers, and the
-   * {@link SubmitCompleteHandler#onSubmitComplete(SubmitCompleteEvent)} event
+   * {@link SubmitCompleteHandler#onSubmitComplete(com.google.gwt.user.client.ui.FormPanel.SubmitCompleteEvent) onSubmitComplete} event
    * may not fire at all.
    * </p>
    * 
diff --git a/user/src/com/google/gwt/user/client/ui/HasFocus.java b/user/src/com/google/gwt/user/client/ui/HasFocus.java
index e0e999e..24c1be1 100644
--- a/user/src/com/google/gwt/user/client/ui/HasFocus.java
+++ b/user/src/com/google/gwt/user/client/ui/HasFocus.java
@@ -18,7 +18,7 @@
 /**
  * A widget that implements this interface can receive keyboard focus.
  * 
- * @deprecated use {@link Focusable} instead
+ * @deprecated Use {@link Focusable} instead
  */
 @Deprecated
 public interface HasFocus extends Focusable, SourcesFocusEvents,
diff --git a/user/src/com/google/gwt/user/client/ui/HasKeyPreview.java b/user/src/com/google/gwt/user/client/ui/HasKeyPreview.java
index 36849c0..927e865 100644
--- a/user/src/com/google/gwt/user/client/ui/HasKeyPreview.java
+++ b/user/src/com/google/gwt/user/client/ui/HasKeyPreview.java
@@ -20,7 +20,7 @@
  * before they are passed to the focused widget.
  * 
  * @see com.google.gwt.event.dom.client.KeyCodeEvent
- * @deprecated This interface hasn't worked in at least two years. Oops.
+ * @deprecated This interface has been superseded.
  */
 @Deprecated
 public interface HasKeyPreview {
diff --git a/user/src/com/google/gwt/user/client/ui/PopupPanel.java b/user/src/com/google/gwt/user/client/ui/PopupPanel.java
index b732c69..08fd2b8 100644
--- a/user/src/com/google/gwt/user/client/ui/PopupPanel.java
+++ b/user/src/com/google/gwt/user/client/ui/PopupPanel.java
@@ -96,8 +96,8 @@
    * 
    * <ul>
    * <li>CENTER - Expand from the center of the popup</li>
-   * <li>ONE_WAY_CORNER - Expand from the top left corner, do not animate hiding
-   * </li>
+   * <li>ONE_WAY_CORNER - Expand from the top left corner, do not animate
+   * hiding </li>
    * </ul>
    */
   static enum AnimationType {
@@ -475,8 +475,8 @@
   }
 
   /**
-   * Returns <code>true</code> if the popup should be automatically hidden when
-   * the user clicks outside of it.
+   * Returns <code>true</code> if the popup should be automatically hidden
+   * when the user clicks outside of it.
    * 
    * @return true if autoHide is enabled, false if disabled
    */
@@ -530,7 +530,8 @@
   }
 
   /**
-   * @deprecated use {@link #onPreviewNativeEvent(NativePreviewEvent)} instead
+   * @deprecated Use <code>onPreviewNativeEvent(NativePreviewEvent)</code>
+   *             instead
    */
   @Deprecated
   public boolean onEventPreview(Event event) {
@@ -545,7 +546,8 @@
    * @param modifiers keyboard modifiers, as specified in
    *          {@link com.google.gwt.event.dom.client.KeyCodes}.
    * @return <code>false</code> to suppress the event
-   * @deprecated use {@link #onPreviewNativeEvent(NativePreviewEvent)} instead
+   * @deprecated Use <code>onPreviewNativeEvent(NativePreviewEvent)</code>
+   *             instead
    */
   @Deprecated
   public boolean onKeyDownPreview(char key, int modifiers) {
@@ -560,7 +562,8 @@
    * @param modifiers keyboard modifiers, as specified in
    *          {@link com.google.gwt.event.dom.client.KeyCodes}.
    * @return <code>false</code> to suppress the event
-   * @deprecated use {@link #onPreviewNativeEvent(NativePreviewEvent)} instead
+   * @deprecated Use <code>onPreviewNativeEvent(NativePreviewEvent)</code>
+   *             instead
    */
   @Deprecated
   public boolean onKeyPressPreview(char key, int modifiers) {
@@ -575,7 +578,8 @@
    * @param modifiers keyboard modifiers, as specified in
    *          {@link com.google.gwt.event.dom.client.KeyCodes}.
    * @return <code>false</code> to suppress the event
-   * @deprecated use {@link #onPreviewNativeEvent(NativePreviewEvent)} instead
+   * @deprecated Use <code>onPreviewNativeEvent(NativePreviewEvent)</code>
+   *             instead
    */
   @Deprecated
   public boolean onKeyUpPreview(char key, int modifiers) {
@@ -722,8 +726,8 @@
    * <code>visibility</code> style attribute. You need to call {@link #show()}
    * to actually attached/detach the {@link PopupPanel} to the page.
    * 
-   * @param visible <code>true</code> to show the object, <code>false</code> to
-   *          hide it
+   * @param visible <code>true</code> to show the object, <code>false</code>
+   *          to hide it
    * @see #show()
    * @see #hide()
    */
@@ -881,11 +885,11 @@
    * @param elt The Element on which <code>blur()</code> will be invoked
    */
   private native void blur(Element elt) /*-{
-    // Issue 2390: blurring the body causes IE to disappear to the background
-    if (elt.blur && elt != $doc.body) {
-      elt.blur();
-    }
-  }-*/;
+            // Issue 2390: blurring the body causes IE to disappear to the background
+            if (elt.blur && elt != $doc.body) {
+              elt.blur();
+            }
+          }-*/;
 
   /**
    * Does the event target one of the partner elements?
diff --git a/user/src/com/google/gwt/user/client/ui/Tree.java b/user/src/com/google/gwt/user/client/ui/Tree.java
index 0f96566..3fde2f4 100644
--- a/user/src/com/google/gwt/user/client/ui/Tree.java
+++ b/user/src/com/google/gwt/user/client/ui/Tree.java
@@ -428,10 +428,9 @@
    * Gets this tree's default image package.
    * 
    * @return the tree's image package
-   * @see #setImageBase
-   * @deprecated Use {@link #Tree(TreeImages)} as it provides a more efficent
+   * @deprecated Use {@link #Tree(TreeImages)} as it provides a more efficient
    *             and manageable way to supply a set of images to be used within
-   *             a tree.
+   *             a tree
    */
   @Deprecated
   public String getImageBase() {