Author: ltheussl
Date: Mon Jan 16 15:30:54 2006
New Revision: 369601
URL: http://svn.apache.org/viewcvs?rev=369601&view=rev
Log:
PR: MAVEN-1722
Submitted by: Dennis Lundberg
Documentation fixes to the User's guide.
Modified:
maven/maven-1/core/trunk/xdocs/reference/conventions.xml
maven/maven-1/core/trunk/xdocs/using/bestpractices.xml
maven/maven-1/core/trunk/xdocs/using/managing-dependencies.xml
maven/maven-1/core/trunk/xdocs/using/migrating.xml
maven/maven-1/core/trunk/xdocs/using/releasing.xml
maven/maven-1/core/trunk/xdocs/using/war.xml
Modified: maven/maven-1/core/trunk/xdocs/reference/conventions.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/xdocs/reference/conventions.xml?rev=369601&r1=369600&r2=369601&view=diff
==============================================================================
--- maven/maven-1/core/trunk/xdocs/reference/conventions.xml (original)
+++ maven/maven-1/core/trunk/xdocs/reference/conventions.xml Mon Jan 16
15:30:54 2006
@@ -133,7 +133,7 @@
<p>
Within artifact producing source directories (ie. <code>main</code>
and <code>test</code>), there is one
directory for the language <code>java</code> (under which the normal
package hierarchy exists), and one for
- <code>resources</code> (the structure under which is copied to the
target classpath given the default resource
+ <code>resources</code> (the structure which is copied to the target
classpath given the default resource
definition).
</p>
<p>
Modified: maven/maven-1/core/trunk/xdocs/using/bestpractices.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/xdocs/using/bestpractices.xml?rev=369601&r1=369600&r2=369601&view=diff
==============================================================================
--- maven/maven-1/core/trunk/xdocs/using/bestpractices.xml (original)
+++ maven/maven-1/core/trunk/xdocs/using/bestpractices.xml Mon Jan 16 15:30:54
2006
@@ -230,7 +230,7 @@
<b>Dependency Scopes:</b> Maven 2 has a concept of
<it><a
href="maven2/dependency-mechanism.html#dependency_scope">scopes</a></it> which
are used to control
when and where the dependencies are used in terms of e.g. the
compile, test and runtime class paths. Maven
- 1 doesn't have this concept but it's still useful for include this
information when adding dependencies to
+ 1 doesn't have this concept but it's still useful to include this
information when adding dependencies to
your project. It will be useful when you (possibly) convert your
project to Maven 2 and if your repository
is ever converted to a Maven 2 repository the Maven 2 POMs will
include dependencies with the correct scope.
</p>
Modified: maven/maven-1/core/trunk/xdocs/using/managing-dependencies.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/xdocs/using/managing-dependencies.xml?rev=369601&r1=369600&r2=369601&view=diff
==============================================================================
--- maven/maven-1/core/trunk/xdocs/using/managing-dependencies.xml (original)
+++ maven/maven-1/core/trunk/xdocs/using/managing-dependencies.xml Mon Jan 16
15:30:54 2006
@@ -47,7 +47,7 @@
<code>maven.jar.override</code> property to
<code>on</code>. Once this property is
set you can specify JAR override directives in any of the properties
- files that maven processes.
+ files that Maven processes.
</p>
<p>
@@ -114,7 +114,7 @@
<p>
Assuming that project is publishing a version called
<code>SNAPSHOT</code> (which happens when the
- <code>jar:deploy-snapshot</code> goal is called), then each time you
build Maven will check the remote
+ <code>jar:deploy-snapshot</code> goal is called), then each time you
build, Maven will check the remote
repository for changes in that JAR and download it again if a newer
<code>SNAPSHOT</code> is available.
</p>
@@ -129,7 +129,7 @@
<p>
If you are working offline Maven will warn you that your SNAPSHOT
dependencies may be out of date. This is
- just a warning, and as the remote copy often does not change
frequently can be ignored.
+ just a warning, and as the remote copy often does not change
frequently it can be ignored.
</p>
<p>
Modified: maven/maven-1/core/trunk/xdocs/using/migrating.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/xdocs/using/migrating.xml?rev=369601&r1=369600&r2=369601&view=diff
==============================================================================
--- maven/maven-1/core/trunk/xdocs/using/migrating.xml (original)
+++ maven/maven-1/core/trunk/xdocs/using/migrating.xml Mon Jan 16 15:30:54 2006
@@ -111,7 +111,7 @@
<a href="../reference/scripting.html#Customising_Goals">Customising
Goals</a> in the Scripting Reference.
</p>
<p>
- After this, your build will continue to growe like any other Maven
build would. For information on how to
+ After this, your build will continue to grow like any other Maven
build would. For information on how to
do this, see <a href="customising.html">Customising Maven</a> and the
<a href="../reference/scripting.html">Scripting Reference</a>, as
well as other sections in this User's
Guide.
Modified: maven/maven-1/core/trunk/xdocs/using/releasing.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/xdocs/using/releasing.xml?rev=369601&r1=369600&r2=369601&view=diff
==============================================================================
--- maven/maven-1/core/trunk/xdocs/using/releasing.xml (original)
+++ maven/maven-1/core/trunk/xdocs/using/releasing.xml Mon Jan 16 15:30:54 2006
@@ -27,7 +27,7 @@
<body>
<section name="Making Releases">
<p>
- Maven can simplify several areas of the release process for software
but it cannot substitute for
+ Maven can simplify several areas of the release process for software
but it is not a substitute for
planning. Think about the process before starting any release.
</p>
<subsection name="Determine Format">
@@ -61,7 +61,7 @@
</p>
<p>
It may take a little effort to create and test release generation but
it only needs to be done once.
- Maven will then be able reliable to generate all future releases to
this format.
+ Maven will then be able to reliable generate all future releases in
this format.
</p>
</subsection>
<subsection name="Check Dependencies">
@@ -120,7 +120,7 @@
</p>
<p>
Pay attention to the version of Java used to compile the release: some
bytecode produced by later versions
- may be incompatible with earlier versions. Look out for warnings
provided by maven about this. Maven can
+ may be incompatible with earlier versions. Look out for warnings
provided by Maven about this. Maven can
offer assistance: setting <code>maven.compile.target</code> of the
<a
href='http://maven.apache.org/maven-1.x/reference/plugins/java/properties.html'>Java
Plugin</a> passes the
target JVM to the compiler.
@@ -167,7 +167,7 @@
<subsection name="Announce the Release">
<p>
Finally, after the release is out and checked, you will want to make
announcements to tell the world
- about it. Here again, maven can help. (If you are using a
sophisticated distribution system with mirroring,
+ about it. Here again, Maven can help. (If you are using a
sophisticated distribution system with mirroring,
you should wait until the mirrors have sync'd before making the
annoucements.)
</p>
<p>
Modified: maven/maven-1/core/trunk/xdocs/using/war.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/xdocs/using/war.xml?rev=369601&r1=369600&r2=369601&view=diff
==============================================================================
--- maven/maven-1/core/trunk/xdocs/using/war.xml (original)
+++ maven/maven-1/core/trunk/xdocs/using/war.xml Mon Jan 16 15:30:54 2006
@@ -90,7 +90,7 @@
reconstructing the WAR in this directory after making changes will
be loaded.
</p>
<p>
- The section will build a <code>.war</code> archive which is later
deployed into the servlet container as is.
+ The second will build a <code>.war</code> archive which is later
deployed into the servlet container as is.
</p>
<p>
To automatically deploy into a servlet container will rely on
scripting up the appropriate goals or locating
