update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@378578 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 36 insertions, 30 deletions

diff --git a/docs/manual/howto/auth.html.en b/docs/manual/howto/auth.html.en
index 93276d8d68..bc45ebab7d 100644
--- a/docs/manual/howto/auth.html.en
+++ b/docs/manual/howto/auth.html.en
@@ -468,32 +468,37 @@ person in</a></h2>
         access is granted. For example the following authorization block would 
         apply the logic:</p>
 
-        <p><var>
-        if ((user == "John") || <br />
-        &nbsp;&nbsp;&nbsp;((Group == "admin") &amp;&amp; (ldap-group &lt;ldap-object&gt; contains auth'ed_user) &amp;&amp;<br />
-        &nbsp;&nbsp;&nbsp;&nbsp;((ldap-attribute dept == "sales") || 
-        (file-group contains contains auth'ed_user))))<br />
-        then<br />
-        &nbsp;&nbsp;auth_granted<br />
-        else<br />
-        &nbsp;&nbsp;auth_denied<br />
-        </var></p>
-    
         <div class="example"><p><code>
-        &lt;Directory /www/mydocs&gt;<br />
-        &nbsp;  Authname ...<br />
-        &nbsp;  AuthBasicProvider ...<br />
-        &nbsp;  ...<br />
-        &nbsp;  Require user John<br />
-        &nbsp;  &lt;SatisfyAll&gt;<br />
-        &nbsp;&nbsp;    Require Group admins<br />
-        &nbsp;&nbsp;    Require ldap-group cn=mygroup,o=foo<br />
-        &nbsp;&nbsp;    &lt;SatisfyOne&gt;<br />
-        &nbsp;&nbsp;&nbsp;      Require ldap-attribute dept="sales"<br />
-        &nbsp;&nbsp;&nbsp;      Require file-group<br />
-        &nbsp;&nbsp;    &lt;/SatisfyOne&gt;<br />
-        &nbsp;  &lt;/SatisfyAll&gt;<br />
-        &lt;/Directory&gt;<br />
+          # if ((user == "John") ||<br />
+          # &nbsp;&nbsp; ((Group == "admin")<br />
+          # &nbsp; &nbsp; &amp;&amp; (ldap-group &lt;ldap-object&gt; contains auth'ed_user)<br />
+          # &nbsp; &nbsp; &amp;&amp; ((ldap-attribute dept == "sales")<br />
+          # &nbsp; &nbsp; &nbsp; &nbsp; || (file-group contains auth'ed_user))))<br />
+          # then<br />
+          # &nbsp; auth_granted<br />
+          # else<br />
+          # &nbsp; auth_denied<br />
+          #<br />
+          &lt;Directory /www/mydocs&gt;<br />
+          <span class="indent">
+            Authname ...<br />
+            AuthBasicProvider ...<br />
+            ...<br />
+            Require user John<br />
+            &lt;SatisfyAll&gt;<br />
+            <span class="indent">
+              Require Group admins<br />
+              Require ldap-group cn=mygroup,o=foo<br />
+              &lt;SatisfyOne&gt;<br />
+              <span class="indent">
+                Require ldap-attribute dept="sales"<br />
+                Require file-group<br />
+              </span>
+              &lt;/SatisfyOne&gt;<br />
+            </span>
+            &lt;/SatisfyAll&gt;<br />
+          </span>
+          &lt;/Directory&gt;
         </code></p></div>
 
         <p>By default all <code class="directive"><a href="../mod/mod_authz_core.html#require">Require</a></code> 
@@ -564,9 +569,10 @@ person in</a></h2>
     
         <div class="example"><p><code>
           &lt;SatisfyAll&gt;<br />
-          &nbsp;  Reject ip <var>192.101.205</var><br />
-          &nbsp;  Reject host <var>cyberthugs.com</var> <var>moreidiots.com</var><br />
-          &nbsp;  Reject host ke<br />
+          <span class="indent">
+            Reject ip <var>192.101.205</var><br />
+            Reject host <var>cyberthugs.com</var> <var>moreidiots.com</var><br />           Reject host ke<br />
+          </span>
           &lt;/SatisfyAll&gt;
         </code></p></div>
     
diff --git a/docs/manual/howto/auth.xml.ja b/docs/manual/howto/auth.xml.ja
index 02acfb2603..caca8d9a5b 100644
--- a/docs/manual/howto/auth.xml.ja
+++ b/docs/manual/howto/auth.xml.ja
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='iso-2022-jp' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 219484:378308 (outdated) -->
+<!-- English Revision: 219484:378577 (outdated) -->
 
 <!--
  Copyright 2003-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/howto/auth.xml.ko b/docs/manual/howto/auth.xml.ko
index b631f34ccf..00a1dc3a62 100644
--- a/docs/manual/howto/auth.xml.ko
+++ b/docs/manual/howto/auth.xml.ko
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='EUC-KR' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 105989:378308 (outdated) -->
+<!-- English Revision: 105989:378577 (outdated) -->
 
 <!--
  Copyright 2004-2005 The Apache Software Foundation or its licensors,