From ea19d8a402590782a9887096509bab81d87e3766 Mon Sep 17 00:00:00 2001 From: ltheussl Date: Thu, 10 Nov 2005 19:05:38 +0000 Subject: [PATCH] Update documentation git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@332354 13f79535-47bb-0310-9956-ffa450edef68 --- html2xdoc/plugin.jelly | 3 +-- html2xdoc/xdocs/changes.xml | 1 + html2xdoc/xdocs/index.xml | 9 ++++++--- html2xdoc/xdocs/properties.xml | 8 +++++--- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/html2xdoc/plugin.jelly b/html2xdoc/plugin.jelly index a3349171..e8d5e314 100644 --- a/html2xdoc/plugin.jelly +++ b/html2xdoc/plugin.jelly @@ -42,8 +42,7 @@ - - + diff --git a/html2xdoc/xdocs/changes.xml b/html2xdoc/xdocs/changes.xml index 2fc74d0e..171c196f 100644 --- a/html2xdoc/xdocs/changes.xml +++ b/html2xdoc/xdocs/changes.xml @@ -25,6 +25,7 @@ + Update documentation. Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated :
  • commons-jelly-tags-xml v1.0 -> v1.1
    • diff --git a/html2xdoc/xdocs/index.xml b/html2xdoc/xdocs/index.xml index 3ffc67c6..6040bf31 100644 --- a/html2xdoc/xdocs/index.xml +++ b/html2xdoc/xdocs/index.xml @@ -45,12 +45,15 @@ are documented here.

    - To enable HTML to xdoc conversion add the following to your maven.xml + To enable HTML to xdoc conversion, either set the + maven.html2xdoc.enabled + property, + or add the following to your maven.xml:

    - <preGoal name="xdoc:jelly-transform"> + <preGoal name="xdoc:init"> <attainGoal name="html2xdoc"/> - </preGoal> + </preGoal> diff --git a/html2xdoc/xdocs/properties.xml b/html2xdoc/xdocs/properties.xml index 04a7d6f0..5097cb71 100644 --- a/html2xdoc/xdocs/properties.xml +++ b/html2xdoc/xdocs/properties.xml @@ -30,11 +30,11 @@ PropertyOptional?Description maven.html2xdoc.dir - Yes (default=xdoc) + Yes (default=${maven.docs.src}) Specifies the directory containing HTML documents which will be - turned into xdoc XML documents in the - target/generated-xdoc directory + turned into xdoc XML documents in the + target/generated-xdoc directory ready for use by the xdoc plugin. @@ -47,6 +47,7 @@ to produce its output as if it's a normal part of the site. +