Backport r611035 from trunk (link to SSLOptions for explanation of password example)

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

diff --git a/docs/manual/ssl/ssl_howto.html.en b/docs/manual/ssl/ssl_howto.html.en
index 619bdc802dcf870304f408fb06b98de7a45ffbaa..a55bb154b0b08510f05b118f38029684e6ea8cbf 100644 (file)
--- a/docs/manual/ssl/ssl_howto.html.en
+++ b/docs/manual/ssl/ssl_howto.html.en
@@ -195,7 +195,11 @@ AuthType             Basic
 AuthUserFile         /usr/local/apache2/conf/httpd.passwd
 require              valid-user
 &lt;/Directory&gt;</pre></div>
-
+    
+    <p>The password used in this example is the DES encrypted string "password".
+    See the <code class="directive"><a href="../mod/mod_ssl.html#ssloptions">SSLOptions</a></code> docs for more 
+    information.</p>
+    
     <div class="example"><h3>httpd.passwd</h3><pre>
 /C=DE/L=Munich/O=Snake Oil, Ltd./OU=Staff/CN=Foo:xxj31ZMTZzkVA
 /C=US/L=S.F./O=Snake Oil, Ltd./OU=CA/CN=Bar:xxj31ZMTZzkVA

diff --git a/docs/manual/ssl/ssl_howto.xml b/docs/manual/ssl/ssl_howto.xml
index 536c4bc326b812c621d22f1d5b05f815cb8f3544..a06cfe40b74f133521d45dbfa8a79b046d6e63d2 100644 (file)
--- a/docs/manual/ssl/ssl_howto.xml
+++ b/docs/manual/ssl/ssl_howto.xml
@@ -201,7 +201,11 @@ AuthUserFile         /usr/local/apache2/conf/httpd.passwd
 require              valid-user
 &lt;/Directory&gt;</pre>
     </example>
-
+    
+    <p>The password used in this example is the DES encrypted string "password".
+    See the <directive module="mod_ssl">SSLOptions</directive> docs for more 
+    information.</p>
+    
     <example><title>httpd.passwd</title><pre>
 /C=DE/L=Munich/O=Snake Oil, Ltd./OU=Staff/CN=Foo:xxj31ZMTZzkVA
 /C=US/L=S.F./O=Snake Oil, Ltd./OU=CA/CN=Bar:xxj31ZMTZzkVA