diff --git a/mozilla/js/rhino/examples/Foo.java b/mozilla/js/rhino/examples/Foo.java
index ce25d5c3884..bca1b79f12f 100644
--- a/mozilla/js/rhino/examples/Foo.java
+++ b/mozilla/js/rhino/examples/Foo.java
@@ -143,8 +143,6 @@ public class Foo extends ScriptableObject {
      * @return computes the string values and types of 'this' and
      * of each of the supplied arguments and returns them in a string.
      *
-     * @exception ThreadAssociationException if the current
-     *            thread is not associated with a Context
      * @see org.mozilla.javascript.ScriptableObject#getTopLevelScope
      */
     public static Object jsFunction_varargs(Context cx, Scriptable thisObj,
diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/ConstProperties.java b/mozilla/js/rhino/src/org/mozilla/javascript/ConstProperties.java
index 368d7e5116b..860db792fa3 100644
--- a/mozilla/js/rhino/src/org/mozilla/javascript/ConstProperties.java
+++ b/mozilla/js/rhino/src/org/mozilla/javascript/ConstProperties.java
@@ -83,10 +83,10 @@ public interface ConstProperties {
      * @param name the name of the property
      * @param start the object whose property is being set
      * @param value value to set the property to
-     * @see org.mozilla.javascript.Scriptable#has
-     * @see org.mozilla.javascript.Scriptable#get
-     * @see org.mozilla.javascript.ScriptableObject#putProperty
-     * @see org.mozilla.javascript.Context#toObject
+     * @see org.mozilla.javascript.Scriptable#has(String, Scriptable)
+     * @see org.mozilla.javascript.Scriptable#get(String, Scriptable)
+     * @see org.mozilla.javascript.ScriptableObject#putProperty(Scriptable, String, Object)
+     * @see org.mozilla.javascript.Context#toObject(Object, Scriptable)
      */
     public void putConst(String name, Scriptable start, Object value);
 
diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/Delegator.java b/mozilla/js/rhino/src/org/mozilla/javascript/Delegator.java
index 27778986f91..da23cb7ec2a 100644
--- a/mozilla/js/rhino/src/org/mozilla/javascript/Delegator.java
+++ b/mozilla/js/rhino/src/org/mozilla/javascript/Delegator.java
@@ -119,49 +119,49 @@ public class Delegator implements Function {
         return obj.getClassName();
     }
     /**
-     * @see org.mozilla.javascript.Scriptable#get
+     * @see org.mozilla.javascript.Scriptable#get(String, Scriptable)
      */
     public Object get(String name, Scriptable start) {
         return obj.get(name,start);
     }
     /**
-     * @see org.mozilla.javascript.Scriptable#get
+     * @see org.mozilla.javascript.Scriptable#get(int, Scriptable)
      */
     public Object get(int index, Scriptable start) {
         return obj.get(index,start);
         }
     /**
-     * @see org.mozilla.javascript.Scriptable#has
+     * @see org.mozilla.javascript.Scriptable#has(String, Scriptable)
      */
     public boolean has(String name, Scriptable start) {
         return obj.has(name,start);
         }
     /**
-     * @see org.mozilla.javascript.Scriptable#has
+     * @see org.mozilla.javascript.Scriptable#has(int, Scriptable)
      */
     public boolean has(int index, Scriptable start) {
         return obj.has(index,start);
         }
     /**
-     * @see org.mozilla.javascript.Scriptable#put
+     * @see org.mozilla.javascript.Scriptable#put(String, Scriptable, Object)
      */
     public void put(String name, Scriptable start, Object value) {
         obj.put(name,start,value);
     }
     /**
-     * @see org.mozilla.javascript.Scriptable#put
+     * @see org.mozilla.javascript.Scriptable#put(int, Scriptable, Object)
      */
     public void put(int index, Scriptable start, Object value) {
         obj.put(index,start,value);
     }
     /**
-     * @see org.mozilla.javascript.Scriptable#delete
+     * @see org.mozilla.javascript.Scriptable#delete(String)
      */
     public void delete(String name) {
         obj.delete(name);
     }
     /**
-     * @see org.mozilla.javascript.Scriptable#delete
+     * @see org.mozilla.javascript.Scriptable#delete(int)
      */
     public void delete(int index) {
         obj.delete(index);
diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/GeneratedClassLoader.java b/mozilla/js/rhino/src/org/mozilla/javascript/GeneratedClassLoader.java
index 9e2ef78e7b9..0f736156a55 100644
--- a/mozilla/js/rhino/src/org/mozilla/javascript/GeneratedClassLoader.java
+++ b/mozilla/js/rhino/src/org/mozilla/javascript/GeneratedClassLoader.java
@@ -60,7 +60,7 @@ public interface GeneratedClassLoader {
      *
      * @param cl Class instance returned from the previous call to
      *        {@link #defineClass(String, byte[])}
-     * @see java.lang.ClassLoader#resolveClass(Class)
+     * @see java.lang.ClassLoader
      */
     public void linkClass(Class cl);
 }
diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/NativeJavaObject.java b/mozilla/js/rhino/src/org/mozilla/javascript/NativeJavaObject.java
index e8c8f89d9ab..1c5dd5a728d 100644
--- a/mozilla/js/rhino/src/org/mozilla/javascript/NativeJavaObject.java
+++ b/mozilla/js/rhino/src/org/mozilla/javascript/NativeJavaObject.java
@@ -176,7 +176,7 @@ public class NativeJavaObject implements Scriptable, Wrapper, Serializable
 
 /**
 @deprecated Use {@link Context#getWrapFactory()} together with calling {@link
-WrapFactory#wrap(Context cx, Scriptable scope, Object obj, Class)}
+WrapFactory#wrap(Context, Scriptable, Object, Class)}
 */
     public static Object wrap(Scriptable scope, Object obj, Class staticType) {
 
diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/Script.java b/mozilla/js/rhino/src/org/mozilla/javascript/Script.java
index f15c559807d..4721ead647e 100644
--- a/mozilla/js/rhino/src/org/mozilla/javascript/Script.java
+++ b/mozilla/js/rhino/src/org/mozilla/javascript/Script.java
@@ -66,7 +66,7 @@ public interface Script {
      * @param cx the Context associated with the current thread
      * @param scope the scope to execute relative to
      * @return the result of executing the script
-     * @see org.mozilla.javascript.Context#initStandardObjects
+     * @see org.mozilla.javascript.Context#initStandardObjects()
      */
     public Object exec(Context cx, Scriptable scope);
 
diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/Scriptable.java b/mozilla/js/rhino/src/org/mozilla/javascript/Scriptable.java
index 0f774f5c73f..74e5ba7a55e 100644
--- a/mozilla/js/rhino/src/org/mozilla/javascript/Scriptable.java
+++ b/mozilla/js/rhino/src/org/mozilla/javascript/Scriptable.java
@@ -139,8 +139,8 @@ public interface Scriptable {
      * @param name the name of the property
      * @param start the object in which the lookup began
      * @return true if and only if the named property is found in the object
-     * @see org.mozilla.javascript.Scriptable#get
-     * @see org.mozilla.javascript.ScriptableObject#getProperty
+     * @see org.mozilla.javascript.Scriptable#get(String, Scriptable)
+     * @see org.mozilla.javascript.ScriptableObject#getProperty(Scriptable, String)
      */
     public boolean has(String name, Scriptable start);
 
@@ -155,8 +155,8 @@ public interface Scriptable {
      * @param index the numeric index for the property
      * @param start the object in which the lookup began
      * @return true if and only if the indexed property is found in the object
-     * @see org.mozilla.javascript.Scriptable#get
-     * @see org.mozilla.javascript.ScriptableObject#getProperty
+     * @see org.mozilla.javascript.Scriptable#get(int, Scriptable)
+     * @see org.mozilla.javascript.ScriptableObject#getProperty(Scriptable, int)
      */
     public boolean has(int index, Scriptable start);
 
@@ -202,10 +202,10 @@ public interface Scriptable {
      * @param name the name of the property
      * @param start the object whose property is being set
      * @param value value to set the property to
-     * @see org.mozilla.javascript.Scriptable#has
-     * @see org.mozilla.javascript.Scriptable#get
-     * @see org.mozilla.javascript.ScriptableObject#putProperty
-     * @see org.mozilla.javascript.Context#toObject
+     * @see org.mozilla.javascript.Scriptable#has(String, Scriptable)
+     * @see org.mozilla.javascript.Scriptable#get(String, Scriptable)
+     * @see org.mozilla.javascript.ScriptableObject#putProperty(Scriptable, String, Object)
+     * @see org.mozilla.javascript.Context#toObject(Object, Scriptable)
      */
     public void put(String name, Scriptable start, Object value);
 
@@ -221,10 +221,10 @@ public interface Scriptable {
      * @param index the numeric index for the property
      * @param start the object whose property is being set
      * @param value value to set the property to
-     * @see org.mozilla.javascript.Scriptable#has
-     * @see org.mozilla.javascript.Scriptable#get
-     * @see org.mozilla.javascript.Scriptable#put(String,Scriptable,Object)
-     * @see org.mozilla.javascript.ScriptableObject#putProperty
+     * @see org.mozilla.javascript.Scriptable#has(int, Scriptable)
+     * @see org.mozilla.javascript.Scriptable#get(int, Scriptable)
+     * @see org.mozilla.javascript.ScriptableObject#putProperty(Scriptable, int, Object)
+     * @see org.mozilla.javascript.Context#toObject(Object, Scriptable)
      */
     public void put(int index, Scriptable start, Object value);
 
@@ -245,8 +245,8 @@ public interface Scriptable {
      * To delete properties defined in a prototype chain,
      * see deleteProperty in ScriptableObject.
      * @param name the identifier for the property
-     * @see org.mozilla.javascript.Scriptable#get
-     * @see org.mozilla.javascript.ScriptableObject#deleteProperty
+     * @see org.mozilla.javascript.Scriptable#get(String, Scriptable)
+     * @see org.mozilla.javascript.ScriptableObject#deleteProperty(Scriptable, String)
      */
     public void delete(String name);
 
@@ -263,8 +263,8 @@ public interface Scriptable {
      * an integral index is used to select the property.
      *
      * @param index the numeric index for the property
-     * @see org.mozilla.javascript.Scriptable#get
-     * @see org.mozilla.javascript.ScriptableObject#deleteProperty
+     * @see org.mozilla.javascript.Scriptable#get(int, Scriptable)
+     * @see org.mozilla.javascript.ScriptableObject#deleteProperty(Scriptable, int)
      */
     public void delete(int index);
 
diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/optimizer/Codegen.java b/mozilla/js/rhino/src/org/mozilla/javascript/optimizer/Codegen.java
index 65b029b9a59..b8cd6811d60 100644
--- a/mozilla/js/rhino/src/org/mozilla/javascript/optimizer/Codegen.java
+++ b/mozilla/js/rhino/src/org/mozilla/javascript/optimizer/Codegen.java
@@ -4711,8 +4711,8 @@ Else pass the JS object in the aReg and 0.0 in the dReg.
     /**
      * Const locals use an extra slot to hold the has-been-assigned-once flag at
      * runtime.
-     * @param isConst
-     * @return
+     * @param isConst true iff the variable is const
+     * @return the register for the word pair (double/long)
      */
     private short getNewWordPairLocal(boolean isConst)
     {
diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/regexp/NativeRegExp.java b/mozilla/js/rhino/src/org/mozilla/javascript/regexp/NativeRegExp.java
index 23df5be707d..ea2f6189482 100644
--- a/mozilla/js/rhino/src/org/mozilla/javascript/regexp/NativeRegExp.java
+++ b/mozilla/js/rhino/src/org/mozilla/javascript/regexp/NativeRegExp.java
@@ -140,6 +140,7 @@ public class NativeRegExp extends IdScriptableObject implements Function
     private static final byte REOP_REPEAT        = 51; /* directs execution of greedy quantifier */
     private static final byte REOP_MINIMALREPEAT = 52; /* directs execution of non-greedy quantifier */
     private static final byte REOP_END           = 53;
+     
 
 
     public static void init(Context cx, Scriptable scope, boolean sealed)
diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/serialize/ScriptableOutputStream.java b/mozilla/js/rhino/src/org/mozilla/javascript/serialize/ScriptableOutputStream.java
index 9ec3622debf..ce61e82cc27 100644
--- a/mozilla/js/rhino/src/org/mozilla/javascript/serialize/ScriptableOutputStream.java
+++ b/mozilla/js/rhino/src/org/mozilla/javascript/serialize/ScriptableOutputStream.java
@@ -195,7 +195,6 @@ public class ScriptableOutputStream extends ObjectOutputStream {
     }
 
     protected Object replaceObject(Object obj)
-        throws IOException
     {
         String name = (String) table.get(obj);
         if (name == null)
diff --git a/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/debugger/Main.java b/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/debugger/Main.java
index 8629fe0962f..0afb9d313dc 100644
--- a/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/debugger/Main.java
+++ b/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/debugger/Main.java
@@ -291,7 +291,7 @@ public class Main implements ContextListener {
     }
 
     /**
-     * Helper method for {@link #mainEmbedded}.
+     * Helper method for {@link #mainEmbedded(String)}, etc.
      */
     private static void mainEmbeddedImpl(ContextFactory factory,
                                          Object scopeProvider,
diff --git a/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/debugger/SwingGui.java b/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/debugger/SwingGui.java
index c1ea4b2f442..d852a423b36 100644
--- a/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/debugger/SwingGui.java
+++ b/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/debugger/SwingGui.java
@@ -110,7 +110,8 @@ public class SwingGui extends JFrame implements GuiCallback {
     private JSInternalConsole console;
 
     /**
-     * The {@link JSplitPane} that separates {@link #desk} from {@link context}.
+     * The {@link JSplitPane} that separates {@link #desk} from
+     * {@link org.mozilla.javascript.Context}.
      */
     private JSplitPane split1;
 
diff --git a/mozilla/js/rhino/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLList.java b/mozilla/js/rhino/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLList.java
index ddc116a20e8..840828661d3 100644
--- a/mozilla/js/rhino/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLList.java
+++ b/mozilla/js/rhino/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLList.java
@@ -545,9 +545,7 @@ class XMLList extends XMLObjectImpl implements Function {
 	
 	/**
 	 * If list is empty, return undefined, if elements have different parents return undefined,
-	 * If they all have the same parent, return that parent.
-	 *
-	 * @return
+	 * If they all have the same parent, return that parent
 	 */
 	Object parent() {
 		if (length() == 0) return Undefined.instance;