Merge r1327041 from trunk and rebuild

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1327043 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/mod/mod_ssl.html.en b/docs/manual/mod/mod_ssl.html.en
index e4f242a873b8ac7366bf5ffe2bcf996b0ad50cbe..0bc994744690a8ad376905b5aa1b6ee09ca7afdc 100644 (file)
--- a/docs/manual/mod/mod_ssl.html.en
+++ b/docs/manual/mod/mod_ssl.html.en
@@ -31,8 +31,7 @@ Layer (SSL) and Transport Layer Security (TLS) protocols</td></tr>
 <h3>Summary</h3>
 
 <p>This module provides SSL v2/v3 and TLS v1 support for the Apache
-HTTP Server.  It was contributed by Ralf S. Engelschall based on his
-mod_ssl project and originally derived from work by Ben Laurie.</p>
+HTTP Server.</p>
 
 <p>This module relies on <a href="http://www.openssl.org/">OpenSSL</a>
 to provide the cryptography engine.</p>
@@ -1632,7 +1631,7 @@ in the global server context because the PRNG is a global facility.</p>
 The following <em>source</em> variants are available:</p>
 <ul>
 <li><code>builtin</code>
-    <p> This is the always available builtin seeding source. It's usage
+    <p> This is the always available builtin seeding source. Its usage
     consumes minimum CPU cycles under runtime and hence can be always used
     without drawbacks. The source used for seeding the PRNG contains of the
     current time, the current process id and (when applicable) a randomly
@@ -1757,7 +1756,7 @@ exception:</p>
 
 <p>In <code>SSLRequire</code>, the comparison operators <code>&lt;</code>,
 <code>&lt;=</code>, ... are completely equivalent to the operators
-<code>lt</code>, <code>le</code>, ... and work in a somewhat pecular way that
+<code>lt</code>, <code>le</code>, ... and work in a somewhat peculiar way that
 first compares the length of two strings and then the lexical order.
 On the other hand, <a href="../expr.html">ap_expr</a> has two sets of
 comparison operators: The operators <code>&lt;</code>,

diff --git a/docs/manual/mod/mod_ssl.xml b/docs/manual/mod/mod_ssl.xml
index 91750fd161ceb094fc2ee507fac0bfa528b4699c..21c79382fee70652d8039520b61c3445c81a517f 100644 (file)
--- a/docs/manual/mod/mod_ssl.xml
+++ b/docs/manual/mod/mod_ssl.xml
@@ -31,8 +31,7 @@ Layer (SSL) and Transport Layer Security (TLS) protocols</description>
 
 <summary>
 <p>This module provides SSL v2/v3 and TLS v1 support for the Apache
-HTTP Server.  It was contributed by Ralf S. Engelschall based on his
-mod_ssl project and originally derived from work by Ben Laurie.</p>
+HTTP Server.</p>
 
 <p>This module relies on <a href="http://www.openssl.org/">OpenSSL</a>
 to provide the cryptography engine.</p>
@@ -336,7 +335,7 @@ in the global server context because the PRNG is a global facility.</p>
 The following <em>source</em> variants are available:</p>
 <ul>
 <li><code>builtin</code>
-    <p> This is the always available builtin seeding source. It's usage
+    <p> This is the always available builtin seeding source. Its usage
     consumes minimum CPU cycles under runtime and hence can be always used
     without drawbacks. The source used for seeding the PRNG contains of the
     current time, the current process id and (when applicable) a randomly
@@ -1301,7 +1300,7 @@ exception:</p>
 
 <p>In <code>SSLRequire</code>, the comparison operators <code>&lt;</code>,
 <code>&lt;=</code>, ... are completely equivalent to the operators
-<code>lt</code>, <code>le</code>, ... and work in a somewhat pecular way that
+<code>lt</code>, <code>le</code>, ... and work in a somewhat peculiar way that
 first compares the length of two strings and then the lexical order.
 On the other hand, <a href="../expr.html">ap_expr</a> has two sets of
 comparison operators: The operators <code>&lt;</code>,