diff --git a/mozilla/content/base/src/mozSanitizingSerializer.cpp b/mozilla/content/base/src/mozSanitizingSerializer.cpp
index c18d62ca9b1..dd9af0c2c17 100644
--- a/mozilla/content/base/src/mozSanitizingSerializer.cpp
+++ b/mozilla/content/base/src/mozSanitizingSerializer.cpp
@@ -37,7 +37,11 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-// Removes potentially insecure or offending HTML
+/*
+ * A serializer and content sink that removes potentially insecure or
+ * otherwise dangerous or offending HTML (eg for display of HTML
+ * e-mail attachments or something).
+ */
 
 /* I used nsPlaintextSerializer as base for this class. I don't understand
    all of the functions in the beginning. Possible that I fail to do
diff --git a/mozilla/content/base/src/mozSanitizingSerializer.h b/mozilla/content/base/src/mozSanitizingSerializer.h
index e9f11617b53..77e862d6db8 100644
--- a/mozilla/content/base/src/mozSanitizingSerializer.h
+++ b/mozilla/content/base/src/mozSanitizingSerializer.h
@@ -37,6 +37,12 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+/*
+ * A serializer and content sink that removes potentially insecure or
+ * otherwise dangerous or offending HTML (eg for display of HTML
+ * e-mail attachments or something).
+ */
+
 #ifndef mozSanitizingSerializer_h__
 #define mozSanitizingSerializer_h__
 
diff --git a/mozilla/content/base/src/nsAtomListUtils.cpp b/mozilla/content/base/src/nsAtomListUtils.cpp
index 18187e4be8d..8504a208983 100644
--- a/mozilla/content/base/src/nsAtomListUtils.cpp
+++ b/mozilla/content/base/src/nsAtomListUtils.cpp
@@ -35,6 +35,10 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+/*
+ * Static helper class for implementing atom lists.
+ */
+
 #include "nsAtomListUtils.h"
 #include "nsIAtom.h"
 #include "nsStaticAtom.h"
diff --git a/mozilla/content/base/src/nsAtomListUtils.h b/mozilla/content/base/src/nsAtomListUtils.h
index c64388f9836..ec3ed8d389f 100644
--- a/mozilla/content/base/src/nsAtomListUtils.h
+++ b/mozilla/content/base/src/nsAtomListUtils.h
@@ -35,6 +35,10 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+/*
+ * Static helper class for implementing atom lists.
+ */
+
 #ifndef nsAtomListUtils_h__
 #define nsAtomListUtils_h__
 
diff --git a/mozilla/content/base/src/nsAttrAndChildArray.cpp b/mozilla/content/base/src/nsAttrAndChildArray.cpp
index 481ba0c31d4..60b700c833f 100644
--- a/mozilla/content/base/src/nsAttrAndChildArray.cpp
+++ b/mozilla/content/base/src/nsAttrAndChildArray.cpp
@@ -36,6 +36,11 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+/*
+ * Storage of the children and attributes of a DOM node; storage for
+ * the two is unified to minimize footprint.
+ */
+
 #include "nsAttrAndChildArray.h"
 #include "nsGenericHTMLElement.h"
 #include "prmem.h"
diff --git a/mozilla/content/base/src/nsAttrAndChildArray.h b/mozilla/content/base/src/nsAttrAndChildArray.h
index 7ed3df14252..63ab30fe96b 100644
--- a/mozilla/content/base/src/nsAttrAndChildArray.h
+++ b/mozilla/content/base/src/nsAttrAndChildArray.h
@@ -36,6 +36,11 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+/*
+ * Storage of the children and attributes of a DOM node; storage for
+ * the two is unified to minimize footprint.
+ */
+
 #ifndef nsAttrAndChildArray_h___
 #define nsAttrAndChildArray_h___
 
diff --git a/mozilla/content/base/src/nsAttrName.h b/mozilla/content/base/src/nsAttrName.h
index da2d402a633..4a411011563 100644
--- a/mozilla/content/base/src/nsAttrName.h
+++ b/mozilla/content/base/src/nsAttrName.h
@@ -36,6 +36,12 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+/*
+ * Class that represents the name (nodeinfo or atom) of an attribute;
+ * using nodeinfos all the time is too slow, so we use atoms when we
+ * can.
+ */
+
 #ifndef nsAttrName_h___
 #define nsAttrName_h___
 
diff --git a/mozilla/content/base/src/nsAttrValue.cpp b/mozilla/content/base/src/nsAttrValue.cpp
index 16cb8deada3..25ef2de043d 100644
--- a/mozilla/content/base/src/nsAttrValue.cpp
+++ b/mozilla/content/base/src/nsAttrValue.cpp
@@ -36,6 +36,11 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+/*
+ * A struct that represents the value (type and actual data) of an
+ * attribute.
+ */
+
 #include "nsAttrValue.h"
 #include "nsIAtom.h"
 #include "nsUnicharUtils.h"
diff --git a/mozilla/content/base/src/nsAttrValue.h b/mozilla/content/base/src/nsAttrValue.h
index 91b7ec2af1a..9acbb661fea 100644
--- a/mozilla/content/base/src/nsAttrValue.h
+++ b/mozilla/content/base/src/nsAttrValue.h
@@ -36,6 +36,11 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+/*
+ * A struct that represents the value (type and actual data) of an
+ * attribute.
+ */
+
 #ifndef nsAttrValue_h___
 #define nsAttrValue_h___
 
diff --git a/mozilla/content/base/src/nsCommentNode.cpp b/mozilla/content/base/src/nsCommentNode.cpp
index 444b8981a55..71838d5b9fe 100644
--- a/mozilla/content/base/src/nsCommentNode.cpp
+++ b/mozilla/content/base/src/nsCommentNode.cpp
@@ -34,6 +34,11 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
+
+/*
+ * Implementations of DOM Core's Comment node.
+ */
+
 #include "nsIDOMComment.h"
 #include "nsGenericDOMDataNode.h"
 #include "nsLayoutAtoms.h"
diff --git a/mozilla/content/base/src/nsContentAreaDragDrop.h b/mozilla/content/base/src/nsContentAreaDragDrop.h
index 3471320afbf..618a73529e4 100644
--- a/mozilla/content/base/src/nsContentAreaDragDrop.h
+++ b/mozilla/content/base/src/nsContentAreaDragDrop.h
@@ -123,6 +123,7 @@ private:
   nsCOMPtr<nsIDOMEventReceiver> mEventReceiver;
 
   // weak ref, this is probably my owning webshell
+  // FIXME: we set this and never null it out.  That's bad!  See bug 332187.
   nsIWebNavigation* mNavigator;
 
 };
diff --git a/mozilla/content/base/src/nsContentIterator.cpp b/mozilla/content/base/src/nsContentIterator.cpp
index 152e1f55a92..fa0d3068378 100644
--- a/mozilla/content/base/src/nsContentIterator.cpp
+++ b/mozilla/content/base/src/nsContentIterator.cpp
@@ -36,11 +36,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-/*
- * nsContentIterator.cpp: Implementation of the nsContentIterator object.
- * This ite
- */
-
 #include "nsISupports.h"
 #include "nsIDOMNodeList.h"
 #include "nsIContentIterator.h"
diff --git a/mozilla/content/base/src/nsContentList.cpp b/mozilla/content/base/src/nsContentList.cpp
index 87a2a117a1f..23ad51e1846 100644
--- a/mozilla/content/base/src/nsContentList.cpp
+++ b/mozilla/content/base/src/nsContentList.cpp
@@ -35,6 +35,12 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+/*
+ * nsBaseContentList is a basic list of content nodes; nsContentList
+ * is a commonly used NodeList implementation (used for
+ * getElementsByTagName, some properties on HTMLDocument, etc).
+ */
+
 #include "nsContentList.h"
 #include "nsIContent.h"
 #include "nsIDOMNode.h"
diff --git a/mozilla/content/base/src/nsContentList.h b/mozilla/content/base/src/nsContentList.h
index 4160e660f8e..45bfa93bb41 100644
--- a/mozilla/content/base/src/nsContentList.h
+++ b/mozilla/content/base/src/nsContentList.h
@@ -34,6 +34,13 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
+
+/*
+ * nsBaseContentList is a basic list of content nodes; nsContentList
+ * is a commonly used NodeList implementation (used for
+ * getElementsByTagName, some properties on HTMLDocument, etc).
+ */
+
 #ifndef nsContentList_h___
 #define nsContentList_h___
 
diff --git a/mozilla/content/base/src/nsContentPolicy.cpp b/mozilla/content/base/src/nsContentPolicy.cpp
index 9058d4497b5..41053181075 100644
--- a/mozilla/content/base/src/nsContentPolicy.cpp
+++ b/mozilla/content/base/src/nsContentPolicy.cpp
@@ -36,6 +36,10 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+/* 
+ * Implementation of the "@mozilla.org/layout/content-policy;1" contract.
+ */
+
 #include "prlog.h"
 
 #include "nsISupports.h"
diff --git a/mozilla/content/base/src/nsContentPolicy.h b/mozilla/content/base/src/nsContentPolicy.h
index c3590d6f6be..ac21c148717 100644
--- a/mozilla/content/base/src/nsContentPolicy.h
+++ b/mozilla/content/base/src/nsContentPolicy.h
@@ -43,6 +43,10 @@
 #include "nsIContentPolicy.h"
 #include "nsCategoryCache.h"
 
+/* 
+ * Implementation of the "@mozilla.org/layout/content-policy;1" contract.
+ */
+
 class nsContentPolicy : public nsIContentPolicy
 {
  public:
diff --git a/mozilla/content/base/src/nsContentSink.cpp b/mozilla/content/base/src/nsContentSink.cpp
index 41565673988..4e5c75b94d0 100644
--- a/mozilla/content/base/src/nsContentSink.cpp
+++ b/mozilla/content/base/src/nsContentSink.cpp
@@ -35,6 +35,11 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+/*
+ * Base class for the XML and HTML content sinks, which construct a
+ * DOM based on information from the parser.
+ */
+
 #include "nsContentSink.h"
 #include "nsIScriptLoader.h"
 #include "nsIDocument.h"
diff --git a/mozilla/content/base/src/nsContentSink.h b/mozilla/content/base/src/nsContentSink.h
index b36d03ae72b..4252fee1b31 100644
--- a/mozilla/content/base/src/nsContentSink.h
+++ b/mozilla/content/base/src/nsContentSink.h
@@ -35,6 +35,11 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+/*
+ * Base class for the XML and HTML content sinks, which construct a
+ * DOM based on information from the parser.
+ */
+
 #ifndef _nsContentSink_h_
 #define _nsContentSink_h_
 
diff --git a/mozilla/content/base/src/nsDOMAttribute.cpp b/mozilla/content/base/src/nsDOMAttribute.cpp
index 306a03fbbf7..82198a54227 100644
--- a/mozilla/content/base/src/nsDOMAttribute.cpp
+++ b/mozilla/content/base/src/nsDOMAttribute.cpp
@@ -35,6 +35,10 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+/*
+ * Implementation of the DOM Core Attr node.
+ */
+
 #include "nsDOMAttribute.h"
 #include "nsGenericElement.h"
 #include "nsIContent.h"
diff --git a/mozilla/content/base/src/nsDOMAttribute.h b/mozilla/content/base/src/nsDOMAttribute.h
index 91c021952fa..aff65f59aa8 100644
--- a/mozilla/content/base/src/nsDOMAttribute.h
+++ b/mozilla/content/base/src/nsDOMAttribute.h
@@ -34,6 +34,11 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
+
+/*
+ * Implementation of the DOM Core Attr node.
+ */
+
 #ifndef nsDOMAttribute_h___
 #define nsDOMAttribute_h___
 
diff --git a/mozilla/content/base/src/nsDOMAttributeMap.cpp b/mozilla/content/base/src/nsDOMAttributeMap.cpp
index 327e0767b67..dab54e67934 100644
--- a/mozilla/content/base/src/nsDOMAttributeMap.cpp
+++ b/mozilla/content/base/src/nsDOMAttributeMap.cpp
@@ -36,6 +36,10 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+/*
+ * Implementation of the |attributes| property of DOM Core's Node object.
+ */
+
 #include "nsDOMAttributeMap.h"
 #include "nsDOMAttribute.h"
 #include "nsGenericElement.h"
diff --git a/mozilla/content/base/src/nsDOMAttributeMap.h b/mozilla/content/base/src/nsDOMAttributeMap.h
index 09fa6799daa..02ac7a4402e 100644
--- a/mozilla/content/base/src/nsDOMAttributeMap.h
+++ b/mozilla/content/base/src/nsDOMAttributeMap.h
@@ -35,6 +35,11 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
+
+/*
+ * Implementation of the |attributes| property of DOM Core's Node object.
+ */
+
 #ifndef nsDOMAttributeMap_h___
 #define nsDOMAttributeMap_h___
 
@@ -51,7 +56,7 @@ class nsINodeInfo;
 class nsIDocument;
 
 /**
- * Structure used to cache nsDOMAttributes with.
+ * Structure used as a key for caching nsDOMAttributes in nsDOMAttributeMap's mAttributeCache.
  */
 class nsAttrKey
 {
diff --git a/mozilla/content/base/src/nsDOMBuilder.cpp b/mozilla/content/base/src/nsDOMBuilder.cpp
index edfe7936b8d..b10e4b2b9d3 100644
--- a/mozilla/content/base/src/nsDOMBuilder.cpp
+++ b/mozilla/content/base/src/nsDOMBuilder.cpp
@@ -36,6 +36,10 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+/*
+ * This file was part of an abortive attempt at DOM3 Load/Save; it's not built.
+ */
+
 #include "nsDOMBuilder.h"
 #include "nsDOMError.h"
 #include "nsContentUtils.h"  // for NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO
diff --git a/mozilla/content/base/src/nsDOMBuilder.h b/mozilla/content/base/src/nsDOMBuilder.h
index 2e79a559f6f..931e49f9305 100644
--- a/mozilla/content/base/src/nsDOMBuilder.h
+++ b/mozilla/content/base/src/nsDOMBuilder.h
@@ -36,6 +36,10 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+/*
+ * This file was part of an abortive attempt at DOM3 Load/Save; it's not built.
+ */
+
 #ifndef nsDOMBuilder_h__
 #define nsDOMBuilder_h__
 
@@ -46,10 +50,6 @@
 #include "nsIDOMDOMImplementation.h"
 #include "nsCOMPtr.h"
 
-/**
- * This class implements the DOMBuilder from DOM3 Load/Save
- */
-
 class nsDOMBuilder : public nsIDOMDOMBuilder
 {
 public:
diff --git a/mozilla/content/base/src/nsDOMDocumentType.cpp b/mozilla/content/base/src/nsDOMDocumentType.cpp
index a0d046b5b6e..0a3e962ca0b 100644
--- a/mozilla/content/base/src/nsDOMDocumentType.cpp
+++ b/mozilla/content/base/src/nsDOMDocumentType.cpp
@@ -35,6 +35,10 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+/*
+ * Implementation of DOM Core's DocumentType node.
+ */
+
 #include "nsDOMDocumentType.h"
 #include "nsDOMAttributeMap.h"
 #include "nsIDOMNamedNodeMap.h"
diff --git a/mozilla/content/base/src/nsDOMDocumentType.h b/mozilla/content/base/src/nsDOMDocumentType.h
index d6f51e9b0d9..a46b9fa5f60 100644
--- a/mozilla/content/base/src/nsDOMDocumentType.h
+++ b/mozilla/content/base/src/nsDOMDocumentType.h
@@ -35,6 +35,10 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+/*
+ * Implementation of DOM Core's DocumentType node.
+ */
+
 #ifndef nsDOMDocumentType_h___
 #define nsDOMDocumentType_h___
 
diff --git a/mozilla/content/base/src/nsDOMLists.cpp b/mozilla/content/base/src/nsDOMLists.cpp
index 2d3bf4acd26..04bda0a6fa9 100644
--- a/mozilla/content/base/src/nsDOMLists.cpp
+++ b/mozilla/content/base/src/nsDOMLists.cpp
@@ -37,6 +37,11 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+/*
+ * Implementations of DOMStringList and DOMNameList, used by various
+ * DOM3 stuff and some interfaces specified by WHATWG.
+ */
+
 #include "nsDOMLists.h"
 #include "nsDOMError.h"
 #include "nsIDOMClassInfo.h"
diff --git a/mozilla/content/base/src/nsDOMLists.h b/mozilla/content/base/src/nsDOMLists.h
index 939c0c53306..1cb259c8b16 100644
--- a/mozilla/content/base/src/nsDOMLists.h
+++ b/mozilla/content/base/src/nsDOMLists.h
@@ -37,6 +37,11 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+/*
+ * Implementations of DOMStringList and DOMNameList, used by various
+ * DOM3 stuff and some interfaces specified by WHATWG.
+ */
+
 #ifndef nsDOMLists_h___
 #define nsDOMLists_h___
 
diff --git a/mozilla/content/base/src/nsDataDocumentContentPolicy.cpp b/mozilla/content/base/src/nsDataDocumentContentPolicy.cpp
index a65257b1ed0..4d0b0f0a69a 100644
--- a/mozilla/content/base/src/nsDataDocumentContentPolicy.cpp
+++ b/mozilla/content/base/src/nsDataDocumentContentPolicy.cpp
@@ -35,6 +35,12 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+/*
+ * Content policy implementation that prevents all loads of images,
+ * subframes, etc from documents loaded as data (eg documents loaded
+ * via XMLHttpRequest).
+ */
+
 #include "nsDataDocumentContentPolicy.h"
 #include "nsIDocument.h"
 #include "nsINode.h"
diff --git a/mozilla/content/base/src/nsDataDocumentContentPolicy.h b/mozilla/content/base/src/nsDataDocumentContentPolicy.h
index 5a20d164f35..d841b88af0b 100644
--- a/mozilla/content/base/src/nsDataDocumentContentPolicy.h
+++ b/mozilla/content/base/src/nsDataDocumentContentPolicy.h
@@ -34,6 +34,13 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
+
+/*
+ * Content policy implementation that prevents all loads of images,
+ * subframes, etc from documents loaded as data (eg documents loaded
+ * via XMLHttpRequest).
+ */
+
 #ifndef nsDataDocumentContentPolicy_h__
 #define nsDataDocumentContentPolicy_h__
 
diff --git a/mozilla/content/base/src/nsDocument.cpp b/mozilla/content/base/src/nsDocument.cpp
index e50bd27f1a2..c0e3a57891c 100644
--- a/mozilla/content/base/src/nsDocument.cpp
+++ b/mozilla/content/base/src/nsDocument.cpp
@@ -39,6 +39,11 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
+
+/*
+ * Base class for all our document implementations.
+ */
+
 #include "plstr.h"
 
 #include "nsIInterfaceRequestor.h"
diff --git a/mozilla/content/base/src/nsDocument.h b/mozilla/content/base/src/nsDocument.h
index e2b56118a7e..cf25b636ad0 100644
--- a/mozilla/content/base/src/nsDocument.h
+++ b/mozilla/content/base/src/nsDocument.h
@@ -34,6 +34,11 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
+
+/*
+ * Base class for all our document implementations.
+ */
+
 #ifndef nsDocument_h___
 #define nsDocument_h___
 
diff --git a/mozilla/content/base/src/nsDocumentEncoder.cpp b/mozilla/content/base/src/nsDocumentEncoder.cpp
index 523b2926a13..542d3757d94 100644
--- a/mozilla/content/base/src/nsDocumentEncoder.cpp
+++ b/mozilla/content/base/src/nsDocumentEncoder.cpp
@@ -36,6 +36,11 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+/*
+ * Object that can be used to serialize selections, ranges, or nodes
+ * to strings in a gazillion different ways.
+ */
+ 
 #include "nsIDocumentEncoder.h"
 
 #include "nscore.h"
diff --git a/mozilla/content/base/src/nsDocumentFragment.cpp b/mozilla/content/base/src/nsDocumentFragment.cpp
index 558658888ec..5fa121f3e7c 100644
--- a/mozilla/content/base/src/nsDocumentFragment.cpp
+++ b/mozilla/content/base/src/nsDocumentFragment.cpp
@@ -35,6 +35,10 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+/*
+ * Implementation of DOM Core's DocumentFragment.
+ */
+
 #include "nsISupports.h"
 #include "nsIContent.h"
 #include "nsIDOMDocumentFragment.h"
diff --git a/mozilla/content/base/src/nsFrameLoader.cpp b/mozilla/content/base/src/nsFrameLoader.cpp
index c7317dcc91f..9b497b11654 100644
--- a/mozilla/content/base/src/nsFrameLoader.cpp
+++ b/mozilla/content/base/src/nsFrameLoader.cpp
@@ -37,6 +37,11 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+/*
+ * Class for managing loading of a subframe (creation of the docshell,
+ * handling of loads in it, recursion-checking).
+ */
+
 #include "nsIDOMHTMLIFrameElement.h"
 #include "nsIDOMHTMLFrameElement.h"
 #include "nsIDOMWindow.h"
diff --git a/mozilla/content/base/src/nsFrameLoader.h b/mozilla/content/base/src/nsFrameLoader.h
index 228e2f1d931..d422c046e00 100755
--- a/mozilla/content/base/src/nsFrameLoader.h
+++ b/mozilla/content/base/src/nsFrameLoader.h
@@ -36,6 +36,11 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+/*
+ * Class for managing loading of a subframe (creation of the docshell,
+ * handling of loads in it, recursion-checking).
+ */
+
 #ifndef nsFrameLoader_h_
 #define nsFrameLoader_h_
 
diff --git a/mozilla/content/base/src/nsGenConImageContent.cpp b/mozilla/content/base/src/nsGenConImageContent.cpp
index a78ee78e170..102038fe980 100644
--- a/mozilla/content/base/src/nsGenConImageContent.cpp
+++ b/mozilla/content/base/src/nsGenConImageContent.cpp
@@ -34,18 +34,20 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
+
+/**
+ * A fake content node class so that the image frame for
+ *   content: url(foo);
+ * in CSS can have an nsIImageLoadingContent but use an
+ * imgIRequest that's already been loaded from the style system.
+ */
+
 #include "nsContentCreatorFunctions.h"
 #include "nsXMLElement.h"
 #include "nsImageLoadingContent.h"
 #include "imgIRequest.h"
 #include "nsIEventStateManager.h"
 
-/**
- * A fake content node class so that the image frame for
- *   p:before { content: url(foo.gif); }
- * can have a content node that knows about image loading but can take
- * an imgIRequest that's already been loaded from the style system.
- */
 class nsGenConImageContent : public nsXMLElement,
                              public nsImageLoadingContent
 {
diff --git a/mozilla/content/base/src/nsGeneratedIterator.cpp b/mozilla/content/base/src/nsGeneratedIterator.cpp
index a598ce1a3aa..467f4b980ac 100644
--- a/mozilla/content/base/src/nsGeneratedIterator.cpp
+++ b/mozilla/content/base/src/nsGeneratedIterator.cpp
@@ -36,10 +36,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-/*
- * nsContentIterator.cpp: Implementation of the nsContentIterator object.
- * This ite
- */
 #include "nsISupports.h"
 #include "nsIDOMNodeList.h"
 #include "nsIContentIterator.h"
diff --git a/mozilla/content/base/src/nsGenericDOMDataNode.cpp b/mozilla/content/base/src/nsGenericDOMDataNode.cpp
index 21689ba2519..b7eef21ed4d 100644
--- a/mozilla/content/base/src/nsGenericDOMDataNode.cpp
+++ b/mozilla/content/base/src/nsGenericDOMDataNode.cpp
@@ -34,6 +34,12 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
+
+/*
+ * Base class for DOM Core's Comment, DocumentType, Text,
+ * CDATASection, and ProcessingInstruction nodes.
+ */
+
 #include "nsGenericDOMDataNode.h"
 #include "nsGenericElement.h"
 #include "nsIDocument.h"
diff --git a/mozilla/content/base/src/nsGenericDOMDataNode.h b/mozilla/content/base/src/nsGenericDOMDataNode.h
index 867116cf1f0..7a070931944 100644
--- a/mozilla/content/base/src/nsGenericDOMDataNode.h
+++ b/mozilla/content/base/src/nsGenericDOMDataNode.h
@@ -34,6 +34,12 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
+
+/*
+ * Base class for DOM Core's Comment, DocumentType, Text,
+ * CDATASection, and ProcessingInstruction nodes.
+ */
+
 #ifndef nsGenericDOMDataNode_h___
 #define nsGenericDOMDataNode_h___