From: kkolinko Date: Wed, 3 Mar 2010 13:16:55 +0000 (+0000) Subject: Add generated TOC, X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=62ade3a146e16b9a589014ba1b0e1468bb7424f1;p=tomcat7.0 Add generated TOC, replacing manual TOC if it was present earlier git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@918461 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/webapps/docs/aio.xml b/webapps/docs/aio.xml index 4cb28fe41..cc0a4ea68 100644 --- a/webapps/docs/aio.xml +++ b/webapps/docs/aio.xml @@ -29,6 +29,10 @@ +
+ +
+

diff --git a/webapps/docs/apr.xml b/webapps/docs/apr.xml index b3d056133..1816ea46d 100644 --- a/webapps/docs/apr.xml +++ b/webapps/docs/apr.xml @@ -29,6 +29,10 @@ +

+ +
+

diff --git a/webapps/docs/balancer-howto.xml b/webapps/docs/balancer-howto.xml index ed4f768e4..b978b9ad6 100644 --- a/webapps/docs/balancer-howto.xml +++ b/webapps/docs/balancer-howto.xml @@ -32,12 +32,7 @@

-

- -Using the JK native connector
- -Using Apache HTTP Server 2.x and mod_proxy -

+
diff --git a/webapps/docs/building.xml b/webapps/docs/building.xml index 31561128b..b6607d405 100644 --- a/webapps/docs/building.xml +++ b/webapps/docs/building.xml @@ -29,6 +29,10 @@ +
+ +
+

diff --git a/webapps/docs/cgi-howto.xml b/webapps/docs/cgi-howto.xml index b9b880a17..c84e0b55c 100644 --- a/webapps/docs/cgi-howto.xml +++ b/webapps/docs/cgi-howto.xml @@ -29,6 +29,10 @@ +

+ +
+

The CGI (Common Gateway Interface) defines a way for a web server to diff --git a/webapps/docs/class-loader-howto.xml b/webapps/docs/class-loader-howto.xml index c964022ac..9564fbde9 100644 --- a/webapps/docs/class-loader-howto.xml +++ b/webapps/docs/class-loader-howto.xml @@ -30,6 +30,9 @@ +

+ +
diff --git a/webapps/docs/cluster-howto.xml b/webapps/docs/cluster-howto.xml index 2a778d6a1..4a591b6ee 100644 --- a/webapps/docs/cluster-howto.xml +++ b/webapps/docs/cluster-howto.xml @@ -30,12 +30,15 @@ -

You can also check the configuration reference documentation.

+
+ +
+

Simply add <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/> diff --git a/webapps/docs/connectors.xml b/webapps/docs/connectors.xml index 71493c92b..b5680eccd 100644 --- a/webapps/docs/connectors.xml +++ b/webapps/docs/connectors.xml @@ -29,6 +29,10 @@ +

+ +
+

Choosing a connector to use with Tomcat can be difficult. This page will diff --git a/webapps/docs/default-servlet.xml b/webapps/docs/default-servlet.xml index 6ab6ff961..9f6c92d66 100644 --- a/webapps/docs/default-servlet.xml +++ b/webapps/docs/default-servlet.xml @@ -29,18 +29,8 @@ -

- -This discusses different ways to manipulate the default servlet. Topics are - - +
+
diff --git a/webapps/docs/extras.xml b/webapps/docs/extras.xml index 6dabdd624..ad91ac5dc 100644 --- a/webapps/docs/extras.xml +++ b/webapps/docs/extras.xml @@ -29,6 +29,10 @@ +
+ +
+

A number of additional third party components may be used with Apache diff --git a/webapps/docs/introduction.xml b/webapps/docs/introduction.xml index ba1059db4..56beb0a42 100644 --- a/webapps/docs/introduction.xml +++ b/webapps/docs/introduction.xml @@ -29,6 +29,9 @@ +

+ +
diff --git a/webapps/docs/jasper-howto.xml b/webapps/docs/jasper-howto.xml index 9c2109a22..9b3c4f1a4 100644 --- a/webapps/docs/jasper-howto.xml +++ b/webapps/docs/jasper-howto.xml @@ -31,13 +31,7 @@
-

-Introduction
-Configuration
-Production Configuration
-Web Application Compilation
-Using Jikes
-

+
diff --git a/webapps/docs/jndi-datasource-examples-howto.xml b/webapps/docs/jndi-datasource-examples-howto.xml index 795183d9f..3152221ca 100644 --- a/webapps/docs/jndi-datasource-examples-howto.xml +++ b/webapps/docs/jndi-datasource-examples-howto.xml @@ -33,14 +33,7 @@
-

-Introduction
- -Database Connection Pool (DBCP) Configurations
-Non DBCP Solutions
-Oracle 8i with OCI client
-Common Problems
-

+
diff --git a/webapps/docs/jndi-resources-howto.xml b/webapps/docs/jndi-resources-howto.xml index 14e7c1d05..c8e6a7960 100644 --- a/webapps/docs/jndi-resources-howto.xml +++ b/webapps/docs/jndi-resources-howto.xml @@ -30,6 +30,9 @@ +
+ +
diff --git a/webapps/docs/logging.xml b/webapps/docs/logging.xml index 3b01343f6..e69ed9037 100644 --- a/webapps/docs/logging.xml +++ b/webapps/docs/logging.xml @@ -30,6 +30,10 @@ +
+ +
+

Tomcat uses diff --git a/webapps/docs/maven-jars.xml b/webapps/docs/maven-jars.xml index 183185f90..b1cdf66c6 100644 --- a/webapps/docs/maven-jars.xml +++ b/webapps/docs/maven-jars.xml @@ -29,6 +29,9 @@ +

+ +
diff --git a/webapps/docs/mbeans-descriptor-howto.xml b/webapps/docs/mbeans-descriptor-howto.xml index a6e5c82e7..597ddb9d6 100644 --- a/webapps/docs/mbeans-descriptor-howto.xml +++ b/webapps/docs/mbeans-descriptor-howto.xml @@ -29,6 +29,10 @@ +
+ +
+

Tomcat uses JMX MBeans as the technology for implementing diff --git a/webapps/docs/monitoring.xml b/webapps/docs/monitoring.xml index 6509dbcc1..9e32724fc 100644 --- a/webapps/docs/monitoring.xml +++ b/webapps/docs/monitoring.xml @@ -30,6 +30,10 @@ +

+ +
+

Monitoring is a key aspect of system administration. Looking inside a diff --git a/webapps/docs/proxy-howto.xml b/webapps/docs/proxy-howto.xml index da33b1fcf..4fb39fb7d 100644 --- a/webapps/docs/proxy-howto.xml +++ b/webapps/docs/proxy-howto.xml @@ -29,6 +29,9 @@ +

+ +
diff --git a/webapps/docs/realm-howto.xml b/webapps/docs/realm-howto.xml index c5904ffb2..44e0999ae 100644 --- a/webapps/docs/realm-howto.xml +++ b/webapps/docs/realm-howto.xml @@ -31,35 +31,8 @@ -
- -

-Quick Start
-

-What is a Realm?
-Configuring a Realm
-
-Common Features
-
-Digested Passwords
-Example Application
-Manager Application
-Logging Within Realms
-
- -Standard Realm Implementations
-
-JDBCRealm
-DataSourceRealm
-JNDIRealm
-MemoryRealm
-JAASRealm
-CombinedRealm
-LockOutRealm
-
-

- +
diff --git a/webapps/docs/security-howto.xml b/webapps/docs/security-howto.xml index fd9a16209..7856bbd3d 100644 --- a/webapps/docs/security-howto.xml +++ b/webapps/docs/security-howto.xml @@ -28,6 +28,10 @@ +
+ +
+

Tomcat is configured to be reasonable secure for must use cases by default. Some environments may require more, or less, secure configurations. @@ -99,7 +103,7 @@

The APR Lifecycle Listener is not stable if compiled on Solaris using - gcc. It using the APR/native connector on Solaris, comppile it with the + gcc. It using the APR/native connector on Solaris, compile it with the Sun Studio compiler.

@@ -150,7 +154,7 @@ necessary for Tomcat to be able to distinguish between secure and non-secure connections received by a proxy, the proxy must use separate connectors to pass secure and non-secure requests to Tomcat. If the - proxy uses AJP then the SSL attributes of the client conenction are + proxy uses AJP then the SSL attributes of the client connection are passed via the AJP protocol and separate connectors are not needed.

The tomcatAuthentication attribute is used with the @@ -220,11 +224,11 @@ configured within each web application. Alternatively, the version number can be changed by creating the following file in CATALINA_HOME/lib/org/apache/catalina/util/ServerInfo.properties with the - content as follows: + content as follows:

server.info=Apache Tomcat/7.0.x - Modify the values as required. Note that this will also change the version +

Modify the values as required. Note that this will also change the version number reported in some of the management tools and may make it harder to determine the real version installed. The CATALINA_HOME/bin/version.bat|sh script will still report the version number.

@@ -239,7 +243,7 @@ server.info=Apache Tomcat/7.0.x tomcat-users.xml require a restart of Tomcat to take effect.

The JDBCRealm is not recommended for production use as it single - threaded for all authentication and authorisation options. Use the + threaded for all authentication and authorization options. Use the DataSourceRealm instead.

The UserDatabaseRealm is not intended for large-scale installations. It diff --git a/webapps/docs/security-manager-howto.xml b/webapps/docs/security-manager-howto.xml index 9ddaff291..eb8787bcd 100644 --- a/webapps/docs/security-manager-howto.xml +++ b/webapps/docs/security-manager-howto.xml @@ -30,6 +30,9 @@ +

+ +
diff --git a/webapps/docs/setup.xml b/webapps/docs/setup.xml index 0e5936511..868bd1037 100644 --- a/webapps/docs/setup.xml +++ b/webapps/docs/setup.xml @@ -29,6 +29,10 @@ +
+ +
+

This document introduces several ways to set up Tomcat for running diff --git a/webapps/docs/ssi-howto.xml b/webapps/docs/ssi-howto.xml index 784d5e155..0479a8b51 100644 --- a/webapps/docs/ssi-howto.xml +++ b/webapps/docs/ssi-howto.xml @@ -29,6 +29,10 @@ +

+ +
+

SSI (Server Side Includes) are directives that are placed in HTML pages, diff --git a/webapps/docs/ssl-howto.xml b/webapps/docs/ssl-howto.xml index 714a22d69..98f867e78 100644 --- a/webapps/docs/ssl-howto.xml +++ b/webapps/docs/ssl-howto.xml @@ -30,6 +30,9 @@ +

+ +
diff --git a/webapps/docs/virtual-hosting-howto.xml b/webapps/docs/virtual-hosting-howto.xml index 6ea08a84e..dc225d702 100644 --- a/webapps/docs/virtual-hosting-howto.xml +++ b/webapps/docs/virtual-hosting-howto.xml @@ -28,6 +28,10 @@ +
+ +
+

For the sake of this how-to, assume you have a development host with two diff --git a/webapps/docs/windows-service-howto.xml b/webapps/docs/windows-service-howto.xml index c50d5c0c6..c2831afda 100644 --- a/webapps/docs/windows-service-howto.xml +++ b/webapps/docs/windows-service-howto.xml @@ -28,7 +28,11 @@ - + +

+ +
+

Tomcat7 is a service application for running Tomcat7 as NT service.