Author: markt
Date: Tue Nov 3 00:14:11 2009
New Revision: 832214
URL: http://svn.apache.org/viewvc?rev=832214&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48104
Align Javadoc, usage message and code
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Catalina.java?rev=832214&r1=832213&r2=832214&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Catalina.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Catalina.java Tue Nov 3
00:14:11 2009
@@ -48,8 +48,10 @@
* 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 @@
System.out.println
("usage: java org.apache.catalina.startup.Catalina"
+ " [ -config {pathname} ]"
- + " [ -nonaming ] { start | stop }");
+ + " [ -nonaming ] "
+ + " { -help | start | stop }");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
