diff --git a/editor/public/nsIEditor.h b/editor/public/nsIEditor.h
index 6519315b599..133370a2773 100644
--- a/editor/public/nsIEditor.h
+++ b/editor/public/nsIEditor.h
@@ -125,9 +125,9 @@ public:
    * @param aResultIsSet  PR_TRUE if aAttribute is set on the current node, PR_FALSE if it is not.
    */
   NS_IMETHOD GetAttributeValue(nsIDOMElement * aElement, 
-                                     const nsString& aAttribute, 
-                                     nsString&       aResultValue, 
-                                     PRBool&         aResultIsSet)=0;
+                               const nsString& aAttribute, 
+                               nsString&       aResultValue, 
+                               PRBool&         aResultIsSet)=0;
 
   /**
    * RemoveAttribute() deletes aAttribute from the attribute list of aElement.
@@ -137,7 +137,7 @@ public:
    * @param aAttribute    the string representation of the attribute to get
    */
   NS_IMETHOD RemoveAttribute(nsIDOMElement * aElement, 
-                                   const nsString& aAttribute)=0;
+                             const nsString& aAttribute)=0;
 
   /** 
    * CreateNode instantiates a new element of type aTag and inserts it into aParent at aPosition.
@@ -147,9 +147,9 @@ public:
    * @param aNewNode  [OUT] The node created.  Caller must release aNewNode.
    */
   NS_IMETHOD CreateNode(const nsString& aTag,
-                              nsIDOMNode *    aParent,
-                              PRInt32         aPosition,
-                              nsIDOMNode **   aNewNode)=0;
+                        nsIDOMNode *    aParent,
+                        PRInt32         aPosition,
+                        nsIDOMNode **   aNewNode)=0;
 
   /** 
    * InsertNode inserts aNode into aParent at aPosition.
@@ -160,8 +160,8 @@ public:
    * @param aPosition The place in aParent to insert the new node
    */
   NS_IMETHOD InsertNode(nsIDOMNode * aNode,
-                              nsIDOMNode * aParent,
-                              PRInt32      aPosition)=0;
+                        nsIDOMNode * aParent,
+                        PRInt32      aPosition)=0;
 
 
   /**
@@ -177,7 +177,6 @@ public:
 
   /** 
    * DeleteNode removes aChild from aParent.
-   * If aChild is not a child of aParent, nothing is done and an error is returned.
    * @param aChild    The node to delete
    */
   NS_IMETHOD DeleteNode(nsIDOMNode * aChild)=0;
@@ -325,6 +324,8 @@ public:
    */
   NS_IMETHOD Paste()=0;
 
+  NS_IMETHOD DebugDumpContent() const =0;
+
 };
 
 #endif //nsIEditor_h__
diff --git a/editor/public/nsIHTMLEditor.h b/editor/public/nsIHTMLEditor.h
index 98bebfac5f0..dc71991bd52 100644
--- a/editor/public/nsIHTMLEditor.h
+++ b/editor/public/nsIHTMLEditor.h
@@ -50,7 +50,7 @@ public:
 
 // Methods shared with nsITextEditor (see nsITextEditor.h for details)
   NS_IMETHOD SetTextProperty(nsIAtom *aProperty)=0;
-  NS_IMETHOD GetTextProperty(nsIAtom *aProperty, PRBool &aAll, PRBool &aAny)=0;
+  NS_IMETHOD GetTextProperty(nsIAtom *aProperty, PRBool &aFirst, PRBool &aAll, PRBool &aAny)=0;
   NS_IMETHOD RemoveTextProperty(nsIAtom *aProperty)=0;
   NS_IMETHOD DeleteSelection(nsIEditor::Direction aDir)=0;
   NS_IMETHOD InsertText(const nsString& aStringToInsert)=0;
diff --git a/editor/public/nsITextEditor.h b/editor/public/nsITextEditor.h
index 2c110c49d16..673caaa1952 100644
--- a/editor/public/nsITextEditor.h
+++ b/editor/public/nsITextEditor.h
@@ -73,7 +73,7 @@ public:
    *                  in the current selection.  Each item in aPropList is an nsEditProperty.
    * NOTE: this method is experimental, expect it to change.
    */
-  NS_IMETHOD GetTextProperty(nsIAtom *aProperty, PRBool &aAny, PRBool &aAll)=0;
+  NS_IMETHOD GetTextProperty(nsIAtom *aProperty, PRBool &aFirst, PRBool &aAny, PRBool &aAll)=0;
 
   /**
    * RemoveTextProperties() deletes the properties from all text in the current selection.