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:43:14 UTC
svn commit: r983814 - in /maven/plugins/branches/maven-site-plugin-3.x: ./
src/site/apt/examples/creating-content.apt.vm
src/site/apt/examples/siterun.apt.vm
src/site/apt/examples/templatefile.apt.vm
Author: dennisl
Date: Mon Aug 9 20:43:13 2010
New Revision: 983814
URL: http://svn.apache.org/viewvc?rev=983814&view=rev
Log:
Merge r801171 from trunk.
o fixed ambiguous links
Modified:
maven/plugins/branches/maven-site-plugin-3.x/ (props changed)
maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/examples/creating-content.apt.vm
maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/examples/siterun.apt.vm
maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/examples/templatefile.apt.vm
Propchange: maven/plugins/branches/maven-site-plugin-3.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 9 20:43:13 2010
@@ -1 +1 @@
-/maven/plugins/trunk/maven-site-plugin:801155,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,806898-806906,807943-808180,809252,810298,884137,886844,886847,890094,890124,891014,920027,942622,943455,944145,956681
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/examples/creating-content.apt.vm
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/examples/creating-content.apt.vm?rev=983814&r1=983813&r2=983814&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/examples/creating-content.apt.vm (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/examples/creating-content.apt.vm Mon Aug 9 20:43:13 2010
@@ -96,7 +96,7 @@ Creating Content
The <<<css>>> and <<<images>>> directories contains stylesheets and images
from the skin being used. You can read more about skins in
- {{{sitedescriptor.html}the site descriptor documentation}}.
+ {{{./sitedescriptor.html}the site descriptor documentation}}.
* Adding Extra Resources
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/examples/siterun.apt.vm
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/examples/siterun.apt.vm?rev=983814&r1=983813&r2=983814&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/examples/siterun.apt.vm (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/examples/siterun.apt.vm Mon Aug 9 20:43:13 2010
@@ -29,7 +29,7 @@
Configuring Site Run
- For the <<<{{{run-mojo.html}site:run}}>>> goal, you can configure which port to use to start up the site as well as the directory where
+ For the <<<{{{./run-mojo.html}site:run}}>>> goal, you can configure which port to use to start up the site as well as the directory where
the pages for the site will be rendered.
For example, you can have the following configuration in your POM:
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/examples/templatefile.apt.vm
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/examples/templatefile.apt.vm?rev=983814&r1=983813&r2=983814&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/examples/templatefile.apt.vm (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/examples/templatefile.apt.vm Mon Aug 9 20:43:13 2010
@@ -37,7 +37,7 @@ Changing the Template File
<<Note:>> If you use this method then skins and the default templates, CSS
and images are disabled. It is therefor highly recommended that you package
- this as a {{{creatingskins.html}skin}} instead.
+ this as a {{{./creatingskins.html}skin}} instead.
For version 2.0-beta-5 and later you would add something like this to your
<<<pom.xml>>>: