Revert r220310 and r220312 to bring mod_setenvif docs in line with

code.

Reviewed by: colm, jorton, trawick, jerenkrantz

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

diff --git a/docs/manual/mod/mod_setenvif.html.en b/docs/manual/mod/mod_setenvif.html.en
index 6114ce1a98d801a668565c2b7d156c2b7561a0f6..05bda3b1f21e7785a04ab0e6a2a4ee406869fc70 100644 (file)
--- a/docs/manual/mod/mod_setenvif.html.en
+++ b/docs/manual/mod/mod_setenvif.html.en
@@ -141,7 +141,7 @@ respect to case</td></tr>
 </table>
     <p>The <code class="directive">SetEnvIf</code> directive defines
     environment variables based on attributes of the request. The
-    <em>attribute</em> specified in the first argument can be one of four
+    <em>attribute</em> specified in the first argument can be one of three
     things:</p>
 
 <ol>
@@ -187,15 +187,6 @@ this manner. 'Earlier' means that they were defined at a broader scope
 Environment variables will be considered only if there was no match
 among request characteristics and a regular expression was not
 used for the <em>attribute</em>.</li>
-
-<li>
- A reference to an extension of an SSL client certificate, located by
- its object id <em>oid</em>.
- If a non-SSL request, or in absense of the configured <em>oid</em>,
- no variable will be set. If the <em>oid</em> is found multiple times,
- the individual strings will be concatenated, separated by a comma <code>','</code>.
- The <em>oid</em> should reference a string-valued extension.
-</li>
 </ol>
 
 <p>The second argument (<em>regex</em>) is a <a href="http://www.pcre.org/">Perl compatible regular expression</a>.
@@ -233,8 +224,6 @@ of</p>
         :<br />
    SetEnvIf object_is_image xbm XBIT_PROCESSING=1<br />
         :<br />
-   SetEnvIf OID("2.16.840.1.113730.1.13") "(.*)" NetscapeComment=$1<br />
-        :<br />
    SetEnvIf ^TS*  ^[a-z].*  HAVE_TS<br />
 </code></p></div>
 
@@ -244,10 +233,6 @@ of</p>
     the referring page was somewhere on the
     <code>www.mydomain.com</code> Web site.</p>
 
-    <p>The sixth example will set the <code>NetscapeComment</code>
-    environment variable to the string found in the corresponding
-    SSL client certificate field (if found).</p>
-
     <p>The last example will set environment variable
     <code>HAVE_TS</code> if the request contains any headers that
     begin with "TS" whose values begins with any character in the

diff --git a/docs/manual/mod/mod_setenvif.xml b/docs/manual/mod/mod_setenvif.xml
index 5949d1db5a7c77df009e3083032552fccbde6604..41d8ded11ed4e49984f40b488e5c6504c20b3a56 100644 (file)
--- a/docs/manual/mod/mod_setenvif.xml
+++ b/docs/manual/mod/mod_setenvif.xml
@@ -135,7 +135,7 @@ respect to case</description>
 <usage>
     <p>The <directive>SetEnvIf</directive> directive defines
     environment variables based on attributes of the request. The
-    <em>attribute</em> specified in the first argument can be one of four
+    <em>attribute</em> specified in the first argument can be one of three
     things:</p>
 
 <ol>
@@ -182,15 +182,6 @@ this manner. 'Earlier' means that they were defined at a broader scope
 Environment variables will be considered only if there was no match
 among request characteristics and a regular expression was not
 used for the <em>attribute</em>.</li>
-
-<li>
- A reference to an extension of an SSL client certificate, located by
- its object id <em>oid</em>.
- If a non-SSL request, or in absense of the configured <em>oid</em>,
- no variable will be set. If the <em>oid</em> is found multiple times,
- the individual strings will be concatenated, separated by a comma <code>','</code>.
- The <em>oid</em> should reference a string-valued extension.
-</li>
 </ol>
 
 <p>The second argument (<em>regex</em>) is a <a
@@ -229,8 +220,6 @@ of</p>
         :<br />
    SetEnvIf object_is_image xbm XBIT_PROCESSING=1<br />
         :<br />
-   SetEnvIf OID("2.16.840.1.113730.1.13") "(.*)" NetscapeComment=$1<br />
-        :<br />
    SetEnvIf ^TS*  ^[a-z].*  HAVE_TS<br />
 </example>
 
@@ -240,10 +229,6 @@ of</p>
     the referring page was somewhere on the
     <code>www.mydomain.com</code> Web site.</p>
 
-    <p>The sixth example will set the <code>NetscapeComment</code>
-    environment variable to the string found in the corresponding
-    SSL client certificate field (if found).</p>
-
     <p>The last example will set environment variable
     <code>HAVE_TS</code> if the request contains any headers that
     begin with "TS" whose values begins with any character in the

diff --git a/docs/manual/mod/mod_setenvif.xml.ja b/docs/manual/mod/mod_setenvif.xml.ja
index 256abc325ba5b823fa828897ee134447889293ac..302b48d7136608e2552ca3995a399cca90c2504c 100644 (file)
--- a/docs/manual/mod/mod_setenvif.xml.ja
+++ b/docs/manual/mod/mod_setenvif.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-2022-jp"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 151408:220310 (outdated) -->
+<!-- English Revision: 151408 -->
 
 <!--
  Copyright 2002-2005 The Apache Software Foundation or its licensors,

diff --git a/docs/manual/mod/mod_setenvif.xml.ko b/docs/manual/mod/mod_setenvif.xml.ko
index 67ad47731948917a2a8772a79d676208da74b8b3..db0016452f3d56b8e78836c6d404c4c3184b1e6f 100644 (file)
--- a/docs/manual/mod/mod_setenvif.xml.ko
+++ b/docs/manual/mod/mod_setenvif.xml.ko
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="EUC-KR" ?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 151408:220310 (outdated) -->
+<!-- English Revision: 151408 -->
 
 <!--
  Copyright 2004-2005 The Apache Software Foundation or its licensors,

diff --git a/docs/manual/mod/mod_setenvif.xml.meta b/docs/manual/mod/mod_setenvif.xml.meta
index ed14967a5671da5d4ac1c7d67b09222a66165d0c..60e6547df3b1b176654607ee4709a22c00f201cf 100644 (file)
--- a/docs/manual/mod/mod_setenvif.xml.meta
+++ b/docs/manual/mod/mod_setenvif.xml.meta
@@ -7,7 +7,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant outdated="yes">ja</variant>
-    <variant outdated="yes">ko</variant>
+    <variant>ja</variant>
+    <variant>ko</variant>
   </variants>
 </metafile>