Sync docs in trunk with 6.0.x

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

diff --git a/webapps/docs/building.xml b/webapps/docs/building.xml
index cb5f9c6..361db50 100644 (file)
--- a/webapps/docs/building.xml
+++ b/webapps/docs/building.xml
@@ -179,17 +179,13 @@ Variables to add two new Classpath variables:
 </p>
 
 <p>
-Use File-&gt;New Project to create a new Java project 
-for each of the binaries repository (e.g., /usr/share/java), 
-container, connectors, jasper, servletapi. 
-Unless you thought ahead to make the ${tomcat.source} directory be under
-your Workspace folder, tell Eclipse the external location using &quot;Import/Export...&quot;,
-General-&gt;Existing Project into Workspace.
+Use File-&gt;Import and chose &quot;Existing Projects into Workspace&quot;.
+From there import the root directory where you have checked out tomcat.
 </p>
 
 <p>
-Eclipse .project and .classpath files are provided in each of these
-directories so Eclipse should find all source trees and jars, and
+Eclipse .project and .classpath files are provided in to root directory of tomcat repository
+should allow Eclipse to find all source trees and jars, and
 hopefully compile without problems. <b>Note</b> that these
 files assume you are using Eclipse with a 5.0 or later JDK; also, the
 connectors module must be built with a compiler compliance level of 5.0.

diff --git a/webapps/docs/cgi-howto.xml b/webapps/docs/cgi-howto.xml
index d2a682d..057b631 100644 (file)
--- a/webapps/docs/cgi-howto.xml
+++ b/webapps/docs/cgi-howto.xml
@@ -59,11 +59,12 @@ will bypass your security policy configuration in <code>catalina.policy.</code><
 
 <p>Remove the XML comments from around the CGI servlet and servlet-mapping
 configuration in <code>$CATALINA_BASE/conf/web.xml</code>.</p>
-</section>
 
 <p>Only Contexts which are marked as privileged may use the CGI servlet (see the
 privileged property of the Context element).</p>
 
+</section>
+
 <section name="Configuration">
 
 <p>There are several servlet init parameters which can be used to

diff --git a/webapps/docs/security-manager-howto.xml b/webapps/docs/security-manager-howto.xml
index 5ae4980..0701f6b 100644 (file)
--- a/webapps/docs/security-manager-howto.xml
+++ b/webapps/docs/security-manager-howto.xml
@@ -180,7 +180,6 @@ grant [signedBy <signer>,] [codeBase <code source>] {
 //
 // * Read access to the document root directory
 //
-// $Id$
 // ============================================================================