diff --git a/webapps/docs/images/tomcat.svg b/webapps/docs/images/tomcat.svg index a43a5d6dd..cfa87dba9 100644 --- a/webapps/docs/images/tomcat.svg +++ b/webapps/docs/images/tomcat.svg @@ -17,34 +17,34 @@ --> - - - - - - - - - - + + + + + + + + + + + ]> + ]]> + + diff --git a/webapps/docs/jasper-howto.xml b/webapps/docs/jasper-howto.xml index 3f6954782..2bc9c56ce 100644 --- a/webapps/docs/jasper-howto.xml +++ b/webapps/docs/jasper-howto.xml @@ -282,7 +282,7 @@ download) to precompile a webapp: optimize="off" debug="on" failonerror="false" srcdir="${webapp.path}/WEB-INF/src" - excludes="**/*.smap"> + excludes="**/*.smap"> <classpath> <pathelement location="${webapp.path}/WEB-INF/classes"/> <fileset dir="${webapp.path}/WEB-INF/lib"> @@ -306,10 +306,10 @@ download) to precompile a webapp: </target> <target name="cleanup"> - <delete> + <delete> <fileset dir="${webapp.path}/WEB-INF/src"/> <fileset dir="${webapp.path}/WEB-INF/classes/org/apache/jsp"/> - </delete> + </delete> </target> </project> diff --git a/webapps/docs/manager-howto.xml b/webapps/docs/manager-howto.xml index c285c5196..b56125b47 100644 --- a/webapps/docs/manager-howto.xml +++ b/webapps/docs/manager-howto.xml @@ -1149,69 +1149,69 @@ can be used:

-	<target name="manager.deploy"
-		depends="context.status"
-		if="context.notInstalled">
-		<deploy url="${mgr.url}"
-			username="${mgr.username}"
-			password="${mgr.password}"
-			path="${mgr.context.path}"
-			config="${mgr.context.descriptor}"/>
-	</target>
-
-	<target name="manager.deploy.war"
-		depends="context.status"
-		if="context.deployable">
-		<deploy url="${mgr.url}"
-			username="${mgr.username}"
-			password="${mgr.password}"
-			update="${mgr.update}"
-			path="${mgr.context.path}"
-			war="${mgr.war.file}"/>
-	</target>
-	
-	<target name="context.status">
-		<property name="running" value="${mgr.context.path}:running"/>
-		<property name="stopped" value="${mgr.context.path}:stopped"/>
-	
-		<list url="${mgr.url}"
-			outputproperty="ctx.status"
-			username="${mgr.username}"
-			password="${mgr.password}">
-		</list>
-		
-		<condition property="context.running">
-			<contains string="${ctx.status}" substring="${running}"/>
-		</condition>
-		<condition property="context.stopped">
-			<contains string="${ctx.status}" substring="${stopped}"/>
-		</condition>
-		<condition property="context.notInstalled">
-			<and>
-				<isfalse value="${context.running}"/>
-				<isfalse value="${context.stopped}"/>
-			</and>
-		</condition>
-		<condition property="context.deployable">
-			<or>
-				<istrue value="${context.notInstalled}"/>
-				<and>
-					<istrue value="${context.running}"/>
-					<istrue value="${mgr.update}"/>
-				</and>
-				<and>
-					<istrue value="${context.stopped}"/>
-					<istrue value="${mgr.update}"/>
-				</and>
-			</or>
-		</condition>
-		<condition property="context.undeployable">
-			<or>
-				<istrue value="${context.running}"/>
-				<istrue value="${context.stopped}"/>
-			</or>
-		</condition>
-	</target>
+    <target name="manager.deploy"
+        depends="context.status"
+        if="context.notInstalled">
+        <deploy url="${mgr.url}"
+            username="${mgr.username}"
+            password="${mgr.password}"
+            path="${mgr.context.path}"
+            config="${mgr.context.descriptor}"/>
+    </target>
+
+    <target name="manager.deploy.war"
+        depends="context.status"
+        if="context.deployable">
+        <deploy url="${mgr.url}"
+            username="${mgr.username}"
+            password="${mgr.password}"
+            update="${mgr.update}"
+            path="${mgr.context.path}"
+            war="${mgr.war.file}"/>
+    </target>
+    
+    <target name="context.status">
+        <property name="running" value="${mgr.context.path}:running"/>
+        <property name="stopped" value="${mgr.context.path}:stopped"/>
+    
+        <list url="${mgr.url}"
+            outputproperty="ctx.status"
+            username="${mgr.username}"
+            password="${mgr.password}">
+        </list>
+        
+        <condition property="context.running">
+            <contains string="${ctx.status}" substring="${running}"/>
+        </condition>
+        <condition property="context.stopped">
+            <contains string="${ctx.status}" substring="${stopped}"/>
+        </condition>
+        <condition property="context.notInstalled">
+            <and>
+                <isfalse value="${context.running}"/>
+                <isfalse value="${context.stopped}"/>
+            </and>
+        </condition>
+        <condition property="context.deployable">
+            <or>
+                <istrue value="${context.notInstalled}"/>
+                <and>
+                    <istrue value="${context.running}"/>
+                    <istrue value="${mgr.update}"/>
+                </and>
+                <and>
+                    <istrue value="${context.stopped}"/>
+                    <istrue value="${mgr.update}"/>
+                </and>
+            </or>
+        </condition>
+        <condition property="context.undeployable">
+            <or>
+                <istrue value="${context.running}"/>
+                <istrue value="${context.stopped}"/>
+            </or>
+        </condition>
+    </target>

diff --git a/webapps/docs/ssl-howto.xml b/webapps/docs/ssl-howto.xml index 98f867e78..21beed1d0 100644 --- a/webapps/docs/ssl-howto.xml +++ b/webapps/docs/ssl-howto.xml @@ -433,14 +433,14 @@ by the Certificate Authority to create a Certificate that will identify your web as "secure". To create a CSR follow these steps:

Create a local Certificate (as described in the previous section): - keytool -genkey -alias tomcat -keyalg RSA \ - -keystore <your_keystore_filename> - Note: In some cases you will have to enter the domain of your website (i.e. www.myside.org) - in the field "first- and lastname" in order to create a working Certificate. + keytool -genkey -alias tomcat -keyalg RSA \ + -keystore <your_keystore_filename> + Note: In some cases you will have to enter the domain of your website (i.e. www.myside.org) + in the field "first- and lastname" in order to create a working Certificate.
The CSR is then created with: - keytool -certreq -keyalg RSA -alias tomcat -file certreq.csr \ - -keystore <your_keystore_filename> + keytool -certreq -keyalg RSA -alias tomcat -file certreq.csr \ + -keystore <your_keystore_filename>

Now you have a file called certreq.csr that you can submit to the Certificate Authority (look at the @@ -454,22 +454,22 @@ After that you can proceed with importing your Certificate.

Download a Chain Certificate from the Certificate Authority you obtained the Certificate from.
- For Verisign.com commercial certificates go to: + For Verisign.com commercial certificates go to: http://www.verisign.com/support/install/intermediate.html
For Verisign.com trial certificates go to: http://www.verisign.com/support/verisign-intermediate-ca/Trial_Secure_Server_Root/index.html
- For Trustcenter.de go to: + For Trustcenter.de go to: http://www.trustcenter.de/certservices/cacerts/en/en.htm#server
- For Thawte.com go to: + For Thawte.com go to: http://www.thawte.com/certs/trustmap.html
Import the Chain Certificate into your keystore keytool -import -alias root -keystore <your_keystore_filename> \ - -trustcacerts -file <filename_of_the_chain_certificate> + -trustcacerts -file <filename_of_the_chain_certificate>
And finally import your new Certificate - keytool -import -alias tomcat -keystore <your_keystore_filename> \ - -file <your_certificate_filename> + keytool -import -alias tomcat -keystore <your_keystore_filename> \ + -file <your_certificate_filename>

diff --git a/webapps/docs/tomcat-docs.xsl b/webapps/docs/tomcat-docs.xsl index 80e06d4b2..f5551baf8 100644 --- a/webapps/docs/tomcat-docs.xsl +++ b/webapps/docs/tomcat-docs.xsl @@ -77,10 +77,10 @@ --> - + ParameterName - Default - Description - + Default + Description + --Description @@ -156,8 +156,8 @@ --User User account used for running executable. It is used only for - StartMode java or exe and enables running applications - as service under account without LogonAsService privilege. + StartMode java or exe and enables running applications + as service under account without LogonAsService privilege. --Password -- 2.11.0