diff --git a/artifact/xdocs/index.xml b/artifact/xdocs/index.xml
index ec598970..5a71d297 100644
--- a/artifact/xdocs/index.xml
+++ b/artifact/xdocs/index.xml
@@ -64,9 +64,9 @@
           </tr>
         </table>
       </subsection>
-      <section name="Requirements">
-        <p>Be careful, maven 1.1 is required to use the artifact plugin v >= 1.5.2.</p>
-      </section>
+    </section>
+    <section name="Requirements">
+      <p>Be careful, maven 1.1 is required to use the artifact plugin v >= 1.5.2.</p>
     </section>
   </body>
 </document>
diff --git a/cruisecontrol/xdocs/faq.fml b/cruisecontrol/xdocs/faq.fml
index 41698bc0..452866ad 100644
--- a/cruisecontrol/xdocs/faq.fml
+++ b/cruisecontrol/xdocs/faq.fml
@@ -118,13 +118,13 @@
       <question>
         Do I need to edit the CruiseControl configuration file?
       </question>
+      <answer>
         By default no, since much of the information in the file originates
         in properties and project.xml.  For changes that affect the generation
         of the project or projects, you may want to create you own template. 
         If you have dependencies defined, then you need to ensure the order 
         of the projects in the file corresponds with the order the project
         should be built.
-      <answer>
       </answer>
     </faq>
 
diff --git a/pom/xdocs/validation.xml b/pom/xdocs/validation.xml
index 5c7eafa3..ef5eae4f 100644
--- a/pom/xdocs/validation.xml
+++ b/pom/xdocs/validation.xml
@@ -37,7 +37,7 @@
         The validation routine works differently for stand-alone
         poms and poms that extend other ones (child poms).
         The following table shows which
-        top-level elements (<emph>i.e.</emph>, elements just below the
+        top-level elements (<em>i.e.</em>, elements just below the
         <code>&lt;project&gt;</code> root) are required in each case.
       </p>
       <table>
diff --git a/site/xdocs/site-deployment.xml b/site/xdocs/site-deployment.xml
index 7cfea9e3..07e7880b 100644
--- a/site/xdocs/site-deployment.xml
+++ b/site/xdocs/site-deployment.xml
@@ -19,9 +19,9 @@
 
 <document>
   <properties>
-    <author>Dion Gillard</author>
-    <author email="ge0ffrey_AT_users_DOT_sourceforge_DOT_net">Geoffrey De Smet</author>
     <title>Site deployment</title>
+    <author email="dion_AT_multitask_DOT_com_DOT_au">Dion Gillard</author>
+    <author email="ge0ffrey_AT_users_DOT_sourceforge_DOT_net">Geoffrey De Smet</author>
   </properties>
   <body>
     <section name="General">
@@ -111,4 +111,4 @@ maven site:sshdeploy
       </subsection>
     </section>
   </body>
-</document>
\ No newline at end of file
+</document>
