From: Andre Malo Date: Tue, 8 Oct 2002 18:40:36 +0000 (+0000) Subject: core.xml: revert turns to 
formatted examples and use
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dfa04eaed26339f8753108b11da62706d8656bc0;p=apache

core.xml: revert turns to 
formatted examples and use
           elements
update transformations of core.html.en and
  quickreference.html.en (due to the mod_rewrite.xml fix)


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

diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index 54418062e0..a8f95f708e 100644
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -118,12 +118,15 @@ availableStatus:
     request, so you can use the following configuration to enable
     such a script:

 
-    
-<Files "mypaths.shtml">
-  Options +Includes
-  SetOutputFilter INCLUDES
-  AcceptPathInfo on
-</Files>

+    

+      <Files "mypaths.shtml">

+      
+        Options +Includes

+        SetOutputFilter INCLUDES

+        AcceptPathInfo on

+      
+      </Files>
+    

 
 
top
AccessFileName Directive
Description: 
               Name of the distributed configuration file
Syntax:
@@ -148,10 +151,13 @@ available
Status:
     /usr/local/.acl and /usr/local/web/.acl
     for directives, unless they have been disabled with

 
-    
-<Directory />
-  AllowOverride None
-</Directory>

+    

+      <Directory />

+      
+        AllowOverride None

+      
+      </Directory>
+    

 
See also
top
AddDefaultCharset Directive
Description: 
               Default character set to be added for a
 response without an explicit character set
Syntax:
@@ -388,10 +394,13 @@ named file-system directory and sub-directories
-<Directory /usr/local/httpd/htdocs>
-  Options Indexes FollowSymLinks
-</Directory>

+    

+      <Directory /usr/local/httpd/htdocs>

+      
+        Options Indexes FollowSymLinks

+      
+      </Directory>
+    

 
     

       
Be careful with the directory-path arguments:
@@ -419,14 +428,19 @@ named file-system directory and sub-directories
.htaccess files. For example,
     with

 
-    
-<Directory />
-  AllowOverride None
-</Directory>
-
-<Directory /home/>
-  AllowOverride FileInfo
-</Directory>

+    

+      <Directory />

+      
+        AllowOverride None

+      
+      </Directory>

+      

+      <Directory /home/>

+      
+        AllowOverride FileInfo

+      
+      </Directory>
+    

 
     
for access to the document /home/web/dir/doc.html
     the steps are:

@@ -447,10 +461,13 @@ named file-system directory and sub-directories
-<Directory ~ abc$>
-  # ... directives here ...
-</Directory>

+    

+      <Directory ~ abc$>

+      
+        # ... directives here ...

+      
+      </Directory>
+    

 
     
The regular expression section won't be considered until after
     all normal <Directory>s and .htaccess files
@@ -463,11 +480,14 @@ named file-system directory and sub-directories
-<Directory />
-  Order Deny,Allow
-  Deny from All
-</Directory>

+    

+      <Directory />

+      
+        Order Deny,Allow

+        Deny from All

+      
+      </Directory>
+    

 
     
and then override this for directories you
     want accessible. See the Security Tips page for more
@@ -888,14 +908,17 @@ if a test is true at startup
-$ httpd -DReverseProxy ...
-
-# httpd.conf
-<IfDefine ReverseProxy>
-  LoadModule rewrite_module modules/mod_rewrite.so
-  LoadModule proxy_module   modules/libproxy.so
-</IfDefine>

+    

+      httpd -DReverseProxy ...

+      

+      # httpd.conf

+      <IfDefine ReverseProxy>

+      
+        LoadModule rewrite_module modules/mod_rewrite.so

+        LoadModule proxy_module   modules/libproxy.so

+      
+      </IfDefine>
+    

 
top
<IfModule> Directive
Description: 
               Encloses directives that are processed conditional on the
 presence or absence of a specific module
Syntax:
@@ -1049,7 +1072,7 @@ methods
Syntax:
     all access methods, and this is the usual
     desired behavior. In the general case, access control
     directives should not be placed within a
-    <limit> section.

+    <Limit> section.

 
     
The purpose of the <Limit>
     directive is to restrict the effect of the access controls to the
@@ -1059,10 +1082,13 @@ methods
Syntax:
     example applies the access control only to the methods POST, PUT,
     and DELETE, leaving all other methods unprotected:

 
-    
-<Limit POST PUT DELETE>
-  Require valid-user
-</Limit>

+    

+      <Limit POST PUT DELETE>

+      
+        Require valid-user

+      
+      </Limit>
+    

 
     
The method names listed can be one or more of: GET,
     POST, PUT, DELETE,
@@ -1091,10 +1117,13 @@ except the named ones
Synt
 
     
For example:

 
-    
-<LimitExcept POST GET>
-  Require valid-user
-<LimitExcept>

+    

+      <LimitExcept POST GET>

+      
+        Require valid-user

+      
+      <LimitExcept>
+    

 
 
top
LimitRequestBody Directive
Description: 
               Restricts the total size of the HTTP request body sent
@@ -1315,13 +1344,16 @@ URLs
Syntax:
     directive. For example, to enable status requests, but allow them
     only from browsers at foo.com, you might use:

 
-    
-<Location /status>
-  SetHandler server-status
-  Order Deny,Allow
-  Deny from all
-  Allow from .foo.com
-</Location>

+    

+      <Location /status>

+      
+        SetHandler server-status

+        Order Deny,Allow

+        Deny from all

+        Allow from .foo.com

+      
+      </Location>
+    

 
     
Note about / (slash)

       
The slash character has special meaning depending on where in a
@@ -1644,27 +1676,37 @@ directory
Syntax:
 
     
For example, without any + and - symbols:

 
-    
-<Directory /web/docs>
-  Options Indexes FollowSymLinks
-</Directory>
-
-<Directory /web/docs/spec>
-  Options Includes
-</Directory>

+    

+      <Directory /web/docs>

+      
+        Options Indexes FollowSymLinks

+      
+      </Directory>

+      

+      <Directory /web/docs/spec>

+      
+        Options Includes

+      
+      </Directory>
+    

 
     
then only Includes will be set for the
     /web/docs/spec directory. However if the second
     Options directive uses the + and - symbols:
 
 
-    
-<Directory /web/docs>
-  Options Indexes FollowSymLinks
-</Directory>
-
-<Directory /web/docs/spec>
-  Options +Includes -Indexes
-</Directory>

+    

+      <Directory /web/docs>

+      
+        Options Indexes FollowSymLinks

+      
+      </Directory>

+      

+      <Directory /web/docs/spec>

+      
+        Options +Includes -Indexes

+      
+      </Directory>
+    

 
     
then the options FollowSymLinks and
     Includes are set for the /web/docs/spec directory.

@@ -2067,7 +2109,9 @@ handler
Syntax:
 
     

       <Location /status>

-      SetHandler server-status

+      
+        SetHandler server-status

+      
       </Location>
     

 
See also
top
SetInputFilter Directive
Description: 
@@ -2107,10 +2151,13 @@ server
Syntax:
     in the /www/data/ directory for server-side
     includes.

 
-    
-<Directory /www/data/>
-  SetOutputFilter INCLUDES
-</Directory>

+    

+      <Directory /www/data/>

+      
+        SetOutputFilter INCLUDES

+      
+      </Directory>
+    

 
     
If more than one filter is specified, they must be separated
     by semicolons in the order in which they should process the
@@ -2189,12 +2236,13 @@ port
Syntax:
     reverse DNS lookup on the server IP address that the client
     connected to in order to work out self-referential URLs.

 
-    
Warning: if CGIs make assumptions about the
-    values of SERVER_NAME they may be broken by this
-    option. The client is essentially free to give whatever value
-    they want as a hostname. But if the CGI is only using
-    SERVER_NAME to construct self-referential URLs
+    
Warning:

+    
If CGIs make assumptions about the values of SERVER_NAME
+    they may be broken by this option. The client is essentially free
+    to give whatever value they want as a hostname. But if the CGI is
+    only using SERVER_NAME to construct self-referential URLs
     then it should be just fine.

+    

 
See also
top
<VirtualHost> Directive

 synchronization
-
Description: 
               Contains directives that apply only to a specific
 hostname or IP address
Syntax:
@@ -2228,11 +2276,13 @@ hostname or IP address
Syn
     
     
Example

       <VirtualHost 10.1.2.3>

-      ServerAdmin webmaster@host.foo.com

-      DocumentRoot /www/docs/host.foo.com

-      ServerName host.foo.com

-      ErrorLog logs/host.foo.com-error_log

-      TransferLog logs/host.foo.com-access_log

+      
+        ServerAdmin webmaster@host.foo.com

+        DocumentRoot /www/docs/host.foo.com

+        ServerName host.foo.com

+        ErrorLog logs/host.foo.com-error_log

+        TransferLog logs/host.foo.com-access_log

+      
       </VirtualHost>
     

 
@@ -2243,11 +2293,13 @@ hostname or IP address
Syn
 
     

       <VirtualHost [fe80::a00:20ff:fea7:ccea]>

-      ServerAdmin webmaster@host.example.com

-      DocumentRoot /www/docs/host.example.com

-      ServerName host.example.com

-      ErrorLog logs/host.example.com-error_log

-      TransferLog logs/host.example.com-access_log

+      
+        ServerAdmin webmaster@host.example.com

+        DocumentRoot /www/docs/host.example.com

+        ServerName host.example.com

+        ErrorLog logs/host.example.com-error_log

+        TransferLog logs/host.example.com-access_log

+      
       </VirtualHost>
     
  
 
@@ -2259,6 +2311,13 @@ hostname or IP address
Syn
     accomplished with the ifconfig alias command (if
     your OS supports it).

 
+    
Note

+    
The use of <VirtualHost> does
+    not affect what addresses Apache listens on.  You
+    may need to ensure that Apache is listening on the correct addresses
+    using Listen.

+    

+
     
When using IP-based virtual hosting, the special name
     _default_ can be specified in
     which case this virtual host will match any IP address that is
@@ -2277,14 +2336,12 @@ hostname or IP address
Syn
     to match all ports on that address. (This is recommended when used
     with _default_.)

 
-    
SECURITY: See the security tips document
-    for details on why your security could be compromised if the
+    
Security

+    
See the security tips
+    document for details on why your security could be compromised if the
     directory where logfiles are stored is writable by anyone other
     than the user that starts the server.

-
-    
NOTE: The use of <VirtualHost> does not
-    affect what addresses Apache listens on.  You may need to ensure
-    that Apache is listening on the correct addresses using Listen.

+    

 
See also
  • Apache Virtual Host documentation
  • Warnings about DNS and
     Apache
  • Setting
     which addresses and ports Apache uses
  • How
diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index 1ada667b0a..f7f3a68298 100644
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -67,12 +67,14 @@ available
     request, so you can use the following configuration to enable
     such a script:
    
 
-    
    -<Files "mypaths.shtml">
-  Options +Includes
-  SetOutputFilter INCLUDES
-  AcceptPathInfo on
-</Files>
    
+    
+      <Files "mypaths.shtml">
    
+      
+        Options +Includes
    
+        SetOutputFilter INCLUDES
    
+        AcceptPathInfo on
    
+          
+      </Files>
         
 
 
@@ -103,10 +105,12 @@ available
     /usr/local/.acl and /usr/local/web/.acl
     for directives, unless they have been disabled with
    
 
-    
    -<Directory />
-  AllowOverride None
-</Directory>
    
+    
+      <Directory />
    
+      
+        AllowOverride None
    
+          
+      </Directory>
         
 
 AllowOverride
@@ -424,10 +428,12 @@ named file-system directory and sub-directories
     /home/user/public_html, but <Directory
     /home/*/public_html> will match. Example:
    
 
-    
    -<Directory /usr/local/httpd/htdocs>
-  Options Indexes FollowSymLinks
-</Directory>
    
+    
+      <Directory /usr/local/httpd/htdocs>
    
+      
+        Options Indexes FollowSymLinks
    
+          
+      </Directory>
         
 
     
@@ -457,14 +463,18 @@ named file-system directory and sub-directories
     href="#accessfilename">.htaccess     files. For example,
     with
    
 
-    
    -<Directory />
-  AllowOverride None
-</Directory>
-
-<Directory /home/>
-  AllowOverride FileInfo
-</Directory>
    
+    
+      <Directory />
    
+      
+        AllowOverride None
    
+          
+      </Directory>
    
+      
    
+      <Directory /home/>
    
+      
+        AllowOverride FileInfo
    
+          
+      </Directory>
         
 
     
    for access to the document /home/web/dir/doc.html
@@ -486,10 +496,12 @@ named file-system directory and sub-directories
     expressions are tested in the order they appeared in the
     configuration file. For example, with
    
 
-    
    -<Directory ~ abc$>
-  # ... directives here ...
-</Directory>
    
+    
+      <Directory ~ abc$>
    
+      
+        # ... directives here ...
    
+          
+      </Directory>
         
 
     
    The regular expression section won't be considered until after
@@ -503,11 +515,13 @@ named file-system directory and sub-directories
     recommended that you change this with a block such
     as
    
 
-    
    -<Directory />
-  Order Deny,Allow
-  Deny from All
-</Directory>
    
+    
+      <Directory />
    
+      
+        Order Deny,Allow
    
+        Deny from All
    
+          
+      </Directory>
         
 
     
    and then override this for directories you
@@ -1024,14 +1038,16 @@ if a test is true at startup
     nest-able, which can be used to implement simple
     multiple-parameter tests. Example:
    
 
-    
    -$ httpd -DReverseProxy ...
-
-# httpd.conf
-<IfDefine ReverseProxy>
-  LoadModule rewrite_module modules/mod_rewrite.so
-  LoadModule proxy_module   modules/libproxy.so
-</IfDefine>
    
+    
+      httpd -DReverseProxy ...
    
+      
    
+      # httpd.conf
    
+      <IfDefine ReverseProxy>
    
+      
+        LoadModule rewrite_module modules/mod_rewrite.so
    
+        LoadModule proxy_module   modules/libproxy.so
    
+          
+      </IfDefine>
         
 
 
@@ -1221,7 +1237,7 @@ methods
     all access methods, and this is the usual
     desired behavior. In the general case, access control
     directives should not be placed within a
-    limit section.
    
+    Limit section.
    
 
     
    The purpose of the Limit
     directive is to restrict the effect of the access controls to the
@@ -1231,10 +1247,12 @@ methods
     example applies the access control only to the methods POST, PUT,
     and DELETE, leaving all other methods unprotected:
    
 
-    
    -<Limit POST PUT DELETE>
-  Require valid-user
-</Limit>
    
+    
+      <Limit POST PUT DELETE>
    
+      
+        Require valid-user
    
+          
+      </Limit>
         
 
     
    The method names listed can be one or more of: GET,
@@ -1272,10 +1290,12 @@ except the named ones
 
     
    For example:
    
 
-    
    -<LimitExcept POST GET>
-  Require valid-user
-<LimitExcept>
    
+    
+      <LimitExcept POST GET>
    
+      
+        Require valid-user
    
+          
+      <LimitExcept>
         
 
 
@@ -1528,13 +1548,15 @@ URLs
     directive. For example, to enable status requests, but allow them
     only from browsers at foo.com, you might use:
    
 
-    
    -<Location /status>
-  SetHandler server-status
-  Order Deny,Allow
-  Deny from all
-  Allow from .foo.com
-</Location>
    
+    
+      <Location /status>
    
+      
+        SetHandler server-status
    
+        Order Deny,Allow
    
+        Deny from all
    
+        Allow from .foo.com
    
+          
+      </Location>
         
 
     Note about / (slash)
@@ -1897,28 +1919,36 @@ directory
 
     
    For example, without any + and - symbols:
    
 
-    
    -<Directory /web/docs>
-  Options Indexes FollowSymLinks
-</Directory>
-
-<Directory /web/docs/spec>
-  Options Includes
-</Directory>
    
+    
+      <Directory /web/docs>
    
+      
+        Options Indexes FollowSymLinks
    
+          
+      </Directory>
    
+      
    
+      <Directory /web/docs/spec>
    
+      
+        Options Includes
    
+          
+      </Directory>
         
 
     
    then only Includes will be set for the
     /web/docs/spec directory. However if the second
     Options directive uses the + and - symbols:
     
 
-    
    -<Directory /web/docs>
-  Options Indexes FollowSymLinks
-</Directory>
-
-<Directory /web/docs/spec>
-  Options +Includes -Indexes
-</Directory>
    
+    
+      <Directory /web/docs>
    
+      
+        Options Indexes FollowSymLinks
    
+          
+      </Directory>
    
+      
    
+      <Directory /web/docs/spec>
    
+      
+        Options +Includes -Indexes
    
+          
+      </Directory>
         
 
     
    then the options FollowSymLinks and
@@ -2420,7 +2450,9 @@ handler
 
     
       <Location /status>
    
-      SetHandler server-status
    
+      
+        SetHandler server-status
    
+          
       </Location>
         
 
@@ -2476,10 +2508,12 @@ server
     in the /www/data/ directory for server-side
     includes.
    
 
-    
    -<Directory /www/data/>
-  SetOutputFilter INCLUDES
-</Directory>
    
+    
+      <Directory /www/data/>
    
+      
+        SetOutputFilter INCLUDES
    
+          
+      </Directory>
         
 
     
    If more than one filter is specified, they must be separated
@@ -2571,12 +2605,13 @@ port
     reverse DNS lookup on the server IP address that the client
     connected to in order to work out self-referential URLs.
    
 
-    
    Warning: if CGIs make assumptions about the
-    values of SERVER_NAME they may be broken by this
-    option. The client is essentially free to give whatever value
-    they want as a hostname. But if the CGI is only using
-    SERVER_NAME to construct self-referential URLs
+    Warning:
+    
    If CGIs make assumptions about the values of SERVER_NAME
+    they may be broken by this option. The client is essentially free
+    to give whatever value they want as a hostname. But if the CGI is
+    only using SERVER_NAME to construct self-referential URLs
     then it should be just fine.
    
+        
 
 ServerName
 Listen
@@ -2616,11 +2651,13 @@ hostname or IP address
     
     Example
       <VirtualHost 10.1.2.3>
    
-      ServerAdmin webmaster@host.foo.com
    
-      DocumentRoot /www/docs/host.foo.com
    
-      ServerName host.foo.com
    
-      ErrorLog logs/host.foo.com-error_log
    
-      TransferLog logs/host.foo.com-access_log
    
+      
+        ServerAdmin webmaster@host.foo.com
    
+        DocumentRoot /www/docs/host.foo.com
    
+        ServerName host.foo.com
    
+        ErrorLog logs/host.foo.com-error_log
    
+        TransferLog logs/host.foo.com-access_log
    
+          
       </VirtualHost>
         
 
@@ -2631,11 +2668,13 @@ hostname or IP address
 
     
       <VirtualHost [fe80::a00:20ff:fea7:ccea]>
    
-      ServerAdmin webmaster@host.example.com
    
-      DocumentRoot /www/docs/host.example.com
    
-      ServerName host.example.com
    
-      ErrorLog logs/host.example.com-error_log
    
-      TransferLog logs/host.example.com-access_log
    
+      
+        ServerAdmin webmaster@host.example.com
    
+        DocumentRoot /www/docs/host.example.com
    
+        ServerName host.example.com
    
+        ErrorLog logs/host.example.com-error_log
    
+        TransferLog logs/host.example.com-access_log
    
+          
       </VirtualHost>
           
 
@@ -2647,6 +2686,13 @@ hostname or IP address
     accomplished with the ifconfig alias command (if
     your OS supports it).
    
 
+    Note
+    
    The use of VirtualHost does
+    not affect what addresses Apache listens on.  You
+    may need to ensure that Apache is listening on the correct addresses
+    using Listen.
    
+        
+
     
    When using IP-based virtual hosting, the special name
     _default_ can be specified in
     which case this virtual host will match any IP address that is
@@ -2667,17 +2713,12 @@ hostname or IP address
     to match all ports on that address. (This is recommended when used
     with _default_.)
    
 
-    
    SECURITY: See the security tips document
-    for details on why your security could be compromised if the
+    Security
+    
    See the security tips
+    document for details on why your security could be compromised if the
     directory where logfiles are stored is writable by anyone other
     than the user that starts the server.
    
-
-    
    NOTE: The use of VirtualHost does not
-    affect what addresses Apache listens on.  You may need to ensure
-    that Apache is listening on the correct addresses using Listen.
    
+    
 
 Apache Virtual Host documentation
 Warnings about DNS and
diff --git a/docs/manual/mod/quickreference.html.en b/docs/manual/mod/quickreference.html.en
index f0b22a44af..35b5855aeb 100644
--- a/docs/manual/mod/quickreference.html.en
+++ b/docs/manual/mod/quickreference.html.en
@@ -457,7 +457,7 @@ a resource

 
RewriteLog file-pathsvE
Sets the name of the file used for logging rewrite engine
 processing
RewriteLogLevel LevelsvE
Sets the verbosity of the log file used by the rewrite
+
RewriteLogLevel Level 0 svE
Sets the verbosity of the log file used by the rewrite
 engine

 
RewriteMap MapName MapType:MapSource
 svE
Defines a mapping function for key-lookup