diff --git a/xdoc/plugin.jelly b/xdoc/plugin.jelly index 79b274ff..61976cc0 100644 --- a/xdoc/plugin.jelly +++ b/xdoc/plugin.jelly @@ -370,7 +370,7 @@ - + @@ -409,12 +409,12 @@ - - + + - - + + @@ -459,10 +459,10 @@ - - + + - + @@ -732,7 +732,7 @@ - + diff --git a/xdoc/plugin.properties b/xdoc/plugin.properties index 415cb79a..ae42b913 100644 --- a/xdoc/plugin.properties +++ b/xdoc/plugin.properties @@ -20,6 +20,8 @@ # Xdoc plugin. # ------------------------------------------------------------------- +maven.xdoc.navigation.file=navigation.xml + maven.xdoc.developmentProcessUrl=http://maven.apache.org/development-process.html maven.xdoc.includeProjectDocumentation = yes diff --git a/xdoc/xdocs/changes.xml b/xdoc/xdocs/changes.xml index c4b9b04c..9919e619 100644 --- a/xdoc/xdocs/changes.xml +++ b/xdoc/xdocs/changes.xml @@ -27,6 +27,7 @@ + Add a property to override navigation.xml. Show organization in header even if logo not set. Ampersands in navigation.xml being escaped twice. Ampersand in section/subsection not correct. diff --git a/xdoc/xdocs/properties.xml b/xdoc/xdocs/properties.xml index ccef1e5d..69602fe2 100644 --- a/xdoc/xdocs/properties.xml +++ b/xdoc/xdocs/properties.xml @@ -202,6 +202,14 @@ Optional? Description + + maven.xdoc.navigation.file + Yes + + The name of the navigation file to use. + The default is navigation.xml. + + maven.xdoc.theme Yes