Author: kkolinko
Date: Thu Nov 27 09:09:54 2014
New Revision: 1642049
URL: http://svn.apache.org/r1642049
Log:
CTR: docs
Improving manager documentation.
Document the Server Status page.
Merged r1642045 from tomcat/tc7.0.x/trunk.
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1641722
Merged /tomcat/tc7.0.x/trunk:r1642045
Merged /tomcat/tc8.0.x/trunk:r1641730
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1642049&r1=1642048&r2=1642049&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Nov 27 09:09:54 2014
@@ -59,7 +59,8 @@
Correct documentation for cgiPathPrefix. (kkolinko)
</fix>
<update>
- Improve Tomcat Manager documentation. (kkolinko)
+ Improve Tomcat Manager documentation. Rearrange, add section on
+ HTML GUI, document Server Status page. (kkolinko)
</update>
</changelog>
</subsection>
Modified: tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml?rev=1642049&r1=1642048&r2=1642049&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml Thu Nov 27 09:09:54 2014
@@ -974,15 +974,27 @@ has been reloaded several times, it may
</subsection>
-<subsection name="Server Status">
+</section>
+
+<section name="Server Status">
+
+<p>From the following links you can view Status information about the server.
+Any one of <strong>manager-**</strong> roles allows access to this page.</p>
+
+<source>http://localhost:8080/manager/status
+http://localhost:8080/manager/status/all</source>
-<p>From this link , you can view information about the server.</p>
+<p>Displays server status information in HTML format.</p>
-<p>First, you have the server and JVM version number, JVM provider, OS name
+<source>http://localhost:8080/manager/status?XML=true
+http://localhost:8080/manager/status/all?XML=true</source>
+
+<p>Displays server status information in XML format.</p>
+
+<p>First, you have the server and JVM version number, JVM provider, OS name
and number followed by the architecture type.</p>
-<p>Second, there is several information about the memory usage of the JVM
-(available, total and max memory).</p>
+<p>Second, there is information about the memory usage of the JVM.</p>
<p>Then, there is information about the Tomcat AJP and HTTP connectors.
The same information is available for both of them :
@@ -1018,7 +1030,9 @@ The same information is available for bo
</ul>
</li>
</ul>
-</subsection>
+
+<p>If you are using <code>/status/all</code> command, additional information
+on each of deployed web applications will be available.</p>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
