From f36cf136c00f9dcfc4183c74eb6af907cd331001 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 3 Nov 2009 00:14:11 +0000
Subject: [PATCH] Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48104
 Align Javadoc, usage message and code

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@832214 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/startup/Catalina.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/catalina/startup/Catalina.java b/java/org/apache/catalina/startup/Catalina.java
index 38bd41e8e..060726b12 100644
--- a/java/org/apache/catalina/startup/Catalina.java
+++ b/java/org/apache/catalina/startup/Catalina.java
@@ -48,8 +48,10 @@ import org.xml.sax.InputSource;
  *     to be processed.  If a relative path is specified, it will be
  *     interpreted as relative to the directory pathname specified by the
  *     "catalina.base" system property.   [conf/server.xml]
- * <li><b>-help</b> - Display usage information.
- * <li><b>-stop</b> - Stop the currently running instance of Catalina.
+ * <li><b>-help</b>      - Display usage information.
+ * <li><b>-nonaming</b>  - Disable naming support.
+ * <li><b>-start</b>     - Start an instance of Catalina.
+ * <li><b>-stop</b>      - Stop the currently running instance of Catalina.
  * </u>
  *
  * Should do the same thing as Embedded, but using a server.xml file.
@@ -660,7 +662,8 @@ public class Catalina extends Embedded {
         System.out.println
             ("usage: java org.apache.catalina.startup.Catalina"
              + " [ -config {pathname} ]"
-             + " [ -nonaming ] { start | stop }");
+             + " [ -nonaming ] "
+             + " { -help | start | stop }");
 
     }
 
-- 
2.11.0