From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 16 Jul 2007 23:33:46 +0000 (+0000)
Subject: Clarify that the manager app is already installed. Remove adding entry to server... 
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=bff4c28100a4cf69d1affd8736e41006e5720354;p=tomcat7.0

Clarify that the manager app is already installed. Remove adding entry to server.xml as an installation option.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@556767 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/webapps/docs/manager-howto.xml b/webapps/docs/manager-howto.xml
index 8b44cb1fe..4bc3fc7ce 100644
--- a/webapps/docs/manager-howto.xml
+++ b/webapps/docs/manager-howto.xml
@@ -82,22 +82,16 @@ the following functions:</p>
     directory (unless it was deployed from file system).</li>
 </ul>
 
-<p>There are two ways to configure the Manager web application
-<code>Context</code>:
-<ul>
-<li>Install the <code>manager.xml</code> context configuration file
-    in the <code>$CATALINA_HOME/conf/[enginename]/[hostname]</code> folder.
-</li>
-<li>Configure the Manager <code>Context</code> within the
-    <code>Host</code> configuration in your Tomcat <code>server.xml</code>
-    configuration. Here is an example:
+<p>A default Tomcat installation includes the manager. To add an instance of the
+Manager web application <code>Context</code> to a new host install the
+<code>manager.xml</code> context configuration file in the
+<code>$CATALINA_HOME/conf/[enginename]/[hostname]</code> folder. Here is an
+example:
 <pre>
-&lt;Context path="/manager" privileged="true"
+&lt;Context path="/manager" debug="0" privileged="true"
          docBase="/usr/local/kinetic/tomcat6/server/webapps/manager"&gt;
 &lt;/Context&gt;
 </pre>
-</li>
-</ul>
 </p>
 
 <p>If you have Tomcat configured to support multiple virtual hosts