maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hbout...@apache.org
Subject svn commit: r829394 [16/31] - in /websites/production/maventest/content/plugins/maven-javadoc-plugin-latest: ./ apidocs/ apidocs/org/apache/maven/plugin/javadoc/ apidocs/org/apache/maven/plugin/javadoc/class-use/ apidocs/org/apache/maven/plugin/javadoc...
Date Sun, 19 Aug 2012 17:31:48 GMT
Modified: websites/production/maventest/content/plugins/maven-javadoc-plugin-latest/examples/aggregate.html
==============================================================================
--- websites/production/maventest/content/plugins/maven-javadoc-plugin-latest/examples/aggregate.html (original)
+++ websites/production/maventest/content/plugins/maven-javadoc-plugin-latest/examples/aggregate.html Sun Aug 19 17:31:42 2012
@@ -75,8 +75,8 @@ Vincent Siveton" />
             
   
     
-             | Last Published: 2009-07-26
-               | Version: 2.6
+             | Last Published: 2009-10-23
+               | Version: 2.6.1
             </div>
       <div class="clear">
         <hr/>
@@ -318,17 +318,17 @@ Project
 </pre>
 </div>
 <div class="section"><h3>Using The &lt;aggregate/&gt; Parameter (<b>deprecated</b>)</h3>
-<p><b>Note</b>: &lt;aggregate/&gt; parameter is <b>deprecated</b> since 2.5. Please use the <tt>aggregate</tt> goal instead of.</p>
-<p>The &lt;aggregate/&gt; parameter can be used to generate javadocs for multi-module projects. It gives the option to generate one javadoc report for the entire project (all modules) or generate one javadoc report for each module.</p>
+<p><b>Note</b>: <a href="../javadoc-mojo.html#aggregate">&lt;aggregate/&gt;</a> parameter is <b>deprecated</b> since 2.5. Please use the <tt>aggregate</tt> goal instead of.</p>
+<p>The <a href="../javadoc-mojo.html#aggregate">&lt;aggregate/&gt;</a> parameter can be used to generate javadocs for multi-module projects. It gives the option to generate one javadoc report for the entire project (all modules) or generate one javadoc report for each module.</p>
 <p>When you execute javadoc:javadoc from Project directory with aggregate set to <b>true</b>, a javadoc report will be created in the target directory of Project with all the javadocs of Project's modules included. If aggregate is set to <b>false</b> (default), a javadoc report for Module1 will be generated in the target directory of Module1, a javadoc report for Module2 will be generated in the target directory of Module2, and a javadoc report for Module3 will be generated in the target directory of Module3.</p>
 <div class="source"><pre>&lt;project&gt;
   ...
-  &lt;reporting&gt;
+  &lt;reporting&gt; (or &lt;build&gt;)
     &lt;plugins&gt;
       &lt;plugin&gt;
         &lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
         &lt;artifactId&gt;maven-javadoc-plugin&lt;/artifactId&gt;
-        &lt;version&gt;2.5&lt;/version&gt;
+        &lt;version&gt;2.6.1&lt;/version&gt;
         &lt;configuration&gt;
           ...
           &lt;aggregate&gt;true&lt;/aggregate&gt;
@@ -337,14 +337,48 @@ Project
       &lt;/plugin&gt;
     &lt;/plugins&gt;
     ...
-  &lt;/reporting&gt;
+  &lt;/reporting&gt; (or &lt;/build&gt;)
   ...
 &lt;/project&gt;
 </pre>
 </div>
 </div>
 <div class="section"><h3>Using The <tt>aggregate</tt> Goals</h3>
-<p>The &lt;aggregate/&gt; parameter doesn't include generate source directories defined using the <a href="http://mojo.codehaus.org/build-helper-maven-plugin/add-source-mojo.html" class="externalLink">build-helper:add-source</a>. In this case, you need to use the <tt>aggregate</tt> goal and <tt>test-aggregate</tt> goals. You could also define several &lt;reportSet/&gt; like the following:</p>
+<p>The <a href="../javadoc-mojo.html#aggregate">&lt;aggregate/&gt;</a> parameter doesn't include generate source directories defined using the <a href="http://mojo.codehaus.org/build-helper-maven-plugin/add-source-mojo.html" class="externalLink">build-helper:add-source</a>. In this case, you need to use the <tt>aggregate</tt> goal and <tt>test-aggregate</tt> goals. You could define these goals in the &lt;build/&gt; element (using the &lt;execution/&gt; tag) or &lt;reporting/&gt; element (using the &lt;reportSet/&gt; tag) as shown below. For more information, refer to the <a href="./selective-javadocs-report.html">Selective Javadocs Reports page</a>.</p>
+<div class="source"><pre>&lt;project&gt;
+  ...
+  &lt;build&gt;
+    &lt;plugins&gt;
+      &lt;plugin&gt;
+        &lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
+        &lt;artifactId&gt;maven-javadoc-plugin&lt;/artifactId&gt;
+        &lt;version&gt;2.6.1&lt;/version&gt;
+        &lt;configuration&gt;
+          &lt;!-- Default configuration for all reports --&gt;
+          ...
+        &lt;/configuration&gt;
+        &lt;executions&gt;
+          &lt;execution&gt;
+            &lt;id&gt;aggregate&lt;/id&gt;
+            &lt;goals&gt;
+              &lt;goal&gt;aggregate&lt;/goal&gt;
+            &lt;/goals&gt;
+            &lt;phase&gt;site&lt;/phase&gt;
+            &lt;configuration&gt;
+              &lt;!-- Specific configuration for the aggregate report --&gt;
+              ...
+            &lt;/configuration&gt;
+          &lt;/execution&gt;
+          ...
+        &lt;/executions&gt;
+      &lt;/plugin&gt;
+      ...
+    &lt;/plugins&gt;
+  &lt;/build&gt;
+  ...
+&lt;/project&gt;
+</pre>
+</div>
 <div class="source"><pre>
 &lt;project&gt;
   ...
@@ -353,11 +387,16 @@ Project
       &lt;plugin&gt;
         &lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
         &lt;artifactId&gt;maven-javadoc-plugin&lt;/artifactId&gt;
-        &lt;version&gt;2.5&lt;/version&gt;
+        &lt;version&gt;2.6.1&lt;/version&gt;
+        &lt;configuration&gt;
+          &lt;!-- Default configuration for all reports --&gt;
+          ...
+        &lt;/configuration&gt;
         &lt;reportSets&gt;
           &lt;reportSet&gt;
             &lt;id&gt;non-aggregate&lt;/id&gt;
             &lt;configuration&gt;
+              &lt;!-- Specific configuration for the non aggregate report --&gt;
               ...
             &lt;/configuration&gt;
             &lt;reports&gt;
@@ -367,14 +406,17 @@ Project
           &lt;reportSet&gt;
             &lt;id&gt;aggregate&lt;/id&gt;
             &lt;configuration&gt;
+              &lt;!-- Specific configuration for the aggregate report --&gt;
               ...
             &lt;/configuration&gt;
             &lt;reports&gt;
               &lt;report&gt;aggregate&lt;/report&gt;
             &lt;/reports&gt;
           &lt;/reportSet&gt;
+          ...
         &lt;/reportSets&gt;
       &lt;/plugin&gt;
+      ...
     &lt;/plugins&gt;
   &lt;/reporting&gt;
   ...

Modified: websites/production/maventest/content/plugins/maven-javadoc-plugin-latest/examples/alternate-doclet.html
==============================================================================
--- websites/production/maventest/content/plugins/maven-javadoc-plugin-latest/examples/alternate-doclet.html (original)
+++ websites/production/maventest/content/plugins/maven-javadoc-plugin-latest/examples/alternate-doclet.html Sun Aug 19 17:31:42 2012
@@ -75,8 +75,8 @@ Maria Odea Ching" />
             
   
     
-            &nbsp;| Last Published: 2009-07-26
-              &nbsp;| Version: 2.6
+            &nbsp;| Last Published: 2009-10-23
+              &nbsp;| Version: 2.6.1
             </div>
       <div class="clear">
         <hr/>
@@ -305,93 +305,93 @@ Maria Odea Ching" />
       <div id="contentBox">
         <div class="section"><h2>Using Alternate Doclet</h2>
 <p>To generate output from an alternate doclet, add configuration similar to the following to your POM.</p>
-<p>In this example, the doclet is UmlGraph. UmlGraph allows the declarative specification and drawing of UML class and sequence diagrams. For more information about UmlGraph, please refer to <a href="http://www.umlgraph.org/" class="externalLink">http://www.umlgraph.org/</a>.</p>
+<p>In this example, the doclet is UmlGraph (<a href="http://www.umlgraph.org/" class="externalLink">http://www.umlgraph.org/</a>). UmlGraph allows the declarative specification and drawing of UML class and sequence diagrams.</p>
+<p><b>Note about UmlGraph</b>: You must have the Graphviz binary in your PATH, or the images will not be generated. For more information about Graphviz, please refer to <a href="http://www.graphviz.org/" class="externalLink">http://www.graphviz.org/</a>.</p>
 <div class="source"><pre>&lt;project&gt;
-   ...
-   &lt;reporting&gt;
-      &lt;plugins&gt;
-         &lt;plugin&gt;
-            &lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
-            &lt;artifactId&gt;maven-javadoc-plugin&lt;/artifactId&gt;
-            &lt;version&gt;2.5&lt;/version&gt;
-            &lt;configuration&gt;
-              &lt;doclet&gt;org.umlgraph.doclet.UmlGraphDoc&lt;/doclet&gt;
+  ...
+  &lt;reporting&gt; (or &lt;build&gt;)
+    &lt;plugins&gt;
+      &lt;plugin&gt;
+        &lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
+        &lt;artifactId&gt;maven-javadoc-plugin&lt;/artifactId&gt;
+        &lt;version&gt;2.6.1&lt;/version&gt;
+        &lt;configuration&gt;
+          &lt;doclet&gt;org.umlgraph.doclet.UmlGraphDoc&lt;/doclet&gt;
 
-              &lt;!-- &lt;docletPath&gt;/path/to/UmlGraph.jar&lt;/docletPath&gt; --&gt;
-              &lt;docletArtifact&gt;
-                &lt;groupId&gt;org.umlgraph&lt;/groupId&gt;
-                &lt;artifactId&gt;doclet&lt;/artifactId&gt;
-                &lt;version&gt;5.1&lt;/version&gt;
-              &lt;/docletArtifact&gt;
-              &lt;additionalparam&gt;-views&lt;/additionalparam&gt;
-              &lt;useStandardDocletOptions&gt;true&lt;/useStandardDocletOptions&gt;
-            &lt;/configuration&gt;
-         &lt;/plugin&gt;
-         ...
-      &lt;/plugins&gt;
-   &lt;/reporting&gt;
-   ...
+          &lt;!-- &lt;docletPath&gt;/path/to/UmlGraph.jar&lt;/docletPath&gt; --&gt;
+          &lt;docletArtifact&gt;
+            &lt;groupId&gt;org.umlgraph&lt;/groupId&gt;
+            &lt;artifactId&gt;doclet&lt;/artifactId&gt;
+            &lt;version&gt;5.1&lt;/version&gt;
+          &lt;/docletArtifact&gt;
+          &lt;additionalparam&gt;-views&lt;/additionalparam&gt;
+          &lt;useStandardDocletOptions&gt;true&lt;/useStandardDocletOptions&gt;
+        &lt;/configuration&gt;
+      &lt;/plugin&gt;
+    ...
+    &lt;/plugins&gt;
+  &lt;/reporting&gt; (or &lt;/build&gt;)
+  ...
 &lt;/project&gt;
 </pre>
 </div>
 <p><b>Note</b>:</p>
-<ul><li>&lt;additionalparam/&gt; is used to set additional parameters on the command line, specifically for doclet options.</li>
-<li>&lt;useStandardDocletOptions/&gt; uses the <a href="http://java.sun.com/j2se/1.4.2/docs/tooldocs/windows/javadoc.html#standard" class="externalLink">options provided by the Standard Doclet</a>.</li>
-<li>If you need more artifacts in the docletpath, you could use &lt;docletArtifacts/&gt;.</li>
+<ul><li><a href="../javadoc-mojo.html#additionalparam">&lt;additionalparam/&gt;</a> parameter could be used to set additional parameters on the command line, specifically for doclet options.</li>
+<li><a href="../javadoc-mojo.html#useStandardDocletOptions">&lt;useStandardDocletOptions/&gt;</a> parameter could be used to specify that the given doclet should use the <a href="http://java.sun.com/j2se/1.4.2/docs/tooldocs/windows/javadoc.html#standard" class="externalLink">options provided by the Standard Doclet</a>.</li>
+<li>If you need more artifacts in the docletpath, you could use the <a href="../javadoc-mojo.html#docletArtifacts">&lt;docletArtifacts/&gt;</a> parameter.</li>
 </ul>
 <p>After executing <tt>mvn site</tt>, you will see that a UML graph (.dot file) will be generated in the destination directory.</p>
-<p><b>Note about UmlGraph</b>: You must have the Graphviz binary in your PATH, or the images will not be generated. For more information about Graphviz, please refer to <a href="http://www.graphviz.org/" class="externalLink">http://www.graphviz.org/</a>.</p>
 </div>
 <div class="section"><h2>Using Alternate Doclet In Addition To The Javadoc Doclet</h2>
 <p>To generate output from an alternate doclet in addition to the normal HTML Javadoc doclet, add configuration similar to the following to your POM.</p>
-<p>In this example, the doclet is Sun DocCheck. The Sun Doc Check Doclet is an extension to the Javadoc tool. It runs on source code and reviews documentation comments, generating an HTML report that identifies empty comments and other ommissions and irregularities in the documentation comments. For more information about Sun DocCheck, please refer to <a href="http://java.sun.com/j2se/javadoc/doccheck/" class="externalLink">http://java.sun.com/j2se/javadoc/doccheck/</a>.</p>
+<p>In this example, the doclet is Sun DocCheck (<a href="http://java.sun.com/j2se/javadoc/doccheck/" class="externalLink">http://java.sun.com/j2se/javadoc/doccheck/</a>). The Sun Doc Check Doclet is an extension to the Javadoc tool. It runs on source code and reviews documentation comments, generating an HTML report that identifies empty comments and other ommissions and irregularities in the documentation comments.</p>
 <div class="source"><pre>&lt;project&gt;
-   ...
-   &lt;reporting&gt;
-      &lt;plugins&gt;
-         &lt;plugin&gt;
-            &lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
-            &lt;artifactId&gt;maven-javadoc-plugin&lt;/artifactId&gt;
-            &lt;version&gt;2.5&lt;/version&gt;
-            &lt;reportSets&gt;
-              &lt;reportSet&gt;
-                &lt;id&gt;html&lt;/id&gt;
-                &lt;reports&gt;
-                  &lt;report&gt;javadoc&lt;/report&gt;
-                &lt;/reports&gt;
-              &lt;/reportSet&gt;
-              &lt;reportSet&gt;
-                &lt;id&gt;doccheck&lt;/id&gt;
-                &lt;configuration&gt;
-                  &lt;doclet&gt;com.sun.tools.doclets.doccheck.DocCheck&lt;/doclet&gt;
+  ...
+  &lt;reporting&gt;
+    &lt;plugins&gt;
+      &lt;plugin&gt;
+        &lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
+        &lt;artifactId&gt;maven-javadoc-plugin&lt;/artifactId&gt;
+        &lt;version&gt;2.6.1&lt;/version&gt;
+        &lt;reportSets&gt;
+          &lt;reportSet&gt;
+            &lt;id&gt;html&lt;/id&gt;
+            &lt;reports&gt;
+              &lt;report&gt;javadoc&lt;/report&gt;
+            &lt;/reports&gt;
+          &lt;/reportSet&gt;
+          &lt;reportSet&gt;
+            &lt;id&gt;doccheck&lt;/id&gt;
+            &lt;configuration&gt;
+              &lt;doclet&gt;com.sun.tools.doclets.doccheck.DocCheck&lt;/doclet&gt;
 
-                  &lt;!-- &lt;docletPath&gt;/path/to/doccheck.jar&lt;/docletPath&gt; --&gt;
-                  &lt;docletArtifact&gt;
-                    &lt;groupId&gt;com.sun.tools.doclets&lt;/groupId&gt;
-                    &lt;artifactId&gt;doccheck&lt;/artifactId&gt;
-                    &lt;version&gt;1.2b2&lt;/version&gt;
-                  &lt;/docletArtifact&gt;
-                  &lt;additionalparam&gt;
+              &lt;!-- &lt;docletPath&gt;/path/to/doccheck.jar&lt;/docletPath&gt; --&gt;
+              &lt;docletArtifact&gt;
+                &lt;groupId&gt;com.sun.tools.doclets&lt;/groupId&gt;
+                &lt;artifactId&gt;doccheck&lt;/artifactId&gt;
+                &lt;version&gt;1.2b2&lt;/version&gt;
+              &lt;/docletArtifact&gt;
+              &lt;additionalparam&gt;
                     -d ${project.build.directory}/site/doccheck
-                  &lt;/additionalparam&gt;
+              &lt;/additionalparam&gt;
 
-                  &lt;!-- Other dir than apidocs --&gt;
-                  &lt;destDir&gt;doccheck&lt;/destDir&gt;
+              &lt;!-- Other dir than apidocs --&gt;
+              &lt;destDir&gt;doccheck&lt;/destDir&gt;
 
-                  &lt;!-- For the project-reports page--&gt;
-                  &lt;name&gt;DocCheck&lt;/name&gt;
-                  &lt;description&gt;DocCheck documentation.&lt;/description&gt;
-                &lt;/configuration&gt;
-                &lt;reports&gt;
-                  &lt;report&gt;javadoc&lt;/report&gt;
-                &lt;/reports&gt;
-              &lt;/reportSet&gt;
-            &lt;/reportSets&gt;
-        &lt;/plugin&gt;
-        ...
-      &lt;/plugins&gt;
-   &lt;/reporting&gt;
-   ...
+              &lt;!-- For the project-reports page--&gt;
+              &lt;name&gt;DocCheck&lt;/name&gt;
+              &lt;description&gt;DocCheck documentation.&lt;/description&gt;
+            &lt;/configuration&gt;
+            &lt;reports&gt;
+              &lt;report&gt;javadoc&lt;/report&gt;
+            &lt;/reports&gt;
+          &lt;/reportSet&gt;
+        &lt;/reportSets&gt;
+      &lt;/plugin&gt;
+      ...
+    &lt;/plugins&gt;
+  &lt;/reporting&gt;
+  ...
 &lt;/project&gt;
 </pre>
 </div>

Modified: websites/production/maventest/content/plugins/maven-javadoc-plugin-latest/examples/alternate-javadoc-tool.html
==============================================================================
--- websites/production/maventest/content/plugins/maven-javadoc-plugin-latest/examples/alternate-javadoc-tool.html (original)
+++ websites/production/maventest/content/plugins/maven-javadoc-plugin-latest/examples/alternate-javadoc-tool.html Sun Aug 19 17:31:42 2012
@@ -74,8 +74,8 @@
             
   
     
-            &nbsp;| Last Published: 2009-07-26
-              &nbsp;| Version: 2.6
+            &nbsp;| Last Published: 2009-10-23
+              &nbsp;| Version: 2.6.1
             </div>
       <div class="clear">
         <hr/>
@@ -305,48 +305,49 @@
         <div class="section"><h2>Using Alternate Javadoc Tool</h2>
 <div class="section"><h3>Using Alternate Javadoc Executable</h3>
 <p>By default, the Maven Javadoc Plugin tries to auto-detect the Javadoc Tool executable from the Java property <i>java.home</i> or from the environment variable <i>JAVA_HOME</i>.</p>
-<p>You could also specify the executable of the Javadoc Tool to use. For example:</p>
+<p>You could also specify the executable of the Javadoc Tool to use with the <a href="../javadoc-mojo.html#javadocExecutable">&lt;javadocExecutable/&gt;</a> parameter. For example:</p>
 <div class="source"><pre>&lt;project&gt;
-   ...
-   &lt;reporting&gt;
-      &lt;plugins&gt;
-         &lt;plugin&gt;
-            &lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
-            &lt;artifactId&gt;maven-javadoc-plugin&lt;/artifactId&gt;
-            &lt;version&gt;2.5&lt;/version&gt;
-            &lt;configuration&gt;
-              &lt;javadocExecutable&gt;C:\jdk1.6.0\bin\javadoc.exe&lt;/javadocExecutable&gt;
-              ...
-            &lt;/configuration&gt;
-         &lt;/plugin&gt;
-         ...
-      &lt;/plugins&gt;
-   &lt;/reporting&gt;
-   ...
+  ...
+  &lt;reporting&gt; (or &lt;build&gt;)
+    &lt;plugins&gt;
+      &lt;plugin&gt;
+        &lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
+        &lt;artifactId&gt;maven-javadoc-plugin&lt;/artifactId&gt;
+        &lt;version&gt;2.6.1&lt;/version&gt;
+        &lt;configuration&gt;
+          &lt;javadocExecutable&gt;C:\jdk1.6.0\bin\javadoc.exe&lt;/javadocExecutable&gt;
+          ...
+        &lt;/configuration&gt;
+      &lt;/plugin&gt;
+      ...
+    &lt;/plugins&gt;
+  &lt;/reporting&gt; (or &lt;/build&gt;)
+  ...
 &lt;/project&gt;
 </pre>
 </div>
+<p><b>IMPORTANT NOTE</b>: by using <a href="../javadoc-mojo.html#javadocExecutable">&lt;javadocExecutable/&gt;</a> parameter, the build will be plateform dependent! A good practice is to define an environnement variable (i.e. JAVA_1.6_HOME), so you could specify it: (i.e. &lt;javadocExecutable&gt;${env.JAVA_1.6_HOME}/bin/javadoc&lt;/javadocExecutable&gt;). An other ways is to define a POM property using &lt;project&gt;&lt;properties/&gt;&lt;/project&gt;.</p>
 </div>
 <div class="section"><h3>Using Alternate Javadoc Version</h3>
 <p>In the same way, the Maven Javadoc Plugin tries to auto-detect the Javadoc Tool version by calling <i>javadoc -J-fullversion</i>.</p>
 <p>You could also specify the version of the Javadoc Tool executable. For example:</p>
 <div class="source"><pre>&lt;project&gt;
-   ...
-   &lt;reporting&gt;
-      &lt;plugins&gt;
-         &lt;plugin&gt;
-            &lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
-            &lt;artifactId&gt;maven-javadoc-plugin&lt;/artifactId&gt;
-            &lt;version&gt;2.5&lt;/version&gt;
-            &lt;configuration&gt;
-              &lt;javadocVersion&gt;1.5&lt;/javadocVersion&gt;
-              ...
-            &lt;/configuration&gt;
-         &lt;/plugin&gt;
-         ...
-      &lt;/plugins&gt;
-   &lt;/reporting&gt;
-   ...
+  ...
+  &lt;reporting&gt; (or &lt;build&gt;)
+    &lt;plugins&gt;
+      &lt;plugin&gt;
+        &lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
+        &lt;artifactId&gt;maven-javadoc-plugin&lt;/artifactId&gt;
+        &lt;version&gt;2.6.1&lt;/version&gt;
+        &lt;configuration&gt;
+          &lt;javadocVersion&gt;1.5&lt;/javadocVersion&gt;
+          ...
+        &lt;/configuration&gt;
+      &lt;/plugin&gt;
+      ...
+    &lt;/plugins&gt;
+  &lt;/reporting&gt; (or &lt;/build&gt;)
+  ...
 &lt;/project&gt;
 </pre>
 </div>

Modified: websites/production/maventest/content/plugins/maven-javadoc-plugin-latest/examples/exclude-package-names.html
==============================================================================
--- websites/production/maventest/content/plugins/maven-javadoc-plugin-latest/examples/exclude-package-names.html (original)
+++ websites/production/maventest/content/plugins/maven-javadoc-plugin-latest/examples/exclude-package-names.html Sun Aug 19 17:31:42 2012
@@ -74,8 +74,8 @@
             
   
     
-            &nbsp;| Last Published: 2009-07-26
-              &nbsp;| Version: 2.6
+            &nbsp;| Last Published: 2009-10-23
+              &nbsp;| Version: 2.6.1
             </div>
       <div class="clear">
         <hr/>
@@ -303,24 +303,64 @@
     <div id="bodyColumn">
       <div id="contentBox">
         <div class="section"><h2>Excluding Packages</h2>
-<p>To exclude specific packages from the javadoc, use &lt;excludePackageNames&gt; as shown below. The parameter accepts wildcard (*) characters in its value but the wildcards should either be at the start or the end of the package name. If more than one package is to be excluded, each package name must be separated either with a ':', ',' or ';'.</p>
+<p>To exclude specific packages, use <a href="../javadoc-mojo.html#excludePackageNames">&lt;excludePackageNames/&gt;</a> parameter as shown below. The parameter accepts wildcard (*) characters in its value but the wildcards should either be at the start or the end of the package name. If more than one package is to be excluded, each package name must be separated either with a colon (':'), a comma (',') or a semicolon (';'). (similar to the <a href="http://java.sun.com/j2se/1.4.2/docs/tooldocs/windows/javadoc.html#exclude" class="externalLink">Javadoc Tool</a>)</p>
+<p>For instance, with the following packages:</p>
+<div class="source"><pre>com.mycompany.myapp
+com.mycompany.myapp.package1
+com.mycompany.myapp.package1.subpackage1
+com.mycompany.myapp.package1.subpackage2
+com.mycompany.myapp.package1.subpackage3
+com.mycompany.myapp.package1.util
+com.mycompany.myapp.package2
+com.mycompany.myapp.package2.subpackage4
+com.mycompany.myapp.package2.subpackage5
+com.mycompany.myapp.package2.util
+com.mycompany.myapp.package3
+com.mycompany.myapp.package3.subpackage6
+com.mycompany.myapp.package3.subpackage6.subsubpackage1
+com.mycompany.myapp.package3.subpackage6.subsubpackage2
+com.mycompany.myapp.package3.subpackage7
+com.mycompany.myapp.package3.util
+</pre>
+</div>
+<p>You could have the following configuration:</p>
 <div class="source"><pre>&lt;project&gt;
   ...
-  &lt;reporting&gt;
+  &lt;reporting&gt; (or &lt;build&gt;)
     &lt;plugins&gt;
       &lt;plugin&gt;
         &lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
         &lt;artifactId&gt;maven-javadoc-plugin&lt;/artifactId&gt;
-        &lt;version&gt;2.5&lt;/version&gt;
+        &lt;version&gt;2.6.1&lt;/version&gt;
         &lt;configuration&gt;
-          ...
-          &lt;excludePackageNames&gt;*.internal:org.acme.exclude1.*:org.acme.exclude2&lt;/excludePackageNames&gt;
+          &lt;!--
+          Exclude packages:
+            com.mycompany.myapp.package1.subpackage1
+            com.mycompany.myapp.package1.subpackage2
+            com.mycompany.myapp.package1.subpackage3
+            com.mycompany.myapp.package1.util
+            com.mycompany.myapp.package2
+            com.mycompany.myapp.package2.subpackage4
+            com.mycompany.myapp.package2.subpackage5
+            com.mycompany.myapp.package2.util
+            com.mycompany.myapp.package3.util
+          BUT include the packages:
+            com.mycompany.myapp
+            com.mycompany.myapp.package1
+            com.mycompany.myapp.package3
+            com.mycompany.myapp.package3.subpackage6
+            com.mycompany.myapp.package3.subpackage6.subsubpackage1
+            com.mycompany.myapp.package3.subpackage6.subsubpackage2
+            com.mycompany.myapp.package3.subpackage7
+          --&gt;
+          &lt;excludePackageNames&gt;com.mycompany.myapp.package1.*:com.mycompany.myapp.package2:*.util.*&lt;/excludePackageNames&gt;
           ...
         &lt;/configuration&gt;
       &lt;/plugin&gt;
+      ...
     &lt;/plugins&gt;
     ...
-  &lt;/reporting&gt;
+  &lt;/reporting&gt; (or &lt;build&gt;)
   ...
 &lt;/project&gt;
 </pre>

Modified: websites/production/maventest/content/plugins/maven-javadoc-plugin-latest/examples/fix-javadocs.html
==============================================================================
--- websites/production/maventest/content/plugins/maven-javadoc-plugin-latest/examples/fix-javadocs.html (original)
+++ websites/production/maventest/content/plugins/maven-javadoc-plugin-latest/examples/fix-javadocs.html Sun Aug 19 17:31:42 2012
@@ -74,8 +74,8 @@
             
   
     
-            &nbsp;| Last Published: 2009-07-26
-              &nbsp;| Version: 2.6
+            &nbsp;| Last Published: 2009-10-23
+              &nbsp;| Version: 2.6.1
             </div>
       <div class="clear">
         <hr/>
@@ -307,9 +307,9 @@
 <p>You need to call <i>mvn javadoc:fix</i> to fix main Java source files (i.e. inside src/main/java directory) or <i>mvn javadoc:test-fix</i> to fix test Java source files (i.e. inside src/test/java directory).</p>
 <p><b>Important Note</b>: Since the changes are done <b>directly</b> in the source code, we recommend <b>strongly</b> the use of a SCM, so you could always do a revert if a problem occurs. You could always add <tt>-DoutputDirectory=/path/to/dir</tt> to specify a target directory where classes will be generated.</p>
 <div class="section"><h3>Features Summary</h3>
-<p>The user could skip the class/field/method Javadoc fixing using specific parameters, i.e. <a href="../fix-mojo.html#fixClassComment">fixClassComment</a>. Also, the user could specify a <a href="../fix-mojo.html#level">level</a>, i.e. public, to fix only class/field/method with the given level.</p>
-<p>These goals could fix dynamically all Javadoc tags (by default, see <a href="../fix-mojo.html#fixTags">fixTags</a>) or selective tags like author, version... Also, the user could specify default value for some tags, i.e. <a href="../fix-mojo.html#defaultAuthor">defaultAuthor</a>.</p>
-<p>The <i>javadoc:fix</i> goal could use <a href="http://clirr.sourceforge.net/" class="externalLink">Clirr</a> via the <a href="http://mojo.codehaus.org/clirr-maven-plugin/" class="externalLink">clirr-maven-plugin</a>, a tool that checks Java libraries for binary and source compatibility with older releases. So, the <i>@since</i> tags will be dynamically added for the current project version. You need to add the <i>comparisonVersion</i> parameter (see below).</p>
+<p>The user could skip the class/field/method Javadoc fixing using specific parameters, i.e. <a href="../fix-mojo.html#fixClassComment">&lt;fixClassComment/&gt;</a>. Also, the user could specify a <a href="../fix-mojo.html#level">&lt;level/&gt;</a>, i.e. public, to fix only class/field/method with the given level.</p>
+<p>These goals could fix dynamically all Javadoc tags (by default, see <a href="../fix-mojo.html#fixTags">&lt;fixTags/&gt;</a>) or selective tags like author, version... Also, the user could specify default value for some tags, i.e. <a href="../fix-mojo.html#defaultAuthor">&lt;defaultAuthor/&gt;</a>.</p>
+<p>The <i>javadoc:fix</i> goal could use Clirr (<a href="http://clirr.sourceforge.net" class="externalLink"></a> via the <a href="http://mojo.codehaus.org/clirr-maven-plugin/" class="externalLink">clirr-maven-plugin</a>, a tool that checks Java libraries for binary and source compatibility with older releases. So, the <i>@since</i> tags will be dynamically added for the current project version. You need to add the <i>comparisonVersion</i> parameter (see below).</p>
 <p>Finally, the user could process specific Java files using the <a href="../fix-mojo.html#includes">includes</a>/<a href="../fix-mojo.html#excludes">excludes</a> parameters.</p>
 <div class="section"><h4>Current limitations</h4>
 <p>The <i>fix</i> and <i>test-fix</i> goals use intensively <a href="http://qdox.codehaus.org/" class="externalLink">Qdox</a> to extract class/interface/method Javadoc from source files. Unfortunately, Qdox has <a href="http://jira.codehaus.org/browse/QDOX" class="externalLink">some known issues</a>.</p>
@@ -354,12 +354,13 @@ y
 <div class="section"><h4>Using another Clirr version</h4>
 <p>By default, the <i>fix</i> and <i>test-fix</i> goals use the <a href="http://mojo.codehaus.org/clirr-maven-plugin/" class="externalLink">clirr-maven-plugin</a>, version <tt>2.2.2</tt>. To use another version, you need to add a dependency in the Javadoc plugin, similar to the following:</p>
 <div class="source"><pre>&lt;project&gt;
+  ...
   &lt;build&gt;
     &lt;plugins&gt;
       &lt;plugin&gt;
         &lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
         &lt;artifactId&gt;maven-javadoc-plugin&lt;/artifactId&gt;
-        &lt;version&gt;2.5&lt;/version&gt;
+        &lt;version&gt;2.6.1&lt;/version&gt;
         &lt;configuration&gt;
             ...
         &lt;/configuration&gt;
@@ -370,10 +371,12 @@ y
             &lt;version&gt;2.3-SNAPSHOT&lt;/version&gt;
           &lt;/dependency&gt;
         &lt;/dependencies&gt;
-        ...
       &lt;/plugin&gt;
+      ...
     &lt;/plugins&gt;
+    ...
   &lt;/build&gt;
+  ...
 &lt;/project&gt;
 </pre>
 </div>

Modified: websites/production/maventest/content/plugins/maven-javadoc-plugin-latest/examples/group-configuration.html
==============================================================================
--- websites/production/maventest/content/plugins/maven-javadoc-plugin-latest/examples/group-configuration.html (original)
+++ websites/production/maventest/content/plugins/maven-javadoc-plugin-latest/examples/group-configuration.html Sun Aug 19 17:31:42 2012
@@ -75,8 +75,8 @@ Maria Odea Ching" />
             
   
     
-            &nbsp;| Last Published: 2009-07-26
-              &nbsp;| Version: 2.6
+            &nbsp;| Last Published: 2009-10-23
+              &nbsp;| Version: 2.6.1
             </div>
       <div class="clear">
         <hr/>
@@ -304,33 +304,116 @@ Maria Odea Ching" />
     <div id="bodyColumn">
       <div id="contentBox">
         <div class="section"><h2>Grouping Packages</h2>
-<p>To set a grouping for different packages, use the &lt;groups/&gt; configuration in your pom:</p>
+<p>To set a grouping for different packages, use the <a href="../javadoc-mojo.html#groups">&lt;groups/&gt;</a> parameter as shown below. Each group will be consist of a &lt;title/&gt; and a &lt;packages/&gt; (as String). The &lt;packages/&gt; element supports wildcard (*) to allow subpackages. If more than one package is to be included, each package name must be separated colon (:) separated (similar to the <a href="http://java.sun.com/j2se/1.4.2/docs/tooldocs/windows/javadoc.html#group" class="externalLink">Javadoc Tool</a>).</p>
+<p>For instance, with the following packages:</p>
+<div class="source"><pre>com.mycompany.myapp
+com.mycompany.myapp.package1
+com.mycompany.myapp.package1.subpackage1
+com.mycompany.myapp.package1.subpackage2
+com.mycompany.myapp.package1.subpackage3
+com.mycompany.myapp.package1.util
+com.mycompany.myapp.package2
+com.mycompany.myapp.package2.subpackage4
+com.mycompany.myapp.package2.subpackage5
+com.mycompany.myapp.package2.util
+</pre>
+</div>
+<p>You could have the following configuration:</p>
 <div class="source"><pre>&lt;project&gt;
   ...
-  &lt;reporting&gt;
+  &lt;reporting&gt; (or &lt;build&gt;)
     &lt;plugins&gt;
       &lt;plugin&gt;
         &lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
         &lt;artifactId&gt;maven-javadoc-plugin&lt;/artifactId&gt;
-        &lt;version&gt;2.5&lt;/version&gt;
+        &lt;version&gt;2.6.1&lt;/version&gt;
         &lt;configuration&gt;
-          ...
           &lt;groups&gt;
             &lt;group&gt;
-              &lt;title&gt;Core Packages&lt;/title&gt;
-              &lt;packages&gt;org.apache.maven.plugin.javadoc.test1&lt;/packages&gt;
+              &lt;title&gt;Example 1 - Group Packages&lt;/title&gt;
+              &lt;!--
+              Include packages:
+                com.mycompany.myapp
+                com.mycompany.myapp.package1
+              BUT exclude all subpackages
+              --&gt;
+              &lt;packages&gt;com.mycompany.myapp:com.mycompany.myapp.package1&lt;/packages&gt;
+            &lt;/group&gt;
+            &lt;group&gt;
+              &lt;title&gt;Example 2 - Group Packages&lt;/title&gt;
+              &lt;!--
+              Include packages:
+                com.mycompany.myapp.package1.subpackage1
+                com.mycompany.myapp.package1.subpackage2
+                com.mycompany.myapp.package1.subpackage3
+                com.mycompany.myapp.package1.util
+              BUT exclude the root package:
+                com.mycompany.myapp.package1
+              --&gt;
+              &lt;packages&gt;com.mycompany.myapp.package1.*&lt;/packages&gt;
+            &lt;/group&gt;
+            &lt;group&gt;
+              &lt;title&gt;Example 3 - Group Packages&lt;/title&gt;
+              &lt;!--
+              Include packages:
+                com.mycompany.myapp.package1
+                com.mycompany.myapp.package1.subpackage1
+                com.mycompany.myapp.package1.subpackage2
+                com.mycompany.myapp.package1.subpackage3
+                com.mycompany.myapp.package1.util
+              --&gt;
+              &lt;packages&gt;com.mycompany.myapp.package1*&lt;/packages&gt;
+            &lt;/group&gt;
+            &lt;group&gt;
+              &lt;title&gt;Example 4 - Group Packages&lt;/title&gt;
+              &lt;!--
+              Include packages:
+                com.mycompany.myapp.package1
+                com.mycompany.myapp.package1.subpackage1
+                com.mycompany.myapp.package1.subpackage2
+                com.mycompany.myapp.package1.subpackage3
+                com.mycompany.myapp.package1.util
+                com.mycompany.myapp.package2
+                com.mycompany.myapp.package2.subpackage4
+                com.mycompany.myapp.package2.subpackage5
+                com.mycompany.myapp.package2.util
+              --&gt;
+              &lt;packages&gt;com.mycompany.myapp.package*&lt;/packages&gt;
+            &lt;/group&gt;
+            &lt;group&gt;
+              &lt;title&gt;Example 5 - Group Packages&lt;/title&gt;
+              &lt;!--
+              Include packages:
+                com.mycompany.myapp.package1.subpackage1
+                com.mycompany.myapp.package1.subpackage2
+                com.mycompany.myapp.package1.subpackage3
+                com.mycompany.myapp.package1.util
+                com.mycompany.myapp.package2.subpackage4
+                com.mycompany.myapp.package2.subpackage5
+                com.mycompany.myapp.package2.util
+              BUT exclude the root packages:
+                com.mycompany.myapp.package1
+                com.mycompany.myapp.package2
+              --&gt;
+              &lt;packages&gt;com.mycompany.myapp.package1.*:com.mycompany.myapp.package2.*&lt;/packages&gt;
             &lt;/group&gt;
             &lt;group&gt;
-              &lt;title&gt;Extension Packages&lt;/title&gt;
-              &lt;packages&gt;org.apache.maven.plugin.javadoc.test2&lt;/packages&gt;
+              &lt;title&gt;Example 6 - Group Packages&lt;/title&gt;
+              &lt;!--
+              Include nothing.
+              The packages com.mycompany.myapp.package1.util and com.mycompany.myapp.package2.util
+              will be in &quot;Other Packages&quot; group
+              --&gt;
+              &lt;packages&gt;*.util.*&lt;/packages&gt;
             &lt;/group&gt;
           &lt;/groups&gt;
           ...
         &lt;/configuration&gt;
       &lt;/plugin&gt;
+      ...
     &lt;/plugins&gt;
     ...
-  &lt;/reporting&gt;
+  &lt;/reporting&gt; (or &lt;/build&gt;)
   ...
 &lt;/project&gt;
 </pre>

Modified: websites/production/maventest/content/plugins/maven-javadoc-plugin-latest/examples/help-configuration.html
==============================================================================
--- websites/production/maventest/content/plugins/maven-javadoc-plugin-latest/examples/help-configuration.html (original)
+++ websites/production/maventest/content/plugins/maven-javadoc-plugin-latest/examples/help-configuration.html Sun Aug 19 17:31:42 2012
@@ -74,8 +74,8 @@
             
   
     
-            &nbsp;| Last Published: 2009-07-26
-              &nbsp;| Version: 2.6
+            &nbsp;| Last Published: 2009-10-23
+              &nbsp;| Version: 2.6.1
             </div>
       <div class="clear">
         <hr/>
@@ -303,14 +303,15 @@
     <div id="bodyColumn">
       <div id="contentBox">
         <div class="section"><h2>Configuring Help File</h2>
-<p>If a custom &lt;helpfile/&gt; parameter is specified, you will be able to use it:</p>
-<ul><li>if &lt;helpfile/&gt; is a given file, you could use an absolute or a relative path, for instance:<div class="source"><pre>&lt;project&gt;
+<p>If a custom <a href="../javadoc-mojo.html#helpfile">&lt;helpfile/&gt;</a> parameter is specified, you will be able to use it:</p>
+<ul><li>if <a href="../javadoc-mojo.html#helpfile">&lt;helpfile/&gt;</a> is a given file, you could use an absolute or a relative path, for instance:<div class="source"><pre>&lt;project&gt;
   ...
-  &lt;reporting&gt;
+  &lt;reporting&gt; (or &lt;build&gt;)
     &lt;plugins&gt;
       &lt;plugin&gt;
         &lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
         &lt;artifactId&gt;maven-javadoc-plugin&lt;/artifactId&gt;
+        &lt;version&gt;2.6.1&lt;/version&gt;
         &lt;configuration&gt;
           &lt;helpfile&gt;${basedir}/path/to/your/helpfile&lt;/helpfile&gt;
           ...
@@ -318,34 +319,20 @@
       &lt;/plugin&gt;
     &lt;/plugins&gt;
     ...
-  &lt;/reporting&gt;
+  &lt;/reporting&gt; (or &lt;/build&gt;)
   ...
 &lt;/project&gt;
 </pre>
 </div>
 </li>
-<li>since 2.6, &lt;helpfile/&gt; could be a resource in your project directory, i.e. <tt>src/main/java</tt>, <tt>src/main/resources</tt> or <tt>src/main/javadoc</tt>, for instance:<div class="source"><pre>&lt;project&gt;
+<li>since 2.6, <a href="../javadoc-mojo.html#helpfile">&lt;helpfile/&gt;</a> could be a resource in your project directory, i.e. <tt>src/main/java</tt>, <tt>src/main/resources</tt> or <tt>src/main/javadoc</tt>, for instance:<div class="source"><pre>&lt;project&gt;
   ...
-  &lt;build&gt;
-    &lt;plugins&gt;
-      &lt;plugin&gt;
-        &lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
-        &lt;artifactId&gt;maven-javadoc-plugin&lt;/artifactId&gt;
-        &lt;configuration&gt;
-          &lt;helpfile&gt;path/to/your/resource/help-doc.html&lt;/helpfile&gt;
-          ...
-        &lt;/configuration&gt;
-      &lt;/plugin&gt;
-    &lt;/plugins&gt;
-    ...
-  &lt;/build&gt;
-  ...
-  &lt;!-- Or the following
-  &lt;reporting&gt;
+  &lt;reporting&gt; (or &lt;build&gt;)
     &lt;plugins&gt;
       &lt;plugin&gt;
         &lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
         &lt;artifactId&gt;maven-javadoc-plugin&lt;/artifactId&gt;
+        &lt;version&gt;2.6.1&lt;/version&gt;
         &lt;configuration&gt;
           &lt;helpfile&gt;path/to/your/resource/help-doc.html&lt;/helpfile&gt;
           ...
@@ -353,20 +340,20 @@
       &lt;/plugin&gt;
     &lt;/plugins&gt;
     ...
-  &lt;/reporting&gt;
-  --&gt;
+  &lt;/reporting&gt; (or &lt;/build&gt;)
   ...
 &lt;/project&gt;
 </pre>
 </div>
 </li>
-<li>since 2.6, &lt;helpfile/&gt; could be a resource in the Javadoc plugin dependencies, for instance:<div class="source"><pre>&lt;project&gt;
+<li>since 2.6, <a href="../javadoc-mojo.html#helpfile">&lt;helpfile/&gt;</a> could be a resource in the Javadoc plugin dependencies, for instance:<div class="source"><pre>&lt;project&gt;
   ...
   &lt;build&gt;
     &lt;plugins&gt;
       &lt;plugin&gt;
         &lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
         &lt;artifactId&gt;maven-javadoc-plugin&lt;/artifactId&gt;
+        &lt;version&gt;2.6.1&lt;/version&gt;
         &lt;configuration&gt;
           &lt;helpfile&gt;path/to/your/resource/help-doc.html&lt;/helpfile&gt;
         &lt;/configuration&gt;

Modified: websites/production/maventest/content/plugins/maven-javadoc-plugin-latest/examples/javadoc-resources.html
==============================================================================
--- websites/production/maventest/content/plugins/maven-javadoc-plugin-latest/examples/javadoc-resources.html (original)
+++ websites/production/maventest/content/plugins/maven-javadoc-plugin-latest/examples/javadoc-resources.html Sun Aug 19 17:31:42 2012
@@ -74,8 +74,8 @@
             
   
     
-            &nbsp;| Last Published: 2009-07-26
-              &nbsp;| Version: 2.6
+            &nbsp;| Last Published: 2009-10-23
+              &nbsp;| Version: 2.6.1
             </div>
       <div class="clear">
         <hr/>
@@ -303,26 +303,27 @@
     <div id="bodyColumn">
       <div id="contentBox">
         <div class="section"><h2>Using Javadoc Resources</h2>
-<p>The &lt;javadocDirectory/&gt; parameter can be used to include Javadoc resources like HTML or images. By default, all javadoc resources are in <i>${basedir}/src/main/javadoc</i> directory.</p>
+<p>The <a href="../javadoc-mojo.html#javadocDirectory">&lt;javadocDirectory/&gt;</a> parameter can be used to include Javadoc resources like HTML or images. By default, all javadoc resources are in <i>${basedir}/src/main/javadoc</i> directory.</p>
 <p>Here is a typical set of resources files used by the Maven Javadoc plugin:</p>
 <div class="source"><pre>
 yourproject
   |-- src
-    |-- main
-      |-- java
-      |  |-- org
-      |     |-- apache
-      |        |-- myapp
-      |         `-- App.java
-      |         `-- package-info.java
-      |-- javadoc
-       `-- overview.html
-         |-- org
-            |-- apache
-               |-- myapp
-                `-- package.html
-                  |-- doc-files
-                   `-- app.png
+     |-- main
+        |-- java
+        |  |-- org
+        |     |-- apache
+        |        |-- myapp
+        |         `-- App.java
+        |         `-- package-info.java
+        |-- javadoc
+         `-- overview.html
+           |-resources
+           |-- org
+              |-- apache
+                 |-- myapp
+                  `-- package.html
+                    |-- doc-files
+                     `-- app.png
 </pre>
 </div>
 <div class="section"><h3>Overview Comment File: <i>overview.html</i></h3>
@@ -340,7 +341,7 @@ yourproject
 &lt;/HTML&gt;
 </pre>
 </div>
-<p>By default, the Javadoc Plugin includes the <i>${basedir}/src/main/javadoc/overview.html</i> if it exists. You could also specify a specific <i>overview</i> file with the &lt;overview/&gt; parameter, for instance:</p>
+<p>By default, the Javadoc Plugin includes the <i>${basedir}/src/main/javadoc/overview.html</i> if it exists. You could also specify a specific <i>overview</i> file with the <a href="../javadoc-mojo.html#overview">&lt;overview/&gt;</a> parameter, for instance:</p>
 <div class="source"><pre>&lt;project&gt;
   ...
   &lt;reporting&gt;
@@ -348,7 +349,7 @@ yourproject
       &lt;plugin&gt;
         &lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
         &lt;artifactId&gt;maven-javadoc-plugin&lt;/artifactId&gt;
-        &lt;version&gt;2.5&lt;/version&gt;
+        &lt;version&gt;2.6.1&lt;/version&gt;
         &lt;configuration&gt;
           ...
           &lt;overview&gt;${basedir}/overview.html&lt;/overview&gt;
@@ -366,7 +367,7 @@ yourproject
 <div class="section"><h3>Package Comment File: <i>package.html</i></h3>
 <p>These contain package comments. The <i>package.html</i> is a brief summary of each packages in the list of all packages.</p>
 <p>For more information, see <a href="http://java.sun.com/j2se/1.4.2/docs/tooldocs/windows/javadoc.html#packagecomment" class="externalLink"> javadoc - The Java API Documentation Generator, Package Comment Files</a> and <a href="http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#packagecomments" class="externalLink"> How to Write Doc Comments for the Javadoc Tool, Package-Level Comments</a>.</p>
-<p>Here is an example of a <i>package.html</i> file, located in <i>${basedir}/src/main/javadoc/org/apache/test/package.html</i>:</p>
+<p>Here is an example of a <i>package.html</i> file, located in <i>${basedir}/src/main/javadoc/org/apache/myapp/package.html</i>:</p>
 <div class="source"><pre>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0 Transitional//EN&quot;&gt;
 &lt;HTML&gt;
   &lt;HEAD&gt;
@@ -381,20 +382,21 @@ yourproject
 </div>
 <p><b>Note</b>: With Javadoc 5.0, this file becomes <i>package-info.java</i> and is preferred over <i>package.html</i>.</p>
 <p>For more information, see <a href="http://java.sun.com/j2se/1.5.0/docs/tooldocs/windows/javadoc.html#packagecomment" class="externalLink"> javadoc - The Java API Documentation Generator, Package Comment Files</a>.</p>
-<p>Here is an example of a <i>package-info.java</i> file, located in <i>${basedir}/src/main/java/org/apache/test/package-info.java</i>:</p>
+<p>Here is an example of a <i>package-info.java</i> file, located in <i>${basedir}/src/main/java/org/apache/myapp/package-info.java</i>:</p>
 <div class="source"><pre>/**
  * This is the core package for the application
  * @since 1.0
  */
-package org.apache.test;
+package org.apache.myapp;
 </pre>
 </div>
 </div>
 <div class="section"><h3>Miscellaneous Unprocessed Files: <i>doc-files</i></h3>
 <p>These include images, sample source code, class files, applets, HTML files...</p>
-<p>For more information, see <a href="http://java.sun.com/j2se/1.4.2/docs/tooldocs/solaris/javadoc.html#unprocessed" class="externalLink"> javadoc - The Java API Documentation Generator, Miscellaneous Unprocessed Files</a> and <a href="http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#images" class="externalLink"> How to Write Doc Comments for the Javadoc Tool, Including Images </a>.</p>
-<p>Here is a sample javadoc comment to use images, located in <i>${basedir}/src/main/javadoc/org/apache/test/doc-files</i> directory:</p>
-<div class="source"><pre>package org.apache.test;
+<p>For more information, see <a href="http://java.sun.com/j2se/1.4.2/docs/tooldocs/solaris/javadoc.html#unprocessed" class="externalLink"> javadoc - The Java API Documentation Generator, Miscellaneous Unprocessed Files</a> and <a href="http://java.sun.com/j2se/javadoc/writingdoccomments/index.html#images" class="externalLink">How to Write Doc Comments for the Javadoc Tool, Including Images </a>.</p>
+<p>In addition to <i>doc-files</i> directories, since 2.6.1, the specific <i>src/main/javadoc/resources</i> directory will be copied to the generated Javadoc resources directory (i.e. <i>apidocs/resources</i>). This is usefull when you want to overwite default Javadoc tool resources, like the default <i>inherit.gif</i> to one with a transparent background (See <a href="../images/inherit.gif">GIF</a> or <a href="../images/inherit.psd">PSD</a>).</p>
+<p>Here is a sample javadoc comment to use <i>app.png</i> image, located in <i>${basedir}/src/main/javadoc/org/apache/myapp/doc-files</i> directory:</p>
+<div class="source"><pre>package org.apache.myapp;
 
 /**
  * The main Class launches the application.
@@ -405,7 +407,7 @@ public class App
 }
 </pre>
 </div>
-<p><b>Note</b>: You need to run the Javadoc Plugin with the <tt>docfilessubdirs</tt> parameter to allow the copy of unprocessed files.</p>
+<p><b>IMPORTANT NOTE</b>: To allow the copy of unprocessed files, you need to run the Javadoc Plugin with the <a href="../javadoc-mojo.html#docfilessubdirs">&lt;docfilessubdirs/&gt;</a> parameter.</p>
 </div>
 </div>
 

Modified: websites/production/maventest/content/plugins/maven-javadoc-plugin-latest/examples/links-configuration.html
==============================================================================
--- websites/production/maventest/content/plugins/maven-javadoc-plugin-latest/examples/links-configuration.html (original)
+++ websites/production/maventest/content/plugins/maven-javadoc-plugin-latest/examples/links-configuration.html Sun Aug 19 17:31:42 2012
@@ -74,8 +74,8 @@
             
   
     
-            &nbsp;| Last Published: 2009-07-26
-              &nbsp;| Version: 2.6
+            &nbsp;| Last Published: 2009-10-23
+              &nbsp;| Version: 2.6.1
             </div>
       <div class="clear">
         <hr/>
@@ -303,14 +303,15 @@
     <div id="bodyColumn">
       <div id="contentBox">
         <div class="section"><h2>Configuring <tt>links</tt> Parameter</h2>
-<p>You could add cross reference links to external projects. For instance:</p>
+<p>You could add cross reference links to external projects using the <a href="../javadoc-mojo.html">&lt;links/&gt;</a> parameters. For instance:</p>
 <div class="source"><pre>&lt;project&gt;
   ...
-  &lt;build&gt;
+  &lt;reporting&gt; (or &lt;build&gt;)
     &lt;plugins&gt;
       &lt;plugin&gt;
         &lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
         &lt;artifactId&gt;maven-javadoc-plugin&lt;/artifactId&gt;
+        &lt;version&gt;2.6.1&lt;/version&gt;
         &lt;configuration&gt;
           &lt;links&gt;
             &lt;link&gt;http://commons.apache.org/dbcp/apidocs/&lt;/link&gt;
@@ -320,13 +321,13 @@
         &lt;/configuration&gt;
       &lt;/plugin&gt;
     &lt;/plugins&gt;
-  &lt;/build&gt;
+  &lt;/reporting&gt; (or &lt;/build&gt;)
   ...
 &lt;/project&gt;
 </pre>
 </div>
 <p><b>Important Note</b>: according the <a href="http://java.sun.com/j2se/1.4.2/docs/tooldocs/windows/javadoc.html#package-list" class="externalLink">Javadoc specifications</a>, all given links <b>should</b> have a fetchable <tt>/package-list</tt> file.</p>
-<p>Since 2.6, you could try to detect all Javadoc links for the project's dependencies. You need to use the <a href="../javadoc-mojo.html#detectLinks">detectLinks</a> parameter. All detected links are based on the default Maven conventions. For instance, if your project has a dependency to <a href="http://commons.apache.org/lang/" class="externalLink">Apache Commons Lang</a> i.e.:</p>
+<p>Since 2.6, you could try to detect all Javadoc links for the project's dependencies. You need to use the <a href="../javadoc-mojo.html#detectLinks">&lt;detectLinks/&gt;</a> parameter. All detected links are based on the default Maven conventions. For instance, if your project has a dependency to <a href="http://commons.apache.org/lang/" class="externalLink">Apache Commons Lang</a> i.e.:</p>
 <div class="source"><pre>&lt;project&gt;
   ...
   &lt;dependencies&gt;
@@ -341,18 +342,20 @@
 </pre>
 </div>
 <p>The added Javadoc link will be <a href="http://commons.apache.org/lang/apidocs" class="externalLink">http://commons.apache.org/lang/apidocs</a>.</p>
-<p>Since 2.6, a <a href="http://java.sun.com/reference/api/index.html" class="externalLink">Javadoc API</a> link, depending the JDK version used by your project, will be added. The version of the Javadoc API is detected from the value of the <tt><a href="http://maven.apache.org/plugins/maven-compiler-plugin/compile-mojo.html#source" class="externalLink">source</a></tt> parameter in the <tt><a href="http://maven.apache.org/plugins/maven-compiler-plugin" class="externalLink">org.apache.maven.plugins:maven-compiler-plugin</a></tt> (defined in ${project.build.plugins} or in ${project.build.pluginManagement}), or computed via the Javadoc Tool executable. If you want to skip this link, you need to configure <a href="../javadoc-mojo.html#detectJavaApiLink">detectJavaApiLink</a> to <tt>false</tt>.</p>
-<p><b>Note</b>: if you are using an unsupported JDK like 7.0, you could add its Javadoc API url using the <a href="../javadoc-mojo.html#javaApiLinks">javaApiLinks</a> parameter, i.e.:</p>
-<div class="source"><pre> &lt;javaApiLinks&gt;
-   ...
-   &lt;property&gt;
-     &lt;name&gt;api_1.7&lt;/name&gt;
-     &lt;value&gt;http://download.java.net/jdk7/docs/api/&lt;/value&gt;
-   &lt;/property&gt;
- &lt;/javaApiLinks&gt;
+<p>Since 2.6, a <a href="http://java.sun.com/reference/api/index.html" class="externalLink">Javadoc API</a> link, depending the JDK version used by your project, will be added. The version of the Javadoc API is detected from the value of the <a href="http://maven.apache.org/plugins/maven-compiler-plugin/compile-mojo.html#source" class="externalLink">&lt;source/&gt;</a> parameter in the <tt><a href="http://maven.apache.org/plugins/maven-compiler-plugin" class="externalLink">org.apache.maven.plugins:maven-compiler-plugin</a></tt> (defined in ${project.build.plugins} or in ${project.build.pluginManagement}), or computed via the Javadoc Tool executable. If you want to skip this link, you need to configure <a href="../javadoc-mojo.html#detectJavaApiLink">&lt;detectJavaApiLink/&gt;</a> to <tt>false</tt>.</p>
+<p><b>Note</b>: if you are using an unsupported JDK like 7.0, you could add its Javadoc API url using the <a href="../javadoc-mojo.html#javaApiLinks">&lt;javaApiLinks/&gt;</a> parameter, i.e.:</p>
+<div class="source"><pre>&lt;configuration&gt;
+  &lt;javaApiLinks&gt;
+    &lt;property&gt;
+      &lt;name&gt;api_1.7&lt;/name&gt;
+      &lt;value&gt;http://download.java.net/jdk7/docs/api/&lt;/value&gt;
+    &lt;/property&gt;
+  &lt;/javaApiLinks&gt;
+  ...
+&lt;/configuration&gt;
 </pre>
 </div>
-<p>Refer to <a href="../javadoc-mojo.html#links">links</a> parameter for more information.</p>
+<p>Refer to <a href="../javadoc-mojo.html">&lt;links/&gt;</a> parameter for more information.</p>
 </div>
 <div class="section"><h2>Configuring <tt>offlineLinks</tt> Parameter</h2>
 <p>If your project has modules, you could add cross reference links to your modules when your goals are not aggregator goals. For instance, if your project has two modules i.e.:</p>
@@ -368,8 +371,8 @@
 </div>
 <p>The offlineLinks for <b>module1</b> will be <tt>/absolute/path/to/</tt><b>module2</b><tt>/target/site/apidocs</tt> and the offlineLinks for <b>module2</b> will be <tt>/absolute/path/to/</tt><b>module1</b><tt>/target/site/apidocs</tt>.</p>
 <p><b>Important Note</b>: all offlinelinks are based on the ${project.url} if present.</p>
-<p>Since 2.6, you could disable the cross reference for <tt>offlineLinks</tt> using the <a href="../javadoc-mojo.html#detectOfflineLinks">detectOfflineLinks</a> parameter.</p>
-<p>Refer to <a href="../javadoc-mojo.html#offlineLinks">offlineLinks</a> parameter for more information.</p>
+<p>Since 2.6, you could disable the cross reference for <tt>offlineLinks</tt> using the <a href="../javadoc-mojo.html#detectOfflineLinks">&lt;detectOfflineLinks/&gt;</a> parameter.</p>
+<p>Refer to <a href="../javadoc-mojo.html#offlineLinks">&lt;offlineLinks/&gt;</a> parameter for more information.</p>
 </div>
 
       </div>

Modified: websites/production/maventest/content/plugins/maven-javadoc-plugin-latest/examples/output-configuration.html
==============================================================================
--- websites/production/maventest/content/plugins/maven-javadoc-plugin-latest/examples/output-configuration.html (original)
+++ websites/production/maventest/content/plugins/maven-javadoc-plugin-latest/examples/output-configuration.html Sun Aug 19 17:31:42 2012
@@ -74,8 +74,8 @@
             
   
     
-            &nbsp;| Last Published: 2009-07-26
-              &nbsp;| Version: 2.6
+            &nbsp;| Last Published: 2009-10-23
+              &nbsp;| Version: 2.6.1
             </div>
       <div class="clear">
         <hr/>
@@ -311,7 +311,7 @@
       &lt;plugin&gt;
         &lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
         &lt;artifactId&gt;maven-javadoc-plugin&lt;/artifactId&gt;
-        &lt;version&gt;2.5&lt;/version&gt;
+        &lt;version&gt;2.6.1&lt;/version&gt;
         &lt;configuration&gt;
           &lt;reportOutputDirectory&gt;${project.reporting.outputDirectory}/myoutput&lt;/reportOutputDirectory&gt;
           &lt;destDir&gt;myapidocs&lt;/destDir&gt;

Modified: websites/production/maventest/content/plugins/maven-javadoc-plugin-latest/examples/selective-javadocs-report.html
==============================================================================
--- websites/production/maventest/content/plugins/maven-javadoc-plugin-latest/examples/selective-javadocs-report.html (original)
+++ websites/production/maventest/content/plugins/maven-javadoc-plugin-latest/examples/selective-javadocs-report.html Sun Aug 19 17:31:42 2012
@@ -74,8 +74,8 @@
             
   
     
-            &nbsp;| Last Published: 2009-07-26
-              &nbsp;| Version: 2.6
+            &nbsp;| Last Published: 2009-10-23
+              &nbsp;| Version: 2.6.1
             </div>
       <div class="clear">
         <hr/>
@@ -303,7 +303,43 @@
     <div id="bodyColumn">
       <div id="contentBox">
         <div class="section"><h2>Selective Javadocs Reports</h2>
-<p>To run the Javadocs reports selectively, you need to include only the Javadocs reports that you prefer. Use &quot;mvn site&quot; to generate the selected reports.</p>
+<p>To run the Javadocs reports selectively, you need to include only the Javadocs reports that you prefer. As said in the <a href="../faq.html#Where_in_the_pom.xml_do_I_configure_the_Javadoc_Plugin">FAQ</a>, the configuration depends on the &lt;build/&gt; tag or &lt;reporting/&gt; tag used.</p>
+<div class="section"><h3>Using &lt;build/&gt; Tag</h3>
+<div class="source"><pre>&lt;project&gt;
+  ...
+  &lt;build&gt;
+    &lt;plugins&gt;
+      &lt;plugin&gt;
+        &lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
+        &lt;artifactId&gt;maven-javadoc-plugin&lt;/artifactId&gt;
+        &lt;version&gt;2.6.1&lt;/version&gt;
+        &lt;configuration&gt;
+          &lt;!-- Default configuration for all reports --&gt;
+          ...
+        &lt;/configuration&gt;
+        &lt;executions&gt;
+          &lt;execution&gt;
+            &lt;goals&gt;
+              &lt;goal&gt;javadoc&lt;/goal&gt;
+              &lt;goal&gt;test-javadoc&lt;/goal&gt;
+            &lt;/goals&gt;
+            &lt;phase&gt;site&lt;/phase&gt;
+            &lt;configuration&gt;
+              &lt;!-- Specific configuration for the given reports --&gt;
+              ...
+            &lt;/configuration&gt;
+          &lt;/execution&gt;
+        &lt;/executions&gt;
+      &lt;/plugin&gt;
+    &lt;/plugins&gt;
+  &lt;/build&gt;
+  ...
+&lt;/project&gt;
+</pre>
+</div>
+<p>Since the phase is <tt>site</tt>, you need to call <tt>mvn site</tt> to generate the selected reports (only main and test javadocs).</p>
+</div>
+<div class="section"><h3>Using &lt;reporting/&gt; Tag</h3>
 <div class="source"><pre>
 &lt;project&gt;
   ...
@@ -312,15 +348,31 @@
       &lt;plugin&gt;
         &lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
         &lt;artifactId&gt;maven-javadoc-plugin&lt;/artifactId&gt;
-        &lt;version&gt;2.5&lt;/version&gt;
+        &lt;version&gt;2.6.1&lt;/version&gt;
         &lt;configuration&gt;
+          &lt;!-- Default configuration for all reports --&gt;
           ...
         &lt;/configuration&gt;
         &lt;reportSets&gt;
           &lt;reportSet&gt;
+            &lt;id&gt;default&lt;/id&gt;
+            &lt;configuration&gt;
+              &lt;!-- Specific configuration for the given reports --&gt;
+              ...
+            &lt;/configuration&gt;
             &lt;reports&gt;
               &lt;report&gt;javadoc&lt;/report&gt;
-              &lt;!-- &lt;report&gt;test-javadoc&lt;/report&gt; --&gt;
+              &lt;report&gt;test-javadoc&lt;/report&gt;
+            &lt;/reports&gt;
+          &lt;/reportSet&gt;
+          &lt;reportSet&gt;
+            &lt;id&gt;aggregate&lt;/id&gt;
+            &lt;configuration&gt;
+              &lt;!-- Specific configuration for the given reports --&gt;
+              ...
+            &lt;/configuration&gt;
+            &lt;reports&gt;
+              &lt;report&gt;aggregate&lt;/report&gt;
             &lt;/reports&gt;
           &lt;/reportSet&gt;
         &lt;/reportSets&gt;
@@ -331,6 +383,8 @@
 &lt;/project&gt;
 </pre>
 </div>
+<p>Just call <tt>mvn site</tt> to generate the selected reports (main, test and aggregate javadocs).</p>
+</div>
 </div>
 
       </div>

Modified: websites/production/maventest/content/plugins/maven-javadoc-plugin-latest/examples/stylesheet-configuration.html
==============================================================================
--- websites/production/maventest/content/plugins/maven-javadoc-plugin-latest/examples/stylesheet-configuration.html (original)
+++ websites/production/maventest/content/plugins/maven-javadoc-plugin-latest/examples/stylesheet-configuration.html Sun Aug 19 17:31:42 2012
@@ -75,8 +75,8 @@ Vincent Siveton" />
             
   
     
-            &nbsp;| Last Published: 2009-07-26
-              &nbsp;| Version: 2.6
+            &nbsp;| Last Published: 2009-10-23
+              &nbsp;| Version: 2.6.1
             </div>
       <div class="clear">
         <hr/>
@@ -304,15 +304,15 @@ Vincent Siveton" />
     <div id="bodyColumn">
       <div id="contentBox">
         <div class="section"><h2>Configuring Stylesheets</h2>
-<p>If no custom stylesheet is specified in the &lt;stylesheetfile/&gt; parameter, the &lt;stylesheet/&gt; parameter will indicate which stylesheet will be used -- the stylesheet included in the maven javadoc plugin or the default stylesheet used by the javadoc tool. <b>maven</b> value indicates the maven javadoc plugin stylesheet, while <b>java</b> value indicates the default javadoc tool stylesheet. The default is <b>java</b> value if not specified.</p>
+<p>If no custom stylesheet is specified in the <a href="../javadoc-mojo.html#stylesheetfile">&lt;stylesheetfile/&gt;</a> parameter, the <a href="../javadoc-mojo.html#stylesheet">&lt;stylesheet/&gt;</a> parameter will indicate which stylesheet will be used -- the stylesheet included in the maven javadoc plugin or the default stylesheet used by the javadoc tool. <b>maven</b> value indicates the maven javadoc plugin stylesheet, while <b>java</b> value indicates the default javadoc tool stylesheet. The default is <b>java</b> value if not specified.</p>
 <div class="source"><pre>&lt;project&gt;
   ...
-  &lt;reporting&gt;
+  &lt;reporting&gt; (or &lt;build&gt;)
     &lt;plugins&gt;
       &lt;plugin&gt;
         &lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
         &lt;artifactId&gt;maven-javadoc-plugin&lt;/artifactId&gt;
-        &lt;version&gt;2.5&lt;/version&gt;
+        &lt;version&gt;2.6.1&lt;/version&gt;
         &lt;configuration&gt;
           &lt;stylesheet&gt;maven&lt;/stylesheet&gt;
           ...
@@ -320,21 +320,22 @@ Vincent Siveton" />
       &lt;/plugin&gt;
     &lt;/plugins&gt;
     ...
-  &lt;/reporting&gt;
+  &lt;/reporting&gt; (or &lt;/build&gt;)
   ...
 &lt;/project&gt;
 </pre>
 </div>
 </div>
 <div class="section"><h2>Configuring Stylesheets File</h2>
-<p>If a custom &lt;stylesheetfile/&gt; parameter is specified, you will be able to use it:</p>
-<ul><li>if &lt;stylesheetfile/&gt; is a given file, you could use an absolute or a relative path, for instance:<div class="source"><pre>&lt;project&gt;
+<p>If a custom <a href="../javadoc-mojo.html#stylesheetfile">&lt;stylesheetfile/&gt;</a> parameter is specified, you will be able to use it:</p>
+<ul><li>if <a href="../javadoc-mojo.html#stylesheetfile">&lt;stylesheetfile/&gt;</a> is a given file, you could use an absolute or a relative path, for instance:<div class="source"><pre>&lt;project&gt;
   ...
-  &lt;reporting&gt;
+  &lt;reporting&gt; (or &lt;build&gt;)
     &lt;plugins&gt;
       &lt;plugin&gt;
         &lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
         &lt;artifactId&gt;maven-javadoc-plugin&lt;/artifactId&gt;
+        &lt;version&gt;2.6.1&lt;/version&gt;
         &lt;configuration&gt;
           &lt;stylesheetfile&gt;${basedir}/path/to/your/stylesheetfile.css&lt;/stylesheetfile&gt;
           ...
@@ -342,34 +343,20 @@ Vincent Siveton" />
       &lt;/plugin&gt;
     &lt;/plugins&gt;
     ...
-  &lt;/reporting&gt;
+  &lt;/reporting&gt; (or &lt;/build&gt;)
   ...
 &lt;/project&gt;
 </pre>
 </div>
 </li>
-<li>since 2.6, &lt;stylesheetfile/&gt; could be a resource in your project directory, i.e. <tt>src/main/java</tt>, <tt>src/main/resources</tt> or <tt>src/main/javadoc</tt>, for instance:<div class="source"><pre>&lt;project&gt;
+<li>since 2.6, <a href="../javadoc-mojo.html#stylesheetfile">&lt;stylesheetfile/&gt;</a> could be a resource in your project directory, i.e. <tt>src/main/java</tt>, <tt>src/main/resources</tt> or <tt>src/main/javadoc</tt>, for instance:<div class="source"><pre>&lt;project&gt;
   ...
-  &lt;build&gt;
-    &lt;plugins&gt;
-      &lt;plugin&gt;
-        &lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
-        &lt;artifactId&gt;maven-javadoc-plugin&lt;/artifactId&gt;
-        &lt;configuration&gt;
-          &lt;stylesheetfile&gt;path/to/your/stylesheet.css&lt;/stylesheetfile&gt;
-          ...
-        &lt;/configuration&gt;
-      &lt;/plugin&gt;
-    &lt;/plugins&gt;
-    ...
-  &lt;/build&gt;
-  ...
-  &lt;!-- Or the following
-  &lt;reporting&gt;
+  &lt;reporting&gt; (or &lt;build&gt;)
     &lt;plugins&gt;
       &lt;plugin&gt;
         &lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
         &lt;artifactId&gt;maven-javadoc-plugin&lt;/artifactId&gt;
+        &lt;version&gt;2.6.1&lt;/version&gt;
         &lt;configuration&gt;
           &lt;stylesheetfile&gt;path/to/your/stylesheet.css&lt;/stylesheetfile&gt;
           ...
@@ -377,20 +364,20 @@ Vincent Siveton" />
       &lt;/plugin&gt;
     &lt;/plugins&gt;
     ...
-  &lt;/reporting&gt;
-  --&gt;
+  &lt;/reporting&gt; (or &lt;/build&gt;)
   ...
 &lt;/project&gt;
 </pre>
 </div>
 </li>
-<li>since 2.6, &lt;stylesheetfile/&gt; could be a resource in the Javadoc plugin dependencies, for instance:<div class="source"><pre>&lt;project&gt;
+<li>since 2.6, <a href="../javadoc-mojo.html#stylesheetfile">&lt;stylesheetfile/&gt;</a> could be a resource in the Javadoc plugin dependencies, for instance:<div class="source"><pre>&lt;project&gt;
   ...
   &lt;build&gt;
     &lt;plugins&gt;
       &lt;plugin&gt;
         &lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
         &lt;artifactId&gt;maven-javadoc-plugin&lt;/artifactId&gt;
+        &lt;version&gt;2.6.1&lt;/version&gt;
         &lt;configuration&gt;
           &lt;stylesheetfile&gt;path/to/your/stylesheet.css&lt;/stylesheetfile&gt;
         &lt;/configuration&gt;

Modified: websites/production/maventest/content/plugins/maven-javadoc-plugin-latest/examples/tag-configuration.html
==============================================================================
--- websites/production/maventest/content/plugins/maven-javadoc-plugin-latest/examples/tag-configuration.html (original)
+++ websites/production/maventest/content/plugins/maven-javadoc-plugin-latest/examples/tag-configuration.html Sun Aug 19 17:31:42 2012
@@ -75,8 +75,8 @@ Maria Odea Ching" />
             
   
     
-            &nbsp;| Last Published: 2009-07-26
-              &nbsp;| Version: 2.6
+            &nbsp;| Last Published: 2009-10-23
+              &nbsp;| Version: 2.6.1
             </div>
       <div class="clear">
         <hr/>
@@ -304,21 +304,31 @@ Maria Odea Ching" />
     <div id="bodyColumn">
       <div id="contentBox">
         <div class="section"><h2>Configuring Custom Javadoc Tags</h2>
-<p>You can configure any custom tags used in your javadoc via the &lt;tags/&gt; element:</p>
+<p>To configure any custom tags, use <a href="../javadoc-mojo.html#tags">&lt;tags/&gt;</a> parameter as shown below. Each tag will be consist of a &lt;name/&gt;, a &lt;placement/&gt; and a &lt;head/&gt;. The &lt;placement/&gt; should be a combination of the letters Xaoptcmf:</p>
+<ul><li>X (disable tag)</li>
+<li>a (all)</li>
+<li>o (overview)</li>
+<li>p (packages)</li>
+<li>t (types, that is classes and interfaces)</li>
+<li>c (constructors)</li>
+<li>m (methods)</li>
+<li>f (fields)</li>
+</ul>
+<p>For instance, with the following configuration:</p>
 <div class="source"><pre>&lt;project&gt;
   ...
-  &lt;reporting&gt;
+  &lt;reporting&gt; (or &lt;build&gt;)
     &lt;plugins&gt;
       &lt;plugin&gt;
         &lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
         &lt;artifactId&gt;maven-javadoc-plugin&lt;/artifactId&gt;
-        &lt;version&gt;2.5&lt;/version&gt;
+        &lt;version&gt;2.6.1&lt;/version&gt;
         &lt;configuration&gt;
           ...
           &lt;tags&gt;
             &lt;tag&gt;
               &lt;name&gt;todo&lt;/name&gt;
-              &lt;!-- Should be a combination of the letters Xaoptcmf --&gt;
+              &lt;!-- todo tag for all places --&gt;
               &lt;placement&gt;a&lt;/placement&gt;
               &lt;head&gt;To do something:&lt;/head&gt;
             &lt;/tag&gt;
@@ -328,11 +338,30 @@ Maria Odea Ching" />
       &lt;/plugin&gt;
     &lt;/plugins&gt;
     ...
-  &lt;/reporting&gt;
+  &lt;/reporting&gt; (or &lt;/build&gt;)
   ...
 &lt;/project&gt;
 </pre>
 </div>
+<p>and with the following todo tag in a class:</p>
+<div class="source"><pre>/**
+ * Hello world!
+ *
+ * @todo complete me!
+ */
+public class App {}
+</pre>
+</div>
+<p>the Javadoc tool will generate the following Javadoc:</p>
+<div class="source"><pre>public class App
+extends Object
+
+Hello world!
+
+To do something:
+    complete me!
+</pre>
+</div>
 </div>
 
       </div>

Modified: websites/production/maventest/content/plugins/maven-javadoc-plugin-latest/examples/taglet-configuration.html
==============================================================================
--- websites/production/maventest/content/plugins/maven-javadoc-plugin-latest/examples/taglet-configuration.html (original)
+++ websites/production/maventest/content/plugins/maven-javadoc-plugin-latest/examples/taglet-configuration.html Sun Aug 19 17:31:42 2012
@@ -74,8 +74,8 @@
             
   
     
-            &nbsp;| Last Published: 2009-07-26
-              &nbsp;| Version: 2.6
+            &nbsp;| Last Published: 2009-10-23
+              &nbsp;| Version: 2.6.1
             </div>
       <div class="clear">
         <hr/>
@@ -303,18 +303,18 @@
     <div id="bodyColumn">
       <div id="contentBox">
         <div class="section"><h2>Configuring Custom Taglets</h2>
-<p>You could configure any custom taglets in your Javadoc Plugin configuration via the &lt;taglet/&gt;, &lt;taglets/&gt; or &lt;tagletArtifacts/&gt; elements, depending the number of taglets used.</p>
+<p>You could configure any custom taglets in your Javadoc Plugin configuration via the <a href="../javadoc-mojo.html#taglet">&lt;taglet/&gt;</a>, <a href="../javadoc-mojo.html#taglets">&lt;taglets/&gt;</a>, or <a href="../javadoc-mojo.html#tagletArtifacts">&lt;tagletArtifacts/&gt;</a> parameters, depending the number of taglets used.</p>
 <p>For more information about the taglet technology, please refer to <a href="http://java.sun.com/j2se/1.4.2/docs/tooldocs/javadoc/taglet/overview.html" class="externalLink">http://java.sun.com/j2se/1.4.2/docs/tooldocs/javadoc/taglet/overview.html</a>.</p>
 <div class="section"><h3>One Taglet</h3>
-<p>For one known Taglet, just use the &lt;taglet/&gt; element:</p>
+<p>For one known Taglet, just use the <a href="../javadoc-mojo.html#taglet">&lt;taglet/&gt;</a> parameter:</p>
 <div class="source"><pre>&lt;project&gt;
   ...
-  &lt;reporting&gt;
+  &lt;reporting&gt; (or &lt;build&gt;)
     &lt;plugins&gt;
       &lt;plugin&gt;
         &lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
         &lt;artifactId&gt;maven-javadoc-plugin&lt;/artifactId&gt;
-        &lt;version&gt;2.5&lt;/version&gt;
+        &lt;version&gt;2.6.1&lt;/version&gt;
         &lt;configuration&gt;
           ...
           &lt;taglet&gt;package.to.YourTagletClass&lt;/taglet&gt;
@@ -329,22 +329,22 @@
       &lt;/plugin&gt;
     &lt;/plugins&gt;
     ...
-  &lt;/reporting&gt;
+  &lt;/reporting&gt; (or &lt;/build&gt;)
   ...
 &lt;/project&gt;
 </pre>
 </div>
 </div>
 <div class="section"><h3>Several Taglets</h3>
-<p>For several known Taglets, just use the &lt;taglets/&gt; element:</p>
+<p>For several known Taglets, just use the <a href="../javadoc-mojo.html#taglets">&lt;taglets/&gt;</a> parameter:</p>
 <div class="source"><pre>&lt;project&gt;
   ...
-  &lt;reporting&gt;
+  &lt;reporting&gt; (or &lt;build&gt;)
     &lt;plugins&gt;
       &lt;plugin&gt;
         &lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
         &lt;artifactId&gt;maven-javadoc-plugin&lt;/artifactId&gt;
-        &lt;version&gt;2.5&lt;/version&gt;
+        &lt;version&gt;2.6.1&lt;/version&gt;
         &lt;configuration&gt;
           ...
           &lt;taglets&gt;
@@ -374,20 +374,20 @@
       &lt;/plugin&gt;
     &lt;/plugins&gt;
     ...
-  &lt;/reporting&gt;
+  &lt;/reporting&gt; (or &lt;/build&gt;)
   ...
 &lt;/project&gt;
 </pre>
 </div>
-<p>If it is several Taglets in the same Taglet artifact, you could use the &lt;taglets/&gt; and the &lt;tagletArtifact/&gt; elements:</p>
+<p>If it is several Taglets in the same Taglet artifact, you could use the <a href="../javadoc-mojo.html#taglets">&lt;taglets/&gt;</a> and the <a href="../javadoc-mojo.html#tagletArtifact">&lt;tagletArtifact/&gt;</a> parameters:</p>
 <div class="source"><pre>&lt;project&gt;
   ...
-  &lt;reporting&gt;
+  &lt;reporting&gt; (or &lt;build&gt;)
     &lt;plugins&gt;
       &lt;plugin&gt;
         &lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
         &lt;artifactId&gt;maven-javadoc-plugin&lt;/artifactId&gt;
-        &lt;version&gt;2.5&lt;/version&gt;
+        &lt;version&gt;2.6.1&lt;/version&gt;
         &lt;configuration&gt;
           ...
           &lt;taglets&gt;
@@ -411,20 +411,20 @@
       &lt;/plugin&gt;
     &lt;/plugins&gt;
     ...
-  &lt;/reporting&gt;
+  &lt;/reporting&gt; (or &lt;/build&gt;)
   ...
 &lt;/project&gt;
 </pre>
 </div>
-<p>If you don't know the Taglets or if you want to auto-detect Taglet class names, you could use the &lt;tagletArtifacts/&gt; element:</p>
+<p>If you don't know the Taglets or if you want to auto-detect Taglet class names, you could use the <a href="../javadoc-mojo.html#tagletArtifacts">&lt;tagletArtifacts/&gt;</a> parameter:</p>
 <div class="source"><pre>&lt;project&gt;
   ...
-  &lt;reporting&gt;
+  &lt;reporting&gt; (or &lt;build&gt;)
     &lt;plugins&gt;
       &lt;plugin&gt;
         &lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
         &lt;artifactId&gt;maven-javadoc-plugin&lt;/artifactId&gt;
-        &lt;version&gt;2.5&lt;/version&gt;
+        &lt;version&gt;2.6.1&lt;/version&gt;
         &lt;configuration&gt;
           ...
           &lt;tagletArtifacts&gt;
@@ -446,7 +446,7 @@
       &lt;/plugin&gt;
     &lt;/plugins&gt;
     ...
-  &lt;/reporting&gt;
+  &lt;/reporting&gt; (or &lt;/build&gt;)
   ...
 &lt;/project&gt;
 </pre>

Modified: websites/production/maventest/content/plugins/maven-javadoc-plugin-latest/examples/test-javadocs.html
==============================================================================
--- websites/production/maventest/content/plugins/maven-javadoc-plugin-latest/examples/test-javadocs.html (original)
+++ websites/production/maventest/content/plugins/maven-javadoc-plugin-latest/examples/test-javadocs.html Sun Aug 19 17:31:42 2012
@@ -74,8 +74,8 @@
             
   
     
-            &nbsp;| Last Published: 2009-07-26
-              &nbsp;| Version: 2.6
+            &nbsp;| Last Published: 2009-10-23
+              &nbsp;| Version: 2.6.1
             </div>
       <div class="clear">
         <hr/>
@@ -303,10 +303,6 @@
     <div id="bodyColumn">
       <div id="contentBox">
         <div class="section"><h2>Generating Test Javadocs</h2>
-<p>There are two ways to generate the test javadocs in the Maven Javadoc plugin:</p>
-<ul><li>using the javadoc:test-javadoc goal</li>
-<li>using the &lt;reportSets/&gt; configuration parameter</li>
-</ul>
 <p>Here is a typical project used by the Maven Javadoc plugin:</p>
 <div class="source"><pre>
 yourproject
@@ -346,12 +342,12 @@ yourproject
 <div class="source"><pre>
 &lt;project&gt;
   ...
-  &lt;reporting&gt;
+  &lt;build&gt;
     &lt;plugins&gt;
       &lt;plugin&gt;
         &lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
         &lt;artifactId&gt;maven-javadoc-plugin&lt;/artifactId&gt;
-        &lt;version&gt;2.5&lt;/version&gt;
+        &lt;version&gt;2.6.1&lt;/version&gt;
         &lt;configuration&gt;
           &lt;doctitle&gt;My API for ${project.name} ${project.version}&lt;/doctitle&gt; &lt;!-- Used by javadoc:javadoc goal --&gt;
           &lt;windowtitle&gt;My API for ${project.name} ${project.version}&lt;/windowtitle&gt; &lt;!-- Used by javadoc:javadoc goal --&gt;
@@ -362,14 +358,17 @@ yourproject
         &lt;/configuration&gt;
       &lt;/plugin&gt;
     &lt;/plugins&gt;
-  &lt;/reporting&gt;
+  &lt;/build&gt;
   ...
 &lt;/project&gt;
 </pre>
 </div>
 <p>You could call <i>mvn javadoc:test-javadoc</i> or <i>mvn site</i>. See <a href="../test-javadoc-mojo.html">javadoc:test-javadoc parameters</a> for more informations.</p>
-<p><b>Note</b>: If you don't set &lt;testDoctitle/&gt; or &lt;testWindowtitle/&gt; parameters, the Test Javadoc report use the same configuration (i.e. &lt;doctitle/&gt; or &lt;windowtitle/&gt; parameters) that Javadoc report (backward compatible reasons).</p>
-<p><b>Note</b>: To run the reports selectively, you need to include only the reports that you prefer. Read the <a href="selective-javadocs-report.html">Selective Javadocs Reports</a> part for more information.</p>
+<p><b>Notes</b>:</p>
+<ol type="1"><li>If you don't set &lt;testDoctitle/&gt; or &lt;testWindowtitle/&gt; parameters, the Test Javadoc report use the same configuration (i.e. &lt;doctitle/&gt; or &lt;windowtitle/&gt; parameters) that Javadoc report (backward compatible reasons).</li>
+<li>To run the reports selectively, you need to include only the reports that you prefer. Read the <a href="./selective-javadocs-report.html">Selective Javadocs Reports</a> part for more information.</li>
+<li>To allow the copy of resources, you need to add the &lt;docfilessubdirs/&gt; parameter. Read the <a href="./javadoc-resources.html">Using Javadoc Resources</a> page for more information.</li>
+</ol>
 </div>
 <div class="section"><h3>Using the &lt;reportSets/&gt; configuration parameter</h3>
 <p>You could also want a different kind of configuration for the Javadoc report and the test Javadoc report. For this, you need to configure the Maven Javadoc plugin in your pom.xml to handle the &lt;reportSets/&gt; configuration parameter, for instance:</p>
@@ -381,7 +380,7 @@ yourproject
       &lt;plugin&gt;
         &lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
         &lt;artifactId&gt;maven-javadoc-plugin&lt;/artifactId&gt;
-        &lt;version&gt;2.5&lt;/version&gt;
+        &lt;version&gt;2.6.1&lt;/version&gt;
         &lt;reportSets&gt;
           &lt;reportSet&gt;
             &lt;id&gt;html&lt;/id&gt;



Mime
View raw message