From d2f955f34cd2a5902ea1d12f2ebc938160fb850d Mon Sep 17 00:00:00 2001
From: Jason van Zyl <jvanzyl@apache.org>
Date: Wed, 19 Oct 2005 04:29:22 +0000
Subject: [PATCH] o change m2 references to mvn

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@326378 13f79535-47bb-0310-9956-ffa450edef68
---
 maven-site/src/site/apt/download.apt          |  4 +--
 .../site/apt/guides/getting-started/index.apt | 28 +++++++++----------
 .../introduction-to-plugin-prefix-mapping.apt |  2 +-
 .../introduction/introduction-to-plugins.apt  |  2 +-
 .../introduction/introduction-to-profiles.apt | 10 +++----
 .../introduction-to-repositories.apt          |  2 +-
 .../introduction-to-the-lifecycle.apt         |  4 +--
 .../guides/introduction/profile-example.txt   |  6 ++--
 .../site/apt/guides/mini/guide-assemblies.apt |  2 +-
 .../apt/guides/mini/guide-attached-tests.apt  |  4 +--
 .../guides/mini/guide-bash-m2-completion.apt  |  2 +-
 .../mini/guide-coping-with-sun-jars.apt       |  2 +-
 .../guides/mini/guide-creating-archetypes.apt |  4 +--
 .../site/apt/guides/mini/guide-deploy-ftp.apt |  2 +-
 .../guides/mini/guide-deploy-ssh-external.apt |  2 +-
 .../src/site/apt/guides/mini/guide-ear.apt    |  4 +--
 .../guides/mini/guide-generating-sources.apt  |  2 +-
 .../apt/guides/mini/guide-ide-eclipse.apt     |  2 +-
 .../site/apt/guides/mini/guide-ide-idea.apt   |  2 +-
 .../guide-ide-netbeans/guide-ide-netbeans.apt |  6 ++--
 .../mini/guide-multiple-repositories.apt      |  2 +-
 .../site/apt/guides/mini/guide-releasing.apt  |  4 +--
 .../src/site/apt/guides/mini/guide-site.apt   |  4 +--
 .../src/site/apt/guides/mini/guide-webapp.apt |  4 +--
 .../plugin/guide-java-plugin-development.apt  |  6 ++--
 .../suggestions/non-standard-directories.txt  |  4 +--
 26 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/maven-site/src/site/apt/download.apt b/maven-site/src/site/apt/download.apt
index 9e3b926db7..cf9f920144 100644
--- a/maven-site/src/site/apt/download.apt
+++ b/maven-site/src/site/apt/download.apt
@@ -64,7 +64,7 @@ Download Maven 2.0
   [[3]] In the same dialog, make sure that <<<JAVA_HOME>>> is set to the location of your JDK,
         eg. <<<C:\Program Files\Java\jdk1.5.0_02>>>
 
-  [[4]] Run <<<m2 --version>>> to verify that it is correctly installed.
+  [[4]] Run <<<mvn --version>>> to verify that it is correctly installed.
 
 ** Unix-based Operating Systems (Linux, Solaris and Mac OS X)
 
@@ -77,5 +77,5 @@ Download Maven 2.0
   [[3]] Make sure that <<<JAVA_HOME>>> is set to the location of your JDK, eg.
         <<<export JAVA_HOME=/usr/java/jdk1.5.0_02>>>
 
-  [[4]] Run <<<m2 --version>>> to verify that it is correctly installed.
+  [[4]] Run <<<mvn --version>>> to verify that it is correctly installed.
 
diff --git a/maven-site/src/site/apt/guides/getting-started/index.apt b/maven-site/src/site/apt/guides/getting-started/index.apt
index 44a27523ee..558b1a0980 100644
--- a/maven-site/src/site/apt/guides/getting-started/index.apt
+++ b/maven-site/src/site/apt/guides/getting-started/index.apt
@@ -105,7 +105,7 @@ Sections
 
 +-----+
 
-m2 archetype:create -DgroupId=com.mycompany.app -DartifactId=my-app
+mvn archetype:create -DgroupId=com.mycompany.app -DartifactId=my-app
 
 +-----+
 
@@ -227,7 +227,7 @@ my-app
 
 +-----+
 
-m2 compile
+mvn compile
 
 +-----+
 
@@ -281,7 +281,7 @@ Compiling 1 source file to <dir>/my-app/target/classes
 
 +----+
 
-m2 test
+mvn test
 
 +----+
 
@@ -335,7 +335,7 @@ Results :
 
 +----+
 
- m2 test-compile
+ mvn test-compile
 
 +----+
 
@@ -350,7 +350,7 @@ Results :
 
 +----+
 
-m2 package
+mvn package
 
 +----+
 
@@ -365,7 +365,7 @@ m2 package
 
 +----+
 
-m2 install
+mvn install
 
 +----+
 
@@ -444,7 +444,7 @@ Results :
 
 +----+
 
-m2 site
+mvn site
 
 +----+
 
@@ -639,7 +639,7 @@ application.version=${pom.version}
 
 +----+
 
-m2 process-resources
+mvn process-resources
 
 +----+
 
@@ -710,7 +710,7 @@ message=${my.filter.value}
 
 +----+
 
- the next execution of the <<<m2 process-resources>>> command will put our new property value into application.properties.
+ the next execution of the <<<mvn process-resources>>> command will put our new property value into application.properties.
  As an alternative to defining the my.filter.value property in an external file, you could also have defined it in the <<<properties>>>
  section of your pom.xml and you'd get the same effect (notice I don't need the references to src/main/filters/filter.properties either):
 
@@ -765,7 +765,7 @@ command.line.prop=${command.line.prop}
 
 +----+
 
-m2 process-resources "-Dcommand.line.prop=hello again"
+mvn process-resources "-Dcommand.line.prop=hello again"
 
 +----+
 
@@ -912,7 +912,7 @@ m2 process-resources "-Dcommand.line.prop=hello again"
 
 +----+
 
- Now, when we compile the project (<<<m2 compile>>>), we'll see Maven download the log4j dependency for us.
+ Now, when we compile the project (<<<mvn compile>>>), we'll see Maven download the log4j dependency for us.
 
 ~~DJ: Current
 
@@ -996,7 +996,7 @@ m2 process-resources "-Dcommand.line.prop=hello again"
 
 +----+
 
-m2 archetype:create -DgroupId=com.mycompany.app -DartifactId=my-app -DarchetypeGroupId=org.apache.maven.archetypes -DarchetypeArtifactId=maven-archetype-site
+mvn archetype:create -DgroupId=com.mycompany.app -DartifactId=my-app -DarchetypeGroupId=org.apache.maven.archetypes -DarchetypeArtifactId=maven-archetype-site
 
 +----+
 
@@ -1070,7 +1070,7 @@ my-app
  Generating the site is very simple, and fast!
 
 ---------------
-m2 site
+mvn site
 ---------------
 
  The resulting site will be in <<<target/site/...>>>
@@ -1097,7 +1097,7 @@ m2 site
   You must presently run the <<<site:site>>> goal independantly.
 
 ---------------
-m2 site-deploy
+mvn site-deploy
 ---------------
 
   <<Note:>> the trailing slash in the URL above indicates that any subprojects that inherit this value should append their artifact ID to
diff --git a/maven-site/src/site/apt/guides/introduction/introduction-to-plugin-prefix-mapping.apt b/maven-site/src/site/apt/guides/introduction/introduction-to-plugin-prefix-mapping.apt
index 4a613b562e..dae81f4aa9 100644
--- a/maven-site/src/site/apt/guides/introduction/introduction-to-plugin-prefix-mapping.apt
+++ b/maven-site/src/site/apt/guides/introduction/introduction-to-plugin-prefix-mapping.apt
@@ -67,7 +67,7 @@ Introduction to Plugin Prefix Resolution
   from the model:
 
 +---+
-m2 -Dversion=4.0.0 -Dmodel=maven.mdo modello:java
+mvn -Dversion=4.0.0 -Dmodel=maven.mdo modello:java
 +---+
 
   Adding <<org.codehaus.modello>> to the list of groupIds searched for plugin
diff --git a/maven-site/src/site/apt/guides/introduction/introduction-to-plugins.apt b/maven-site/src/site/apt/guides/introduction/introduction-to-plugins.apt
index b3423fe264..d3a3d4fb63 100644
--- a/maven-site/src/site/apt/guides/introduction/introduction-to-plugins.apt
+++ b/maven-site/src/site/apt/guides/introduction/introduction-to-plugins.apt
@@ -45,7 +45,7 @@ Introduction to Maven 2.0 Plugin Development
   One of the simplest plugins in Maven 2.0 is the Clean Plugin.  The 
   {{{http://maven.apache.org/maven2/plugins/maven-clean-plugin/}Maven
   Clean plugin}} (maven-clean-plugin) is responsible for removing the target 
-  directory of a Maven 2 project.  When you run "m2 clean:clean", Maven 2 executes
+  directory of a Maven 2 project.  When you run "mvn clean:clean", Maven 2 executes
   the "clean:clean" goal as defined in the Clean plug-in, and the target directory
   is removed.  The Clean plugin 
   {{{http://maven.apache.org/maven2/plugins/maven-clean-plugin/clean-mojo.html}defines 
diff --git a/maven-site/src/site/apt/guides/introduction/introduction-to-profiles.apt b/maven-site/src/site/apt/guides/introduction/introduction-to-profiles.apt
index 9bb690d17c..8f485154ee 100644
--- a/maven-site/src/site/apt/guides/introduction/introduction-to-profiles.apt
+++ b/maven-site/src/site/apt/guides/introduction/introduction-to-profiles.apt
@@ -288,13 +288,13 @@ Introduction to Build Profiles
   system properties contain "env=dev". So, executing:
 
 +---+
-m2 -Denv=dev integration-test
+mvn -Denv=dev integration-test
 +---+
 
   should result in a successful build. However, this won't:
 
 +---+
-m2 -Denv=production integration-test
+mvn -Denv=production integration-test
 +---+
 
   Why? Because, the resulting non-interpolated literal value of $\{appserver.home\}
@@ -334,7 +334,7 @@ m2 -Denv=production integration-test
   you need to activate <<env-test>> by issuing:
 
 +---+
-m2 -Denv=test <phase>
+mvn -Denv=test <phase>
 +---+
 
   The right command-line option can be had by simply substituting "=" for "-" in
@@ -348,7 +348,7 @@ m2 -Denv=test <phase>
   To see the list of active profiles, issue:
 
 +---+
-m2 projecthelp:active-profiles -Denv=test
+mvn projecthelp:active-profiles -Denv=test
 +---+
 
   This should render a bulleted list of the profiles (hopefully including one
@@ -358,7 +358,7 @@ m2 projecthelp:active-profiles -Denv=test
   POM, issue:
 
 +---+
-m2 projecthelp:effective-pom -Denv=test
+mvn projecthelp:effective-pom -Denv=test
 +---+
 
   This will print the effective POM for this build configuration out to the 
diff --git a/maven-site/src/site/apt/guides/introduction/introduction-to-repositories.apt b/maven-site/src/site/apt/guides/introduction/introduction-to-repositories.apt
index e33039f2b3..936d7dcd0b 100644
--- a/maven-site/src/site/apt/guides/introduction/introduction-to-repositories.apt
+++ b/maven-site/src/site/apt/guides/introduction/introduction-to-repositories.apt
@@ -99,7 +99,7 @@ Introduction to Repositories
 
 +---+
 
- m2 -o package
+ mvn -o package
 
 +---+
 
diff --git a/maven-site/src/site/apt/guides/introduction/introduction-to-the-lifecycle.apt b/maven-site/src/site/apt/guides/introduction/introduction-to-the-lifecycle.apt
index e5e771f7ca..8c659ae8c0 100644
--- a/maven-site/src/site/apt/guides/introduction/introduction-to-the-lifecycle.apt
+++ b/maven-site/src/site/apt/guides/introduction/introduction-to-the-lifecycle.apt
@@ -41,7 +41,7 @@ Introduction to the Build Lifecycle
   you desire on the command line. For example:
 
 -------
-m2 install
+mvn install
 -------
 
   This command will compile, test, package, verify and install the package into the local repository when run.
@@ -51,7 +51,7 @@ m2 install
   It should also be noted that the same command can be used in a multi-module scenario. For example;
 
 ------
-m2 clean:clean install
+mvn clean:clean install
 ------
 
   This command will traverse into all of the subprojects and run <<<clean:clean>>>, then <<<install>>> (including all of
diff --git a/maven-site/src/site/apt/guides/introduction/profile-example.txt b/maven-site/src/site/apt/guides/introduction/profile-example.txt
index aaf21010f5..7c63cedfbc 100644
--- a/maven-site/src/site/apt/guides/introduction/profile-example.txt
+++ b/maven-site/src/site/apt/guides/introduction/profile-example.txt
@@ -29,10 +29,10 @@ you declare profile in your pom like this :
      </profile>
    </profiles>
 
-and you can run m2 with one of profiles like :
-m2 -P env-production clean:clean install ==> we use the profile id
+and you can run mvn with one of profiles like :
+mvn -P env-production clean:clean install ==> we use the profile id
 or
-m2 -Denv=test clean:clean install ==> we use the property env define in 
+mvn -Denv=test clean:clean install ==> we use the property env define in
 <activation>
 
 Emmanuel
diff --git a/maven-site/src/site/apt/guides/mini/guide-assemblies.apt b/maven-site/src/site/apt/guides/mini/guide-assemblies.apt
index bc04e9dc2c..d30a8a8b36 100644
--- a/maven-site/src/site/apt/guides/mini/guide-assemblies.apt
+++ b/maven-site/src/site/apt/guides/mini/guide-assemblies.apt
@@ -142,7 +142,7 @@ Guide to creating assemblies
 
 +----+
 
-m2 assembly:assembly
+mvn assembly:assembly
 
 +----+
 
diff --git a/maven-site/src/site/apt/guides/mini/guide-attached-tests.apt b/maven-site/src/site/apt/guides/mini/guide-attached-tests.apt
index ae3b079205..8938644b7a 100644
--- a/maven-site/src/site/apt/guides/mini/guide-attached-tests.apt
+++ b/maven-site/src/site/apt/guides/mini/guide-attached-tests.apt
@@ -42,7 +42,7 @@ Guide to using attached tests
 
 +----+
 
-m2 install
+mvn install
 
 +----+
 
@@ -53,7 +53,7 @@ m2 install
 
 +----+
 
-m2 deploy
+mvn deploy
 
 +----+
 
diff --git a/maven-site/src/site/apt/guides/mini/guide-bash-m2-completion.apt b/maven-site/src/site/apt/guides/mini/guide-bash-m2-completion.apt
index 22c0d2e41b..1aa8d2d574 100644
--- a/maven-site/src/site/apt/guides/mini/guide-bash-m2-completion.apt
+++ b/maven-site/src/site/apt/guides/mini/guide-bash-m2-completion.apt
@@ -45,7 +45,7 @@ _m2_complete()
   COMPREPLY=($(compgen -W "${goals}" ${cur} | sed 's/\\\\//g') )
 }
 
-complete -F _m2_complete -o filenames m2
+complete -F _m2_complete -o filenames mvn
 
 +----+
 
diff --git a/maven-site/src/site/apt/guides/mini/guide-coping-with-sun-jars.apt b/maven-site/src/site/apt/guides/mini/guide-coping-with-sun-jars.apt
index 5b21cf0135..6d467129a1 100644
--- a/maven-site/src/site/apt/guides/mini/guide-coping-with-sun-jars.apt
+++ b/maven-site/src/site/apt/guides/mini/guide-coping-with-sun-jars.apt
@@ -69,7 +69,7 @@ Coping with SUN JARs
 
 +----+
 
-m2 install:install-file -Dfile=<path-to-file> -DgroupId=<group-id> \
+mvn install:install-file -Dfile=<path-to-file> -DgroupId=<group-id> \
     -DartifactId=<artifact-id> -Dversion=<version> -Dpackaging=<packaging>
 
 +----+
diff --git a/maven-site/src/site/apt/guides/mini/guide-creating-archetypes.apt b/maven-site/src/site/apt/guides/mini/guide-creating-archetypes.apt
index db811cae1f..8b46cc0eff 100644
--- a/maven-site/src/site/apt/guides/mini/guide-creating-archetypes.apt
+++ b/maven-site/src/site/apt/guides/mini/guide-creating-archetypes.apt
@@ -56,7 +56,7 @@ archetype
 
 +----+
 
-m2 install
+mvn install
 
 +----+
 
@@ -64,7 +64,7 @@ m2 install
 
 +----+
 
-m2 archetype:create -DgroupId=com.mycompany.app \
+mvn archetype:create -DgroupId=com.mycompany.app \
     -DartifactId=my-archetype -DarchetypeGroupId=<artifact-group-id> -DarchetypeArtifactId=<archetype-artifact-id>
 
 +----+
diff --git a/maven-site/src/site/apt/guides/mini/guide-deploy-ftp.apt b/maven-site/src/site/apt/guides/mini/guide-deploy-ftp.apt
index 61409588e4..837a6fcafc 100644
--- a/maven-site/src/site/apt/guides/mini/guide-deploy-ftp.apt
+++ b/maven-site/src/site/apt/guides/mini/guide-deploy-ftp.apt
@@ -88,6 +88,6 @@ Guide to deploying with FTP
 
 +----+
 
-m2 deploy
+mvn deploy
 
 +----+
\ No newline at end of file
diff --git a/maven-site/src/site/apt/guides/mini/guide-deploy-ssh-external.apt b/maven-site/src/site/apt/guides/mini/guide-deploy-ssh-external.apt
index 0812cda7de..590f6c4ebe 100644
--- a/maven-site/src/site/apt/guides/mini/guide-deploy-ssh-external.apt
+++ b/maven-site/src/site/apt/guides/mini/guide-deploy-ssh-external.apt
@@ -67,6 +67,6 @@ Guide to deploying with an external SSH command
 
 +----+
 
-m2 deploy
+mvn deploy
 
 +----+
diff --git a/maven-site/src/site/apt/guides/mini/guide-ear.apt b/maven-site/src/site/apt/guides/mini/guide-ear.apt
index 7dda7d7d6f..78ea968a35 100644
--- a/maven-site/src/site/apt/guides/mini/guide-ear.apt
+++ b/maven-site/src/site/apt/guides/mini/guide-ear.apt
@@ -8,7 +8,7 @@
 
 +----+
 
-m2 archetype:create -DgroupId=com.mycompany.app -DartifactId=my-webapp -DarchetypeArtifactId=maven-archetype-ear
+mvn archetype:create -DgroupId=com.mycompany.app -DartifactId=my-webapp -DarchetypeArtifactId=maven-archetype-ear
 
 +----+
 
@@ -39,7 +39,7 @@ m2 archetype:create -DgroupId=com.mycompany.app -DartifactId=my-webapp -Darchety
 
 +----+
 
-m2 clean package
+mvn clean package
 
 +----+
 
diff --git a/maven-site/src/site/apt/guides/mini/guide-generating-sources.apt b/maven-site/src/site/apt/guides/mini/guide-generating-sources.apt
index b385704f25..93f5ea4570 100644
--- a/maven-site/src/site/apt/guides/mini/guide-generating-sources.apt
+++ b/maven-site/src/site/apt/guides/mini/guide-generating-sources.apt
@@ -46,7 +46,7 @@ Guide to generating sources
 
 +----+
 
- If you then type "m2 compile" m2 will walk through the {{{../introduction/introduction-to-the-lifecycle.html}lifecycle}}
+ If you then type "mvn compile" m2 will walk through the {{{../introduction/introduction-to-the-lifecycle.html}lifecycle}}
  and will eventually hit the <<<generate-sources>>> phase and see you have a plugin configured that
  wants to participate in that phase and the antlr plugin is executed with
  your given configuration.
diff --git a/maven-site/src/site/apt/guides/mini/guide-ide-eclipse.apt b/maven-site/src/site/apt/guides/mini/guide-ide-eclipse.apt
index e15b3005e2..3ec8955a31 100644
--- a/maven-site/src/site/apt/guides/mini/guide-ide-eclipse.apt
+++ b/maven-site/src/site/apt/guides/mini/guide-ide-eclipse.apt
@@ -12,6 +12,6 @@ Guide to using Eclipse with Maven 2.x
 
 +----+
 
-m2 eclipse:eclipse
+mvn eclipse:eclipse
 
 +----+
diff --git a/maven-site/src/site/apt/guides/mini/guide-ide-idea.apt b/maven-site/src/site/apt/guides/mini/guide-ide-idea.apt
index 6c919896a2..fcc4f9938b 100644
--- a/maven-site/src/site/apt/guides/mini/guide-ide-idea.apt
+++ b/maven-site/src/site/apt/guides/mini/guide-ide-idea.apt
@@ -12,6 +12,6 @@ Guide to using IDEA with Maven 2.x
 
 +----+
 
-m2 idea:idea
+mvn idea:idea
 
 +----+
diff --git a/maven-site/src/site/apt/guides/mini/guide-ide-netbeans/guide-ide-netbeans.apt b/maven-site/src/site/apt/guides/mini/guide-ide-netbeans/guide-ide-netbeans.apt
index 550894d389..2519d76a10 100644
--- a/maven-site/src/site/apt/guides/mini/guide-ide-netbeans/guide-ide-netbeans.apt
+++ b/maven-site/src/site/apt/guides/mini/guide-ide-netbeans/guide-ide-netbeans.apt
@@ -1,7 +1,7 @@
     ------
     Guide to Using maven 2 in Netbeans 4.0 (4.1 and 5.0)
     ------
-    Raphaël Piéroni
+    Rapha�l Pi�roni
     ------
     Mon Aug 9 2005
     ------
@@ -34,7 +34,7 @@ Using maven 2 in Netbeans 4.0 (4.1 and 5.0)
     You can also checkout the Maven 2 project using your versionning system.
 
 -------------------
-[maven-user@mini-guide examples]$ m2 archetype:create -DarchetypeArtifactId=maven-archetype-quickstart -DartifactId=demoquickstart -DgroupId=demoquickstart
+[maven-user@mini-guide examples]$ mvn archetype:create -DarchetypeArtifactId=maven-archetype-quickstart -DartifactId=demoquickstart -DgroupId=demoquickstart
 
 [INFO] Searching repository for plugin with prefix: 'archetype'.
 [INFO] ----------------------------------------------------------------------------
@@ -107,7 +107,7 @@ Using maven 2 in Netbeans 4.0 (4.1 and 5.0)
     To eneable the project, use the netbeans-freeform plugin for Maven 2.
 
 -------------------
-[maven-user@mini-guide demoquickstart]$ m2 netbeans-freeform:generate-netbeans-project
+[maven-user@mini-guide demoquickstart]$ mvn netbeans-freeform:generate-netbeans-project
 [INFO] Searching repository for plugin with prefix: 'netbeans-freeform'.
 [INFO] ----------------------------------------------------------------------------
 [INFO] Building Maven Quick Start Archetype
diff --git a/maven-site/src/site/apt/guides/mini/guide-multiple-repositories.apt b/maven-site/src/site/apt/guides/mini/guide-multiple-repositories.apt
index 016a31ebe3..d453a0bf4d 100644
--- a/maven-site/src/site/apt/guides/mini/guide-multiple-repositories.apt
+++ b/maven-site/src/site/apt/guides/mini/guide-multiple-repositories.apt
@@ -78,7 +78,7 @@ Setting up Multiple Repositories
 
 +----+
 
-m2 -Pmyprofile ...
+mvn -Pmyprofile ...
 
 +----+
 
diff --git a/maven-site/src/site/apt/guides/mini/guide-releasing.apt b/maven-site/src/site/apt/guides/mini/guide-releasing.apt
index 0cd680b755..a4f5879be1 100644
--- a/maven-site/src/site/apt/guides/mini/guide-releasing.apt
+++ b/maven-site/src/site/apt/guides/mini/guide-releasing.apt
@@ -34,7 +34,7 @@ Preparing the release
    []
 
 -----
-m2 release:prepare -DtagBase=svn+ssh://svn.codehaus.org/home/projects/plexus/scm/tags
+mvn release:prepare -DtagBase=svn+ssh://svn.codehaus.org/home/projects/plexus/scm/tags
 -----
 
  When this operation is over, your source control has the released code tagged and ready to deploy.
@@ -42,7 +42,7 @@ m2 release:prepare -DtagBase=svn+ssh://svn.codehaus.org/home/projects/plexus/scm
 Performing the release
 
 -----
-m2 release:perform -DtagBase=svn+ssh://svn.codehaus.org/home/projects/plexus/scm
+mvn release:perform -DtagBase=svn+ssh://svn.codehaus.org/home/projects/plexus/scm
 -----
 
 ~~ -----
diff --git a/maven-site/src/site/apt/guides/mini/guide-site.apt b/maven-site/src/site/apt/guides/mini/guide-site.apt
index 4cfe20ed0d..5296eee9c2 100644
--- a/maven-site/src/site/apt/guides/mini/guide-site.apt
+++ b/maven-site/src/site/apt/guides/mini/guide-site.apt
@@ -49,7 +49,7 @@ Creating a site
   Generating the site is very simple, and fast!
 
 ---------------
-m2 site:site
+mvn site:site
 ---------------
 
   The resulting site will be in <<<target/site/...>>>
@@ -78,7 +78,7 @@ m2 site:site
   You must presently run the <<<site:site>>> goal as well.
 
 ---------------
-m2 site:site site:deploy
+mvn site:site site:deploy
 ---------------
 
   <<Note:>> the trailing slash in the URL above indicates that any subprojects that inherit this value should append their artifact ID to
diff --git a/maven-site/src/site/apt/guides/mini/guide-webapp.apt b/maven-site/src/site/apt/guides/mini/guide-webapp.apt
index bcd9622464..fcc9210db9 100644
--- a/maven-site/src/site/apt/guides/mini/guide-webapp.apt
+++ b/maven-site/src/site/apt/guides/mini/guide-webapp.apt
@@ -8,7 +8,7 @@
 
 +----+
 
-m2 archetype:create -DgroupId=com.mycompany.app -DartifactId=my-webapp -DarchetypeArtifactId=maven-archetype-webapp
+mvn archetype:create -DgroupId=com.mycompany.app -DartifactId=my-webapp -DarchetypeArtifactId=maven-archetype-webapp
 
 +----+
 
@@ -39,7 +39,7 @@ m2 archetype:create -DgroupId=com.mycompany.app -DartifactId=my-webapp -Darchety
 
 +----+
 
-m2 clean:clean package
+mvn clean:clean package
 
 +----+
 
diff --git a/maven-site/src/site/apt/guides/plugin/guide-java-plugin-development.apt b/maven-site/src/site/apt/guides/plugin/guide-java-plugin-development.apt
index 530a974052..47bd25e553 100644
--- a/maven-site/src/site/apt/guides/plugin/guide-java-plugin-development.apt
+++ b/maven-site/src/site/apt/guides/plugin/guide-java-plugin-development.apt
@@ -162,7 +162,7 @@ groupID:artifactID:version:goal
 +----+
 
   For example, to run the simple mojo in the sample plugin, you would enter
-  "<<<m2 sample.plugin:maven-hello-plugin:1.0-SNAPSHOT:sayhi>>>" on the
+  "<<<mvn sample.plugin:maven-hello-plugin:1.0-SNAPSHOT:sayhi>>>" on the
   command line.
 
 *** Shortening the Command Line
@@ -172,7 +172,7 @@ groupID:artifactID:version:goal
   <<<updateReleaseInfo>>> option set to true; for example:
 
 +----+
-m2 -DupdateReleaseInfo=true install
+mvn -DupdateReleaseInfo=true install
 +----+
 
   You also need to add your plugin's group ID to the list of group IDs
@@ -185,7 +185,7 @@ m2 -DupdateReleaseInfo=true install
 </pluginGroups>
 +----+
 
-  At this point, you can run the mojo with "<<<m2 hello:sayhi>>>".
+  At this point, you can run the mojo with "<<<mvn hello:sayhi>>>".
 
 
 *** Attaching the Mojo to the Build Lifecycle
diff --git a/maven-site/src/site/apt/guides/suggestions/non-standard-directories.txt b/maven-site/src/site/apt/guides/suggestions/non-standard-directories.txt
index 3860bafa0f..9e142bfc68 100644
--- a/maven-site/src/site/apt/guides/suggestions/non-standard-directories.txt
+++ b/maven-site/src/site/apt/guides/suggestions/non-standard-directories.txt
@@ -68,7 +68,7 @@ artifact project.
 3. I ran the install phase as follows:
 
  > cd com/acme
- > m2 install
+ > mvn install
 
 which caused the target directories to be generated also at the same  
 level as each pom - for example com/acme/util/target and com/acme/gui/ 
@@ -90,7 +90,7 @@ com/acme/gui/Main.class
 gui.properties
 META-INF/maven/com.acme/gui/pom.properties
 
-which looks fine. I also ran "m2 site:site" as a random goal and that  
+which looks fine. I also ran "mvn site:site" as a random goal and that
 seemed to work too, ie a target/site directory was created with all  
 the files correctly generated underneath.