svn commit: r983822 - in /maven/plugins/branches/maven-site-plugin-3.x: ./ src/site/apt/index.apt

[de...@apache.org]

Author: dennisl
Date: Mon Aug  9 21:00:15 2010
New Revision: 983822

URL: http://svn.apache.org/viewvc?rev=983822&view=rev
Log:
Merge r891688 from trunk.
add a note about upgrading to 2.1

Modified:
    maven/plugins/branches/maven-site-plugin-3.x/   (props changed)
    maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/index.apt

Propchange: maven/plugins/branches/maven-site-plugin-3.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug  9 21:00:15 2010
@@ -1 +1 @@
-/maven/plugins/trunk/maven-site-plugin:801155,801171,801470,806898-806906,807943-808180,809252,810298,884137,886844,886847,890094,890124,891014,920027,942622,943455,944145,956681
+/maven/plugins/trunk/maven-site-plugin:801155,801171,801470,806898-806906,807943-808180,809252,810298,884137,886844,886847,890094,890124,891014,891688,920027,942622,943455,944145,956681

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=983822&r1=983821&r2=983822&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 Mon Aug  9 21:00:15 2010
@@ -32,6 +32,15 @@ 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.
+
 * Goals Overview
 
    The Site Plugin has seven goals: