Author: kkolinko
Date: Sun Nov 9 14:54:35 2014
New Revision: 1637681
URL: http://svn.apache.org/r1637681
Log:
CTR: docs
Correct typos in configuration samples: XML comments start with '<!--'.
Remove comment markers around configuration samples
It is backport of r1446641 r1446660 from tomcat/tc7.0.x/trunk.
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/docs/ssl-howto.xml
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1446640,1446650
Merged /tomcat/tc7.0.x/trunk:r1446641-1446660
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1637681&r1=1637680&r2=1637681&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun Nov 9 14:54:35 2014
@@ -87,6 +87,10 @@
Configure the Javadoc tool to read sources as ISO-8859-1, suppress
timestamp comments and enable charset header. (kkolinko)
</fix>
+ <fix>
+ Correct typos in configuration samples on SSL Configuration page
+ of Tomcat documentation. (kkolinko)
+ </fix>
</changelog>
</subsection>
<subsection name="Other">
Modified: tomcat/tc6.0.x/trunk/webapps/docs/ssl-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/ssl-howto.xml?rev=1637681&r1=1637680&r2=1637681&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/ssl-howto.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/ssl-howto.xml Sun Nov 9 14:54:35 2014
@@ -302,17 +302,17 @@ then it will use the APR SSL implementat
in the <b>protocol</b> attribute of the Connector.<br/>
To define a Java (JSSE) connector, regardless of whether the APR library is
loaded or not do:
<source>
-<-- Define a blocking Java SSL Coyote HTTP/1.1 Connector on port 8443 -->
+<!-- Define a blocking Java SSL Coyote HTTP/1.1 Connector on port 8443
-->
<Connector protocol="org.apache.coyote.http11.Http11Protocol"
port="8443" .../>
-<-- Define a non-blocking Java SSL Coyote HTTP/1.1 Connector on port 8443
-->
+<!-- Define a non-blocking Java SSL Coyote HTTP/1.1 Connector on port 8443
-->
<Connector protocol="org.apache.coyote.http11.Http11NioProtocol"
port="8443" .../>
</source>
Alternatively, to specify an APR connector (the APR library must be available)
use:
<source>
-<-- Define a APR SSL Coyote HTTP/1.1 Connector on port 8443 -->
+<!-- Define a APR SSL Coyote HTTP/1.1 Connector on port 8443 -->
<Connector protocol="org.apache.coyote.http11.Http11AprProtocol"
port="8443" .../>
</source>
@@ -350,22 +350,19 @@ Tomcat 6 instance. An example <code><
for an SSL connector is included in the default <code>server.xml</code>
file installed with Tomcat. For JSSE, it should look something like this:</p>
<source>
-<-- Define a SSL Coyote HTTP/1.1 Connector on port 8443 -->
-<!--
+<!-- Define a SSL Coyote HTTP/1.1 Connector on port 8443 -->
<Connector
port="8443" maxThreads="200"
scheme="https" secure="true" SSLEnabled="true"
keystoreFile="${user.home}/.keystore" keystorePass="changeit"
clientAuth="false" sslProtocol="TLS"/>
--->
</source>
<p>
The example above will throw an error if you have the APR and the Tomcat
Native libraries in your path,
as Tomcat will try to use the APR connector. The APR connector uses
different attributes for
SSL keys and certificates. An example of an APR configuration is:
<source>
-<-- Define a SSL Coyote HTTP/1.1 Connector on port 8443 -->
-<!--
+<!-- Define a SSL Coyote HTTP/1.1 Connector on port 8443 -->
<Connector
port="8443" maxThreads="200"
scheme="https" secure="true" SSLEnabled="true"
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
