diff --git a/cruisecontrol/plugin.jelly b/cruisecontrol/plugin.jelly
index 9feb9ff4..6e0597b7 100644
--- a/cruisecontrol/plugin.jelly
+++ b/cruisecontrol/plugin.jelly
@@ -1,7 +1,8 @@
 <?xml version="1.0"?>
+
 <!-- 
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Copyright 2001-2005 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,13 +18,13 @@
  */
  -->
 
-
 <project
     xmlns:j="jelly:core" 
     xmlns:util="jelly:util" 
     xmlns:x="jelly:xml" 
     xmlns:ant="jelly:ant"
-    xmlns:doc="doc">
+    xmlns:doc="doc"
+  xmlns:maven="jelly:maven">
 
   <goal name="cruisecontrol" prereqs="cruisecontrol:configure"/>
 
@@ -46,6 +47,26 @@
       <util:tokenize var="tokens" delim="@">${pom.build.nagEmailAddress}</util:tokenize>
       <j:set var="maven.cruisecontrol.mail.defaultsuffix" value="@${tokens[1]}" />
     </j:if>
+
+    <!-- FIXME: Shouldn't this use the second element of pom.repository.connection -->
+    <maven:pluginVar var="method" plugin="maven-scm-plugin" property="maven.scm.method"/>
+
+    <j:if test="${method == 'cvs'}">
+      <maven:pluginVar var="root" plugin="maven-scm-plugin" property="maven.scm.cvs.root"/>
+      <maven:pluginVar var="module" plugin="maven-scm-plugin" property="maven.scm.cvs.module"/>
+    </j:if>
+    <j:if test="${method == 'svn'}">
+      <maven:pluginVar var="root" plugin="maven-scm-plugin" property="maven.scm.svn.root"/>
+      <maven:pluginVar var="module" plugin="maven-scm-plugin" property="maven.scm.svn.module"/>
+    </j:if>
+
+    <!-- Compute the merge directory automatically if not specified by the user -->
+    <maven:makeRelativePath var="relativeMavenBuildDir" basedir="${basedir}"
+        path="${maven.build.dir}" separator="/"/>
+    <maven:property var="maven.cruisecontrol.logs.mergedirectory" 
+        name="maven.cruisecontrol.logs.mergedirectory" 
+        defaultValue="${maven.cruisecontrol.checkout.dir}/${module}/${relativeMavenBuildDir}/test-reports/"/>
+    
   </goal>
 
   <!--==================================================================-->
@@ -70,10 +91,13 @@
       <x:parse var="doc" xml="${inputFile}" />
     </util:available>
 
-    <ant:mkdir dir="${maven.build.dir}" />
+    <!-- Question: Why is the tmp file required? Is it to prevent CC reloading 
+         the config.xml during the generation? If so we need to comment this as
+         it's not obvious... -->
+    <ant:mkdir dir="${maven.cruisecontrol.build.dir}" />
     <j:set
         var="tempConfigFile"
-        value="${maven.build.dir}/cruisecontrol-config-temp.xml" />
+        value="${maven.cruisecontrol.build.dir}/config-temp.xml" />
     <j:set
         var="stylesheet" 
         value="file:${maven.cruisecontrol.template}" />
@@ -81,6 +105,7 @@
       <j:include uri="${stylesheet.toString()}" />
     </j:file>
     <ant:copy file="${tempConfigFile}" tofile="${maven.cruisecontrol.config}" />
+    <ant:delete file="${tempConfigFile}"/>
   </goal>
 
   <!--==================================================================-->
@@ -89,10 +114,48 @@
   <goal name="cruisecontrol:run"
     description="Run Cruise Control"
     prereqs="cruisecontrol:validate">
-    <ant:java jar="${maven.cruisecontrol.home}/main/dist/cruisecontrol.jar" fork="true">
-      <arg line="-projectname ${pom.artifactId}"/>
-      <arg line="-configfile ${maven.cruisecontrol.config}"/>
-    </ant:java>
+
+    <!-- Verify if work directory exists -->
+    <util:file var="workDirAsFile" name="${maven.cruisecontrol.work.dir}"/>
+    <j:choose>
+      <j:when test="${workDirAsFile.exists()}">
+        <ant:java jar="${maven.cruisecontrol.home}/main/dist/cruisecontrol.jar"
+            fork="true" dir="${maven.cruisecontrol.work.dir}">
+          <arg line="-projectname ${pom.artifactId}"/>
+        </ant:java>
+      </j:when>
+      <j:otherwise>
+        <ant:echo>You must have a work directory (${maven.cruisecontrol.work.dir}) set up before trying to run Cruisecontrol.</ant:echo>
+      </j:otherwise>
+    </j:choose>
+  </goal>
+
+  <goal name="cruisecontrol:install-local" prereqs="cruisecontrol:configure">
+
+    <!-- Only deploy if the work dir property has been set to a location
+         different than the default -->
+    <j:choose>
+      <j:when test="${!context.getVariable('maven.cruisecontrol.work.dir').equals(context.getVariable('maven.cruisecontrol.build.dir'))}">
+        <ant:mkdir dir="${maven.cruisecontrol.work.dir}"/>
+        <ant:copy tofile="${maven.cruisecontrol.work.dir}/config.xml" 
+            file="${maven.cruisecontrol.config}"/>
+        <attainGoal name="cruisecontrol:checkout"/>
+      </j:when>
+      <j:otherwise>
+        <ant:echo>You need to customize maven.cruisecontrol.work.dir to the real location</ant:echo>
+      </j:otherwise>
+    </j:choose>
+
+  </goal>
+
+  <goal name="cruisecontrol:checkout">
+    <maven:set plugin="maven-scm-plugin" property="maven.scm.checkout.dir"
+        value="${maven.cruisecontrol.checkout.dir}"/>
+    <!-- This needs SCM 1.5 and it needs support for the URL notation with
+         the module specified after a colon or to find another way to 
+         get the module
+    <attainGoal name="scm:checkout"/>    
+    -->
   </goal>
 
   <goal name="maven-cruisecontrol-plugin:report">
diff --git a/cruisecontrol/plugin.properties b/cruisecontrol/plugin.properties
index 9107cdfa..9198f58e 100644
--- a/cruisecontrol/plugin.properties
+++ b/cruisecontrol/plugin.properties
@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------
-# Copyright 2001-2004 The Apache Software Foundation.
+# Copyright 2001-2005 The Apache Software Foundation.
 # 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,17 +14,40 @@
 # limitations under the License.
 # -------------------------------------------------------------------
 
-maven.cruisecontrol.config=${basedir}/cruisecontrol.xml
+# Location where the CruiseControl configuration file will be generated.
+maven.cruisecontrol.build.dir = ${maven.build.dir}/cruisecontrol
+maven.cruisecontrol.config = ${maven.cruisecontrol.build.dir}/config.xml
+
+# Properties that are used for generating the content of the CC config file 
+# -------------------------------------------------------------------------
+
+# By default we create a CC work directory that is executable from Maven's
+# build directory. In practice you'll probably want to execute CC from
+# another machine and you'll need to change the maven.cruisecontrol.work.dir
+# property to make it match the location where you wish to put the work dir
+# on this other machine.
+  
+maven.cruisecontrol.work.dir=${maven.cruisecontrol.build.dir}
+maven.cruisecontrol.checkout.dir=${maven.cruisecontrol.work.dir}/checkout
+maven.cruisecontrol.logs.dir=${maven.cruisecontrol.work.dir}/logs
+
 maven.cruisecontrol.mavenhome=${maven.home}
+
 maven.cruisecontrol.schedule.type=interval
 maven.cruisecontrol.schedule.interval=300
 maven.cruisecontrol.schedule.time=1900
-maven.cruisecontrol.checkout.dir=${basedir}/checkout
-maven.cruisecontrol.logs.encodingtype=ISO-8859-1
-maven.cruisecontrol.logs.dir=${maven.build.dir}/cc-logs
-maven.cruisecontrol.logs.mergedirectory=${maven.cruisecontrol.checkout.dir}/${module}/target/test-reports
+
+# If left undefined this property is computed automatically by the plugin
+# from the ${maven.build.dir} property.
+#maven.cruisecontrol.logs.mergedirectory=${maven.cruisecontrol.checkout.dir}/${module}/target/test-reports
+
 maven.cruisecontrol.logs.merge=true
-maven.cruisecontrol.currentbuildstatus.filename=currentbuildstatus.txt
+maven.cruisecontrol.logs.encodingtype=ISO-8859-1
+maven.cruisecontrol.logs.pattern=*.xml
+
+maven.cruisecontrol.currentbuildstatus.filename=status.txt
+
+# TODO: Once the SCM plugin 1.5 is released, modify the first goal to be scm:update
 maven.cruisecontrol.goals=scm:update-project|clean test|site:deploy
 
 maven.cruisecontrol.mail.host=localhost
diff --git a/cruisecontrol/src/plugin-resources/cruisecontrol.jsl b/cruisecontrol/src/plugin-resources/cruisecontrol.jsl
index 877d15b5..49e435ff 100644
--- a/cruisecontrol/src/plugin-resources/cruisecontrol.jsl
+++ b/cruisecontrol/src/plugin-resources/cruisecontrol.jsl
@@ -32,8 +32,6 @@
       <jsl:applyTemplates select="./project" />
       <!-- TODO: more configurable -->
       <project name="${pom.artifactId}">
-        <!-- FIXME: Shouldn't this use the second element of pom.repository.connection -->
-        <maven:pluginVar var="method" plugin='maven-scm-plugin' property='maven.scm.method' />
         
         <j:if test="${method == 'svn'}">
           <plugin name="svn" classname="net.sourceforge.cruisecontrol.sourcecontrols.SVN"/> 
@@ -44,14 +42,9 @@
         </bootstrappers>
         <modificationset>
           <j:if test="${method == 'cvs'}">
-            <maven:pluginVar var="root" plugin='maven-scm-plugin' property='maven.scm.cvs.root' />
-            <maven:pluginVar var="module" plugin='maven-scm-plugin' property='maven.scm.cvs.module' />
             <cvs cvsroot="${root}" localWorkingCopy="${maven.cruisecontrol.checkout.dir}/${module}" />
           </j:if>
-          
           <j:if test="${method == 'svn'}">
-            <maven:pluginVar var="root" plugin='maven-scm-plugin' property='maven.scm.svn.root' />
-            <maven:pluginVar var="module" plugin='maven-scm-plugin' property='maven.scm.svn.module' />
             <svn repositoryLocation="${root}" localWorkingCopy="${maven.cruisecontrol.checkout.dir}/${module}" />
           </j:if>
           <!-- Add the list of additional directories for the classpath from ${maven.eclipse.classpath.include}-->
@@ -60,7 +53,6 @@
           <j:forEach var="triggerProject" items="${triggerProjectsSplit}">
             <buildstatus logdir="${maven.cruisecontrol.logs.dir}/${triggerProject}"/>
           </j:forEach>
-                    
         </modificationset>
  
         <j:set var="type" value="${maven.cruisecontrol.schedule.type}"/>
@@ -89,7 +81,8 @@
           dir="${maven.cruisecontrol.logs.dir}/${pom.artifactId}">
           <j:set var="mergevar" value="${maven.cruisecontrol.logs.merge}"/>
           <j:if test="${mergevar == 'true'}">
-           <merge dir="${maven.cruisecontrol.logs.mergedirectory}"/>
+           <merge dir="${maven.cruisecontrol.logs.mergedirectory}" 
+               pattern="${maven.cruisecontrol.logs.pattern}"/>
           </j:if>
         </log>
         <publishers>
diff --git a/cruisecontrol/xdocs/changes.xml b/cruisecontrol/xdocs/changes.xml
index 8d97d794..18053200 100644
--- a/cruisecontrol/xdocs/changes.xml
+++ b/cruisecontrol/xdocs/changes.xml
@@ -22,19 +22,50 @@
   <properties>
     <title>Changes</title>
     <author email="brett@apache.org">Brett Porter</author>
+    <author email="vmassol@apache.org">Vincent Massol</author>
   </properties>
   <body>
     <release version="1.7" date="in SVN">
-      <action dev="vmassol" type="fix" issue="MPCRUISECONTROL-19">
-        Fix order in which the CruiseControl's <code>&lt;project&gt;</code>
-        elements are generated. They must be in the order of the less
-        dependent project first.        
+      <action dev="vmassol" type="update">
+        Compute automatically the merge directory automatically (the 
+        value of <code>maven.cruisecontrol.logs.mergedirectory</code>
+        if not specified by the user. The computation uses the
+        <code>maven.build.dir</code> property to guess the output
+        directory for JUnit test results.
+      </action>
+      <action dev="vmassol" type="add">
+        Added a new <code>maven.cruisecontrol.logs.pattern</code> property
+        to specify the report files that will be merged by CC. Defaults to
+        <code>*.xml</code>.
+      </action>
+      <action dev="vmassol" type="add">
+        Added a new <code>cruisecontrol:install-local</code> goal
+        to install the generated CC config to a target location on 
+        the same machine (it uses a file copy). In the future we could
+        provide other installation mechanisms like ssh, scp, etc.
+      </action>
+      <action dev="vmassol" type="update">
+        Changed the default build status file name to be 
+        <code>status.txt</code> which is the default value
+        expected by the CC Webapp.
+      </action>
+      <action dev="vmassol" type="update">
+        New <code>maven.cruisecontrol.work.dir</code> property that specifies
+        what CC work directory to use for the project. Default values of
+        <code>maven.cruisecontrol.checkout.dir</code> and 
+        <code>maven.cruisecontrol.logs.dir</code> have been modified to be
+        relative to it.
       </action>
       <action dev="vmassol" type="fix">
         Fixed default property values for <code>maven.cruisecontrol.mail.xlsdir</code>
         and <code>maven.cruisecontrol.mail.css</code> so that the plugin works by default
         with the latest CC version (2.2.1).
       </action>
+      <action dev="vmassol" type="fix" issue="MPCRUISECONTROL-19">
+        Fix order in which the CruiseControl's <code>&lt;project&gt;</code>
+        elements are generated. They must be in the order of the less
+        dependent project first.        
+      </action>
     </release>
     <release version="1.6" date="2004-12-06">
       <action dev="epugh" type="add" issue="MPCRUISECONTROL-15">Lost script extension when use "maven cruisecontrol:configure" command</action>
diff --git a/cruisecontrol/xdocs/faq.fml b/cruisecontrol/xdocs/faq.fml
index 1718d0b2..fe1ddfbf 100644
--- a/cruisecontrol/xdocs/faq.fml
+++ b/cruisecontrol/xdocs/faq.fml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
+
 <!--
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Copyright 2001-2005 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +18,6 @@
  */
  -->
 
-
 <!-- $Id: faq.fml,v 1.7 2004/05/05 07:34:38 brett Exp $ -->
 <faqs title="Frequently Asked Questions">
 
@@ -67,23 +67,6 @@ maven.cruisecontrol.template=${plugin.resources}/my-cc-template.jsl]]></source>
       </answer>
     </faq>
 
-    <faq id="multiple-projects">
-      <question>How can I generate just a single configuration file for multiple projects?</question>
-      <answer>
-        A neat trick of the cruisecontrol plugin is that if you specify a single configuration file for all your
-        projects, then the plugin will just install/update the one your are working on.  So, in your project.xml
-        set <code>maven.cruisecontrol.config=c:/cruisecontrol.xml</code> or maybe
-        <code>maven.cruisecontrol.config=${maven.cruisecontrol.home}/cruisecontrol.xml</code> for use in cross
-        platform situations.  Unfortunantly, I haven't been able to have a plugin set this value, so you need
-        to put it in all your projects.
-        <p/>
-        Something else to keep in mind is that if you are using the <code>cruisecontrol</code> goal to update your
-        cruisecontrol.xml file with information in the project.xml then you will need to update the file fairly
-        frequently as new developers are added.  I use a simple cron job to stop CruiseControl, call the multiproject
-        goal, and then restart CruiseControl.
-      </answer>
-    </faq>
-
     <faq id="setup">
       <question>
         How do I setup my project to be built using Cruise Control?
@@ -142,5 +125,33 @@ maven.cruisecontrol.template=${plugin.resources}/my-cc-template.jsl]]></source>
 
   </part>
 
+  <part id="Multiprojects">
+    <title>Multiprojects</title>
+
+    <faq id="multiple-projects">
+      <question>How can I generate just a single configuration file for multiple projects?</question>
+      <answer>
+        A neat trick of the cruisecontrol plugin is that if you specify a single configuration 
+        file for all your projects, then the plugin will just install/update the one your are
+        working on. 
+        However the cruisecontrol plugin does not currently support having one CC project 
+        definitions per Maven subproject. The currently recommended solution is to have one CC 
+        project for your multiproject (i.e. viewing the multiproject project as one project only).
+      </answer>
+    </faq>
+
+    <faq id="merging-logs">
+      <question>How can I tell CC to correctly merge JUnit logs for a multiproject setup?</question>
+      <answer>
+        Define the following 2 properties in the project.properties file of your master project:
+<source><![CDATA[
+maven.cruisecontrol.logs.mergedirectory=${maven.cruisecontrol.checkout.dir}/${module}
+maven.cruisecontrol.logs.pattern=TEST-*.xml
+]]></source>       
+      </answer>
+    </faq>
+    
+  </part>
+
 </faqs>
 
diff --git a/cruisecontrol/xdocs/goals.xml b/cruisecontrol/xdocs/goals.xml
index f35bd41d..2355ab71 100644
--- a/cruisecontrol/xdocs/goals.xml
+++ b/cruisecontrol/xdocs/goals.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <!-- 
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Copyright 2001-2005 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +18,6 @@
  */
  -->
 
-
 <document>
   <properties>
     <title>Maven Cruise Control Plug-in Goals</title>
@@ -36,6 +36,13 @@
         <name>cruisecontrol:run</name>
         <description>Run Cruise Control</description>
       </goal>
+      <goal>
+        <name>cruisecontrol:install-local</name>
+        <description>
+          Install the generated CC config to a target location on the same 
+          machine (it uses a file copy).
+        </description>
+      </goal>
     </goals>
   </body>
 </document>
diff --git a/cruisecontrol/xdocs/navigation.xml b/cruisecontrol/xdocs/navigation.xml
index fae1ffdd..bc49cbad 100644
--- a/cruisecontrol/xdocs/navigation.xml
+++ b/cruisecontrol/xdocs/navigation.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <!-- 
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Copyright 2001-2005 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +18,6 @@
  */
  -->
 
-
 <project name="Maven Cruise Control Plug-in">
   <title>Maven Cruise Control Plug-in</title>
   <body>
diff --git a/cruisecontrol/xdocs/properties.xml b/cruisecontrol/xdocs/properties.xml
index 086ab74c..093d1f0a 100644
--- a/cruisecontrol/xdocs/properties.xml
+++ b/cruisecontrol/xdocs/properties.xml
@@ -1,7 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
+
 <!-- 
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Copyright 2001-2005 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,155 +18,142 @@
  */
  -->
 
-
 <document>
   <properties>
-    <title>Maven Cruise Control Plug-in Properties</title>
+    <title>Maven CruiseControl Plug-in Properties</title>
   </properties>
   <body>
-    <section name="Maven Cruise Control Plug-in Global Settings">
+    <section name="Maven CruiseControl properties">
       <table>
         <tr>
           <th>Property</th>
           <th>Optional?</th>
           <th>Description</th>
         </tr>
+        <tr>
+          <td>maven.cruisecontrol.config</td>
+          <td>Yes</td>
+          <td>
+            Config file to update/create. 
+            Default value is <code>${maven.build.dir}/cruisecontrol/config.xml</code>.
+          </td>
+        </tr>
         <tr>
           <td>maven.cruisecontrol.home</td>
           <td>No</td>
           <td>
-            <p>Location of cruise control installation - for finding the reporting directory</p>
-            <p>
-        <strong>NOTE: </strong>It may be more appropriate to set this in build.properties
-        on the CruiseControl server since the value may differ from developer to developer.
-            </p>
+            Location where CC is installed. No default value.
           </td>
         </tr>
         <tr>
-          <td>maven.cruisecontrol.schedule.type</td>
+          <td>maven.cruisecontrol.work.dir</td>
           <td>Yes</td>
           <td>
-            <p>Defines the schedule type: interval or time. Default value is
-              <code>interval</code>.</p>
-          </td>
-        </tr>
-        <tr>
-          <td>maven.cruisecontrol.schedule.interval</td>
-          <td>Yes</td>
-          <td>
-            <p>Seconds in between builds for this project. Default value is
-              <code>300</code>.</p>
-          </td>
-        </tr>
-        <tr>
-          <td>maven.cruisecontrol.schedule.time</td>
-          <td>Yes</td>
-          <td>
-            <p>Time when builds this project, in the form HHmm (execute every day). Default value is
-              <code>1900</code>.</p>
+            Location of the CC work directory that will be used at runtime. 
+            Default value is <code>${maven.cruisecontrol.build.dir}</code>.
           </td>
         </tr>
         <tr>
           <td>maven.cruisecontrol.checkout.dir</td>
           <td>Yes</td>
           <td>
-            <p>Where to checkout/update code temporarily. Default value is
-              <code>${basedir}/checkout</code>.</p>
-            <p>
-        <strong>NOTE: </strong>It may be more appropriate to set this in build.properties
-        on the CruiseControl server since the value may differ from developer to developer.
-            </p>
-          </td>
-        </tr>
-        <tr>
-          <td>maven.cruisecontrol.logs.encodingtype</td>
-          <td>Yes</td>
-          <td>
-            <p>Encoding type for logs files. Default value is
-              <code>ISO-8859-1</code>.</p>
+            Location where to checkout/update code at runtime.
+            Default value is <code>${maven.cruisecontrol.work.dir}/checkout</code>.
           </td>
         </tr>
         <tr>
           <td>maven.cruisecontrol.logs.dir</td>
           <td>Yes</td>
           <td>
-            <p>Default value is
-              <code>${maven.build.dir}/cc-logs</code>.</p>
-            <p>
-        <strong>NOTE: </strong>It may be more appropriate to set this in build.properties
-        on the CruiseControl server since the value may differ from developer to developer.
-            </p>
+            Location where CC logs will be generated at runtime.
+            Default value is <code>${maven.cruisecontrol.work.dir}/logs</code>
+          </td>
+        </tr>
+        <tr>
+          <td>maven.cruisecontrol.schedule.type</td>
+          <td>Yes</td>
+          <td>
+            Defines the schedule type: interval or time. 
+            Default value is <code>interval</code>.
+          </td>
+        </tr>
+        <tr>
+          <td>maven.cruisecontrol.schedule.interval</td>
+          <td>Yes</td>
+          <td>
+            Seconds in between builds for this project. 
+            Default value is <code>300</code>.
+          </td>
+        </tr>
+        <tr>
+          <td>maven.cruisecontrol.schedule.time</td>
+          <td>Yes</td>
+          <td>
+            Time when builds this project, in the form HHmm (execute every day). 
+            Default value is <code>1900</code>.
+          </td>
+        </tr>
+        <tr>
+          <td>maven.cruisecontrol.logs.encodingtype</td>
+          <td>Yes</td>
+          <td>
+            Encoding type for logs files. 
+            Default value is <code>ISO-8859-1</code>.
           </td>
         </tr>
         <tr>
           <td>maven.cruisecontrol.logs.merge</td>
           <td>Yes</td>
           <td>
-            <p>Set true if you want to add others reports files at the end of the Cruisecontrol report file. Default value is
-              <code>true</code>.</p>
+            Set true if you want to add others reports files at the end of the
+            Cruisecontrol report file. 
+            Default value is <code>true</code>.
           </td>
         </tr>
         <tr>
           <td>maven.cruisecontrol.logs.mergedirectory</td>
           <td>Yes</td>
           <td>
-            <p>Directory containing .xml reports files to merge. Default value is
-              <code>${maven.cruisecontrol.checkout.dir}/${module}/target/test-reports</code>.</p>
+            Directory containing .xml reports files to merge. 
+            Default value is
+            <code>${maven.cruisecontrol.checkout.dir}/${module}/[maven.build.dir relative location]/test-reports</code>.
           </td>
         </tr>
         <tr>
           <td>maven.cruisecontrol.currentbuildstatus.filename</td>
           <td>Yes</td>
           <td>
-            <p>The filename to write the currentbuildstatus. Default value is
-              <code>currentbuildstatus.txt</code>.</p>
+            The filename to write the current build status.
+            Default value is <code>status.txt</code>.
           </td>
         </tr>
         <tr>
           <td>maven.cruisecontrol.goals</td>
           <td>Yes</td>
           <td>
-            <p>Default value is
-              <code>scm:update-project|clean test|site:deploy</code>.</p>
-          </td>
-        </tr>
-        <tr>
-          <td>maven.cruisecontrol.config</td>
-          <td>Yes</td>
-          <td>
-            <p>Config file to update/create. Default value is
-              <code>${basedir}/cruisecontrol.xml</code>.</p>
-            <p>
-        <strong>NOTE: </strong>It may be more appropriate to set this in build.properties
-        on the CruiseControl server since the value may differ from developer to developer.
-            </p>
+            Default value is
+            <code>scm:update-project|clean test|site:deploy</code>.
           </td>
         </tr>
         <tr>
           <td>maven.cruisecontrol.template</td>
           <td>Yes</td>
           <td>
-            <p>Template file to use in generating the cruisecontrol.xml file.</p>
-            <p>
-        <strong>NOTE: </strong>It may be more appropriate to set this in build.properties
-        on the CruiseControl server since the value may differ from developer to developer.
-            </p>
+            Template file to use in generating the cruisecontrol.xml file.
           </td>
         </tr>     
         <tr>
           <td>maven.cruisecontrol.trigger.projects</td>
           <td>Yes</td>
           <td>
+    	      A comma separated list of projects that should trigger this project 
+            to build when they are built. Allows you to build a project whose 
+            dependencies have changed.
             <p>
-				A comma separated list of projects that should trigger this project to build when 
-				they are built.  Allows you to build a project whose dependencies
-				have changed.
-            </p>
-            <p>
-        <strong>NOTE: </strong>You may need to edit the config file to ensure that dependent
-        project appear prior to the project.  This is because CruiseControl builds projects in
-        the order that appear in the config file.  Failure to order the project properly may 
-        results in continuious rebuilding of project and/or avoidable build failures.
+              <strong>NOTE: </strong>You may need to edit the config file to ensure that dependent
+              project appear prior to the project.  This is because CruiseControl builds projects in
+              the order that appear in the config file.  Failure to order the project properly may 
+              results in continuious rebuilding of project and/or avoidable build failures.
             </p>
           </td>
         </tr> 		
@@ -173,12 +161,9 @@
           <td>maven.cruisecontrol.buildresults.site</td>
           <td>Yes</td>
           <td>
-            <p>
-				The root of the cruisecontrol site used in generating the link to
-				CruiseControl.  By default this is 
-        <code>${pom.url}/cruisecontrol</code>.  While not required,
-				typically you will need to set this.
-            </p>
+            The root of the cruisecontrol site used in generating the link to CC
+            Default value is <code>${pom.url}/cruisecontrol</code>.  While not required,
+            typically you will need to set this.
           </td>
         </tr> 		   
         <tr>