diff --git a/doc/C/config-prefs.sgml b/doc/C/config-prefs.sgml
index d75adf383a..e0f6dd0297 100644
--- a/doc/C/config-prefs.sgml
+++ b/doc/C/config-prefs.sgml
@@ -257,8 +257,9 @@
           <para>
             Click <guibutton>Add</guibutton> to add a news server; you
             will be prompted for its name.  Enter the name, click
-            <guibutton>OK</guibutton>
-
+            <guibutton>OK</guibutton>, and you're done. (FIXME, this needs work).
+          </para>
+     </sect2>
 
      <sect2 id="config-prefs-mail-other">
 	<title>Other Mail Preferences</title>
diff --git a/doc/C/usage-mail.sgml b/doc/C/usage-mail.sgml
index 3396fb2f70..de2f3b0a23 100644
--- a/doc/C/usage-mail.sgml
+++ b/doc/C/usage-mail.sgml
@@ -1,6 +1,6 @@
-
+<!--
 <!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
-
+-->
 
 <chapter id="usage-mail"> 
   <title>Evolution Mail</title>
@@ -119,7 +119,7 @@
              <term><guimenuitem>Forward Message</guimenuitem> </term>
              <listitem><para> 
                Send the message on to another person.
-               See <xref linkend="usage-mail-getnsent-fwd"> for
+               See <xref linkend="usage-mail-getnsend-fwd"> for
                information about how to use the Forward feature.
              </para></listitem>
            </varlistentry>
@@ -493,8 +493,8 @@ with quoted materials and the relevant replies interspersed-->
 	    get very angry if you send them HTML mail, which is why
 	    <application>Evolution</application> sends plain text
 	    unless you explicitly ask for HTML.  To send HTML mail,
-	    you will need to select <guilabel>Send Messages as
-	    HTML</guilabel> in the mail settings dialog box.  See
+	    you will need to select <menuchoice> <guimenuitem>
+	    HTML</guimenuitem></menuchoice> in the mail settings dialog box.  See
 	    <xref linkend="config-prefs-mail-other"> for more information.
           </para>
 	  <para>
@@ -659,7 +659,7 @@ possibly never will be due to security evil. -->
 	</sect3>
 -->
 
-      <sect3 id="usage-getnsend-fwd">
+      <sect3 id="usage-mail-getnsend-fwd">
 	<title>Forwarding Mail</title>      
 	<para>
 	  The post office forwards your mail for you when you change
diff --git a/doc/C/usage-mainwindow.sgml b/doc/C/usage-mainwindow.sgml
index 17263d01a9..8a71f2d4f2 100644
--- a/doc/C/usage-mainwindow.sgml
+++ b/doc/C/usage-mainwindow.sgml
@@ -1,7 +1,6 @@
-
+<!--
  <!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
-
-
+-->
 <chapter id="usage-mainwindow">
 
   <title>The Main Window: Evolution Basics</title>
@@ -364,7 +363,7 @@
           Configuration</guimenuitem> and the <guimenuitem>vFolder
           Editor</guimenuitem>.  For the
           <interface>Calendar</interface> and the <interface>Contact
-          Manager</interface> </para></listitem>, they'll be different.
+          Manager</interface> </para></listitem>
         </varlistentry>
 
         <varlistentry>
diff --git a/help/C/config-prefs.sgml b/help/C/config-prefs.sgml
index d75adf383a..e0f6dd0297 100644
--- a/help/C/config-prefs.sgml
+++ b/help/C/config-prefs.sgml
@@ -257,8 +257,9 @@
           <para>
             Click <guibutton>Add</guibutton> to add a news server; you
             will be prompted for its name.  Enter the name, click
-            <guibutton>OK</guibutton>
-
+            <guibutton>OK</guibutton>, and you're done. (FIXME, this needs work).
+          </para>
+     </sect2>
 
      <sect2 id="config-prefs-mail-other">
 	<title>Other Mail Preferences</title>
diff --git a/help/C/usage-mail.sgml b/help/C/usage-mail.sgml
index 3396fb2f70..de2f3b0a23 100644
--- a/help/C/usage-mail.sgml
+++ b/help/C/usage-mail.sgml
@@ -1,6 +1,6 @@
-
+<!--
 <!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
-
+-->
 
 <chapter id="usage-mail"> 
   <title>Evolution Mail</title>
@@ -119,7 +119,7 @@
              <term><guimenuitem>Forward Message</guimenuitem> </term>
              <listitem><para> 
                Send the message on to another person.
-               See <xref linkend="usage-mail-getnsent-fwd"> for
+               See <xref linkend="usage-mail-getnsend-fwd"> for
                information about how to use the Forward feature.
              </para></listitem>
            </varlistentry>
@@ -493,8 +493,8 @@ with quoted materials and the relevant replies interspersed-->
 	    get very angry if you send them HTML mail, which is why
 	    <application>Evolution</application> sends plain text
 	    unless you explicitly ask for HTML.  To send HTML mail,
-	    you will need to select <guilabel>Send Messages as
-	    HTML</guilabel> in the mail settings dialog box.  See
+	    you will need to select <menuchoice> <guimenuitem>
+	    HTML</guimenuitem></menuchoice> in the mail settings dialog box.  See
 	    <xref linkend="config-prefs-mail-other"> for more information.
           </para>
 	  <para>
@@ -659,7 +659,7 @@ possibly never will be due to security evil. -->
 	</sect3>
 -->
 
-      <sect3 id="usage-getnsend-fwd">
+      <sect3 id="usage-mail-getnsend-fwd">
 	<title>Forwarding Mail</title>      
 	<para>
 	  The post office forwards your mail for you when you change
diff --git a/help/C/usage-mainwindow.sgml b/help/C/usage-mainwindow.sgml
index 17263d01a9..8a71f2d4f2 100644
--- a/help/C/usage-mainwindow.sgml
+++ b/help/C/usage-mainwindow.sgml
@@ -1,7 +1,6 @@
-
+<!--
  <!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
-
-
+-->
 <chapter id="usage-mainwindow">
 
   <title>The Main Window: Evolution Basics</title>
@@ -364,7 +363,7 @@
           Configuration</guimenuitem> and the <guimenuitem>vFolder
           Editor</guimenuitem>.  For the
           <interface>Calendar</interface> and the <interface>Contact
-          Manager</interface> </para></listitem>, they'll be different.
+          Manager</interface> </para></listitem>
         </varlistentry>
 
         <varlistentry>