Author: kkolinko
Date: Thu Jan 10 00:42:05 2013
New Revision: 1431165
URL: http://svn.apache.org/viewvc?rev=1431165&view=rev
Log:
Merged revision 1431164 from tomcat/trunk:
A pair of typos
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1431164
Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml?rev=1431165&r1=1431164&r2=1431165&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml Thu Jan 10 00:42:05 2013
@@ -1040,13 +1040,13 @@
<attribute name="sslProtocol" required="false">
<p>The the SSL protocol(s) to use (a single value may enable multiple
protocols - see the JVM documentation for details). If not specified, the
- default is <code>TLS</code>. The permitted values may be obainted from
the
+ default is <code>TLS</code>. The permitted values may be obtained from
the
JVM documentation for the allowed values for algorithm when creating an
<code>SSLContext</code> instance e.g.
<a
href="http://docs.oracle.com/javase/6/docs/technotes/guides/security/StandardNames.html#SSLContext";>
Oracle Java 6</a> and
<a
href="http://docs.oracle.com/javase/7/docs/technotes/guides/security/StandardNames.html#SSLContext";>
- Oracle Java 7</a>.Note: There is overlap between this attribute and
+ Oracle Java 7</a>. Note: There is overlap between this attribute and
<code>sslEnabledProtocols</code>.</p>
</attribute>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
