Return-Path: 
 <cvs-return-24526-apmail-httpd-cvs-archive=httpd.apache.org@httpd.apache.org>
Delivered-To: apmail-httpd-cvs-archive@www.apache.org
Received: (qmail 38477 invoked from network); 17 Feb 2006 17:45:20 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 17 Feb 2006 17:45:19 -0000
Received: (qmail 4152 invoked by uid 500); 17 Feb 2006 17:45:18 -0000
Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org
Received: (qmail 4117 invoked by uid 500); 17 Feb 2006 17:45:18 -0000
Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
list-help: <mailto:cvs-help@httpd.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@httpd.apache.org>
List-Post: <mailto:cvs@httpd.apache.org>
List-Id: <cvs.httpd.apache.org>
Delivered-To: mailing list cvs@httpd.apache.org
Received: (qmail 4105 invoked by uid 99); 17 Feb 2006 17:45:18 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Feb 2006 09:45:18 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Fri, 17 Feb 2006 09:45:17 -0800
Received: (qmail 38258 invoked by uid 65534); 17 Feb 2006 17:44:57 -0000
Message-ID: <20060217174457.38257.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: svn commit: r378578 - in /httpd/httpd/trunk/docs/manual:
 dns-caveats.html.en
 dns-caveats.html.ja.euc-jp dns-caveats.xml.ja dns-caveats.xml.ko
 dns-caveats.xml.meta howto/auth.html.en howto/auth.xml.ja howto/auth.xml.ko
 mod/mod_authz_core.html.en
Date: Fri, 17 Feb 2006 17:44:54 -0000
To: cvs@httpd.apache.org
From: nd@apache.org
X-Mailer: svnmailer-1.0.6
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: nd
Date: Fri Feb 17 09:44:52 2006
New Revision: 378578

URL: http://svn.apache.org/viewcvs?rev=378578&view=rev
Log:
update transformation

Modified:
    httpd/httpd/trunk/docs/manual/dns-caveats.html.en
    httpd/httpd/trunk/docs/manual/dns-caveats.html.ja.euc-jp
    httpd/httpd/trunk/docs/manual/dns-caveats.xml.ja
    httpd/httpd/trunk/docs/manual/dns-caveats.xml.ko
    httpd/httpd/trunk/docs/manual/dns-caveats.xml.meta
    httpd/httpd/trunk/docs/manual/howto/auth.html.en
    httpd/httpd/trunk/docs/manual/howto/auth.xml.ja
    httpd/httpd/trunk/docs/manual/howto/auth.xml.ko
    httpd/httpd/trunk/docs/manual/mod/mod_authz_core.html.en

Modified: httpd/httpd/trunk/docs/manual/dns-caveats.html.en
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/dns-caveats.html.en?rev=378578&r1=378577&r2=378578&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/dns-caveats.html.en (original)
+++ httpd/httpd/trunk/docs/manual/dns-caveats.html.en Fri Feb 17 09:44:52 2006
@@ -109,14 +109,18 @@
     configuration snippet:</p>
 
     <div class="example"><p><code>
-      &lt;VirtualHost www.abc.dom&gt; <br />
-      &nbsp;&nbsp;ServerAdmin webgirl@abc.dom <br />
-      &nbsp;&nbsp;DocumentRoot /www/abc <br />
-      &lt;/VirtualHost&gt; <br />
+      &lt;VirtualHost www.abc.dom&gt;<br />
+      <span class="indent">
+        ServerAdmin webgirl@abc.dom<br />
+        DocumentRoot /www/abc<br />
+      </span>
+      &lt;/VirtualHost&gt;<br />
       <br />
-      &lt;VirtualHost www.def.dom&gt; <br />
-      &nbsp;&nbsp;ServerAdmin webguy@def.dom <br />
-      &nbsp;&nbsp;DocumentRoot /www/def <br />
+      &lt;VirtualHost www.def.dom&gt;<br />
+      <span class="indent">
+        ServerAdmin webguy@def.dom<br />
+        DocumentRoot /www/def<br />
+      </span>
       &lt;/VirtualHost&gt;
     </code></p></div>
 

Modified: httpd/httpd/trunk/docs/manual/dns-caveats.html.ja.euc-jp
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/dns-caveats.html.ja.euc-jp?rev=378578&r1=378577&r2=378578&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/dns-caveats.html.ja.euc-jp [euc-jp] (original)
+++ httpd/httpd/trunk/docs/manual/dns-caveats.html.ja.euc-jp [euc-jp] Fri Feb 17 09:44:52 2006
@@ -23,6 +23,8 @@
 <a href="./ja/dns-caveats.html" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/dns-caveats.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div>
+<div class="outofdate">This translation may be out of date. Check the
+            English version for recent changes.</div>
 
     <p>本文書の内容は次の一言に尽きます。「Apache が設定ファイルを読み込むときに
     DNS を使用する必要がないようにして下さい」。Apache が設定ファイルを

Modified: httpd/httpd/trunk/docs/manual/dns-caveats.xml.ja
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/dns-caveats.xml.ja?rev=378578&r1=378577&r2=378578&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/dns-caveats.xml.ja [iso-2022-jp] (original)
+++ httpd/httpd/trunk/docs/manual/dns-caveats.xml.ja [iso-2022-jp] Fri Feb 17 09:44:52 2006
@@ -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: 151408 -->
+<!-- English Revision: 151408:378577 (outdated) -->
 
 <!--
  Copyright 2002-2005 The Apache Software Foundation or its licensors,

Modified: httpd/httpd/trunk/docs/manual/dns-caveats.xml.ko
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/dns-caveats.xml.ko?rev=378578&r1=378577&r2=378578&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/dns-caveats.xml.ko [euc-kr] (original)
+++ httpd/httpd/trunk/docs/manual/dns-caveats.xml.ko [euc-kr] Fri Feb 17 09:44:52 2006
@@ -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:151408 (outdated) -->
+<!-- English Revision: 105989:378577 (outdated) -->
 
 <!--
  Copyright 2003-2005 The Apache Software Foundation or its licensors,

Modified: httpd/httpd/trunk/docs/manual/dns-caveats.xml.meta
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/dns-caveats.xml.meta?rev=378578&r1=378577&r2=378578&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/dns-caveats.xml.meta (original)
+++ httpd/httpd/trunk/docs/manual/dns-caveats.xml.meta Fri Feb 17 09:44:52 2006
@@ -7,7 +7,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant>ja</variant>
+    <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
   </variants>
 </metafile>

Modified: httpd/httpd/trunk/docs/manual/howto/auth.html.en
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/howto/auth.html.en?rev=378578&r1=378577&r2=378578&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/howto/auth.html.en (original)
+++ httpd/httpd/trunk/docs/manual/howto/auth.html.en Fri Feb 17 09:44:52 2006
@@ -468,32 +468,37 @@
         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 />
+        <div class="example"><p><code>
+          # 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 @@
     
         <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>
     

Modified: httpd/httpd/trunk/docs/manual/howto/auth.xml.ja
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/howto/auth.xml.ja?rev=378578&r1=378577&r2=378578&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/howto/auth.xml.ja [iso-2022-jp] (original)
+++ httpd/httpd/trunk/docs/manual/howto/auth.xml.ja [iso-2022-jp] Fri Feb 17 09:44:52 2006
@@ -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,

Modified: httpd/httpd/trunk/docs/manual/howto/auth.xml.ko
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/howto/auth.xml.ko?rev=378578&r1=378577&r2=378578&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/howto/auth.xml.ko [euc-kr] (original)
+++ httpd/httpd/trunk/docs/manual/howto/auth.xml.ko [euc-kr] Fri Feb 17 09:44:52 2006
@@ -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,

Modified: httpd/httpd/trunk/docs/manual/mod/mod_authz_core.html.en
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/mod/mod_authz_core.html.en?rev=378578&r1=378577&r2=378578&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_authz_core.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_authz_core.html.en Fri Feb 17 09:44:52 2006
@@ -168,34 +168,38 @@
     allow you to apply "AND" and "OR" logic to the authorization processing. 
     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>
-
 
 <h3>See also</h3>
 <ul>