diff --git a/appserver/xdocs/changes.xml b/appserver/xdocs/changes.xml
index 1f8d761b..cb22c494 100644
--- a/appserver/xdocs/changes.xml
+++ b/appserver/xdocs/changes.xml
@@ -12,7 +12,7 @@
         b5
       </action>
       <action dev="dion" type="fix">
-      	Fix for jars not being included in an EAR file
+        Fix for jars not being included in an EAR file
       </action>
       <action dev="dion" type="add">
         Added the new <a href="changes-report.html">changes report</a>.
diff --git a/changes/src/plugin-resources/changes.jsl b/changes/src/plugin-resources/changes.jsl
index 54cc596e..30191ef2 100644
--- a/changes/src/plugin-resources/changes.jsl
+++ b/changes/src/plugin-resources/changes.jsl
@@ -9,7 +9,7 @@
     
     <jsl:template match="document">
         <document>
-            <jsl:applyTemplates select="*"/>	
+            <jsl:applyTemplates select="*"/>  
         </document>
     </jsl:template>
     
@@ -23,7 +23,7 @@
         <j:set var="sectionName">Release <x:expr select="@version"/> - <x:expr select="@date"/></j:set>
         <section name="${sectionName}">
             <table>
-                <tr><th style='width:50px'>Type</th><th>Changes</th><th style='width:70px'>By</th></tr>        	
+                <tr><th style='width:50px'>Type</th><th>Changes</th><th style='width:70px'>By</th></tr>          
                 <x:forEach var="action" select="action">
                     <j:set var="type"><x:expr select="@type"/></j:set>
                     <j:set var="dev"><x:expr select="@dev"/></j:set>
@@ -31,7 +31,7 @@
                         <td><img src="images/${type}.gif" alt="${type}"/></td>
                         <td><x:expr select="string(.)"/></td>
                         <td><a href="team-list.html#${dev}">${dev}</a></td>
-                    </tr>        	  	
+                    </tr>              
                 </x:forEach>
             </table>
         </section>
diff --git a/checkstyle/src/plugin-resources/checkstyle.jsl b/checkstyle/src/plugin-resources/checkstyle.jsl
index b2d6a2c4..3a39e1ac 100644
--- a/checkstyle/src/plugin-resources/checkstyle.jsl
+++ b/checkstyle/src/plugin-resources/checkstyle.jsl
@@ -81,7 +81,7 @@
             <j:if test="${errorCount != 0}">
               <j:set var="name" value="${file.attribute('name').getValue()}"/>
               <j:set var="name" value="${name.substring(mavenTool.toInteger(srcDirLength.toString()))}"/>
-			  <util:replace var="name" value="${name}" oldChar="\\" newChar="/"/>
+              <util:replace var="name" value="${name}" oldChar="\\" newChar="/"/>
               
               <subsection name="${name}">
                 <table>
diff --git a/xdoc/src/plugin-resources/templates/cvs-usage.xml b/xdoc/src/plugin-resources/templates/cvs-usage.xml
index f117a2c1..c4fbe1a8 100644
--- a/xdoc/src/plugin-resources/templates/cvs-usage.xml
+++ b/xdoc/src/plugin-resources/templates/cvs-usage.xml
@@ -8,16 +8,16 @@
   </properties>
 
   <body>
-  	#set ($repository = $project.repository)
-  	
-  	#if (!$repository)
+    #set ($repository = $project.repository)
+    
+    #if (!$repository)
       <section name="Repository">
         <p>
           No SCM repository is defined.
         </p>
       </section>
-  	#else
-  	
+    #else
+    
     #set ($conn = $repository.cvsRoot)
     #set ($module = $repository.cvsModule)
     #set ($url = $escape.getText($project.repository.url))
diff --git a/xdoc/xdocs/goals.xml b/xdoc/xdocs/goals.xml
index 204f59e2..80e7f30a 100644
--- a/xdoc/xdocs/goals.xml
+++ b/xdoc/xdocs/goals.xml
@@ -9,36 +9,36 @@
   <body>
     <section name="Goals">
       <table>
-      	<tr><th>Goal</th><th>Description</th></tr>
-      	
-		<a name="xdoc" />
-      	<tr>
-      	  <td>xdoc</td>
-      	  <td>
-      	    The default goal. This goal simply executes the 
-      	    <a href="#xdoc:generate-from-pom">xdoc:generate-from-pom</a>
-      	    and <a href="#xdoc:transform">xdoc:transform</a> goals
-      	  </td>
-      	</tr>
-      	
-      	<a name="xdoc:generate-from-pom" />
-      	<tr>
+        <tr><th>Goal</th><th>Description</th></tr>
+        
+    <a name="xdoc" />
+        <tr>
+          <td>xdoc</td>
+          <td>
+            The default goal. This goal simply executes the 
+            <a href="#xdoc:generate-from-pom">xdoc:generate-from-pom</a>
+            and <a href="#xdoc:transform">xdoc:transform</a> goals
+          </td>
+        </tr>
+        
+        <a name="xdoc:generate-from-pom" />
+        <tr>
           <td>xdoc:generate-from-pom</td>
           <td>
             Generate a set of reports from your <code>project.xml</code> file.
             This includes the dependency, mailing list, project info, project
             reports and team list pages
           </td>
-      	</tr>
-      	
-      	<a name="init-dvsl-tag" />
-      	<tr>
-      	  <td>init-dvsl-tag</td>
-      	  <td>
-      	    This goal defines the <code>DVSL</code> tag library for generating
-      	    documentation. A single tag <code>dvsl:dvsl</code> is defined.
-      	  </td>
-      	</tr>
+        </tr>
+        
+        <a name="init-dvsl-tag" />
+        <tr>
+          <td>init-dvsl-tag</td>
+          <td>
+            This goal defines the <code>DVSL</code> tag library for generating
+            documentation. A single tag <code>dvsl:dvsl</code> is defined.
+          </td>
+        </tr>
       </table>
     </section>
   </body>

Goal	Description
xdoc	- The default goal. This goal simply executes the - xdoc:generate-from-pom - and xdoc:transform goals -
Goal	Description
xdoc	+ The default goal. This goal simply executes the + xdoc:generate-from-pom + and xdoc:transform goals +
xdoc:generate-from-pom	Generate a set of reports from your `project.xml` file. This includes the dependency, mailing list, project info, project reports and team list pages
init-dvsl-tag	- This goal defines the `DVSL` tag library for generating - documentation. A single tag `dvsl:dvsl` is defined. -
init-dvsl-tag	+ This goal defines the `DVSL` tag library for generating + documentation. A single tag `dvsl:dvsl` is defined. +