You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by nd...@apache.org on 2006/02/17 18:44:54 UTC
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
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>
- <VirtualHost www.abc.dom> <br />
- ServerAdmin webgirl@abc.dom <br />
- DocumentRoot /www/abc <br />
- </VirtualHost> <br />
+ <VirtualHost www.abc.dom><br />
+ <span class="indent">
+ ServerAdmin webgirl@abc.dom<br />
+ DocumentRoot /www/abc<br />
+ </span>
+ </VirtualHost><br />
<br />
- <VirtualHost www.def.dom> <br />
- ServerAdmin webguy@def.dom <br />
- DocumentRoot /www/def <br />
+ <VirtualHost www.def.dom><br />
+ <span class="indent">
+ ServerAdmin webguy@def.dom<br />
+ DocumentRoot /www/def<br />
+ </span>
</VirtualHost>
</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"> ja </a> |
<a href="./ko/dns-caveats.html" hreflang="ko" rel="alternate" title="Korean"> ko </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 />
- ((Group == "admin") && (ldap-group <ldap-object> contains auth'ed_user) &&<br />
- ((ldap-attribute dept == "sales") ||
- (file-group contains contains auth'ed_user))))<br />
- then<br />
- auth_granted<br />
- else<br />
- auth_denied<br />
- </var></p>
-
- <div class="example"><p><code>
- <Directory /www/mydocs><br />
- Authname ...<br />
- AuthBasicProvider ...<br />
- ...<br />
- Require user John<br />
- <SatisfyAll><br />
- Require Group admins<br />
- Require ldap-group cn=mygroup,o=foo<br />
- <SatisfyOne><br />
- Require ldap-attribute dept="sales"<br />
- Require file-group<br />
- </SatisfyOne><br />
- </SatisfyAll><br />
- </Directory><br />
+ <div class="example"><p><code>
+ # if ((user == "John") ||<br />
+ # ((Group == "admin")<br />
+ # && (ldap-group <ldap-object> contains auth'ed_user)<br />
+ # && ((ldap-attribute dept == "sales")<br />
+ # || (file-group contains auth'ed_user))))<br />
+ # then<br />
+ # auth_granted<br />
+ # else<br />
+ # auth_denied<br />
+ #<br />
+ <Directory /www/mydocs><br />
+ <span class="indent">
+ Authname ...<br />
+ AuthBasicProvider ...<br />
+ ...<br />
+ Require user John<br />
+ <SatisfyAll><br />
+ <span class="indent">
+ Require Group admins<br />
+ Require ldap-group cn=mygroup,o=foo<br />
+ <SatisfyOne><br />
+ <span class="indent">
+ Require ldap-attribute dept="sales"<br />
+ Require file-group<br />
+ </span>
+ </SatisfyOne><br />
+ </span>
+ </SatisfyAll><br />
+ </span>
+ </Directory>
</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>
<SatisfyAll><br />
- Reject ip <var>192.101.205</var><br />
- Reject host <var>cyberthugs.com</var> <var>moreidiots.com</var><br />
- 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>
</SatisfyAll>
</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 />
- ((Group == "admin") && (ldap-group <ldap-object> contains auth'ed_user) &&<br />
- ((ldap-attribute dept == "sales") ||
- (file-group contains contains auth'ed_user))))<br />
- then<br />
- auth_granted<br />
- else<br />
- auth_denied<br />
- </var></p>
-
<div class="example"><p><code>
- <Directory /www/mydocs><br />
- Authname ...<br />
- AuthBasicProvider ...<br />
- ...<br />
- Require user John<br />
- <SatisfyAll><br />
- Require Group admins<br />
- Require ldap-group cn=mygroup,o=foo<br />
- <SatisfyOne><br />
- Require ldap-attribute dept="sales"<br />
- Require file-group<br />
- </SatisfyOne><br />
- </SatisfyAll><br />
- </Directory><br />
+ # if ((user == "John") ||<br />
+ # ((Group == "admin")<br />
+ # && (ldap-group <ldap-object> contains auth'ed_user)<br />
+ # && ((ldap-attribute dept == "sales")<br />
+ # || (file-group contains auth'ed_user))))<br />
+ # then<br />
+ # auth_granted<br />
+ # else<br />
+ # auth_denied<br />
+ #<br />
+ <Directory /www/mydocs><br />
+ <span class="indent">
+ Authname ...<br />
+ AuthBasicProvider ...<br />
+ ...<br />
+ Require user John<br />
+ <SatisfyAll><br />
+ <span class="indent">
+ Require Group admins<br />
+ Require ldap-group cn=mygroup,o=foo<br />
+ <SatisfyOne><br />
+ <span class="indent">
+ Require ldap-attribute dept="sales"<br />
+ Require file-group<br />
+ </span>
+ </SatisfyOne><br />
+ </span>
+ </SatisfyAll><br />
+ </span>
+ </Directory>
</code></p></div>
-
<h3>See also</h3>
<ul>