diff options
| author | Andr辿 Malo <nd@apache.org> | 2006-02-17 18:44:52 +0100 |
|---|---|---|
| committer | Andr辿 Malo <nd@apache.org> | 2006-02-17 18:44:52 +0100 |
| commit | 28d729ed44fb85b6cf3ba102d834a6b190baf54a (patch) | |
| tree | f32ae54f87bd5549e85b75c5f5d21a0a8680fb22 /docs | |
| parent | don't use in configuration code that might be copy and pasted and cannot (diff) | |
| download | apache2-28d729ed44fb85b6cf3ba102d834a6b190baf54a.tar.xz apache2-28d729ed44fb85b6cf3ba102d834a6b190baf54a.zip | |
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@378578 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/manual/dns-caveats.html.en | 18 | ||||
| -rw-r--r-- | docs/manual/dns-caveats.html.ja.euc-jp | 2 | ||||
| -rw-r--r-- | docs/manual/dns-caveats.xml.ja | 2 | ||||
| -rw-r--r-- | docs/manual/dns-caveats.xml.ko | 2 | ||||
| -rw-r--r-- | docs/manual/dns-caveats.xml.meta | 2 | ||||
| -rw-r--r-- | docs/manual/howto/auth.html.en | 62 | ||||
| -rw-r--r-- | docs/manual/howto/auth.xml.ja | 2 | ||||
| -rw-r--r-- | docs/manual/howto/auth.xml.ko | 2 | ||||
| -rw-r--r-- | docs/manual/mod/mod_authz_core.html.en | 56 |
9 files changed, 82 insertions, 66 deletions
diff --git a/docs/manual/dns-caveats.html.en b/docs/manual/dns-caveats.html.en index e0b18202ea..1e941ed921 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> - <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> diff --git a/docs/manual/dns-caveats.html.ja.euc-jp b/docs/manual/dns-caveats.html.ja.euc-jp index b49937d381..780ec1e983 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"> 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 が設定ファイルを diff --git a/docs/manual/dns-caveats.xml.ja b/docs/manual/dns-caveats.xml.ja index 5d4a39e8d6..9ecb91355e 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 5d2c7ebf37..b4d953c117 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 dec5aad3db..a218acd9dd 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 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 /> - ((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> <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> <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> 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, diff --git a/docs/manual/mod/mod_authz_core.html.en b/docs/manual/mod/mod_authz_core.html.en index 11f4767ff0..1926017dc0 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 /> - ((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> <li><a href="../howto/auth.html">Authentication, Authorization, |