You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by de...@apache.org on 2010/08/11 20:30:23 UTC
svn commit: r984519 - in /maven/plugins/branches/maven-site-plugin-3.x: ./
src/site/apt/index.apt src/site/apt/migrate.apt src/site/site.xml
Author: dennisl
Date: Wed Aug 11 18:30:23 2010
New Revision: 984519
URL: http://svn.apache.org/viewvc?rev=984519&view=rev
Log:
Merge r984466 from trunk.
o Create a migration document describing how to migrate from one version to another.
Added:
maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/migrate.apt
- copied unchanged from r984466, maven/plugins/trunk/maven-site-plugin/src/site/apt/migrate.apt
Modified:
maven/plugins/branches/maven-site-plugin-3.x/ (props changed)
maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/index.apt
maven/plugins/branches/maven-site-plugin-3.x/src/site/site.xml
Propchange: maven/plugins/branches/maven-site-plugin-3.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 11 18:30:23 2010
@@ -1 +1 @@
-/maven/plugins/trunk/maven-site-plugin:801155,801171,801470,806898-806906,807943-808180,809252,810298,884137,886844,886847,890094,890124,891014,891688,920027,920041,942622,943455,944145,950463,956681
+/maven/plugins/trunk/maven-site-plugin:801155,801171,801470,806898-806906,807943-808180,809252,810298,884137,886844,886847,890094,890124,891014,891688,920027,920041,942622,943455,944145,950463,956681,984466
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/index.apt?rev=984519&r1=984518&r2=984519&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/index.apt (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/index.apt Wed Aug 11 18:30:23 2010
@@ -32,14 +32,7 @@ Maven Site Plugin
The Site Plugin is used to generate a site for the project. The generated site also includes the project's reports
that were configured in the <<<\<reporting\>>>> section of the POM.
- If you consider <<upgrading to site-plugin-2.1>>, please note that there have been a couple of important changes.
- First, the plugin now requires at least <<Maven 2.1.x>> to run, you cannot use it with older Maven versions.
- Second, and most notable, site-plugin-2.1 has been upgraded to use <<Doxia 1.1>>, which has seen a lot of major
- changes itself. If you experience unexpected behavior, please read
- {{{http://maven.apache.org/doxia/whatsnew-1.1.html}Doxia: what's new in 1.1?}},
- {{{http://maven.apache.org/doxia/references/doxia-apt.html}Doxia: Enhancements to the APT format}},
- {{{http://maven.apache.org/doxia/issues/index.html}Doxia: Issues & Gotchas}}, and the
- {{{http://maven.apache.org/doxia/faq.html}Doxia: Frequently Asked Questions}} first.
+ Please read the {{{migrate.html}migration guide}} if you want to upgrade the Site Plugin.
* Goals Overview
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/site/site.xml?rev=984519&r1=984518&r2=984519&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/site/site.xml (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/site/site.xml Wed Aug 11 18:30:23 2010
@@ -28,6 +28,7 @@ under the License.
<item name="Goals" href="plugin-info.html"/>
<item name="Usage" href="usage.html"/>
<item name="FAQ" href="faq.html"/>
+ <item name="Migrate" href="migrate.html"/>
</menu>
<menu name="Configuration">
<item name="Internationalization" href="i18n.html"/>