Remove path attribute from examples of <Context> where this attribute is not needed.

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

diff --git a/webapps/docs/config/context.xml b/webapps/docs/config/context.xml
index 30a52f9..4be9ac2 100644 (file)
--- a/webapps/docs/config/context.xml
+++ b/webapps/docs/config/context.xml
@@ -767,7 +767,7 @@
     by nesting a <a href="valve.html">Valve</a> element like this:</p>
 
 <source>
-&lt;Context path="/examples" ...&gt;
+&lt;Context&gt;
   ...
   &lt;Valve className="org.apache.catalina.valves.AccessLogValve"
          prefix="localhost_access_log." suffix=".txt"
@@ -821,7 +821,7 @@
     <code>&lt;Parameter&gt;</code> elements inside this element.  For
     example, you can create an initialization parameter like this:</p>
 <source>
-&lt;Context ...&gt;
+&lt;Context&gt;
   ...
   &lt;Parameter name="companyName" value="My Company, Incorporated"
          override="false"/&gt;
@@ -880,7 +880,7 @@
     <code>&lt;Environment&gt;</code> entries inside this element.  For
     example, you can create an environment entry like this:</p>
 <source>
-&lt;Context ...&gt;
+&lt;Context&gt;
   ...
   &lt;Environment name="maxExemptions" value="10"
          type="java.lang.Integer" override="false"/&gt;
@@ -957,7 +957,7 @@
     lifecycle events.  Configuration of such a listener looks like this:</p>
 
 <source>
-&lt;Context path="/examples" ...&gt;
+&lt;Context&gt;
   ...
   &lt;Listener className="com.mycompany.mypackage.MyListener" ... &gt;
   ...
@@ -985,7 +985,7 @@
     Example filter declarations:</p>
 
 <source>
-&lt;Context path="/examples" ...&gt;
+&lt;Context&gt;
   ...
   &lt;Valve className="org.apache.catalina.valves.RemoteHostValve"
          allow=".*\.mycompany\.com|www\.yourcompany\.com"/&gt;
@@ -1014,7 +1014,7 @@
 
     <p>For example, you can create a resource definition like this:</p>
 <source>
-&lt;Context ...&gt;
+&lt;Context&gt;
   ...
   &lt;Resource name="jdbc/EmployeeDB" auth="Container"
             type="javax.sql.DataSource"
@@ -1111,7 +1111,7 @@
 
     <p>For example, you can create a resource link like this:</p>
 <source>
-&lt;Context ...&gt;
+&lt;Context&gt;
   ...
   &lt;ResourceLink name="linkToGlobalResource"
             global="simpleValue"
@@ -1172,7 +1172,7 @@
     </attributes>
     <p>Shared Data Source Example</p>
 <source>
-&lt;GlobalNamingResources ...&gt;
+&lt;GlobalNamingResources&gt;
   ...
   &lt;Resource name=&quot;sharedDataSource&quot;
             global=&quot;sharedDataSource&quot;

diff --git a/webapps/docs/jndi-datasource-examples-howto.xml b/webapps/docs/jndi-datasource-examples-howto.xml
index b7165d5..e005c0d 100644 (file)
--- a/webapps/docs/jndi-datasource-examples-howto.xml
+++ b/webapps/docs/jndi-datasource-examples-howto.xml
@@ -206,8 +206,7 @@ resource to your <a href="config/context.html">Context</a>.</p>
 <p>For example:
 
 <source>
-&lt;Context path="/DBTest" docBase="DBTest"
-        reloadable="true" crossContext="true"&gt;
+&lt;Context&gt;
 
     &lt;!-- maxActive: Maximum number of dB connections in pool. Make sure you
          configure your mysqld max_connections large enough to handle
@@ -411,8 +410,7 @@ The Context element should look something like the following.
 </p>
 
 <source>
-&lt;Context path="/someApp" docBase="someApp"
-   crossContext="true" reloadable="true"&gt;
+&lt;Context&gt;
 
 &lt;Resource name="jdbc/postgres" auth="Container"
           type="javax.sql.DataSource" driverClassName="org.postgresql.Driver"

diff --git a/webapps/docs/manager-howto.xml b/webapps/docs/manager-howto.xml
index 571b8ba..81ae2b0 100644 (file)
--- a/webapps/docs/manager-howto.xml
+++ b/webapps/docs/manager-howto.xml
@@ -71,7 +71,7 @@ Manager web application <code>Context</code> to a new host install the
 <code>$CATALINA_BASE/conf/[enginename]/[hostname]</code> folder. Here is an
 example:</p>
 <pre>
-&lt;Context path="/manager" privileged="true"
+&lt;Context privileged="true"
          docBase="/usr/local/kinetic/tomcat7/server/webapps/manager"&gt;
 &lt;/Context&gt;
 </pre>
@@ -162,8 +162,7 @@ could be restricted by the remote IP address or host by adding a
 <code>RemoteAddrValve</code> or <code>RemoteHostValve</code>.  Here is
 an example of restricting access to the localhost by IP address:</p>
 <pre>
-&lt;Context path="/manager" privileged="true"
-         docBase="/usr/local/kinetic/tomcat7/server/webapps/manager"&gt;
+&lt;Context privileged="true"&gt;
          &lt;Valve className="org.apache.catalina.valves.RemoteAddrValve"
                 allow="127\.0\.0\.1"/&gt;
 &lt;/Context&gt;