httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n.@apache.org
Subject svn commit: r378577 - in /httpd/httpd/trunk/docs/manual: dns-caveats.xml howto/auth.xml mod/mod_authz_core.xml
Date Fri, 17 Feb 2006 17:39:59 GMT
Author: nd
Date: Fri Feb 17 09:39:47 2006
New Revision: 378577

URL: http://svn.apache.org/viewcvs?rev=378577&view=rev
Log:
don't use   in configuration code that might be copy and pasted and cannot
be interpreted correctly by the httpd

Modified:
    httpd/httpd/trunk/docs/manual/dns-caveats.xml
    httpd/httpd/trunk/docs/manual/howto/auth.xml
    httpd/httpd/trunk/docs/manual/mod/mod_authz_core.xml

Modified: httpd/httpd/trunk/docs/manual/dns-caveats.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/dns-caveats.xml?rev=378577&r1=378576&r2=378577&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/dns-caveats.xml (original)
+++ httpd/httpd/trunk/docs/manual/dns-caveats.xml Fri Feb 17 09:39:47 2006
@@ -104,14 +104,18 @@
     configuration snippet:</p>
 
     <example>
-      &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 />
+      <indent>
+        ServerAdmin webgirl@abc.dom<br />
+        DocumentRoot /www/abc<br />
+      </indent>
+      &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 />
+      <indent>
+        ServerAdmin webguy@def.dom<br />
+        DocumentRoot /www/def<br />
+      </indent>
       &lt;/VirtualHost&gt;
     </example>
 

Modified: httpd/httpd/trunk/docs/manual/howto/auth.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/howto/auth.xml?rev=378577&r1=378576&r2=378577&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/howto/auth.xml (original)
+++ httpd/httpd/trunk/docs/manual/howto/auth.xml Fri Feb 17 09:39:47 2006
@@ -466,32 +466,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>
-    
-        <example>
-        &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 />
+        <example>
+          # 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 />
+          <indent>
+            Authname ...<br />
+            AuthBasicProvider ...<br />
+            ...<br />
+            Require user John<br />
+            &lt;SatisfyAll&gt;<br />
+            <indent>
+              Require Group admins<br />
+              Require ldap-group cn=mygroup,o=foo<br />
+              &lt;SatisfyOne&gt;<br />
+              <indent>
+                Require ldap-attribute dept="sales"<br />
+                Require file-group<br />
+              </indent>
+              &lt;/SatisfyOne&gt;<br />
+            </indent>
+            &lt;/SatisfyAll&gt;<br />
+          </indent>
+          &lt;/Directory&gt;
         </example>
 
         <p>By default all <directive module="mod_authz_core">Require</directive>

@@ -562,9 +567,10 @@
     
         <example>
           &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 />
+          <indent>
+            Reject ip <var>192.101.205</var><br />
+            Reject host <var>cyberthugs.com</var> <var>moreidiots.com</var><br
/>           Reject host ke<br />
+          </indent>
           &lt;/SatisfyAll&gt;
         </example>
     

Modified: httpd/httpd/trunk/docs/manual/mod/mod_authz_core.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/mod/mod_authz_core.xml?rev=378577&r1=378576&r2=378577&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_authz_core.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_authz_core.xml Fri Feb 17 09:39:47 2006
@@ -156,34 +156,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>
-
     <example>
-    &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 />
+      <indent>
+        Authname ...<br />
+        AuthBasicProvider ...<br />
+        ...<br />
+        Require user John<br />
+        &lt;SatisfyAll&gt;<br />
+        <indent>
+          Require Group admins<br />
+          Require ldap-group cn=mygroup,o=foo<br />
+          &lt;SatisfyOne&gt;<br />
+          <indent>
+            Require ldap-attribute dept="sales"<br />
+            Require file-group<br />
+          </indent>
+          &lt;/SatisfyOne&gt;<br />
+        </indent>
+        &lt;/SatisfyAll&gt;<br />
+      </indent>
+      &lt;/Directory&gt;
     </example>
-
 </usage>
 
 <seealso><a href="../howto/auth.html">Authentication, Authorization,



Mime
View raw message