diff --git a/announcement/src/plugin-test/project.xml b/announcement/src/plugin-test/project.xml
index d16190ff..f4587919 100644
--- a/announcement/src/plugin-test/project.xml
+++ b/announcement/src/plugin-test/project.xml
@@ -33,8 +33,8 @@
http://maven.apache.org/images/maven.gif
Test for Maven Announcement plugin
Test for Maven Announcement plugin
- http://maven.apache.org/reference/plugins/announcement/
- /www/maven.apache.org/reference/plugins/announcement/
+ http://maven.apache.org/plugins/announcement/
+ /www/maven.apache.org/plugins/announcement/
scm:svn:http://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk/announcement/
http://svn.apache.org/viewcvs.cgi/maven/maven-1/plugins/trunk/announcement/
diff --git a/announcement/xdocs/index.xml b/announcement/xdocs/index.xml
index 956f3162..9dd5c694 100644
--- a/announcement/xdocs/index.xml
+++ b/announcement/xdocs/index.xml
@@ -40,7 +40,7 @@
The maven team is pleased to announce the Maven Announcement plugin 1.1
release!
-http://maven.apache.org/maven-1.x/reference/plugins/announcement/
+http://maven.apache.org/maven-1.x/plugins/announcement/
The Announcement plugin generates release announcements. It uses the
information found in both the POM and in the changes.xml file to generate the
diff --git a/announcement/xdocs/navigation.xml b/announcement/xdocs/navigation.xml
index 90b72302..6d688ece 100644
--- a/announcement/xdocs/navigation.xml
+++ b/announcement/xdocs/navigation.xml
@@ -23,13 +23,9 @@
+
+
-
-
-
-
-
-
diff --git a/developer-activity/xdocs/navigation.xml b/developer-activity/xdocs/navigation.xml
index 388940e2..bbc45aae 100644
--- a/developer-activity/xdocs/navigation.xml
+++ b/developer-activity/xdocs/navigation.xml
@@ -23,12 +23,10 @@
+
+
-
-
-
-
-
diff --git a/developer-activity/xdocs/properties.xml b/developer-activity/xdocs/properties.xml
index 19a97669..f962a490 100644
--- a/developer-activity/xdocs/properties.xml
+++ b/developer-activity/xdocs/properties.xml
@@ -24,7 +24,7 @@
diff --git a/dist/src/plugin-test/project.xml b/dist/src/plugin-test/project.xml
index 4da36e60..85f7b3f8 100644
--- a/dist/src/plugin-test/project.xml
+++ b/dist/src/plugin-test/project.xml
@@ -34,8 +34,8 @@
http://maven.apache.org/images/maven.jpg
Test for Maven Dist plugin
Test for Maven Dist plugin
- http://maven.apache.org/maven-1.x/reference/plugins/dist/
- /www/maven.apache.org/maven-1.x/reference/plugins/dist/
+ http://maven.apache.org/maven-1.x/plugins/dist/
+ /www/maven.apache.org/maven-1.x/plugins/dist/
scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/dist/
http://cvs.apache.org/viewcvs/maven/src/plugins-build/dist/
diff --git a/dist/xdocs/navigation.xml b/dist/xdocs/navigation.xml
index 5bcc1289..39b146dd 100644
--- a/dist/xdocs/navigation.xml
+++ b/dist/xdocs/navigation.xml
@@ -23,12 +23,10 @@
+
+
-
-
-
-
diff --git a/ear/src/plugin-test/project.xml b/ear/src/plugin-test/project.xml
index b4c1e334..afe8ea44 100644
--- a/ear/src/plugin-test/project.xml
+++ b/ear/src/plugin-test/project.xml
@@ -33,8 +33,8 @@
http://maven.apache.org/images/maven.gif
Test for Maven Ear plugin
Test for Maven Ear plugin
- http://maven.apache.org/maven-1.x/reference/plugins/ear/
- /www/maven.apache.org/maven-1.x/reference/plugins/ear/
+ http://maven.apache.org/maven-1.x/plugins/ear/
+ /www/maven.apache.org/maven-1.x/plugins/ear/
scm:svn:http://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk/ear/
http://svn.apache.org/viewcvs.cgi/maven/maven-1/plugins/trunk/ear/
diff --git a/ear/xdocs/navigation.xml b/ear/xdocs/navigation.xml
index e58c3aa1..5ee9e4cf 100644
--- a/ear/xdocs/navigation.xml
+++ b/ear/xdocs/navigation.xml
@@ -23,12 +23,10 @@
+
+
-
-
-
-
diff --git a/ear/xdocs/properties.xml b/ear/xdocs/properties.xml
index cea76927..aa5cf2d8 100644
--- a/ear/xdocs/properties.xml
+++ b/ear/xdocs/properties.xml
@@ -137,14 +137,14 @@
maven.build.dir |
where the component will be assembled |
- maven.build.dir
+ maven.build.dir
|
| maven.final.name |
The assembled component will be ${maven.build.dir}/${maven.final.name}.ear |
- maven.final.name
+ maven.final.name
|
diff --git a/eclipse/src/plugin-test/project.xml b/eclipse/src/plugin-test/project.xml
index 50dcb977..732c0ad5 100644
--- a/eclipse/src/plugin-test/project.xml
+++ b/eclipse/src/plugin-test/project.xml
@@ -34,8 +34,8 @@
http://maven.apache.org/images/maven.jpg
Test for Maven Eclipse plugin
Test for Maven Eclipse plugin
- http://maven.apache.org/maven-1.x/reference/plugins/eclipse/
- /www/maven.apache.org/maven-1.x/reference/plugins/eclipse/
+ http://maven.apache.org/maven-1.x/plugins/eclipse/
+ /www/maven.apache.org/maven-1.x/plugins/eclipse/
scm:svn:http://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk/eclipse/src/plugin-test
http://svn.apache.org/viewcvs.cgi/maven/maven-1/plugins/trunk/eclipse/src/plugin-test
diff --git a/eclipse/xdocs/navigation.xml b/eclipse/xdocs/navigation.xml
index 599e559b..f0e4da3a 100644
--- a/eclipse/xdocs/navigation.xml
+++ b/eclipse/xdocs/navigation.xml
@@ -23,12 +23,10 @@
+
+
-
-
-
-
diff --git a/ejb/xdocs/navigation.xml b/ejb/xdocs/navigation.xml
index e90bfa1b..ae97e878 100644
--- a/ejb/xdocs/navigation.xml
+++ b/ejb/xdocs/navigation.xml
@@ -23,12 +23,10 @@
+
+
-
-
-
-
diff --git a/examples/project.xml b/examples/project.xml
index 1850500a..ca397eef 100644
--- a/examples/project.xml
+++ b/examples/project.xml
@@ -53,10 +53,10 @@
A collection of example projects showing how to use maven in different situations
- http://maven.apache.org/maven-1.x/reference/plugins/examples/
+ http://maven.apache.org/maven-1.x/plugins/examples/
http://jira.codehaus.org/BrowseProject.jspa?id=10030
jakarta.apache.org
- /www/maven.apache.org/maven-1.x/reference/plugins/examples/
+ /www/maven.apache.org/maven-1.x/plugins/examples/
/www/maven.apache.org/builds/
- http://maven.apache.org/maven-1.x/reference/plugins/examples/
+ http://maven.apache.org/maven-1.x/plugins/examples/
http://issues.apache.org/scarab/servlet/scarab/
jakarta.apache.org
- /www/maven.apache.org/maven-1.x/reference/plugins/examples/
+ /www/maven.apache.org/maven-1.x/plugins/examples/
/www/maven.apache.org/builds/
- http://maven.apache.org/maven-1.x/reference/plugins/examples/
+ http://maven.apache.org/maven-1.x/plugins/examples/
http://issues.apache.org/scarab/servlet/scarab/
jakarta.apache.org
- /www/maven.apache.org/maven-1.x/reference/plugins/examples/
+ /www/maven.apache.org/maven-1.x/plugins/examples/
/www/maven.apache.org/builds/
- http://maven.apache.org/maven-1.x/reference/plugins/examples/
+ http://maven.apache.org/maven-1.x/plugins/examples/
http://issues.apache.org/scarab/servlet/scarab/
jakarta.apache.org
- /www/maven.apache.org/maven-1.x/reference/plugins/examples/
+ /www/maven.apache.org/maven-1.x/plugins/examples/
/www/maven.apache.org/builds/
- http://maven.apache.org/maven-1.x/reference/plugins/examples/
+ http://maven.apache.org/maven-1.x/plugins/examples/
http://issues.apache.org/scarab/servlet/scarab/
jakarta.apache.org
- /www/maven.apache.org/maven-1.x/reference/plugins/examples/
+ /www/maven.apache.org/maven-1.x/plugins/examples/
/www/maven.apache.org/builds/
- http://maven.apache.org/reference/plugins/examples/
+ http://maven.apache.org/plugins/examples/
http://nagoya.apache.org/scarab/servlet/scarab/
jakarta.apache.org
- /www/maven.apache.org/reference/plugins/examples/
+ /www/maven.apache.org/plugins/examples/
/www/maven.apache.org/builds/
- http://maven.apache.org/maven-1.x/reference/plugins/examples/
+ http://maven.apache.org/maven-1.x/plugins/examples/
http://issues.apache.org/scarab/servlet/scarab/
jakarta.apache.org
- /www/maven.apache.org/maven-1.x/reference/plugins/examples/
+ /www/maven.apache.org/maven-1.x/plugins/examples/
/www/maven.apache.org/builds/
- http://maven.apache.org/reference/plugins/examples/
+ http://maven.apache.org/plugins/examples/
http://nagoya.apache.org/scarab/servlet/scarab/
jakarta.apache.org
- /www/maven.apache.org/reference/plugins/examples/
+ /www/maven.apache.org/plugins/examples/
/www/maven.apache.org/builds/
- http://maven.apache.org/maven-1.x/reference/plugins/examples/
+ http://maven.apache.org/maven-1.x/plugins/examples/
http://issues.apache.org/scarab/servlet/scarab/
jakarta.apache.org
- /www/maven.apache.org/maven-1.x/reference/plugins/examples/
+ /www/maven.apache.org/maven-1.x/plugins/examples/
/www/maven.apache.org/builds/
- http://maven.apache.org/maven-1.x/reference/plugins/examples/
+ http://maven.apache.org/maven-1.x/plugins/examples/
http://issues.apache.org/scarab/servlet/scarab/
jakarta.apache.org
- /www/maven.apache.org/maven-1.x/reference/plugins/examples/
+ /www/maven.apache.org/maven-1.x/plugins/examples/
/www/maven.apache.org/builds/
- http://maven.apache.org/maven-1.x/reference/plugins/examples/
+ http://maven.apache.org/maven-1.x/plugins/examples/
http://issues.apache.org/scarab/servlet/scarab/
jakarta.apache.org
- /www/maven.apache.org/maven-1.x/reference/plugins/examples/
+ /www/maven.apache.org/maven-1.x/plugins/examples/
/www/maven.apache.org/builds/
-
-
-
-
-
-
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
-
+
+
diff --git a/plugins-site/project.xml b/plugins-site/project.xml
index caf52050..1c5c587b 100644
--- a/plugins-site/project.xml
+++ b/plugins-site/project.xml
@@ -30,10 +30,10 @@
2001
org.apache.maven
http://maven.apache.org/images/maven-logo-2.gif
- http://maven.apache.org/maven-1.x/reference/plugins/
+ http://maven.apache.org/maven-1.x/plugins/bundled/
http://jira.codehaus.org/BrowseProject.jspa?id=10030
people.apache.org
- /www/maven.apache.org/maven-1.x/reference/plugins/
+ /www/maven.apache.org/maven-1.x/plugins/bundled/
people.apache.org
/www/www.apache.org/dist/java-repository/
@@ -197,7 +197,7 @@
- plugins:site
+ multiproject:site
maven-dashboard-plugin
diff --git a/plugins-site/xdocs/navigation.xml b/plugins-site/xdocs/navigation.xml
index 6e3abea9..337610f7 100644
--- a/plugins-site/xdocs/navigation.xml
+++ b/plugins-site/xdocs/navigation.xml
@@ -16,19 +16,16 @@
* limitations under the License.
*/
-->
-
- Maven Plugins
+
+ Maven Plugins Bundled
+
-
-
-
-
diff --git a/pmd/src/plugin-test/project.xml b/pmd/src/plugin-test/project.xml
index 4a190a3d..7b5a2f93 100644
--- a/pmd/src/plugin-test/project.xml
+++ b/pmd/src/plugin-test/project.xml
@@ -34,8 +34,8 @@
http://maven.apache.org/images/maven.jpg
Test for Maven PMD plugin
Test for Maven PMD plugin
- http://maven.apache.org/maven-1.x/reference/plugins/pmd/
- /www/maven.apache.org/maven-1.x/reference/plugins/pmd/
+ http://maven.apache.org/maven-1.x/plugins/pmd/
+ /www/maven.apache.org/maven-1.x/plugins/pmd/
scm:svn:http://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk/pmd/
http://svn.apache.org/viewcvs.cgi/maven/maven-1/plugins/trunk/pmd/
diff --git a/pmd/xdocs/navigation.xml b/pmd/xdocs/navigation.xml
index 5fd9b09f..e110336e 100644
--- a/pmd/xdocs/navigation.xml
+++ b/pmd/xdocs/navigation.xml
@@ -23,12 +23,10 @@
+
+
-
-
-
-
diff --git a/pom/xdocs/navigation.xml b/pom/xdocs/navigation.xml
index 9d59ab25..5eee38b0 100644
--- a/pom/xdocs/navigation.xml
+++ b/pom/xdocs/navigation.xml
@@ -23,12 +23,10 @@
+
+
-
-
-
-
diff --git a/rar/src/plugin-test/project.xml b/rar/src/plugin-test/project.xml
index f980f8dd..4e2c219d 100644
--- a/rar/src/plugin-test/project.xml
+++ b/rar/src/plugin-test/project.xml
@@ -33,7 +33,7 @@ http://maven.apache.org/maven-v3_0_0.xsd">
http://bugzilla
www.fooserver.org
- /www/maven.apache.org/maven-1.x/reference/plugins/rar/
+ /www/maven.apache.org/maven-1.x/plugins/rar/
scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven
diff --git a/rar/xdocs/navigation.xml b/rar/xdocs/navigation.xml
index 1148410f..826a6dac 100644
--- a/rar/xdocs/navigation.xml
+++ b/rar/xdocs/navigation.xml
@@ -23,12 +23,10 @@
+
+
-
-
-
-
-
diff --git a/scm/xdocs/navigation.xml b/scm/xdocs/navigation.xml
index 09f08d4f..aa17033a 100644
--- a/scm/xdocs/navigation.xml
+++ b/scm/xdocs/navigation.xml
@@ -23,12 +23,10 @@
+
+
-
-
-
-
diff --git a/simian/xdocs/navigation.xml b/simian/xdocs/navigation.xml
index d71e976c..08340c10 100644
--- a/simian/xdocs/navigation.xml
+++ b/simian/xdocs/navigation.xml
@@ -23,12 +23,10 @@
+
+
-
-
-
-
diff --git a/site/xdocs/index.xml b/site/xdocs/index.xml
index 61b508c4..483dd850 100644
--- a/site/xdocs/index.xml
+++ b/site/xdocs/index.xml
@@ -30,7 +30,7 @@
This plug-in is used to generate the documentation site for your
project. This includes both transforming your custom xdoc documents into
- XHTML (see the xdoc plugin), and
+ XHTML (see the xdoc plugin), and
running the designated reports for your project. The result is then
packaged or deployed in the form that you desire.
diff --git a/site/xdocs/navigation.xml b/site/xdocs/navigation.xml
index f8971448..af12c78d 100644
--- a/site/xdocs/navigation.xml
+++ b/site/xdocs/navigation.xml
@@ -23,12 +23,10 @@
+
+
-
-
-
-
diff --git a/source/src/plugin-test/codeGenerationTest/project.xml b/source/src/plugin-test/codeGenerationTest/project.xml
index c9236fe4..042c9ed8 100644
--- a/source/src/plugin-test/codeGenerationTest/project.xml
+++ b/source/src/plugin-test/codeGenerationTest/project.xml
@@ -33,8 +33,8 @@
http://maven.apache.org/images/maven.gif
Test for Maven Source plugin
Test for Maven Source plugin
- http://maven.apache.org/maven-1.x/reference/plugins/source/
- /www/maven.apache.org/maven-1.x/reference/plugins/source/
+ http://maven.apache.org/maven-1.x/plugins/source/
+ /www/maven.apache.org/maven-1.x/plugins/source/
scm:svn:http://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk/source/
http://svn.apache.org/viewcvs.cgi/maven/maven-1/plugins/trunk/source/
diff --git a/source/src/plugin-test/project.xml b/source/src/plugin-test/project.xml
index caad7123..d5d377ad 100644
--- a/source/src/plugin-test/project.xml
+++ b/source/src/plugin-test/project.xml
@@ -32,8 +32,8 @@
http://maven.apache.org/images/maven.gif
Test for Maven Source plugin
Test for Maven Source plugin
- http://maven.apache.org/maven-1.x/reference/plugins/source/
- /www/maven.apache.org/maven-1.x/reference/plugins/source/
+ http://maven.apache.org/maven-1.x/plugins/source/
+ /www/maven.apache.org/maven-1.x/plugins/source/
scm:svn:http://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk/source/
http://svn.apache.org/viewcvs.cgi/maven/maven-1/plugins/trunk/source/
diff --git a/source/src/plugin-test/simpleTest/project.xml b/source/src/plugin-test/simpleTest/project.xml
index 8d4c07c6..d80caee0 100644
--- a/source/src/plugin-test/simpleTest/project.xml
+++ b/source/src/plugin-test/simpleTest/project.xml
@@ -33,8 +33,8 @@
http://maven.apache.org/images/maven.gif
Test for Maven Source plugin
Test for Maven Source plugin
- http://maven.apache.org/maven-1.x/reference/plugins/source/
- /www/maven.apache.org/maven-1.x/reference/plugins/source/
+ http://maven.apache.org/maven-1.x/plugins/source/
+ /www/maven.apache.org/maven-1.x/plugins/source/
scm:svn:http://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk/source/
http://svn.apache.org/viewcvs.cgi/maven/maven-1/plugins/trunk/source/
diff --git a/source/xdocs/navigation.xml b/source/xdocs/navigation.xml
index 5afebe06..4cf64e28 100644
--- a/source/xdocs/navigation.xml
+++ b/source/xdocs/navigation.xml
@@ -7,12 +7,10 @@
+
+
-
-
-
-
-
diff --git a/tasklist/xdocs/navigation.xml b/tasklist/xdocs/navigation.xml
index bceb010e..3f51abac 100644
--- a/tasklist/xdocs/navigation.xml
+++ b/tasklist/xdocs/navigation.xml
@@ -23,12 +23,10 @@
+
+
-
-
-
-
diff --git a/test/xdocs/navigation.xml b/test/xdocs/navigation.xml
index bf1245e5..fa47c6b9 100644
--- a/test/xdocs/navigation.xml
+++ b/test/xdocs/navigation.xml
@@ -23,12 +23,10 @@
+
+
-
-
-
-
diff --git a/war/src/plugin-test/project.xml b/war/src/plugin-test/project.xml
index fcc381a4..1932014e 100644
--- a/war/src/plugin-test/project.xml
+++ b/war/src/plugin-test/project.xml
@@ -34,8 +34,8 @@
http://maven.apache.org/images/maven.gif
Test for Maven War plugin
Test for Maven War plugin
- http://maven.apache.org/maven-1.x/reference/plugins/war/
- /www/maven.apache.org/maven-1.x/reference/plugins/war/
+ http://maven.apache.org/maven-1.x/plugins/war/
+ /www/maven.apache.org/maven-1.x/plugins/war/
scm:svn:http://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk/war/
http://svn.apache.org/viewcvs.cgi/maven/maven-1/plugins/trunk/war/
diff --git a/war/src/plugin-test/test01/project.xml b/war/src/plugin-test/test01/project.xml
index e0ff44ac..2623e819 100644
--- a/war/src/plugin-test/test01/project.xml
+++ b/war/src/plugin-test/test01/project.xml
@@ -34,8 +34,8 @@
http://maven.apache.org/images/maven.gif
Test for Maven War plugin, tests property maven.war.manifest
test for maven.war.manifest
- http://maven.apache.org/maven-1.x/reference/plugins/war/
- /www/maven.apache.org/maven-1.x/reference/plugins/war/
+ http://maven.apache.org/maven-1.x/plugins/war/
+ /www/maven.apache.org/maven-1.x/plugins/war/
scm:svn:http://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk/war/
http://svn.apache.org/viewcvs.cgi/maven/maven-1/plugins/trunk/war/
diff --git a/war/xdocs/navigation.xml b/war/xdocs/navigation.xml
index 2d8c72cf..3cd05539 100644
--- a/war/xdocs/navigation.xml
+++ b/war/xdocs/navigation.xml
@@ -23,12 +23,10 @@
+
+
-
-
-
-
diff --git a/xdoc/src/plugin-test/project.xml b/xdoc/src/plugin-test/project.xml
index 92490faf..84774026 100644
--- a/xdoc/src/plugin-test/project.xml
+++ b/xdoc/src/plugin-test/project.xml
@@ -34,8 +34,8 @@
http://maven.apache.org/images/maven.gif
Test for Maven Xdoc plugin
Test for Maven Xdoc plugin
- http://maven.apache.org/maven-1.x/reference/plugins/xdoc/
- /www/maven.apache.org/maven-1.x/reference/plugins/xdoc/
+ http://maven.apache.org/maven-1.x/plugins/xdoc/
+ /www/maven.apache.org/maven-1.x/plugins/xdoc/
scm:svn:http://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk/xdoc/
scm:svn:https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk/xdoc/
diff --git a/xdoc/src/plugin-test/test01/project.xml b/xdoc/src/plugin-test/test01/project.xml
index 070a983b..5e88cf60 100644
--- a/xdoc/src/plugin-test/test01/project.xml
+++ b/xdoc/src/plugin-test/test01/project.xml
@@ -32,8 +32,8 @@
http://maven.apache.org/images/maven.gif
Test for Maven Xdoc plugin
Test for Maven Xdoc plugin
- http://maven.apache.org/maven-1.x/reference/plugins/xdoc/
- /www/maven.apache.org/maven-1.x/reference/plugins/xdoc/
+ http://maven.apache.org/maven-1.x/plugins/xdoc/
+ /www/maven.apache.org/maven-1.x/plugins/xdoc/
scm:svn:http://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk/xdoc/
scm:svn:https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk/xdoc/
diff --git a/xdoc/src/plugin-test/test03/xdocs/navigation.xml b/xdoc/src/plugin-test/test03/xdocs/navigation.xml
index 70159aae..3977445c 100644
--- a/xdoc/src/plugin-test/test03/xdocs/navigation.xml
+++ b/xdoc/src/plugin-test/test03/xdocs/navigation.xml
@@ -21,7 +21,7 @@
-
+