don't use   in configuration code that might be copy and pasted and cannot

be interpreted correctly by the httpd

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

diff --git a/docs/manual/dns-caveats.xml b/docs/manual/dns-caveats.xml
index a7d4a1da1ca2d911c641b1ad41a6c329078b81e0..74af02ca1e0f2850f11ae8baaa1407f95bbd614a 100644 (file)
--- a/docs/manual/dns-caveats.xml
+++ b/docs/manual/dns-caveats.xml
@@ -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>
 

diff --git a/docs/manual/howto/auth.xml b/docs/manual/howto/auth.xml
index 728c05812d12a4ea4fd654c34eed54855fcc8e11..c19e3f8f8837d4090a4849a691cd97b891dc9c0c 100644 (file)
--- a/docs/manual/howto/auth.xml
+++ b/docs/manual/howto/auth.xml
@@ -466,32 +466,37 @@ person in</title>
         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 />
+          # 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 @@ person in</title>
     
         <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>
     

diff --git a/docs/manual/mod/mod_authz_core.xml b/docs/manual/mod/mod_authz_core.xml
index 43219c1d798d606f09d9d0cabf4610d5715e98ef..d61de7e066235c66a123211a357b7f91fcc690f7 100644 (file)
--- a/docs/manual/mod/mod_authz_core.xml
+++ b/docs/manual/mod/mod_authz_core.xml
@@ -156,34 +156,38 @@ for 'AND' logic to be applied to various authorization providers.</description>
     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,