diff --git a/archiva-docs/src/site/apt/adminguide/databases.apt b/archiva-docs/src/site/apt/adminguide/databases.apt
index 2a80bad6c..889c75a19 100644
--- a/archiva-docs/src/site/apt/adminguide/databases.apt
+++ b/archiva-docs/src/site/apt/adminguide/databases.apt
@@ -53,7 +53,7 @@ Apache Archiva Database
   As a workaround, set the database to UTF-8 encoding after it has been populated. See {{{http://jira.codehaus.org/browse/MRM-1373} MRM-1373}} for more details.
 
 +------+
-...
+<!-- omitted xml -->
 
 <New id="users" class="org.mortbay.jetty.plus.naming.Resource">
   <Arg>jdbc/users</Arg>
@@ -76,7 +76,7 @@ Apache Archiva Database
     </New>
   </Arg>
 </New>
-...
+<!-- omitted xml -->
 +------+
 
 * Backing up the database
diff --git a/archiva-docs/src/site/apt/adminguide/standalone.apt b/archiva-docs/src/site/apt/adminguide/standalone.apt
index 883d640c8..56ca1feae 100644
--- a/archiva-docs/src/site/apt/adminguide/standalone.apt
+++ b/archiva-docs/src/site/apt/adminguide/standalone.apt
@@ -123,7 +123,7 @@ Installing Standalone Distribution of Apache Archiva
  for more details.
 
 +------+
-  ...
+  <!-- omitted xml -->
 
   <!-- Users / Security Database -->
 
@@ -148,7 +148,7 @@ Installing Standalone Distribution of Apache Archiva
       </New>
     </Arg>
   </New>
-  ...
+  <!-- omitted xml -->
 +------+
 
  More information about using Derby Network Server as an external user database
diff --git a/archiva-docs/src/site/apt/userguide/deploy.apt b/archiva-docs/src/site/apt/userguide/deploy.apt
index a50222ff1..0681126e8 100644
--- a/archiva-docs/src/site/apt/userguide/deploy.apt
+++ b/archiva-docs/src/site/apt/userguide/deploy.apt
@@ -51,7 +51,7 @@ Deploying to Repository
 
 +-------------------------------------------------------------------------+
 <settings>
-  ...
+  <!-- omitted xml -->
   <servers>
     <server>
       <id>archiva.internal</id>
@@ -63,9 +63,9 @@ Deploying to Repository
       <username>{archiva-deployment-user}</username>
       <password>{archiva-deployment-pwd}</password>
     </server>
-    ...
+    <!-- omitted xml -->
   </servers>
-  ...
+  <!-- omitted xml -->
 </settings>
 +-------------------------------------------------------------------------+
 
@@ -77,7 +77,7 @@ Deploying to Repository
  
 +-------------------------------------------------------------------------+
 <project>
-  ...
+  <!-- omitted xml -->
   <distributionManagement>
     <repository>
       <id>archiva.internal</id>
@@ -90,7 +90,7 @@ Deploying to Repository
       <url>http://reposerver.mycompany.com:8080/archiva/repository/snapshots/</url>
     </snapshotRepository>
   </distributionManagement>
-  ...
+  <!-- omitted xml -->
 </project>
 +-------------------------------------------------------------------------+
 
@@ -103,7 +103,7 @@ Deploying to Repository
  
 +-------------------------------------------------------------------------+
 <project>
-  ...
+  <!-- omitted xml -->
   <distributionManagement>
     <repository>
       <id>archiva.internal</id>
@@ -116,7 +116,7 @@ Deploying to Repository
       <url>dav:http://reposerver.mycompany.com:8080/archiva/repository/snapshots/</url>
     </snapshotRepository>
   </distributionManagement>
-  ...
+  <!-- omitted xml -->
 </project>
 +-------------------------------------------------------------------------+
 
@@ -124,7 +124,7 @@ Deploying to Repository
 
 +-------------------------------------------------------------------------+
 <project>
-  ...
+  <!-- omitted xml -->
   <build>
     <extensions>
       <extension>
@@ -134,7 +134,7 @@ Deploying to Repository
       </extension>
     </extensions>
   </build>
-  ...
+  <!-- omitted xml -->
 </project>
 +-------------------------------------------------------------------------+
 
diff --git a/archiva-docs/src/site/apt/userguide/searching.apt b/archiva-docs/src/site/apt/userguide/searching.apt
index a2c75ccba..733d836be 100644
--- a/archiva-docs/src/site/apt/userguide/searching.apt
+++ b/archiva-docs/src/site/apt/userguide/searching.apt
@@ -59,7 +59,7 @@ Searching
   The repository files that are indexed during repository scan can be configured in the Repository Scanning page, in the
   Repository Scanning - File Types section (indexable-content). By default, the indexable-content file types are:
 
-+-----+
+-----
 **/*.txt
 **/*.TXT
 **/*.block
@@ -69,7 +69,7 @@ Searching
 **/*.xsd
 **/*.dtd
 **/*.tld
-+-----+
+-----
 
 * Quick Search
 
diff --git a/archiva-docs/src/site/apt/userguide/using-repository.apt b/archiva-docs/src/site/apt/userguide/using-repository.apt
index 9d4bec32c..c4ab2aa7c 100644
--- a/archiva-docs/src/site/apt/userguide/using-repository.apt
+++ b/archiva-docs/src/site/apt/userguide/using-repository.apt
@@ -34,7 +34,7 @@ Configuring Maven 2 to use an Archiva repository
 
 +-------------------------------------------------------------------------+
 <settings>
-  ...
+  <!-- omitted xml -->
   <mirrors>
     <mirror>
       <id>archiva.default</id>
@@ -42,7 +42,7 @@ Configuring Maven 2 to use an Archiva repository
       <mirrorOf>external:*</mirrorOf>
     </mirror>
   </mirrors>
-  ...
+  <!-- omitted xml -->
 </settings>
 +-------------------------------------------------------------------------+
 
@@ -55,13 +55,13 @@ Mirror Settings}} for more information.>
   If you have separate Archiva repositories that you wish to use, you can add an extra mirror declaration as needed:
 
 +-------------------------------------------------------------------------+
-    ...
+    <!-- omitted xml -->
     <mirror>
       <id>archiva.apache.snapshots</id>
       <url>http://repo.mycompany.com:8080/archiva/repository/snapshots/</url>
       <mirrorOf>apache.snapshots</mirrorOf>
     </mirror>
-    ...
+    <!-- omitted xml -->
 +-------------------------------------------------------------------------+
 
   <<WARNING:>> Maven, as of version 2.0.8, does not properly report the correct URL in errors when a mirror is used - so although the Archiva instance is being consulted any error messages will still reflect
@@ -75,7 +75,7 @@ Mirror Settings}} for more information.>
 
 +-------------------------------------------------------------------------+
 <settings>
-  ...
+  <!-- omitted xml -->
   <profiles>
     <profile>
       <id>Repository Proxy</id>
@@ -87,23 +87,23 @@ Mirror Settings}} for more information.>
       <!-- ******************************************************* -->
       <repositories>
         <repository>
-          ...
+          <!-- omitted xml -->
         </repository>
-        ...   
+        <!-- omitted xml -->   
       </repositories>
       <!-- ******************************************************* -->
       <!-- repositories for maven plugins -->
       <!-- ******************************************************* -->
       <pluginRepositories>
         <pluginRepository>
-          ...
+          <!-- omitted xml -->
         </pluginRepository>
-        ...   
+        <!-- omitted xml -->   
       </pluginRepositories>
     </profile>
-    ...
+    <!-- omitted xml -->
   </profiles>
-  ...
+  <!-- omitted xml -->
 </settings>
 +-------------------------------------------------------------------------+
 
@@ -130,16 +130,16 @@ Mirror Settings}} for more information.>
 
 +-------------------------------------------------------------------------+
 <settings>
-  ...
+  <!-- omitted xml -->
   <servers>
     <server>
       <id>repository-1</id>
       <username>{archiva-user}</username>
       <password>{archiva-pwd}</password>
     </server>
-    ...
+    <!-- omitted xml -->
   </servers>
-  ...
+  <!-- omitted xml -->
 </settings>
 +-------------------------------------------------------------------------+
 
diff --git a/archiva-docs/src/site/apt/userguide/virtual-repositories.apt b/archiva-docs/src/site/apt/userguide/virtual-repositories.apt
index 7e77cde22..e0e3dfdff 100644
--- a/archiva-docs/src/site/apt/userguide/virtual-repositories.apt
+++ b/archiva-docs/src/site/apt/userguide/virtual-repositories.apt
@@ -28,7 +28,7 @@ Virtual Repositories
 
 +-------------------------------------------------------------------------+
 <settings>
-  ...
+  <!-- omitted xml -->
   <profiles>
     <profile>
       <id>Repository Proxy</id>
@@ -68,9 +68,9 @@ Virtual Repositories
         </repository>
       </repositories>
     </profile>
-    ...
+    <!-- omitted xml -->
   </profiles>
-  ...
+  <!-- omitted xml -->
 </settings>
 +-------------------------------------------------------------------------+
 
@@ -78,7 +78,7 @@ Virtual Repositories
 
 +-------------------------------------------------------------------------+
 <settings>
-  ...
+  <!-- omitted xml -->
   <profiles>
     <profile>
       <id>Repository Proxy</id>
@@ -92,9 +92,9 @@ Virtual Repositories
         </repository>
       </repositories>
     </profile>
-    ...
+    <!-- omitted xml -->
   </profiles>
-  ...
+  <!-- omitted xml -->
 </settings>
 +-------------------------------------------------------------------------+