Author: dennisl
Date: Mon Jan 26 19:26:34 2009
New Revision: 737793
URL: http://svn.apache.org/viewvc?rev=737793&view=rev
Log:
o Merge r709883 from trunk.
Added:
maven/doxia/doxia/branches/doxia-1.0.x/doxia-core/src/site/
- copied from r709883, maven/doxia/doxia/trunk/doxia-core/src/site/
maven/doxia/doxia/branches/doxia-1.0.x/doxia-core/src/site/site.xml
- copied unchanged from r709883,
maven/doxia/doxia/trunk/doxia-core/src/site/site.xml
maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/doxia-module-apt/src/site/
- copied from r709883,
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/site/
maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/doxia-module-apt/src/site/site.xml
- copied unchanged from r709883,
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/site/site.xml
maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/doxia-module-confluence/src/site/
- copied from r709883,
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/site/
maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/doxia-module-confluence/src/site/site.xml
- copied unchanged from r709883,
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/site/site.xml
maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/doxia-module-docbook-simple/src/site/
- copied from r709883,
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/site/
maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/doxia-module-docbook-simple/src/site/site.xml
- copied unchanged from r709883,
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/site/site.xml
maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/doxia-module-fml/src/site/
- copied from r709883,
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/site/
maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/doxia-module-fml/src/site/site.xml
- copied unchanged from r709883,
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/site/site.xml
maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/doxia-module-itext/src/site/
- copied from r709883,
maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/site/
maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/doxia-module-itext/src/site/site.xml
- copied unchanged from r709883,
maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/site/site.xml
maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/doxia-module-latex/src/site/
- copied from r709883,
maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/site/
maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/doxia-module-latex/src/site/site.xml
- copied unchanged from r709883,
maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/site/site.xml
maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/doxia-module-rtf/src/site/
- copied from r709883,
maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/site/
maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/doxia-module-rtf/src/site/site.xml
- copied unchanged from r709883,
maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/site/site.xml
maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/doxia-module-twiki/src/site/
- copied from r709883,
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/site/
maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/doxia-module-twiki/src/site/site.xml
- copied unchanged from r709883,
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/site/site.xml
maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/doxia-module-xdoc/src/site/
- copied from r709883,
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/site/
maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/doxia-module-xdoc/src/site/site.xml
- copied unchanged from r709883,
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/site/site.xml
maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/doxia-module-xhtml/src/site/
- copied from r709883,
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/site/
maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/doxia-module-xhtml/src/site/site.xml
- copied unchanged from r709883,
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/site/site.xml
maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/src/
- copied from r709883, maven/doxia/doxia/trunk/doxia-modules/src/
maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/src/site/
- copied from r709883, maven/doxia/doxia/trunk/doxia-modules/src/site/
maven/doxia/doxia/branches/doxia-1.0.x/doxia-modules/src/site/site.xml
- copied unchanged from r709883,
maven/doxia/doxia/trunk/doxia-modules/src/site/site.xml
maven/doxia/doxia/branches/doxia-1.0.x/doxia-sink-api/src/site/
- copied from r709883, maven/doxia/doxia/trunk/doxia-sink-api/src/site/
maven/doxia/doxia/branches/doxia-1.0.x/doxia-sink-api/src/site/site.xml
- copied unchanged from r709883,
maven/doxia/doxia/trunk/doxia-sink-api/src/site/site.xml
Modified:
maven/doxia/doxia/branches/doxia-1.0.x/ (props changed)
maven/doxia/doxia/branches/doxia-1.0.x/doxia-book/src/site/site.xml
maven/doxia/doxia/branches/doxia-1.0.x/doxia-maven-plugin/src/site/site.xml
maven/doxia/doxia/branches/doxia-1.0.x/src/site/site.xml
Propchange: maven/doxia/doxia/branches/doxia-1.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 26 19:26:34 2009
@@ -1 +1 @@
-/maven/doxia/doxia/trunk:725783
+/maven/doxia/doxia/trunk:709883,725783
Modified: maven/doxia/doxia/branches/doxia-1.0.x/doxia-book/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/branches/doxia-1.0.x/doxia-book/src/site/site.xml?rev=737793&r1=737792&r2=737793&view=diff
==============================================================================
--- maven/doxia/doxia/branches/doxia-1.0.x/doxia-book/src/site/site.xml
(original)
+++ maven/doxia/doxia/branches/doxia-1.0.x/doxia-book/src/site/site.xml Mon Jan
26 19:26:34 2009
@@ -21,37 +21,11 @@
*/
-->
-<project name="Doxia">
-
- <bannerLeft>
- <name>Doxia</name>
- <src>images/apache-maven-project-2.png</src>
- </bannerLeft>
-
- <bannerRight>
- <src>images/maven-logo-2.gif</src>
- </bannerRight>
-
- <publishDate format="dd MMM yyyy" position="right" />
-
- <skin>
- <groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-stylus-skin</artifactId>
- <version>1.0.1</version>
- </skin>
+<project>
<body>
- <links>
- <item name="Apache" href="http://www.apache.org/"/>
- <item name="Maven 1.x" href="http://maven.apache.org/maven-1.x"/>
- <item name="Maven 2.x" href="http://maven.apache.org/"/>
- <item name="Continuum" href="http://maven.apache.org/continuum"/>
- <item name="SCM" href="http://maven.apache.org/scm"/>
- <item name="Wagon" href="http://maven.apache.org/wagon"/>
- <item name="JXR" href="http://maven.apache.org/jxr"/>
- <item name="Doxia" href="http://maven.apache.org/doxia"/>
- </links>
+ <menu ref="parent"/>
<menu name="About Doxia :: Book Components">
<item name="Introduction" href="index.html"/>
Modified:
maven/doxia/doxia/branches/doxia-1.0.x/doxia-maven-plugin/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/branches/doxia-1.0.x/doxia-maven-plugin/src/site/site.xml?rev=737793&r1=737792&r2=737793&view=diff
==============================================================================
--- maven/doxia/doxia/branches/doxia-1.0.x/doxia-maven-plugin/src/site/site.xml
(original)
+++ maven/doxia/doxia/branches/doxia-1.0.x/doxia-maven-plugin/src/site/site.xml
Mon Jan 26 19:26:34 2009
@@ -22,7 +22,11 @@
-->
<project name="Doxia">
+
<body>
+
+ <menu ref="parent"/>
+
<menu name="Overview">
<item name="Introduction" href="index.html"/>
<item name="Goals" href="plugin-info.html"/>
@@ -33,4 +37,5 @@
<menu ref="reports"/>
</body>
+
</project>
Modified: maven/doxia/doxia/branches/doxia-1.0.x/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/branches/doxia-1.0.x/src/site/site.xml?rev=737793&r1=737792&r2=737793&view=diff
==============================================================================
--- maven/doxia/doxia/branches/doxia-1.0.x/src/site/site.xml (original)
+++ maven/doxia/doxia/branches/doxia-1.0.x/src/site/site.xml Mon Jan 26
19:26:34 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
/*
@@ -35,6 +35,7 @@
<artifactId>maven-stylus-skin</artifactId>
<version>1.0.1</version>
</skin>
+
<body>
<links>
<item name="Apache" href="http://www.apache.org/"/>
@@ -58,5 +59,6 @@
<menu ref="modules"/>
<menu ref="reports"/>
+
</body>
</project>
