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/09 22:40:27 UTC
svn commit: r983813 - in /maven/plugins/branches/maven-site-plugin-3.x: ./
src/site/apt/examples/
Author: dennisl
Date: Mon Aug 9 20:40:26 2010
New Revision: 983813
URL: http://svn.apache.org/viewvc?rev=983813&view=rev
Log:
Merge r801155 from trunk.
o filtering version in doc
Added:
maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/examples/creating-content.apt.vm
- copied unchanged from r801155, maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/creating-content.apt.vm
maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/examples/moduleexcludes.apt.vm
- copied unchanged from r801155, maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/moduleexcludes.apt.vm
maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/examples/siterun.apt.vm
- copied unchanged from r801155, maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/siterun.apt.vm
maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/examples/templatefile.apt.vm
- copied unchanged from r801155, maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/templatefile.apt.vm
Removed:
maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/examples/creating-content.apt
maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/examples/moduleexcludes.apt
maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/examples/siterun.apt
maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/examples/templatefile.apt
Modified:
maven/plugins/branches/maven-site-plugin-3.x/ (props changed)
Propchange: maven/plugins/branches/maven-site-plugin-3.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 9 20:40:26 2010
@@ -1 +1 @@
-/maven/plugins/trunk/maven-site-plugin:806898-806906,807943-808180,809252,810298,884137,886844,886847,890094,890124,891014,920027,942622,943455,944145,956681
+/maven/plugins/trunk/maven-site-plugin:801155,806898-806906,807943-808180,809252,810298,884137,886844,886847,890094,890124,891014,920027,942622,943455,944145,956681