diff --git a/plugin/xdocs/goals.xml b/plugin/xdocs/goals.xml
index d348c0ab..f7e23043 100644
--- a/plugin/xdocs/goals.xml
+++ b/plugin/xdocs/goals.xml
@@ -67,7 +67,7 @@
       </goal>
       <goal>
         <name>plugin:install</name>
-        <description>Install the plugin in Maven's plugins dir</description>
+        <description>Build and install the current plugin in <code>${maven.plugin.dir}</code>.</description>
       </goal>
       <goal>
         <name>plugin:install-now</name>
@@ -79,13 +79,13 @@
       </goal>
       <goal>
         <name>plugin:uninstall</name>
-        <description>Uninstall all versions of the plugin in Maven's plugins dir</description>
+        <description>Uninstall all versions of the plugin from Maven's plugins dir</description>
       </goal>      
       <goal>
         <name>plugin:uninstall-now</name>
         <description>
           Uninstall the plugin from the current Maven instance.
-          It is also uninstalled into the user's plugin cache and the global Maven installation.
+          It is also uninstalled from the user's plugin cache and the global Maven installation.
         </description>
       </goal>
       <goal>
@@ -102,6 +102,8 @@
         <name>plugin:repository-install-snapshot</name>
         <description>
           Install a snapshot build of the plugin to the local repository.
+          <strong>DEPRECATED</strong>: use <code>plugin:repository-install</code> with
+          <code>-SNAPSHOT</code> in the project version for equivalent behaviour.
         </description>
       </goal>
       <goal>
@@ -118,6 +120,8 @@
           Deploy a snapshot build of the plugin to the remote repository.
           This uses the <a href="../artifact/index.html">Artifact plugin</a> to
           do the deployment, so properties need to be set up as per that plugin.
+          <strong>DEPRECATED</strong>: use <code>plugin:repository-deploy</code> with
+          <code>-SNAPSHOT</code> in the project version for equivalent behaviour.
         </description>
       </goal>
     </goals>
diff --git a/plugin/xdocs/index.xml b/plugin/xdocs/index.xml
index 6e7a3b97..c1d64d1b 100644
--- a/plugin/xdocs/index.xml
+++ b/plugin/xdocs/index.xml
@@ -27,7 +27,8 @@
   <body>
     <section name="Maven Plugin Plug-in">
       <p>
-        This plug-in provides ways of working with maven plugins
+        This plug-in provides means for building, installing
+        and downloading plugins for Maven.
       </p>
       <p>
         For more information on the functionality provided by this plugin,
diff --git a/plugin/xdocs/properties.xml b/plugin/xdocs/properties.xml
index 97f53be5..c9368c40 100644
--- a/plugin/xdocs/properties.xml
+++ b/plugin/xdocs/properties.xml
@@ -35,11 +35,55 @@
           <td>maven.docs.src</td>
           <td>Yes</td>
           <td>
-            <p>Default value is
-              <code>${basedir}/xdocs</code>.</p>
+            Default is <code>${basedir}/xdocs</code>.
           </td>
         </tr>
+          <tr>
+            <td><code>maven.plugin.dir</code></td>
+            <td>Yes</td>
+            <td>
+              Where Maven can find it's plugins.
+              Default is <code>${maven.home}/plugins</code>.
+            </td>
+          </tr>
+          <tr>
+            <td><code>maven.plugin.user.dir</code></td>
+            <td>Yes</td>
+            <td>
+              Where Maven can find plugins for this user only.
+              Default is <code>${maven.home.local}/plugins</code>.
+            </td>
+          </tr>
+          <tr>
+            <td><code>maven.plugin.unpacked.dir</code></td>
+            <td>Yes</td>
+            <td>
+              Where Maven expands installed plugins for processing.
+              Default is <code>${maven.home.local}/cache</code>.
+            </td>
+          </tr>
+          <tr>
+            <td><code>maven.repo.local</code></td>
+            <td>Yes</td>
+            <td>
+              The repository on the local machine Maven should use to store
+              downloaded artifacts (jars etc).
+              Default is <code>${maven.home.local}/repository</code>.
+            </td>
+          </tr>
+          <tr>
+            <td><code>maven.repo.remote</code></td>
+            <td>Yes</td>
+            <td>
+              The repository maven should use to download artifacts
+              (jars etc) that it can't find in the local repository.
+              You should set this to one of the
+              <a href="http://maven.apache.org/faq.html#ibiblio-mirrors">Ibiblio mirrors</a>.
+              You can also specify multiple repositories, separated by commas.
+              Default is <code>http://www.ibiblio.org/maven</code>.
+            </td>
+          </tr>
       </table>
     </section>
   </body>
-</document>
\ No newline at end of file
+</document>
