Merge
authormrkam
Thu, 31 Mar 2011 10:16:45 -0700
changeset 8984 fbedde2feaa7
parent 8983 72a73724c353 (current diff)
parent 8982 19c972e3d3ee (diff)
child 8985 d1dcf5ef2c42
Merge
--- a/jdk/src/share/classes/java/awt/Component.java	Thu Mar 31 10:15:08 2011 -0700
+++ b/jdk/src/share/classes/java/awt/Component.java	Thu Mar 31 10:16:45 2011 -0700
@@ -5795,7 +5795,7 @@
      * <code>InputMethodRequests</code> instance.
      * If listener <code>l</code> is <code>null</code>,
      * no exception is thrown and no action is performed.
-     * <p>Refer to <a href="doc-files/AWTThreadIssues.html#ListenersThreads"
+     * <p>Refer to <a href="{@docRoot}/java/awt/doc-files/AWTThreadIssues.html#ListenersThreads"
      * >AWT Threading Issues</a> for details on AWT's threading model.
      *
      * @param    l   the input method listener
--- a/jdk/src/share/classes/java/lang/CharSequence.java	Thu Mar 31 10:15:08 2011 -0700
+++ b/jdk/src/share/classes/java/lang/CharSequence.java	Thu Mar 31 10:16:45 2011 -0700
@@ -66,7 +66,7 @@
      * indexing. </p>
      *
      * <p>If the <code>char</code> value specified by the index is a
-     * <a href="Character.html#unicode">surrogate</a>, the surrogate
+     * <a href="{@docRoot}/java/lang/Character.html#unicode">surrogate</a>, the surrogate
      * value is returned.
      *
      * @param   index   the index of the <code>char</code> value to be returned