Update documentation

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@332354 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
ltheussl 2005-11-10 19:05:38 +00:00
parent a44f732cf8
commit ea19d8a402
4 changed files with 13 additions and 8 deletions

View File

@ -42,8 +42,7 @@
<j:set var="srcdir" value="${maven.html2xdoc.dir}"/> <j:set var="srcdir" value="${maven.html2xdoc.dir}"/>
<j:if test="${empty(srcdir)}"> <j:if test="${empty(srcdir)}">
<!-- FIXME? Should be maven.docs.src --> <j:set var="srcdir" value="${maven.docs.src}"/>
<j:set var="srcdir" value="${basedir}/xdocs"/>
</j:if> </j:if>
<j:set var="outputencoding" value="${maven.docs.outputencoding}"/> <j:set var="outputencoding" value="${maven.docs.outputencoding}"/>

View File

@ -25,6 +25,7 @@
</properties> </properties>
<body> <body>
<release version="1.4-SNAPSHOT" date="In SVN"> <release version="1.4-SNAPSHOT" date="In SVN">
<action dev="ltheussl" type="update">Update documentation.</action>
<action dev="aheritier" type="update" issue="MAVEN-1712">Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : <action dev="aheritier" type="update" issue="MAVEN-1712">Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated :
<ul> <ul>
<li>commons-jelly-tags-xml v1.0 -> v1.1</li> <li>commons-jelly-tags-xml v1.0 -> v1.1</li>

View File

@ -45,10 +45,13 @@
are documented <a href="properties.html">here</a>. are documented <a href="properties.html">here</a>.
</p> </p>
<p> <p>
To enable HTML to xdoc conversion add the following to your maven.xml To enable HTML to xdoc conversion, either set the
<code>maven.html2xdoc.enabled</code>
<a href="properties.html">property</a>,
or add the following to your <code>maven.xml</code>:
</p> </p>
<source> <source>
&lt;preGoal name="xdoc:jelly-transform"&gt; &lt;preGoal name="xdoc:init"&gt;
&lt;attainGoal name="html2xdoc"/&gt; &lt;attainGoal name="html2xdoc"/&gt;
&lt;/preGoal&gt; &lt;/preGoal&gt;
</source> </source>

View File

@ -30,11 +30,11 @@
<tr><th>Property</th><th>Optional?</th><th>Description</th></tr> <tr><th>Property</th><th>Optional?</th><th>Description</th></tr>
<tr> <tr>
<td>maven.html2xdoc.dir</td> <td>maven.html2xdoc.dir</td>
<td>Yes (default=xdoc)</td> <td>Yes (default=<code>${maven.docs.src}</code>)</td>
<td> <td>
Specifies the directory containing HTML documents which will be Specifies the directory containing HTML documents which will be
turned into xdoc XML documents in the turned into xdoc XML documents in the
<code>target/generated-xdoc</code> directory <code>target/generated-xdoc</code> directory
ready for use by the xdoc plugin. ready for use by the xdoc plugin.
</td> </td>
</tr> </tr>
@ -47,6 +47,7 @@
to produce its output as if it's a normal part of the site. to produce its output as if it's a normal part of the site.
</td> </td>
</tr> </tr>
<!--
<tr> <tr>
<td>maven.html2xdoc.jsl</td> <td>maven.html2xdoc.jsl</td>
<td>Yes</td> <td>Yes</td>
@ -55,6 +56,7 @@
HTML to XDoc transformation. HTML to XDoc transformation.
</td> </td>
</tr> </tr>
-->
</table> </table>
</section> </section>
</body> </body>