Backport r1308707 from trunk to 2.2 and rebuild.

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

diff --git a/docs/manual/mod/mod_ssl.html.en b/docs/manual/mod/mod_ssl.html.en
index beaf17d81ad5c47801e5f65fa8a9b184c4ac5049..de2977390e6e19d72b68a19ed823f4f4a774638a 100644 (file)
--- a/docs/manual/mod/mod_ssl.html.en
+++ b/docs/manual/mod/mod_ssl.html.en
@@ -1556,8 +1556,8 @@ function ::= funcname "<strong>(</strong>" funcargs "<strong>)</strong>"
 representation and then evaluated in a second step. Actually, in Global and
 Per-Server Class context <em>expression</em> is parsed at startup time and
 at runtime only the machine representation is executed. For Per-Directory
-context this is different: here <em>expression</em> has to be parsed and
-immediately executed for every request.</p>
+context, specifically in a .htaccess context, this is different: here <em>
+expression</em> has to be parsed and immediately executed for every request.</p>
 <div class="example"><h3>Example</h3><p><code>
 SSLRequire (    %{SSL_CIPHER} !~ m/^(EXP|NULL)-/ \<br />
             and %{SSL_CLIENT_S_DN_O} eq "Snake Oil, Ltd." \<br />

diff --git a/docs/manual/mod/mod_ssl.xml b/docs/manual/mod/mod_ssl.xml
index f28b9b031ce0b1225cd5cd0628e9a864d050287a..54796751a4df1c5263904f6f21da17f63184101d 100644 (file)
--- a/docs/manual/mod/mod_ssl.xml
+++ b/docs/manual/mod/mod_ssl.xml
@@ -1267,8 +1267,8 @@ href="#table3">Table 3</a> can be used. Finally for
 representation and then evaluated in a second step. Actually, in Global and
 Per-Server Class context <em>expression</em> is parsed at startup time and
 at runtime only the machine representation is executed. For Per-Directory
-context this is different: here <em>expression</em> has to be parsed and
-immediately executed for every request.</p>
+context, specifically in a .htaccess context, this is different: here <em>
+expression</em> has to be parsed and immediately executed for every request.</p>
 <example><title>Example</title>
 SSLRequire (    %{SSL_CIPHER} !~ m/^(EXP|NULL)-/ \<br />
             and %{SSL_CLIENT_S_DN_O} eq "Snake Oil, Ltd." \<br />