Imported Upstream version 2.4.9upstream/2.4.9

1 files changed, 18 insertions, 33 deletions

diff --git a/docs/manual/mod/mod_session_crypto.html.en b/docs/manual/mod/mod_session_crypto.html.en
index 8ff06873..19079e69 100644
--- a/docs/manual/mod/mod_session_crypto.html.en
+++ b/docs/manual/mod/mod_session_crypto.html.en
@@ -9,7 +9,7 @@
 <link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
 <link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
 <link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link rel="stylesheet" type="text/css" href="../style/css/prettify.css" />
-<script src="../style/scripts/prettify.js" type="text/javascript">
+<script src="../style/scripts/prettify.min.js" type="text/javascript">
 </script>
 
 <link href="../images/favicon.ico" rel="shortcut icon" /></head>
@@ -77,11 +77,9 @@
       <p>To create a simple encrypted session and store it in a cookie called
       <var>session</var>, configure the session as follows:</p>
 
-      <div class="example"><h3>Browser based encrypted session</h3><pre class="prettyprint lang-config">
-Session On
+      <div class="example"><h3>Browser based encrypted session</h3><pre class="prettyprint lang-config">Session On
 SessionCookieName session path=/
-SessionCryptoPassphrase secret
-    </pre>
+SessionCryptoPassphrase secret</pre>
 </div>
 
       <p>The session will be encrypted with the given key. Different servers can
@@ -134,35 +132,26 @@ SessionCryptoPassphrase secret
     <p>The <var>NSS</var> crypto driver requires some parameters for configuration,
     which are specified as parameters with optional values after the driver name.</p>
 
-    <div class="example"><h3>NSS without a certificate database</h3><pre class="prettyprint lang-config">
-      SessionCryptoDriver nss
-      </pre>
+    <div class="example"><h3>NSS without a certificate database</h3><pre class="prettyprint lang-config">SessionCryptoDriver nss</pre>
 </div>
 
-    <div class="example"><h3>NSS with certificate database</h3><pre class="prettyprint lang-config">
-      SessionCryptoDriver nss dir=certs
-      </pre>
+    <div class="example"><h3>NSS with certificate database</h3><pre class="prettyprint lang-config">SessionCryptoDriver nss dir=certs</pre>
 </div>
 
-    <div class="example"><h3>NSS with certificate database and parameters</h3><pre class="prettyprint lang-config">
-      SessionCryptoDriver nss dir=certs key3=key3.db cert7=cert7.db secmod=secmod
-      </pre>
+    <div class="example"><h3>NSS with certificate database and parameters</h3><pre class="prettyprint lang-config">SessionCryptoDriver nss dir=certs key3=key3.db cert7=cert7.db secmod=secmod</pre>
 </div>
 
-    <div class="example"><h3>NSS with paths containing spaces</h3><pre class="prettyprint lang-config">
-      SessionCryptoDriver nss "dir=My Certs" key3=key3.db cert7=cert7.db secmod=secmod
-      </pre>
+    <div class="example"><h3>NSS with paths containing spaces</h3><pre class="prettyprint lang-config">SessionCryptoDriver nss "dir=My Certs" key3=key3.db cert7=cert7.db secmod=secmod</pre>
 </div>
 
-    <p>The <var>NSS</var> crypto driver might have already been configured by another
-    part of the server, for example from <code class="module"><a href="../mod/mod_nss.html">mod_nss</a></code> or
-    <code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code>. If found to have already been configured,
-    a warning will be logged, and the existing configuration will have taken affect.
-    To avoid this warning, use the noinit parameter as follows.</p>
+    <p>The <var>NSS</var> crypto driver might have already been
+    configured by another part of the server, for example from
+    <code>mod_nss</code> or <code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code>. If found to
+    have already been configured, a warning will be logged, and the
+    existing configuration will have taken affect.  To avoid this
+    warning, use the noinit parameter as follows.</p>
 
-    <div class="example"><h3>NSS with certificate database</h3><pre class="prettyprint lang-config">
-      SessionCryptoDriver nss noinit
-      </pre>
+    <div class="example"><h3>NSS with certificate database</h3><pre class="prettyprint lang-config">SessionCryptoDriver nss noinit</pre>
 </div>
 
     <p>To prevent confusion, ensure that all modules requiring NSS are configured with
@@ -171,9 +160,7 @@ SessionCryptoPassphrase secret
     <p>The <var>openssl</var> crypto driver supports an optional parameter to specify
     the engine to be used for encryption.</p>
 
-    <div class="example"><h3>OpenSSL with engine support</h3><pre class="prettyprint lang-config">
-      SessionCryptoDriver openssl engine=name
-      </pre>
+    <div class="example"><h3>OpenSSL with engine support</h3><pre class="prettyprint lang-config">SessionCryptoDriver openssl engine=name</pre>
 </div>
 
 
@@ -205,16 +192,14 @@ SessionCryptoPassphrase secret
 
     <p>If the value begins with exec: the resulting command will be executed and the
     first line returned to standard output by the program will be used as the key.</p>
-<div class="example"><pre>
-#key used as-is
+<div class="example"><pre>#key used as-is
 SessionCryptoPassphrase secret
 
 #Run /path/to/program to get key
 SessionCryptoPassphrase exec:/path/to/program
 
 #Run /path/to/otherProgram and provide arguments
-SessionCryptoPassphrase "exec:/path/to/otherProgram argument1"
-</pre></div>
+SessionCryptoPassphrase "exec:/path/to/otherProgram argument1"</pre></div>
 
 
 </div>
@@ -268,7 +253,7 @@ var comments_identifier = 'http://httpd.apache.org/docs/2.4/mod/mod_session_cryp
     }
 })(window, document);
 //--><!]]></script></div><div id="footer">
-<p class="apache">Copyright 2013 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2014 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="http://wiki.apache.org/httpd/FAQ">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div><script type="text/javascript"><!--//--><![CDATA[//><!--
 if (typeof(prettyPrint) !== 'undefined') {
     prettyPrint();