diff --git a/mozilla/htmlparser/src/CNavDTD.cpp b/mozilla/htmlparser/src/CNavDTD.cpp
index 4a047508b6c..ffc47d5f8dc 100644
--- a/mozilla/htmlparser/src/CNavDTD.cpp
+++ b/mozilla/htmlparser/src/CNavDTD.cpp
@@ -1391,7 +1391,7 @@ nsresult CNavDTD::HandleDefaultStartToken(CToken* aToken,eHTMLTags aChildTag,nsC
  * This gets called before we've handled a given start tag.
  * It's a generic hook to let us do pre processing.
  * @param   aToken contains the tag in question
- * @param   aChildTag is the tag itself.
+ * @param   aTag is the tag itself.
  * @param   aNode is the node (tag) with associated attributes.
  * @return  TRUE if tag processing should continue; FALSE if the tag has been handled.
  */
@@ -2569,34 +2569,34 @@ PRBool CNavDTD::IsInlineElement(PRInt32 aTagID,PRInt32 aParentID) const {
  *  @param   aChild -- tag enum of child container
  *  @return  PR_TRUE if propagation should occur
  */
-PRBool CNavDTD::CanPropagate(eHTMLTags aParentTag,eHTMLTags aChildTag,PRBool aParentContains)  {
+PRBool CNavDTD::CanPropagate(eHTMLTags aParent,eHTMLTags aChild,PRBool aParentContains)  {
   PRBool    result=PR_FALSE;
-  PRBool    theParentContains=(-1==aParentContains) ? CanContain(aParentTag,aChildTag) : aParentContains;
+  PRBool    theParentContains=(-1==aParentContains) ? CanContain(aParent,aChild) : aParentContains;
 
-  if(aParentTag==aChildTag) {
+  if(aParent==aChild) {
     return result;
   }
 
-  if(nsHTMLElement::IsContainer(aChildTag)){
+  if(nsHTMLElement::IsContainer(aChild)){
     mScratch.Truncate();
-    if(!gHTMLElements[aChildTag].HasSpecialProperty(kNoPropagate)){
-      if(nsHTMLElement::IsBlockParent(aParentTag) || (gHTMLElements[aParentTag].GetSpecialChildren())) {
+    if(!gHTMLElements[aChild].HasSpecialProperty(kNoPropagate)){
+      if(nsHTMLElement::IsBlockParent(aParent) || (gHTMLElements[aParent].GetSpecialChildren())) {
 
-        result=ForwardPropagate(mScratch,aParentTag,aChildTag);
+        result=ForwardPropagate(mScratch,aParent,aChild);
 
         if(PR_FALSE==result){
 
-          if(eHTMLTag_unknown!=aParentTag) {
-            if(aParentTag!=aChildTag) //dont even bother if we're already inside a similar element...
-              result=BackwardPropagate(mScratch,aParentTag,aChildTag);
+          if(eHTMLTag_unknown!=aParent) {
+            if(aParent!=aChild) //dont even bother if we're already inside a similar element...
+              result=BackwardPropagate(mScratch,aParent,aChild);
           } //if
-          else result=BackwardPropagate(mScratch,eHTMLTag_html,aChildTag);
+          else result=BackwardPropagate(mScratch,eHTMLTag_html,aChild);
 
         } //elseif
 
       }//if
     }//if
-    if(mScratch.Length()-1>gHTMLElements[aParentTag].mPropagateRange)
+    if(mScratch.Length()-1>gHTMLElements[aParent].mPropagateRange)
       result=PR_FALSE;
   }//if
   else result=theParentContains;
@@ -2709,24 +2709,24 @@ PRBool CNavDTD::IsContainer(PRInt32 aTag) const {
  * @param   aChild -- tag type of child
  * @return  TRUE if propagation closes; false otherwise
  */
-PRBool CNavDTD::ForwardPropagate(nsString& aSequence,eHTMLTags aParentTag,eHTMLTags aChildTag)  {
+PRBool CNavDTD::ForwardPropagate(nsString& aSequence,eHTMLTags aParent,eHTMLTags aChild)  {
   PRBool result=PR_FALSE;
 
-  switch(aParentTag) {
+  switch(aParent) {
     case eHTMLTag_table:
       {
-        if((eHTMLTag_tr==aChildTag) || (eHTMLTag_td==aChildTag)) {
-          return BackwardPropagate(aSequence,aParentTag,aChildTag);
+        if((eHTMLTag_tr==aChild) || (eHTMLTag_td==aChild)) {
+          return BackwardPropagate(aSequence,aParent,aChild);
         }
       }
       //otherwise, intentionally fall through...
 
     case eHTMLTag_tr:
       {  
-        PRBool theCanContainResult=CanContain(eHTMLTag_td,aChildTag);
+        PRBool theCanContainResult=CanContain(eHTMLTag_td,aChild);
         if(PR_TRUE==theCanContainResult) {
           aSequence.Append((PRUnichar)eHTMLTag_td);
-          result=BackwardPropagate(aSequence,aParentTag,eHTMLTag_td);
+          result=BackwardPropagate(aSequence,aParent,eHTMLTag_td);
         }
       }
       break;
@@ -2752,25 +2752,25 @@ PRBool CNavDTD::ForwardPropagate(nsString& aSequence,eHTMLTags aParentTag,eHTMLT
  * @param   aChild -- tag type of child
  * @return  TRUE if propagation closes; false otherwise
  */
-PRBool CNavDTD::BackwardPropagate(nsString& aSequence,eHTMLTags aParentTag,eHTMLTags aChildTag) const {
+PRBool CNavDTD::BackwardPropagate(nsString& aSequence,eHTMLTags aParent,eHTMLTags aChild) const {
 
-  eHTMLTags theParentTag=aParentTag; //just init to get past first condition...
+  eHTMLTags theParent=aParent; //just init to get past first condition...
 
   do {
-    const TagList* theRootTags=gHTMLElements[aChildTag].GetRootTags();
+    const TagList* theRootTags=gHTMLElements[aChild].GetRootTags();
     if(theRootTags) {
-      theParentTag=theRootTags->mTags[0];
-      if(CanContain(theParentTag,aChildTag)) {
+      theParent=theRootTags->mTags[0];
+      if(CanContain(theParent,aChild)) {
         //we've found a complete sequence, so push the parent...
-        aChildTag=theParentTag;
-        aSequence.Append((PRUnichar)theParentTag);
+        aChild=theParent;
+        aSequence.Append((PRUnichar)theParent);
       }
     }
     else break;
   } 
-  while((theParentTag!=eHTMLTag_unknown) && (theParentTag!=aParentTag));
+  while((theParent!=eHTMLTag_unknown) && (theParent!=aParent));
 
-  return PRBool(aParentTag==theParentTag);
+  return PRBool(aParent==theParent);
 }
 
 
@@ -3635,21 +3635,21 @@ nsresult CNavDTD::CloseContainersTo(PRInt32 anIndex,eHTMLTags aTarget, PRBool aC
  * @param   aClosedByStartTag -- ONLY TRUE if the container is being closed by opening of another container.
  * @return  TRUE if ok, FALSE if error
  */
-nsresult CNavDTD::CloseContainersTo(eHTMLTags aTarget,PRBool aClosedByStartTag){
+nsresult CNavDTD::CloseContainersTo(eHTMLTags aTag,PRBool aClosedByStartTag){
   NS_PRECONDITION(mBodyContext->GetCount() > 0, kInvalidTagStackPos);
 
-  PRInt32 pos=mBodyContext->LastOf(aTarget);
+  PRInt32 pos=mBodyContext->LastOf(aTag);
 
   if(kNotFound!=pos) {
     //the tag is indeed open, so close it.
-    return CloseContainersTo(pos,aTarget,aClosedByStartTag);
+    return CloseContainersTo(pos,aTag,aClosedByStartTag);
   }
 
   eHTMLTags theTopTag=mBodyContext->Last();
 
-  PRBool theTagIsSynonymous=((nsHTMLElement::IsResidualStyleTag(aTarget)) && (nsHTMLElement::IsResidualStyleTag(theTopTag)));
+  PRBool theTagIsSynonymous=((nsHTMLElement::IsResidualStyleTag(aTag)) && (nsHTMLElement::IsResidualStyleTag(theTopTag)));
   if(!theTagIsSynonymous){
-    theTagIsSynonymous=(gHTMLElements[aTarget].IsMemberOf(kHeading) && 
+    theTagIsSynonymous=(gHTMLElements[aTag].IsMemberOf(kHeading) && 
                         gHTMLElements[theTopTag].IsMemberOf(kHeading));  
   }
 
@@ -3657,21 +3657,21 @@ nsresult CNavDTD::CloseContainersTo(eHTMLTags aTarget,PRBool aClosedByStartTag){
     //if you're here, it's because we're trying to close one tag,
     //but a different (synonymous) one is actually open. Because this is NAV4x
     //compatibililty mode, we must close the one that's really open.
-    aTarget=theTopTag;    
-    pos=mBodyContext->LastOf(aTarget);
+    aTag=theTopTag;    
+    pos=mBodyContext->LastOf(aTag);
     if(kNotFound!=pos) {
       //the tag is indeed open, so close it.
-      return CloseContainersTo(pos,aTarget,aClosedByStartTag);
+      return CloseContainersTo(pos,aTag,aClosedByStartTag);
     }
   }
   
   nsresult result=NS_OK;
-  const TagList* theRootTags=gHTMLElements[aTarget].GetRootTags();
+  const TagList* theRootTags=gHTMLElements[aTag].GetRootTags();
   eHTMLTags theParentTag=(theRootTags) ? theRootTags->mTags[0] : eHTMLTag_unknown;
   pos=mBodyContext->LastOf(theParentTag);
   if(kNotFound!=pos) {
     //the parent container is open, so close it instead
-    result=CloseContainersTo(pos+1,aTarget,aClosedByStartTag);
+    result=CloseContainersTo(pos+1,aTag,aClosedByStartTag);
   }
   return result;
 }
@@ -3762,25 +3762,25 @@ nsresult CNavDTD::AddHeadLeaf(nsIParserNode *aNode){
  *  stack until the child can be properly placed.
  *
  *  @update  gess 4/8/98
- *  @param   aChildTag is the child for whom we need to 
+ *  @param   aChild is the child for whom we need to 
  *           create a new context vector
  *  @return  true if we succeeded, otherwise false
  */
-nsresult CNavDTD::CreateContextStackFor(eHTMLTags aChildTag){
+nsresult CNavDTD::CreateContextStackFor(eHTMLTags aChild){
   
   mScratch.Truncate();
   
   nsresult  result=(nsresult)kContextMismatch;
   eHTMLTags theTop=mBodyContext->Last();
-  PRBool    bResult=ForwardPropagate(mScratch,theTop,aChildTag);
+  PRBool    bResult=ForwardPropagate(mScratch,theTop,aChild);
   
   if(PR_FALSE==bResult){
 
     if(eHTMLTag_unknown!=theTop) {
-      if(theTop!=aChildTag) //dont even bother if we're already inside a similar element...
-        bResult=BackwardPropagate(mScratch,theTop,aChildTag);      
+      if(theTop!=aChild) //dont even bother if we're already inside a similar element...
+        bResult=BackwardPropagate(mScratch,theTop,aChild);      
     } //if
-    else bResult=BackwardPropagate(mScratch,eHTMLTag_html,aChildTag);
+    else bResult=BackwardPropagate(mScratch,eHTMLTag_html,aChild);
   } //elseif
 
   PRInt32   theLen=mScratch.Length();
diff --git a/mozilla/htmlparser/src/CNavDTD.h b/mozilla/htmlparser/src/CNavDTD.h
index 5407429b29e..c2094ac0ddd 100644
--- a/mozilla/htmlparser/src/CNavDTD.h
+++ b/mozilla/htmlparser/src/CNavDTD.h
@@ -176,8 +176,8 @@ public:
      * @return  True if closure was achieved -- other false
      */
     virtual PRBool ForwardPropagate(nsString& aSequence,
-                                    eHTMLTags aParentTag,
-                                    eHTMLTags aChildTag);
+                                    eHTMLTags aParent,
+                                    eHTMLTags aChild);
 
     /**
      * This method tries to design a context map (without actually
@@ -189,17 +189,17 @@ public:
      * @return  True if closure was achieved -- other false
      */
     virtual PRBool BackwardPropagate(nsString& aSequence,
-                                     eHTMLTags aParentTag,
-                                     eHTMLTags aChildTag) const;
+                                     eHTMLTags aParent,
+                                     eHTMLTags aChild) const;
 
     /**
      * Attempt forward and/or backward propagation for the given
      * child within the current context vector stack.
      * @update	gess5/11/98
-     * @param   type of child to be propagated.
+     * @param   aChild -- type of child to be propagated.
      * @return  TRUE if succeeds, otherwise FALSE
      */
-    nsresult CreateContextStackFor(eHTMLTags aChildTag);
+    nsresult CreateContextStackFor(eHTMLTags aChild);
 
     /**
      * Ask parser if a given container is open ANYWHERE on stack
diff --git a/mozilla/htmlparser/src/COtherDTD.cpp b/mozilla/htmlparser/src/COtherDTD.cpp
index 3807f5ee586..bdfabd2089e 100644
--- a/mozilla/htmlparser/src/COtherDTD.cpp
+++ b/mozilla/htmlparser/src/COtherDTD.cpp
@@ -554,7 +554,7 @@ nsresult COtherDTD::HandleToken(CToken* aToken,nsIParser* aParser){
  * This gets called after we've handled a given start tag.
  * It's a generic hook to let us to post processing.
  * @param   aToken contains the tag in question
- * @param   aChildTag is the tag itself.
+ * @param   aTag is the tag itself.
  * @return  status
  */
 nsresult COtherDTD::DidHandleStartTag(nsIParserNode& aNode,eHTMLTags aChildTag){
diff --git a/mozilla/htmlparser/src/COtherDTD.h b/mozilla/htmlparser/src/COtherDTD.h
index fc1d224c85f..f88432b0a6e 100644
--- a/mozilla/htmlparser/src/COtherDTD.h
+++ b/mozilla/htmlparser/src/COtherDTD.h
@@ -159,7 +159,7 @@ class COtherDTD : public nsIDTD
 protected:
 
 		nsresult        CollectAttributes(nsIParserNode& aNode,eHTMLTags aTag,PRInt32 aCount);
-    nsresult        WillHandleStartTag(CToken* aToken,eHTMLTags aChildTag,nsIParserNode& aNode);
+    nsresult        WillHandleStartTag(CToken* aToken,eHTMLTags aTag,nsIParserNode& aNode);
     nsresult        DidHandleStartTag(nsIParserNode& aNode,eHTMLTags aChildTag);
     nsIParserNode*  CreateNode(CToken* aToken=nsnull,PRInt32 aLineNumber=1,nsTokenAllocator* aTokenAllocator=0);
 
diff --git a/mozilla/htmlparser/src/nsDTDUtils.cpp b/mozilla/htmlparser/src/nsDTDUtils.cpp
index f91f8cf8efa..23d3b714c9d 100644
--- a/mozilla/htmlparser/src/nsDTDUtils.cpp
+++ b/mozilla/htmlparser/src/nsDTDUtils.cpp
@@ -379,7 +379,7 @@ eHTMLTags nsEntryStack::operator[](PRInt32 anIndex) const
  * @update  harishd 04/04/99
  * @update  gess 04/21/99
  */
-eHTMLTags nsEntryStack::Last() const 
+eHTMLTags nsEntryStack::Last(void) const 
 {
   eHTMLTags result=eHTMLTag_unknown;
   if(0<mCount) {
@@ -1243,7 +1243,7 @@ void nsDTDContext::RemoveStyle(eHTMLTags aTag){
  * 
  * @return  nada
  */
-void nsDTDContext::ReleaseGlobalObjects(){
+void nsDTDContext::ReleaseGlobalObjects(void){
 }
 
 
diff --git a/mozilla/htmlparser/src/nsDTDUtils.h b/mozilla/htmlparser/src/nsDTDUtils.h
index 8a876cdf970..5b363d2b3cf 100644
--- a/mozilla/htmlparser/src/nsDTDUtils.h
+++ b/mozilla/htmlparser/src/nsDTDUtils.h
@@ -127,7 +127,7 @@ public:
   void            EnsureCapacityFor(PRInt32 aNewMax, PRInt32 aShiftOffset=0);
   void            Push(nsCParserNode* aNode,nsEntryStack* aStyleStack=0, PRBool aRefCntNode = PR_TRUE);
   void            PushFront(nsCParserNode* aNode,nsEntryStack* aStyleStack=0, PRBool aRefCntNode = PR_TRUE);
-  void            Append(nsEntryStack *theStack);
+  void            Append(nsEntryStack *aStack);
   nsCParserNode*  Pop(void);
   nsCParserNode*  Remove(PRInt32 anIndex,eHTMLTags aTag);
   nsCParserNode*  NodeAt(PRInt32 anIndex) const;
@@ -355,7 +355,7 @@ public:
   PRInt32         GetResidualStyleCount(void) {return mResidualStyleCount;}
   nsEntryStack*   GetStylesAt(PRInt32 anIndex) const;
   void            PushStyle(nsCParserNode* aNode);
-  void            PushStyles(nsEntryStack *theStyles);
+  void            PushStyles(nsEntryStack *aStyles);
   nsCParserNode*  PopStyle(void);
   nsCParserNode*  PopStyle(eHTMLTags aTag);
   void            RemoveStyle(eHTMLTags aTag);
@@ -574,7 +574,7 @@ struct CRCStruct {
 class nsObserverEntry : public nsIObserverEntry {
 public:
   NS_DECL_ISUPPORTS
-            nsObserverEntry(const nsAString& aTopic);
+            nsObserverEntry(const nsAString& aString);
   virtual   ~nsObserverEntry();
 
   NS_IMETHOD Notify(nsIParserNode* aNode,
diff --git a/mozilla/parser/htmlparser/src/CNavDTD.cpp b/mozilla/parser/htmlparser/src/CNavDTD.cpp
index 4a047508b6c..ffc47d5f8dc 100644
--- a/mozilla/parser/htmlparser/src/CNavDTD.cpp
+++ b/mozilla/parser/htmlparser/src/CNavDTD.cpp
@@ -1391,7 +1391,7 @@ nsresult CNavDTD::HandleDefaultStartToken(CToken* aToken,eHTMLTags aChildTag,nsC
  * This gets called before we've handled a given start tag.
  * It's a generic hook to let us do pre processing.
  * @param   aToken contains the tag in question
- * @param   aChildTag is the tag itself.
+ * @param   aTag is the tag itself.
  * @param   aNode is the node (tag) with associated attributes.
  * @return  TRUE if tag processing should continue; FALSE if the tag has been handled.
  */
@@ -2569,34 +2569,34 @@ PRBool CNavDTD::IsInlineElement(PRInt32 aTagID,PRInt32 aParentID) const {
  *  @param   aChild -- tag enum of child container
  *  @return  PR_TRUE if propagation should occur
  */
-PRBool CNavDTD::CanPropagate(eHTMLTags aParentTag,eHTMLTags aChildTag,PRBool aParentContains)  {
+PRBool CNavDTD::CanPropagate(eHTMLTags aParent,eHTMLTags aChild,PRBool aParentContains)  {
   PRBool    result=PR_FALSE;
-  PRBool    theParentContains=(-1==aParentContains) ? CanContain(aParentTag,aChildTag) : aParentContains;
+  PRBool    theParentContains=(-1==aParentContains) ? CanContain(aParent,aChild) : aParentContains;
 
-  if(aParentTag==aChildTag) {
+  if(aParent==aChild) {
     return result;
   }
 
-  if(nsHTMLElement::IsContainer(aChildTag)){
+  if(nsHTMLElement::IsContainer(aChild)){
     mScratch.Truncate();
-    if(!gHTMLElements[aChildTag].HasSpecialProperty(kNoPropagate)){
-      if(nsHTMLElement::IsBlockParent(aParentTag) || (gHTMLElements[aParentTag].GetSpecialChildren())) {
+    if(!gHTMLElements[aChild].HasSpecialProperty(kNoPropagate)){
+      if(nsHTMLElement::IsBlockParent(aParent) || (gHTMLElements[aParent].GetSpecialChildren())) {
 
-        result=ForwardPropagate(mScratch,aParentTag,aChildTag);
+        result=ForwardPropagate(mScratch,aParent,aChild);
 
         if(PR_FALSE==result){
 
-          if(eHTMLTag_unknown!=aParentTag) {
-            if(aParentTag!=aChildTag) //dont even bother if we're already inside a similar element...
-              result=BackwardPropagate(mScratch,aParentTag,aChildTag);
+          if(eHTMLTag_unknown!=aParent) {
+            if(aParent!=aChild) //dont even bother if we're already inside a similar element...
+              result=BackwardPropagate(mScratch,aParent,aChild);
           } //if
-          else result=BackwardPropagate(mScratch,eHTMLTag_html,aChildTag);
+          else result=BackwardPropagate(mScratch,eHTMLTag_html,aChild);
 
         } //elseif
 
       }//if
     }//if
-    if(mScratch.Length()-1>gHTMLElements[aParentTag].mPropagateRange)
+    if(mScratch.Length()-1>gHTMLElements[aParent].mPropagateRange)
       result=PR_FALSE;
   }//if
   else result=theParentContains;
@@ -2709,24 +2709,24 @@ PRBool CNavDTD::IsContainer(PRInt32 aTag) const {
  * @param   aChild -- tag type of child
  * @return  TRUE if propagation closes; false otherwise
  */
-PRBool CNavDTD::ForwardPropagate(nsString& aSequence,eHTMLTags aParentTag,eHTMLTags aChildTag)  {
+PRBool CNavDTD::ForwardPropagate(nsString& aSequence,eHTMLTags aParent,eHTMLTags aChild)  {
   PRBool result=PR_FALSE;
 
-  switch(aParentTag) {
+  switch(aParent) {
     case eHTMLTag_table:
       {
-        if((eHTMLTag_tr==aChildTag) || (eHTMLTag_td==aChildTag)) {
-          return BackwardPropagate(aSequence,aParentTag,aChildTag);
+        if((eHTMLTag_tr==aChild) || (eHTMLTag_td==aChild)) {
+          return BackwardPropagate(aSequence,aParent,aChild);
         }
       }
       //otherwise, intentionally fall through...
 
     case eHTMLTag_tr:
       {  
-        PRBool theCanContainResult=CanContain(eHTMLTag_td,aChildTag);
+        PRBool theCanContainResult=CanContain(eHTMLTag_td,aChild);
         if(PR_TRUE==theCanContainResult) {
           aSequence.Append((PRUnichar)eHTMLTag_td);
-          result=BackwardPropagate(aSequence,aParentTag,eHTMLTag_td);
+          result=BackwardPropagate(aSequence,aParent,eHTMLTag_td);
         }
       }
       break;
@@ -2752,25 +2752,25 @@ PRBool CNavDTD::ForwardPropagate(nsString& aSequence,eHTMLTags aParentTag,eHTMLT
  * @param   aChild -- tag type of child
  * @return  TRUE if propagation closes; false otherwise
  */
-PRBool CNavDTD::BackwardPropagate(nsString& aSequence,eHTMLTags aParentTag,eHTMLTags aChildTag) const {
+PRBool CNavDTD::BackwardPropagate(nsString& aSequence,eHTMLTags aParent,eHTMLTags aChild) const {
 
-  eHTMLTags theParentTag=aParentTag; //just init to get past first condition...
+  eHTMLTags theParent=aParent; //just init to get past first condition...
 
   do {
-    const TagList* theRootTags=gHTMLElements[aChildTag].GetRootTags();
+    const TagList* theRootTags=gHTMLElements[aChild].GetRootTags();
     if(theRootTags) {
-      theParentTag=theRootTags->mTags[0];
-      if(CanContain(theParentTag,aChildTag)) {
+      theParent=theRootTags->mTags[0];
+      if(CanContain(theParent,aChild)) {
         //we've found a complete sequence, so push the parent...
-        aChildTag=theParentTag;
-        aSequence.Append((PRUnichar)theParentTag);
+        aChild=theParent;
+        aSequence.Append((PRUnichar)theParent);
       }
     }
     else break;
   } 
-  while((theParentTag!=eHTMLTag_unknown) && (theParentTag!=aParentTag));
+  while((theParent!=eHTMLTag_unknown) && (theParent!=aParent));
 
-  return PRBool(aParentTag==theParentTag);
+  return PRBool(aParent==theParent);
 }
 
 
@@ -3635,21 +3635,21 @@ nsresult CNavDTD::CloseContainersTo(PRInt32 anIndex,eHTMLTags aTarget, PRBool aC
  * @param   aClosedByStartTag -- ONLY TRUE if the container is being closed by opening of another container.
  * @return  TRUE if ok, FALSE if error
  */
-nsresult CNavDTD::CloseContainersTo(eHTMLTags aTarget,PRBool aClosedByStartTag){
+nsresult CNavDTD::CloseContainersTo(eHTMLTags aTag,PRBool aClosedByStartTag){
   NS_PRECONDITION(mBodyContext->GetCount() > 0, kInvalidTagStackPos);
 
-  PRInt32 pos=mBodyContext->LastOf(aTarget);
+  PRInt32 pos=mBodyContext->LastOf(aTag);
 
   if(kNotFound!=pos) {
     //the tag is indeed open, so close it.
-    return CloseContainersTo(pos,aTarget,aClosedByStartTag);
+    return CloseContainersTo(pos,aTag,aClosedByStartTag);
   }
 
   eHTMLTags theTopTag=mBodyContext->Last();
 
-  PRBool theTagIsSynonymous=((nsHTMLElement::IsResidualStyleTag(aTarget)) && (nsHTMLElement::IsResidualStyleTag(theTopTag)));
+  PRBool theTagIsSynonymous=((nsHTMLElement::IsResidualStyleTag(aTag)) && (nsHTMLElement::IsResidualStyleTag(theTopTag)));
   if(!theTagIsSynonymous){
-    theTagIsSynonymous=(gHTMLElements[aTarget].IsMemberOf(kHeading) && 
+    theTagIsSynonymous=(gHTMLElements[aTag].IsMemberOf(kHeading) && 
                         gHTMLElements[theTopTag].IsMemberOf(kHeading));  
   }
 
@@ -3657,21 +3657,21 @@ nsresult CNavDTD::CloseContainersTo(eHTMLTags aTarget,PRBool aClosedByStartTag){
     //if you're here, it's because we're trying to close one tag,
     //but a different (synonymous) one is actually open. Because this is NAV4x
     //compatibililty mode, we must close the one that's really open.
-    aTarget=theTopTag;    
-    pos=mBodyContext->LastOf(aTarget);
+    aTag=theTopTag;    
+    pos=mBodyContext->LastOf(aTag);
     if(kNotFound!=pos) {
       //the tag is indeed open, so close it.
-      return CloseContainersTo(pos,aTarget,aClosedByStartTag);
+      return CloseContainersTo(pos,aTag,aClosedByStartTag);
     }
   }
   
   nsresult result=NS_OK;
-  const TagList* theRootTags=gHTMLElements[aTarget].GetRootTags();
+  const TagList* theRootTags=gHTMLElements[aTag].GetRootTags();
   eHTMLTags theParentTag=(theRootTags) ? theRootTags->mTags[0] : eHTMLTag_unknown;
   pos=mBodyContext->LastOf(theParentTag);
   if(kNotFound!=pos) {
     //the parent container is open, so close it instead
-    result=CloseContainersTo(pos+1,aTarget,aClosedByStartTag);
+    result=CloseContainersTo(pos+1,aTag,aClosedByStartTag);
   }
   return result;
 }
@@ -3762,25 +3762,25 @@ nsresult CNavDTD::AddHeadLeaf(nsIParserNode *aNode){
  *  stack until the child can be properly placed.
  *
  *  @update  gess 4/8/98
- *  @param   aChildTag is the child for whom we need to 
+ *  @param   aChild is the child for whom we need to 
  *           create a new context vector
  *  @return  true if we succeeded, otherwise false
  */
-nsresult CNavDTD::CreateContextStackFor(eHTMLTags aChildTag){
+nsresult CNavDTD::CreateContextStackFor(eHTMLTags aChild){
   
   mScratch.Truncate();
   
   nsresult  result=(nsresult)kContextMismatch;
   eHTMLTags theTop=mBodyContext->Last();
-  PRBool    bResult=ForwardPropagate(mScratch,theTop,aChildTag);
+  PRBool    bResult=ForwardPropagate(mScratch,theTop,aChild);
   
   if(PR_FALSE==bResult){
 
     if(eHTMLTag_unknown!=theTop) {
-      if(theTop!=aChildTag) //dont even bother if we're already inside a similar element...
-        bResult=BackwardPropagate(mScratch,theTop,aChildTag);      
+      if(theTop!=aChild) //dont even bother if we're already inside a similar element...
+        bResult=BackwardPropagate(mScratch,theTop,aChild);      
     } //if
-    else bResult=BackwardPropagate(mScratch,eHTMLTag_html,aChildTag);
+    else bResult=BackwardPropagate(mScratch,eHTMLTag_html,aChild);
   } //elseif
 
   PRInt32   theLen=mScratch.Length();
diff --git a/mozilla/parser/htmlparser/src/CNavDTD.h b/mozilla/parser/htmlparser/src/CNavDTD.h
index 5407429b29e..c2094ac0ddd 100644
--- a/mozilla/parser/htmlparser/src/CNavDTD.h
+++ b/mozilla/parser/htmlparser/src/CNavDTD.h
@@ -176,8 +176,8 @@ public:
      * @return  True if closure was achieved -- other false
      */
     virtual PRBool ForwardPropagate(nsString& aSequence,
-                                    eHTMLTags aParentTag,
-                                    eHTMLTags aChildTag);
+                                    eHTMLTags aParent,
+                                    eHTMLTags aChild);
 
     /**
      * This method tries to design a context map (without actually
@@ -189,17 +189,17 @@ public:
      * @return  True if closure was achieved -- other false
      */
     virtual PRBool BackwardPropagate(nsString& aSequence,
-                                     eHTMLTags aParentTag,
-                                     eHTMLTags aChildTag) const;
+                                     eHTMLTags aParent,
+                                     eHTMLTags aChild) const;
 
     /**
      * Attempt forward and/or backward propagation for the given
      * child within the current context vector stack.
      * @update	gess5/11/98
-     * @param   type of child to be propagated.
+     * @param   aChild -- type of child to be propagated.
      * @return  TRUE if succeeds, otherwise FALSE
      */
-    nsresult CreateContextStackFor(eHTMLTags aChildTag);
+    nsresult CreateContextStackFor(eHTMLTags aChild);
 
     /**
      * Ask parser if a given container is open ANYWHERE on stack
diff --git a/mozilla/parser/htmlparser/src/COtherDTD.cpp b/mozilla/parser/htmlparser/src/COtherDTD.cpp
index 3807f5ee586..bdfabd2089e 100644
--- a/mozilla/parser/htmlparser/src/COtherDTD.cpp
+++ b/mozilla/parser/htmlparser/src/COtherDTD.cpp
@@ -554,7 +554,7 @@ nsresult COtherDTD::HandleToken(CToken* aToken,nsIParser* aParser){
  * This gets called after we've handled a given start tag.
  * It's a generic hook to let us to post processing.
  * @param   aToken contains the tag in question
- * @param   aChildTag is the tag itself.
+ * @param   aTag is the tag itself.
  * @return  status
  */
 nsresult COtherDTD::DidHandleStartTag(nsIParserNode& aNode,eHTMLTags aChildTag){
diff --git a/mozilla/parser/htmlparser/src/COtherDTD.h b/mozilla/parser/htmlparser/src/COtherDTD.h
index fc1d224c85f..f88432b0a6e 100644
--- a/mozilla/parser/htmlparser/src/COtherDTD.h
+++ b/mozilla/parser/htmlparser/src/COtherDTD.h
@@ -159,7 +159,7 @@ class COtherDTD : public nsIDTD
 protected:
 
 		nsresult        CollectAttributes(nsIParserNode& aNode,eHTMLTags aTag,PRInt32 aCount);
-    nsresult        WillHandleStartTag(CToken* aToken,eHTMLTags aChildTag,nsIParserNode& aNode);
+    nsresult        WillHandleStartTag(CToken* aToken,eHTMLTags aTag,nsIParserNode& aNode);
     nsresult        DidHandleStartTag(nsIParserNode& aNode,eHTMLTags aChildTag);
     nsIParserNode*  CreateNode(CToken* aToken=nsnull,PRInt32 aLineNumber=1,nsTokenAllocator* aTokenAllocator=0);
 
diff --git a/mozilla/parser/htmlparser/src/nsDTDUtils.cpp b/mozilla/parser/htmlparser/src/nsDTDUtils.cpp
index f91f8cf8efa..23d3b714c9d 100644
--- a/mozilla/parser/htmlparser/src/nsDTDUtils.cpp
+++ b/mozilla/parser/htmlparser/src/nsDTDUtils.cpp
@@ -379,7 +379,7 @@ eHTMLTags nsEntryStack::operator[](PRInt32 anIndex) const
  * @update  harishd 04/04/99
  * @update  gess 04/21/99
  */
-eHTMLTags nsEntryStack::Last() const 
+eHTMLTags nsEntryStack::Last(void) const 
 {
   eHTMLTags result=eHTMLTag_unknown;
   if(0<mCount) {
@@ -1243,7 +1243,7 @@ void nsDTDContext::RemoveStyle(eHTMLTags aTag){
  * 
  * @return  nada
  */
-void nsDTDContext::ReleaseGlobalObjects(){
+void nsDTDContext::ReleaseGlobalObjects(void){
 }
 
 
diff --git a/mozilla/parser/htmlparser/src/nsDTDUtils.h b/mozilla/parser/htmlparser/src/nsDTDUtils.h
index 8a876cdf970..5b363d2b3cf 100644
--- a/mozilla/parser/htmlparser/src/nsDTDUtils.h
+++ b/mozilla/parser/htmlparser/src/nsDTDUtils.h
@@ -127,7 +127,7 @@ public:
   void            EnsureCapacityFor(PRInt32 aNewMax, PRInt32 aShiftOffset=0);
   void            Push(nsCParserNode* aNode,nsEntryStack* aStyleStack=0, PRBool aRefCntNode = PR_TRUE);
   void            PushFront(nsCParserNode* aNode,nsEntryStack* aStyleStack=0, PRBool aRefCntNode = PR_TRUE);
-  void            Append(nsEntryStack *theStack);
+  void            Append(nsEntryStack *aStack);
   nsCParserNode*  Pop(void);
   nsCParserNode*  Remove(PRInt32 anIndex,eHTMLTags aTag);
   nsCParserNode*  NodeAt(PRInt32 anIndex) const;
@@ -355,7 +355,7 @@ public:
   PRInt32         GetResidualStyleCount(void) {return mResidualStyleCount;}
   nsEntryStack*   GetStylesAt(PRInt32 anIndex) const;
   void            PushStyle(nsCParserNode* aNode);
-  void            PushStyles(nsEntryStack *theStyles);
+  void            PushStyles(nsEntryStack *aStyles);
   nsCParserNode*  PopStyle(void);
   nsCParserNode*  PopStyle(eHTMLTags aTag);
   void            RemoveStyle(eHTMLTags aTag);
@@ -574,7 +574,7 @@ struct CRCStruct {
 class nsObserverEntry : public nsIObserverEntry {
 public:
   NS_DECL_ISUPPORTS
-            nsObserverEntry(const nsAString& aTopic);
+            nsObserverEntry(const nsAString& aString);
   virtual   ~nsObserverEntry();
 
   NS_IMETHOD Notify(nsIParserNode* aNode,