Author: dennisl
Date: Fri Jul 28 14:49:40 2006
New Revision: 426674
URL: http://svn.apache.org/viewvc?rev=426674&view=rev
Log:
o Fix typos and broken links in documentation.
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractAssemblyMojo.java
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/filtering-some-distribution-files.apt
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/using-components.apt
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/index.apt
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/usage.apt
maven/plugins/trunk/maven-assembly-plugin/src/site/fml/faq.fml
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractAssemblyMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractAssemblyMojo.java?rev=426674&r1=426673&r2=426674&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractAssemblyMojo.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractAssemblyMojo.java
Fri Jul 28 14:49:40 2006
@@ -123,7 +123,7 @@
/**
* Sets the base directory from which archive files are created.
- * This base directory pre-pended to any <code><directory></code>
+ * This base directory is pre-pended to any <code><directory></code>
* specifications in the assembly descriptor.
*
* @parameter
@@ -206,7 +206,7 @@
/**
* Used to customize the generated archive of the plugin. The Maven
website has an in-depth guide on using
- * this parameter to customize which can be found
+ * this parameter which can be found
* <a
href="http://maven.apache.org/guides/mini/guide-archive-configuration.html";>here</a>.
*
* @parameter
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/filtering-some-distribution-files.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/filtering-some-distribution-files.apt?rev=426674&r1=426673&r2=426674&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/filtering-some-distribution-files.apt
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/filtering-some-distribution-files.apt
Fri Jul 28 14:49:40 2006
@@ -45,7 +45,7 @@
[]
All the above files are in the root directory of the project but only the
- README and the NOTICE files should be filtered. The property file to use to
+ README and the NOTICE files should be filtered. The property file used to
filter these are files is found in <<<src/assemble/filter.properties>>>.
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/using-components.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/using-components.apt?rev=426674&r1=426673&r2=426674&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/using-components.apt
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/using-components.apt
Fri Jul 28 14:49:40 2006
@@ -38,7 +38,7 @@
to exclude dependencies meant for the new appserver.>
This example demonstrate the use of \<componentDescriptors\>, more
information
- can be found {{{../../assembly}here}}.
+ can be found {{{../../assembly.html}here}}.
* The Assembly Descriptors
Modified: maven/plugins/trunk/maven-assembly-plugin/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/apt/index.apt?rev=426674&r1=426673&r2=426674&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/site/apt/index.apt (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/site/apt/index.apt Fri Jul 28
14:49:40 2006
@@ -49,7 +49,7 @@
To use the Assembly Plugin in Maven 2, you simply need to:
- * choose or write an assembly descriptor to use,
+ * choose or write the assembly descriptor to use,
* configure the Assembly Plugin in your project's pom.xml, and
@@ -61,7 +61,7 @@
What is an Assembly?
- An "assembly" is a group of files, directories, and dependencies that is
+ An "assembly" is a group of files, directories, and dependencies that are
assembled into an archive format and distributed. For example, assume that
a Maven project defines a single JAR artifact that contains both a console
application and a Swing application. Such a project could define two
Modified: maven/plugins/trunk/maven-assembly-plugin/src/site/apt/usage.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/apt/usage.apt?rev=426674&r1=426673&r2=426674&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/site/apt/usage.apt (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/site/apt/usage.apt Fri Jul 28
14:49:40 2006
@@ -72,7 +72,7 @@
Alternatively, we've created a custom assembly descriptor called
<<<src.xml>>> in the <<<src/assembly>>> directory (see the
- {{{#resources}Resources}} section for more information), we can tell the
+ {{{#Resources}Resources}} section for more information), we can tell the
Assembly Plugin to use it instead:
+---+
@@ -325,7 +325,7 @@
To accommodate this, the Assembly Plugin supports configuration of an
<<<\<archive\>>>> element which is identical to that supported by the
- <<<maven-jar-plugin>>> (see {{{#resources}Resources}}). Using this
+ <<<maven-jar-plugin>>> (see {{{#Resources}Resources}}). Using this
configuration, it's easy to configure the <<<Main-Class>>> attribute of the
jar manifest:
@@ -361,7 +361,7 @@
+---+
For more information on advanced configuration for the Assembly Plugin, see
- the {{{#resources}Resources}} section.
+ the {{{#Resources}Resources}} section.
** GOTCHA!
@@ -375,7 +375,7 @@
{{{assembly.html}Assembly Descriptor}}
[[2]] For more information about the <<<maven-jar-plugin>>>, look
- {{{/plugins/maven-jar-plugin}here}}.
+ {{{http://maven.apache.org/plugins/maven-jar-plugin/}here}}.
[[3]] For more information on advanced <<<maven-assembly-plugin>>>
configuration, see the {{{examples/index.html}examples}}.
Modified: maven/plugins/trunk/maven-assembly-plugin/src/site/fml/faq.fml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/fml/faq.fml?rev=426674&r1=426673&r2=426674&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/site/fml/faq.fml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/site/fml/faq.fml Fri Jul 28
14:49:40 2006
@@ -34,7 +34,7 @@
<question>How do I use the Assembly Plugin to package my project's
javadoc files?</question>
<answer>
<p>The Javadoc Plugin can generate the javadoc files of your projects.
Also, the Javadoc Plugin can package them!</p>
- <p>Please see the <a href="/plugins/maven-javadoc-plugin/">Javadoc
Plugin Documentation</a>.</p>
+ <p>Please see the <a
href="http://maven.apache.org/plugins/maven-javadoc-plugin/";>Javadoc Plugin
Documentation</a>.</p>
</answer>
</faq>
</part>
