svn commit: r1446660 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/ssl-howto.xml

[kkolinko]

Author: kkolinko
Date: Fri Feb 15 16:06:15 2013
New Revision: 1446660

URL: http://svn.apache.org/r1446660
Log:
Merged revision 1446650 from tomcat/trunk:
Correct typos in configuration samples: XML comments start with '<!--'.

Modified:
    tomcat/tc7.0.x/trunk/   (props changed)
    tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
    tomcat/tc7.0.x/trunk/webapps/docs/ssl-howto.xml

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
  Merged /tomcat/trunk:r1446650

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1446660&r1=1446659&r2=1446660&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri Feb 15 16:06:15 2013
@@ -74,6 +74,10 @@
         <bug>54203</bug>: Complete the Javadoc for
         <code>javax.servlet.http.Part</code>. (markt)
       </fix>
+      <fix>
+        Correct typos in configuration samples on SSL Configuration page
+        of Tomcat documentation. (kkolinko)
+      </fix>
     </changelog>
   </subsection>
 </section>

Modified: tomcat/tc7.0.x/trunk/webapps/docs/ssl-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/ssl-howto.xml?rev=1446660&r1=1446659&r2=1446660&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/ssl-howto.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/ssl-howto.xml Fri Feb 15 16:06:15 2013
@@ -297,17 +297,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>
-&lt;-- Define a blocking Java SSL Coyote HTTP/1.1 Connector on port 8443 --&gt;
+&lt;!-- Define a blocking Java SSL Coyote HTTP/1.1 Connector on port 8443 
--&gt;
 &lt;Connector protocol="org.apache.coyote.http11.Http11Protocol"
            port="8443" .../&gt;
 
-&lt;-- Define a non-blocking Java SSL Coyote HTTP/1.1 Connector on port 8443 
--&gt;
+&lt;!-- Define a non-blocking Java SSL Coyote HTTP/1.1 Connector on port 8443 
--&gt;
 &lt;Connector protocol="org.apache.coyote.http11.Http11NioProtocol"
            port="8443" .../&gt;
 </source>
 Alternatively, to specify an APR connector (the APR library must be available) 
use:
 <source>
-&lt;-- Define a APR SSL Coyote HTTP/1.1 Connector on port 8443 --&gt;
+&lt;!-- Define a APR SSL Coyote HTTP/1.1 Connector on port 8443 --&gt;
 &lt;Connector protocol="org.apache.coyote.http11.Http11AprProtocol"
            port="8443" .../&gt;
 </source>
@@ -347,7 +347,7 @@ file installed with Tomcat.  To configur
 will need to remove the comments and edit it so it looks something like
 this:</p>
 <source>
-&lt;-- Define a SSL Coyote HTTP/1.1 Connector on port 8443 --&gt;
+&lt;!-- Define a SSL Coyote HTTP/1.1 Connector on port 8443 --&gt;
 &lt;Connector
            protocol="HTTP/1.1"
            port="8443" maxThreads="200"
@@ -361,7 +361,7 @@ this:</p>
   The APR connector uses different attributes for many SSL settings,
   particularly keys and certificates. An example of an APR configuration is:
 <source>
-&lt;-- Define a SSL Coyote HTTP/1.1 Connector on port 8443 --&gt;
+&lt;!-- Define a SSL Coyote HTTP/1.1 Connector on port 8443 --&gt;
 &lt;Connector
            protocol="HTTP/1.1"
            port="8443" maxThreads="200"



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org