From: André Malo <nd@apache.org>
Date: Fri, 17 Feb 2006 17:44:52 +0000 (+0000)
Subject: update transformation
X-Git-Tag: 2.3.0~2533
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=28d729ed44fb85b6cf3ba102d834a6b190baf54a;p=thirdparty%2Fapache%2Fhttpd.git

update transformation


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

diff --git a/docs/manual/dns-caveats.html.en b/docs/manual/dns-caveats.html.en
index e0b18202ea1..1e941ed9213 100644
--- a/docs/manual/dns-caveats.html.en
+++ b/docs/manual/dns-caveats.html.en
@@ -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>
 
diff --git a/docs/manual/dns-caveats.html.ja.euc-jp b/docs/manual/dns-caveats.html.ja.euc-jp
index b49937d381d..780ec1e9838 100644
--- a/docs/manual/dns-caveats.html.ja.euc-jp
+++ b/docs/manual/dns-caveats.html.ja.euc-jp
@@ -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 ¤¬ÀßÄê¥Õ¥¡¥¤¥ë¤ò
diff --git a/docs/manual/dns-caveats.xml.ja b/docs/manual/dns-caveats.xml.ja
index 5d4a39e8d66..9ecb91355eb 100644
--- a/docs/manual/dns-caveats.xml.ja
+++ b/docs/manual/dns-caveats.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: 151408 -->
+<!-- English Revision: 151408:378577 (outdated) -->
 
 <!--
  Copyright 2002-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/dns-caveats.xml.ko b/docs/manual/dns-caveats.xml.ko
index 5d2c7ebf375..b4d953c1179 100644
--- a/docs/manual/dns-caveats.xml.ko
+++ b/docs/manual/dns-caveats.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:151408 (outdated) -->
+<!-- English Revision: 105989:378577 (outdated) -->
 
 <!--
  Copyright 2003-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/dns-caveats.xml.meta b/docs/manual/dns-caveats.xml.meta
index dec5aad3db6..a218acd9dda 100644
--- a/docs/manual/dns-caveats.xml.meta
+++ b/docs/manual/dns-caveats.xml.meta
@@ -7,7 +7,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant>ja</variant>
+    <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
   </variants>
 </metafile>
diff --git a/docs/manual/howto/auth.html.en b/docs/manual/howto/auth.html.en
index 93276d8d684..bc45ebab7d0 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 02acfb2603e..caca8d9a5bb 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 b631f34ccf3..00a1dc3a628 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,
diff --git a/docs/manual/mod/mod_authz_core.html.en b/docs/manual/mod/mod_authz_core.html.en
index 11f4767ff05..1926017dc0c 100644
--- a/docs/manual/mod/mod_authz_core.html.en
+++ b/docs/manual/mod/mod_authz_core.html.en
@@ -168,35 +168,39 @@ for 'AND' logic to be applied to various authorization providers.</td></tr>
     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>
 <li><a href="../howto/auth.html">Authentication, Authorization,