svn commit: r726543 - in /maven/components/branches/maven-2.1.x: ./ maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java

[bentmann]

Author: bentmann
Date: Sun Dec 14 13:47:55 2008
New Revision: 726543

URL: http://svn.apache.org/viewvc?rev=726543&view=rev
Log:
o Fixed doc about command to get help output from CLI (merged from r726541)

Modified:
    maven/components/branches/maven-2.1.x/   (props changed)
    
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java

Propchange: maven/components/branches/maven-2.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec 14 13:47:55 2008
@@ -1,5 +1,5 @@
 
/maven/components/branches/maven-2.0.10-RC:679193-679867,680477-688882,720697,725329-725330,725342,725349,725359
-/maven/components/branches/maven-2.0.x:679552-679867,709032,709208,709241,720042,725949,726244,726417
+/maven/components/branches/maven-2.0.x:679552-679867,709032,709208,709241,720042,725949,726244,726417,726541
 /maven/components/branches/maven-2.1.0-M1-RC:690315,691793-694304
 /maven/components/branches/maven-2.1.0-RC:688883,689695,689976,689990
 /maven/components/trunk:720001,721902

Modified: 
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=726543&r1=726542&r2=726543&view=diff
==============================================================================
--- 
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
 (original)
+++ 
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
 Sun Dec 14 13:47:55 2008
@@ -168,7 +168,7 @@
             buffer.append( "Please see\n" );
             buffer.append( 
"http://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html\n";
 );
             buffer.append( "for a complete description of available lifecycle 
phases.\n\n" );
-            buffer.append( "Use \"mvn -?\" to show general usage information 
about Maven's command line.\n\n" );
+            buffer.append( "Use \"mvn --help\" to show general usage 
information about Maven's command line.\n\n" );
 
             throw new BuildFailureException( buffer.toString() );
         }