From 47a3b5144e994be76379c2fef3acd1c9ab15e059 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 20 Jul 2014 10:17:46 +0300
Subject: [PATCH] =?UTF-8?q?PR=2056747=20Document=20which=20options=20exit?=
 =?UTF-8?q?=20in=20help=20output,=20submitted=20by=20Ville=20Skytt=C3=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manual/running.html                     | 6 +++---
 src/main/org/apache/tools/ant/Main.java | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/manual/running.html b/manual/running.html
index 46005b553..529afc7dc 100644
--- a/manual/running.html
+++ b/manual/running.html
@@ -100,11 +100,11 @@ targets, or if Ant is invoked in -verbose or -debug mode).
 <h3><a name="options">Command-line Options Summary</a></h3>
 <pre>ant [options] [target [target2 [target3] ...]]
 Options:
-  -help, -h              print this message
-  -projecthelp, -p       print project help information
+  -help, -h              print this message and exit
+  -projecthelp, -p       print project help information and exit
   -version               print the version information and exit
   -diagnostics           print information that might be helpful to
-                         diagnose or report problems.
+                         diagnose or report problems and exit
   -quiet, -q             be extra quiet
   -silent, -S            print nothing but task outputs and build failures
   -verbose, -v           be extra verbose
diff --git a/src/main/org/apache/tools/ant/Main.java b/src/main/org/apache/tools/ant/Main.java
index b9492acb1..a9c23a53a 100644
--- a/src/main/org/apache/tools/ant/Main.java
+++ b/src/main/org/apache/tools/ant/Main.java
@@ -1009,11 +1009,11 @@ public class Main implements AntMain {
     private static void printUsage() {
         System.out.println("ant [options] [target [target2 [target3] ...]]");
         System.out.println("Options: ");
-        System.out.println("  -help, -h              print this message");
-        System.out.println("  -projecthelp, -p       print project help information");
+        System.out.println("  -help, -h              print this message and exit");
+        System.out.println("  -projecthelp, -p       print project help information and exit");
         System.out.println("  -version               print the version information and exit");
         System.out.println("  -diagnostics           print information that might be helpful to");
-        System.out.println("                         diagnose or report problems.");
+        System.out.println("                         diagnose or report problems and exit");
         System.out.println("  -quiet, -q             be extra quiet");
         System.out.println("  -silent, -S            print nothing but task outputs and build failures");
         System.out.println("  -verbose, -v           be extra verbose");