diff --git a/mozilla/xpcom/build/nsOS2VACLegacy.cpp b/mozilla/xpcom/build/nsOS2VACLegacy.cpp
index 72687a655cf..4de75d46c9b 100644
--- a/mozilla/xpcom/build/nsOS2VACLegacy.cpp
+++ b/mozilla/xpcom/build/nsOS2VACLegacy.cpp
@@ -48,8 +48,8 @@
 /*******************************************************************************
 *   Defined Constants And Macros                                               *
 *******************************************************************************/
-/** @group Visual Age for C++ v3.6.5 target (OS/2).
- * @{ */
+/** @group Visual Age for C++ v3.6.5 target (OS/2). */
+/* @{ */
 /** Indicate Visual Age for C++ v3.6.5 target */
 #define VFT_VAC365          1
 /** VFTable/Interface Calling Convention for Win32. */
diff --git a/mozilla/xpcom/build/nsXPCOM.h b/mozilla/xpcom/build/nsXPCOM.h
index 503df97bd5e..5fdb608995e 100644
--- a/mozilla/xpcom/build/nsXPCOM.h
+++ b/mozilla/xpcom/build/nsXPCOM.h
@@ -68,12 +68,12 @@ class nsITraceRefcnt;
  *
  * @param result           The service manager.  You may pass null.
  *
- * @param abinDirectory    The directory containing the component
+ * @param binDirectory     The directory containing the component
  *                         registry and runtime libraries;
  *                         or use <CODE>nsnull</CODE> to use the working
  *                         directory.
  *
- * @param aAppFileLocProvider The object to be used by Gecko that specifies
+ * @param appFileLocationProvider The object to be used by Gecko that specifies
  *                         to Gecko where to find profiles, the component
  *                         registry preferences and so on; or use
  *                         <CODE>nsnull</CODE> for the default behaviour.
@@ -167,7 +167,7 @@ NS_GetMemoryManager(nsIMemory* *result);
  * 
  * @status FROZEN
  * 
- *   @param filePath       
+ *   @param path       
  *       A string which specifies a full file path to a 
  *       location.  Relative paths will be treated as an
  *       error (NS_ERROR_FILE_UNRECOGNIZED_PATH).       
diff --git a/mozilla/xpcom/io/nsIObjectInputStream.idl b/mozilla/xpcom/io/nsIObjectInputStream.idl
index dcf494515fd..97c0ca6e003 100644
--- a/mozilla/xpcom/io/nsIObjectInputStream.idl
+++ b/mozilla/xpcom/io/nsIObjectInputStream.idl
@@ -40,8 +40,8 @@
 #include "nsrootidl.idl"
 
 /**
- * @See nsIObjectOutputStream
- * @See nsIBinaryInputStream
+ * @see nsIObjectOutputStream
+ * @see nsIBinaryInputStream
  */
 
 [scriptable, uuid(6c248606-4eae-46fa-9df0-ba58502368eb)]
@@ -54,7 +54,7 @@ interface nsIObjectInputStream : nsIBinaryInputStream
      * readObject will QueryInterface from the deserialized object root to the
      * correct interface, which was specified when the object was serialized.
      *
-     * @See nsIObjectOutputStream
+     * @see nsIObjectOutputStream
      */
     nsISupports readObject(in PRBool aIsStrongRef);
 
diff --git a/mozilla/xpcom/string/src/nsStringObsolete.cpp b/mozilla/xpcom/string/src/nsStringObsolete.cpp
index 131a03236dc..682cf936773 100644
--- a/mozilla/xpcom/string/src/nsStringObsolete.cpp
+++ b/mozilla/xpcom/string/src/nsStringObsolete.cpp
@@ -274,7 +274,7 @@ RFindChar2(const PRUnichar* aDest,PRUint32 aDestLength,PRInt32 anOffset,const PR
  * @param   aStr1 is the first buffer to be compared
  * @param   aStr2 is the 2nd buffer to be compared
  * @param   aCount is the number of chars to compare
- * @param   aIgnorecase tells us whether to use a case-sensitive comparison
+ * @param   aIgnoreCase tells us whether to use a case-sensitive comparison
  * @return  -1,0,1 depending on <,==,>
  */
 static
@@ -304,7 +304,7 @@ Compare1To1(const char* aStr1,const char* aStr2,PRUint32 aCount,PRBool aIgnoreCa
  * @param   aStr1 is the first buffer to be compared
  * @param   aStr2 is the 2nd buffer to be compared
  * @param   aCount is the number of chars to compare
- * @param   aIgnorecase tells us whether to use a case-sensitive comparison
+ * @param   aIgnoreCase tells us whether to use a case-sensitive comparison
  * @return  -1,0,1 depending on <,==,>
  */
 static 
@@ -344,7 +344,7 @@ Compare2To2(const PRUnichar* aStr1,const PRUnichar* aStr2,PRUint32 aCount){
  * @param   aStr1 is the first buffer to be compared
  * @param   aStr2 is the 2nd buffer to be compared
  * @param   aCount is the number of chars to compare
- * @param   aIgnorecase tells us whether to use a case-sensitive comparison
+ * @param   aIgnoreCase tells us whether to use a case-sensitive comparison
  * @return  -1,0,1 depending on <,==,>
  */
 static
@@ -398,7 +398,7 @@ Compare2To1(const PRUnichar* aStr1,const char* aStr2,PRUint32 aCount,PRBool aIgn
  * @param   aStr1 is the first buffer to be compared
  * @param   aStr2 is the 2nd buffer to be compared
  * @param   aCount is the number of chars to compare
- * @param   aIgnorecase tells us whether to use a case-sensitive comparison
+ * @param   aIgnoreCase tells us whether to use a case-sensitive comparison
  * @return  -1,0,1 depending on <,==,>
  */
 inline PRInt32
diff --git a/mozilla/xpcom/stub/nsOS2VACLegacy.cpp b/mozilla/xpcom/stub/nsOS2VACLegacy.cpp
index 72687a655cf..4de75d46c9b 100644
--- a/mozilla/xpcom/stub/nsOS2VACLegacy.cpp
+++ b/mozilla/xpcom/stub/nsOS2VACLegacy.cpp
@@ -48,8 +48,8 @@
 /*******************************************************************************
 *   Defined Constants And Macros                                               *
 *******************************************************************************/
-/** @group Visual Age for C++ v3.6.5 target (OS/2).
- * @{ */
+/** @group Visual Age for C++ v3.6.5 target (OS/2). */
+/* @{ */
 /** Indicate Visual Age for C++ v3.6.5 target */
 #define VFT_VAC365          1
 /** VFTable/Interface Calling Convention for Win32. */