From 03cc6f7d4e45e03e9aac99ecf742fbba8a7814dd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20Malo?= Date: Fri, 27 Apr 2012 19:06:57 +0000 Subject: [PATCH] update transformation git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1331546 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/developer/output-filters.html.en | 31 +-- docs/manual/howto/htaccess.html.en | 12 +- docs/manual/mod/mod_actions.html.en | 13 +- docs/manual/mod/mod_auth_basic.html.en | 6 +- docs/manual/mod/mod_auth_digest.html.en | 12 +- docs/manual/mod/mod_auth_form.html.en | 48 ++-- docs/manual/mod/mod_authn_anon.html.en | 12 +- docs/manual/mod/mod_authn_core.html.en | 12 +- docs/manual/mod/mod_buffer.html.en | 6 +- docs/manual/mod/mod_cache.html.en | 48 ++-- docs/manual/mod/mod_cgi.html.en | 6 +- docs/manual/mod/mod_cgid.html.en | 6 +- docs/manual/mod/mod_charset_lite.html.en | 12 +- docs/manual/mod/mod_data.html.en | 6 +- docs/manual/mod/mod_dav.html.en | 12 +- docs/manual/mod/mod_dav_fs.html.en | 12 +- docs/manual/mod/mod_dav_lock.html.en | 6 +- docs/manual/mod/mod_deflate.html.en | 30 +-- docs/manual/mod/mod_dir.html.en | 12 +- docs/manual/mod/mod_dumpio.html.en | 12 +- docs/manual/mod/mod_echo.html.en | 6 +- docs/manual/mod/mod_env.html.en | 18 +- docs/manual/mod/mod_expires.html.en | 6 +- docs/manual/mod/mod_ext_filter.html.en | 6 +- docs/manual/mod/mod_file_cache.html.en | 12 +- docs/manual/mod/mod_firehose.html.en | 36 +-- docs/manual/mod/mod_info.html.en | 6 +- docs/manual/mod/mod_log_config.html.en | 12 +- docs/manual/mod/mod_lua.html.en | 18 +- docs/manual/mod/mod_mime.html.en | 90 +++---- docs/manual/mod/mod_mime_magic.html.en | 6 +- docs/manual/mod/mod_policy.html.en | 72 ++--- docs/manual/mod/mod_proxy.html.en | 54 ++-- docs/manual/mod/mod_proxy_ajp.html.en | 18 +- docs/manual/mod/mod_proxy_fcgi.html.en | 18 +- docs/manual/mod/mod_proxy_ftp.html.en | 6 +- docs/manual/mod/mod_proxy_scgi.html.en | 24 +- docs/manual/mod/mod_ratelimit.html.en | 6 +- docs/manual/mod/mod_remoteip.html.en | 36 +-- docs/manual/mod/mod_rewrite.html.en | 6 +- docs/manual/mod/mod_sed.html.en | 12 +- docs/manual/mod/mod_session.html.en | 42 +-- docs/manual/mod/mod_session_cookie.html.en | 18 +- docs/manual/mod/mod_session_crypto.html.en | 42 +-- docs/manual/mod/mod_session_dbd.html.en | 30 +-- docs/manual/mod/mod_ssl.html.en | 264 +++++++------------ docs/manual/mod/mod_substitute.html.en | 24 +- docs/manual/mod/mod_suexec.html.en | 7 +- docs/manual/mod/mod_unixd.html.en | 6 +- docs/manual/mod/mod_version.html.en | 18 +- docs/manual/mod/mpm_common.html.en | 12 +- docs/manual/platform/windows.html.en | 18 +- docs/manual/rewrite/avoid.html.en | 6 +- docs/manual/upgrading.html.en | 42 +-- 54 files changed, 434 insertions(+), 877 deletions(-) diff --git a/docs/manual/developer/output-filters.html.en b/docs/manual/developer/output-filters.html.en index 6707ba4f142..7ef9ca4d198 100644 --- a/docs/manual/developer/output-filters.html.en +++ b/docs/manual/developer/output-filters.html.en @@ -129,8 +129,7 @@ brigade should have no side effects (such as changing any state private to the filter).

-

How to handle an empty brigade

- 

+    
How to handle an empty brigade
     apr_status_t dummy_filter(ap_filter_t *f, apr_bucket_brigade *bb)

     {
         if (APR_BRIGADE_EMPTY(bb)) {
@@ -138,8 +137,7 @@
         }
         ....
     

-
-    

+
top
@@ -256,8 +254,7 @@

Taking an example which loops through the entire brigade as follows:

-

Bad output filter -- do not imitate!

- 

+    
Bad output filter -- do not imitate!
 apr_bucket *e = APR_BRIGADE_FIRST(bb);
 const char *data;
 apr_size_t len;
@@ -270,8 +267,7 @@ while (e != APR_BRIGADE_SENTINEL(bb)) {
 
 return ap_pass_brigade(bb);
 

-
-    

+

The above implementation would consume memory proportional to content size. If passed a FILE bucket, for example, @@ -283,8 +279,7 @@ return ap_pass_brigade(bb); amount of memory to filter any brigade; a temporary brigade is needed and must be allocated only once per response, see the Maintaining state section.

-

Better output filter

-

+    
Better output filter
 apr_bucket *e;
 const char *data;
 apr_size_t len;
@@ -302,8 +297,7 @@ while ((e = APR_BRIGADE_FIRST(bb)) != APR_BRIGADE_SENTINEL(bb)) {
    apr_brigade_cleanup(tmpbb);
 }
 

-
-    

+
top
@@ -317,8 +311,7 @@ while ((e = APR_BRIGADE_FIRST(bb)) != APR_BRIGADE_SENTINEL(bb)) { temporary brigade in such a structure, to avoid having to allocate a new brigade per invocation as described in the Brigade structure section.

-

Example code to maintain filter state

- 

+  
Example code to maintain filter state
 struct dummy_state {
    apr_bucket_brigade *tmpbb;
    int filter_state;
@@ -343,8 +336,7 @@ apr_status_t dummy_filter(ap_filter_t *f, apr_bucket_brigade *bb)
     }
     ...
 

-
-    

+
top
@@ -418,9 +410,7 @@ apr_status_t dummy_filter(ap_filter_t *f, apr_bucket_brigade *bb) script; reading from such a bucket will block when waiting for the CGI script to produce more output.

-

Example code using non-blocking bucket reads

- - 

+    
Example code using non-blocking bucket reads
 apr_bucket *e;
 apr_read_type_e mode = APR_NONBLOCK_READ;
 
@@ -448,8 +438,7 @@ while ((e = APR_BRIGADE_FIRST(bb)) != APR_BRIGADE_SENTINEL(bb)) {
     ...
 }
 

-
-    

+
top
diff --git a/docs/manual/howto/htaccess.html.en b/docs/manual/howto/htaccess.html.en index 9643ddd9381..ae231bc0835 100644 --- a/docs/manual/howto/htaccess.html.en +++ b/docs/manual/howto/htaccess.html.en @@ -193,20 +193,16 @@ changes on a per-directory basis.

.htaccess file in /www/htdocs/example:

Contents of .htaccess file in - /www/htdocs/example

- 

AddType text/example .exm
- -

+ /www/htdocs/example
AddType text/example .exm
+

Section from your httpd.conf - file

- 

+    file
 <Directory /www/htdocs/example>

     AddType text/example .exm

 </Directory>
     

-
-
+

However, putting this configuration in your server configuration file will result in less of a performance hit, as the configuration is diff --git a/docs/manual/mod/mod_actions.html.en b/docs/manual/mod/mod_actions.html.en index a3af1888779..eecf5447cb5 100644 --- a/docs/manual/mod/mod_actions.html.en +++ b/docs/manual/mod/mod_actions.html.en @@ -78,27 +78,22 @@ introduced in Apache 2.1 environment variables. The handler used for the particular request is passed using the REDIRECT_HANDLER variable.

-

Example: MIME type

- 

+    
Example: MIME type
 # Requests for files of a particular MIME content type:
 Action image/gif /cgi-bin/images.cgi
     

-
-    

+

In this example, requests for files with a MIME content type of image/gif will be handled by the specified cgi script /cgi-bin/images.cgi.

-

Example: File extension

- - 

+    
Example: File extension
 # Files of a particular file extension
 AddHandler my-file-type .xyz
 Action my-file-type /cgi-bin/program.cgi
     

-
-    

+

In this example, requests for files with a file extension of .xyz are handled by the specified cgi script /cgi-bin/program.cgi.

diff --git a/docs/manual/mod/mod_auth_basic.html.en b/docs/manual/mod/mod_auth_basic.html.en index 6992e457247..b9d2484caa7 100644 --- a/docs/manual/mod/mod_auth_basic.html.en +++ b/docs/manual/mod/mod_auth_basic.html.en @@ -100,8 +100,7 @@ lower level modules The default file provider is implemented by the mod_authn_file module. Make sure that the chosen provider module is present in the server.

-

Example

- 

+    
Example
 <Location /secure>
     AuthType basic
     AuthName "private area"
@@ -111,8 +110,7 @@ lower level modules
     Require            valid-user
 </Location>
     

-
-    

+

Providers are queried in order until a provider finds a match for the requested username, at which point this sole provider will attempt to check the password. A failure to verify the password does diff --git a/docs/manual/mod/mod_auth_digest.html.en b/docs/manual/mod/mod_auth_digest.html.en index 2baaf194962..e2646e3b785 100644 --- a/docs/manual/mod/mod_auth_digest.html.en +++ b/docs/manual/mod/mod_auth_digest.html.en @@ -77,8 +77,7 @@

Appropriate user (text) files can be created using the htdigest tool.

-

Example:

- 

+    
Example:
 <Location /private/>
     AuthType Digest
     AuthName "private area"
@@ -89,8 +88,7 @@
     Require valid-user
 </Location>
       

-
-    

+

Note

Digest authentication is more secure than Basic authentication, @@ -128,12 +126,10 @@ remove the query string from the digest comparison. Using this method would look similar to the following.

-

Using Digest Authentication with MSIE:

- 

+    
Using Digest Authentication with MSIE:
         BrowserMatch "MSIE" AuthDigestEnableQueryStringHack=On
     

-
-    

+

This workaround is not necessary for MSIE 7, though enabling it does not cause any compatibility issues or significant overhead.

diff --git a/docs/manual/mod/mod_auth_form.html.en b/docs/manual/mod/mod_auth_form.html.en index 007c5a117a1..ffd85e6fb40 100644 --- a/docs/manual/mod/mod_auth_form.html.en +++ b/docs/manual/mod/mod_auth_form.html.en @@ -106,8 +106,7 @@ a file using mod_authn_file. If authentication is unsuccessful, the user will be redirected to the form login page.

-

Basic example

- 

+      
Basic example
 AuthFormProvider file
 AuthUserFile conf/passwd
 AuthType form
@@ -117,8 +116,7 @@ Session On
 SessionCookieName session path=/
 SessionCryptoPassphrase secret
         

-
-      

+

The directive AuthType will enable the mod_auth_form authentication when set to the value form. @@ -163,8 +161,7 @@ SessionCryptoPassphrase secret The action of the form should point at this handler, which is configured within Apache httpd as follows:

-

Form login handler example

- 

+      
Form login handler example
 <Location /dologin.html>
     SetHandler form-login-handler
     AuthFormLoginRequiredLocation http://example.com/login.html
@@ -178,8 +175,7 @@ SessionCryptoPassphrase secret
     SessionCryptoPassphrase secret
 </Location>
         

-
-      

+

The URLs specified by the AuthFormLoginRequiredLocation directive will typically @@ -231,8 +227,7 @@ SessionCryptoPassphrase secret returned by the HTTP_UNAUTHORIZED status code with a custom error document containing the login form, as follows:

-

Basic inline example

- 

+      
Basic inline example
 AuthFormProvider file
 ErrorDocument 401 /login.shtml
 AuthUserFile conf/passwd
@@ -243,8 +238,7 @@ Session On
 SessionCookieName session path=/
 SessionCryptoPassphrase secret
         

-
-      

+

The error document page should contain a login form with an empty action property, as per the example below. This has the effect of submitting the form to @@ -311,14 +305,12 @@ SessionCryptoPassphrase secret

Another option is to render the login form using a CGI script or other dynamic technology.

-

CGI example

- 

+      
CGI example
         AuthFormProvider file
         ErrorDocument 401 /cgi-bin/login.cgi
         ...
         

-
-      

+
top
@@ -335,8 +327,7 @@ SessionCryptoPassphrase secret logout. This URL might explain to the user that they have been logged out, and give the user the option to log in again.

-

Basic logout example

- 

+      
Basic logout example
 SetHandler form-logout-handler
 AuthName realm
 AuthFormLogoutLocation http://example.com/loggedout.html
@@ -344,8 +335,7 @@ Session On
 SessionCookieName session path=/
 SessionCryptoPassphrase secret
         

-
-      

+

Note that logging a user out does not delete the session; it merely removes the username and password from the session. If this results in an empty session, @@ -355,8 +345,7 @@ SessionCryptoPassphrase secret value, like 1 (setting the directive to zero would mean no session age limit).

-

Basic session expiry example

- 

+      
Basic session expiry example
 SetHandler form-logout-handler
 AuthFormLogoutLocation http://example.com/loggedout.html
 Session On
@@ -364,8 +353,7 @@ SessionMaxAge 1
 SessionCookieName session path=/
 SessionCryptoPassphrase secret
         

-
-      

+
top
@@ -539,8 +527,7 @@ lower level modules

When a URI is accessed that is served by the handler form-logout-handler, the page specified by this directive will be shown to the end user. For example:

-

Example

- 

+    
Example
 <Location /logout>
     SetHandler form-logout-handler
     AuthFormLogoutLocation http://example.com/loggedout.html
@@ -548,8 +535,7 @@ lower level modules
     #...
 </Location>
       

-
-    

+

An attempt to access the URI /logout/ will result in the user being logged out, and the page /loggedout.html will be displayed. Make sure that the page @@ -638,8 +624,7 @@ lower level modules by the mod_authn_file module. Make sure that the chosen provider module is present in the server.

-

Example

- 

+    
Example
 <Location /secure>
     AuthType form
     AuthName "private area"
@@ -650,8 +635,7 @@ lower level modules
     #...
 </Location>
       

-
-    

+

Providers are implemented by mod_authn_dbm, mod_authn_file, mod_authn_dbd, diff --git a/docs/manual/mod/mod_authn_anon.html.en b/docs/manual/mod/mod_authn_anon.html.en index 860c31255c9..a2d7c7913c1 100644 --- a/docs/manual/mod/mod_authn_anon.html.en +++ b/docs/manual/mod/mod_authn_anon.html.en @@ -93,8 +93,7 @@ (Anonymous_LogEmail) -

Example

- 

+    
Example
 <Directory /var/www/html/private>
     AuthName "Use 'anonymous' & Email address for guest entry"
     AuthType Basic
@@ -110,8 +109,7 @@
     Require valid-user
 </Directory>
       

-
-    

+
top

Anonymous Directive

@@ -135,12 +133,10 @@ password verification 'anonymous' is always one of the allowed userIDs.

-

Example:

- 

+    
Example:
       Anonymous anonymous "Not Registered" "I don't know"
     

-
-    

+

This would allow the user to enter without password verification by using the userIDs "anonymous", diff --git a/docs/manual/mod/mod_authn_core.html.en b/docs/manual/mod/mod_authn_core.html.en index 766e82ba802..95162ea8530 100644 --- a/docs/manual/mod/mod_authn_core.html.en +++ b/docs/manual/mod/mod_authn_core.html.en @@ -68,8 +68,7 @@

This example checks for passwords in two different text files.

-

Checking multiple text password files

- 

+        
Checking multiple text password files
 # Check here first
 <AuthnProviderAlias file file1>
     AuthUserFile /www/conf/passwords1
@@ -88,16 +87,14 @@
     Require valid-user
 </Directory>
         

-
-        

+

The example below creates two different ldap authentication provider aliases based on the ldap provider. This allows a single authenticated location to be serviced by multiple ldap hosts:

-

Checking multiple LDAP servers

- 

+        
Checking multiple LDAP servers
 <AuthnProviderAlias ldap ldap-alias1>
     AuthLDAPBindDN cn=youruser,o=ctx
     AuthLDAPBindPassword yourpassword
@@ -121,8 +118,7 @@ Alias /secure /webpages/secure
     Require valid-user
 </Directory>
           

-
-        

+
diff --git a/docs/manual/mod/mod_buffer.html.en b/docs/manual/mod/mod_buffer.html.en index 9e3636b2b7b..454f0142312 100644 --- a/docs/manual/mod/mod_buffer.html.en +++ b/docs/manual/mod/mod_buffer.html.en @@ -58,12 +58,10 @@ AddOutputFilter or AddOutputFilterByType directives.

-

Using buffer with mod_include

- 

+      
Using buffer with mod_include
         AddOutputFilterByType INCLUDES;BUFFER text/html
         

-
-      

+
The buffer filters read the request/response into RAM and then repack the request/response into the fewest memory diff --git a/docs/manual/mod/mod_cache.html.en b/docs/manual/mod/mod_cache.html.en index 39f80070083..b6a0938752b 100644 --- a/docs/manual/mod/mod_cache.html.en +++ b/docs/manual/mod/mod_cache.html.en @@ -169,8 +169,7 @@
top

Sample Configuration

-

Sample httpd.conf

- 

+    
Sample httpd.conf
 #
 # Sample Cache Configuration
 #
@@ -188,8 +187,7 @@ LoadModule cache_module modules/mod_cache.so
     CacheDisable http://security.update.server/update-list/
 </IfModule>
       

-
-    

+
top

Avoiding the Thundering Herd

@@ -241,8 +239,7 @@ LoadModule cache_module modules/mod_cache.so

Example configuration

-

Enabling the cache lock

- 

+    
Enabling the cache lock
 #
 # Enable the cache lock
 #
@@ -252,8 +249,7 @@ LoadModule cache_module modules/mod_cache.so
     CacheLockMaxAge 5
 </IfModule>
       

-
-    

+
top
@@ -437,25 +433,21 @@ CacheDetailHeader on mod_cache to not cache urls at or below url-string.

-

Example

- 

+    
Example
       CacheDisable /local_files
       

-
-    

+

If used in a <Location> directive, the path needs to be specified below the Location, or if the word "on" is used, caching for the whole location will be disabled.

-

Example

- 

+    
Example
 <Location /foo>
     CacheDisable on
 </Location>
       

-
-    

+

The no-cache environment variable can be set to disable caching on a finer grained set of resources in versions @@ -662,19 +654,15 @@ CacheHeader on behaviour), CacheIgnoreHeaders can be set to None.

-

Example 1

- 

+    
Example 1
       CacheIgnoreHeaders Set-Cookie
       

+

 
-
- -

Example 2

- 

+    
Example 2
       CacheIgnoreHeaders None
       

-
-    

+

Warning:

If headers like Expires which are needed for proper cache @@ -765,19 +753,15 @@ header.

CacheIgnoreURLSessionIdentifiers None clears the list of ignored identifiers. Otherwise, each identifier is added to the list.

-

Example 1

- 

+    
Example 1
       CacheIgnoreURLSessionIdentifiers jsessionid
       

+

 
-
- -

Example 2

- 

+    
Example 2
       CacheIgnoreURLSessionIdentifiers None
       

-
-    

+
diff --git a/docs/manual/mod/mod_cgi.html.en b/docs/manual/mod/mod_cgi.html.en index 096c8591dc2..e9713695240 100644 --- a/docs/manual/mod/mod_cgi.html.en +++ b/docs/manual/mod/mod_cgi.html.en @@ -177,12 +177,10 @@ taken relative to the ServerRoot.

-

Example

- 

+    
Example
       ScriptLog logs/cgi_log
     

-
-    

+

This log will be opened as the user the child processes run as, i.e. the user specified in the main User directive. This means that diff --git a/docs/manual/mod/mod_cgid.html.en b/docs/manual/mod/mod_cgid.html.en index bbc1d05e01c..a5a63b08ce9 100644 --- a/docs/manual/mod/mod_cgid.html.en +++ b/docs/manual/mod/mod_cgid.html.en @@ -92,12 +92,10 @@ the cgi daemon scripts, it is important that no other user has permission to write in the directory where the socket is located.

-

Example

- 

+    
Example
       ScriptSock /var/run/cgid.sock
     

-
-    

+
diff --git a/docs/manual/mod/mod_charset_lite.html.en b/docs/manual/mod/mod_charset_lite.html.en index 834e7ff3f8c..5d7fa358ddd 100644 --- a/docs/manual/mod/mod_charset_lite.html.en +++ b/docs/manual/mod/mod_charset_lite.html.en @@ -114,15 +114,13 @@ APR. Generally, this means that it must be supported by iconv.

-

Example

- 

+    
Example
 <Directory /export/home/trawick/apacheinst/htdocs/convert>
     CharsetSourceEnc  UTF-16BE
     CharsetDefault    ISO-8859-1
 </Directory>
       

-
-    

+
Specifying the same charset for both CharsetSourceEnc @@ -186,15 +184,13 @@ APR. Generally, this means that it must be supported by iconv.

-

Example

- 

+    
Example
 <Directory /export/home/trawick/apacheinst/htdocs/convert>
     CharsetSourceEnc  UTF-16BE
     CharsetDefault    ISO-8859-1
 </Directory>
       

-
-    

+

The character set names in this example work with the iconv translation support in Solaris 8.

diff --git a/docs/manual/mod/mod_data.html.en b/docs/manual/mod/mod_data.html.en index 5fca0fd6de8..75f7c153323 100644 --- a/docs/manual/mod/mod_data.html.en +++ b/docs/manual/mod/mod_data.html.en @@ -58,14 +58,12 @@ or any of the directives supported by the mod_filter module.

-

Configuring the filter

- 

+    
Configuring the filter
 <Location /data/images>
     SetOutputFilter DATA
 </Location>
         

-
-    

+

Directives

diff --git a/docs/manual/mod/mod_dav.html.en b/docs/manual/mod/mod_dav.html.en index 42df4d0d634..118a0e16dc1 100644 --- a/docs/manual/mod/mod_dav.html.en +++ b/docs/manual/mod/mod_dav.html.en @@ -94,8 +94,7 @@ directive. The "normal" LimitRequestBody directive has no effect on DAV requests.

-

Full Example

- 

+    
Full Example
 DavLockDB /usr/local/apache2/var/DavLock
 
 <Directory /usr/local/apache2/htdocs/foo>
@@ -111,8 +110,7 @@ DavLockDB /usr/local/apache2/var/DavLock
     </LimitExcept>
 </Directory>
       

-
-    

+
top
@@ -249,14 +247,12 @@ a DAV resource (like 600 seconds) to reduce the chance of the client losing the lock due to network latency.

-

Example

- 

+    
Example
 <Location /MSWord>
     DavMinTimeout 600
 </Location>
     

-
-    

+
diff --git a/docs/manual/mod/mod_dav_fs.html.en b/docs/manual/mod/mod_dav_fs.html.en index 0281e04ca03..632a36ca2fd 100644 --- a/docs/manual/mod/mod_dav_fs.html.en +++ b/docs/manual/mod/mod_dav_fs.html.en @@ -40,12 +40,10 @@ will be invoked by using the Dav directive:

-

Example

- 

+    
Example
       Dav filesystem
       

-
-    

+

Since filesystem is the default provider for mod_dav, you may simply use the value @@ -77,12 +75,10 @@ -

Example

- 

+    
Example
       DavLockDB var/DavLock
       

-
-    

+

The directory containing the lock database file must be writable by the User diff --git a/docs/manual/mod/mod_dav_lock.html.en b/docs/manual/mod/mod_dav_lock.html.en index 53dceff8650..6f2797f0eac 100644 --- a/docs/manual/mod/mod_dav_lock.html.en +++ b/docs/manual/mod/mod_dav_lock.html.en @@ -79,12 +79,10 @@ mod_dav_lock uses a SDBM database to track user locks.

-

Example

- 

+    
Example
       DavGenericLockDB var/DavLock
       

-
-    

+

The directory containing the lock database file must be writable by the User diff --git a/docs/manual/mod/mod_deflate.html.en b/docs/manual/mod/mod_deflate.html.en index a76590e2f6f..e3d128bbce7 100644 --- a/docs/manual/mod/mod_deflate.html.en +++ b/docs/manual/mod/mod_deflate.html.en @@ -63,19 +63,16 @@ client

Sample Configurations

This is a simple sample configuration for the impatient.

-

Compress only a few types

- 

+    
Compress only a few types
       AddOutputFilterByType DEFLATE text/html text/plain text/xml
       

-
-    

+

The following configuration, while resulting in more compressed content, is also much more complicated. Do not use this unless you fully understand all the configuration details.

-

Compress everything except images

- 

+    
Compress everything except images
 <Location />
     # Insert filter
     SetOutputFilter DEFLATE
@@ -95,8 +92,7 @@ client
     Header append Vary User-Agent env=!dont-vary
 </Location>
       

-
-    

+
top
@@ -247,12 +243,10 @@ BrowserMatch \bMSIE !no-gzip !gzip-only-text/html Vary header to the value *. This prevents compliant proxies from caching entirely.

-

Example

- 

+    
Example
       Header set Vary *
       

-
-    

+
top

DeflateBufferSize Directive

@@ -303,15 +297,13 @@ BrowserMatch \bMSIE !no-gzip !gzip-only-text/html the directive. You can use that note for statistical purposes by adding the value to your access log.

-

Example

- 

+    
Example
       DeflateFilterNote ratio
     
       LogFormat '"%r" %b (%{ratio}n) "%{User-agent}i"' deflate
       CustomLog logs/deflate_log deflate
       

-
-    

+

If you want to extract more accurate values from your logs, you can use the type argument to specify the type of data @@ -332,8 +324,7 @@ BrowserMatch \bMSIE !no-gzip !gzip-only-text/html

Thus you may log it this way:

-

Accurate Logging

- 

+    
Accurate Logging
 DeflateFilterNote Input instream
 DeflateFilterNote Output outstream
 DeflateFilterNote Ratio ratio
@@ -341,8 +332,7 @@ DeflateFilterNote Ratio ratio
 LogFormat '"%r" %{outstream}n/%{instream}n (%{ratio}n%%)' deflate
 CustomLog logs/deflate_log deflate
 

-
-    

+

See also

top
@@ -104,12 +102,10 @@ later.

Enable dumping of all output.

-

Example

- 

+    
Example
       DumpIOOutput On
       

-
-    

+
diff --git a/docs/manual/mod/mod_echo.html.en b/docs/manual/mod/mod_echo.html.en index 0163f3f498e..97ec71c01ed 100644 --- a/docs/manual/mod/mod_echo.html.en +++ b/docs/manual/mod/mod_echo.html.en @@ -62,12 +62,10 @@ later.

The ProtocolEcho directive enables or disables the echo server.

-

Example

- 

+    
Example
       ProtocolEcho On
     

-
-    

+
diff --git a/docs/manual/mod/mod_env.html.en b/docs/manual/mod/mod_env.html.en index 042eae3fbe8..2e7e3d16596 100644 --- a/docs/manual/mod/mod_env.html.en +++ b/docs/manual/mod/mod_env.html.en @@ -73,12 +73,10 @@ SSI pages native OS environment of the shell which invoked the httpd process.

-

Example

- 

+    
Example
       PassEnv LD_LIBRARY_PATH
       

-
-    

+
top
@@ -94,12 +92,10 @@ SSI pages

Sets an internal environment variable, which is then available to Apache HTTP Server modules, and passed on to CGI scripts and SSI pages.

-

Example

- 

+    
Example
       SetEnv SPECIAL_PATH /foo/bin
       

-
-    

+

The internal environment variables set by this directive are set after most early request processing directives are run, such as access @@ -130,12 +126,10 @@ SSI pages

Removes one or more internal environment variables from those passed on to CGI scripts and SSI pages.

-

Example

- 

+    
Example
       UnsetEnv LD_LIBRARY_PATH
       

-
-    

+
diff --git a/docs/manual/mod/mod_expires.html.en b/docs/manual/mod/mod_expires.html.en index 562e4cfab3c..cfd001c4051 100644 --- a/docs/manual/mod/mod_expires.html.en +++ b/docs/manual/mod/mod_expires.html.en @@ -205,8 +205,7 @@ by MIME type the same images (i.e., the images will be accessed repeatedly within a relatively short timespan).

-

Example:

- 

+    
Example:
 # enable expirations
 ExpiresActive On
 # expire GIF images after a month in the client's cache
@@ -215,8 +214,7 @@ ExpiresByType image/gif A2592000
 # time they were changed
 ExpiresByType text/html M604800
       

-
-    

+

Note that this directive only has effect if ExpiresActive On has been specified. It overrides, diff --git a/docs/manual/mod/mod_ext_filter.html.en b/docs/manual/mod/mod_ext_filter.html.en index 6f14d1ae6ff..b98e803bea4 100644 --- a/docs/manual/mod/mod_ext_filter.html.en +++ b/docs/manual/mod/mod_ext_filter.html.en @@ -186,8 +186,7 @@ ExtFilterDefine traceafter \ -

Here is the filter which traces the data:

- 

+      
Here is the filter which traces the data:
 #!/usr/local/bin/perl -w
 use strict;
 
@@ -201,8 +200,7 @@ while (<STDIN>) {
 
 close(SAVE);
         

-
-      

+
top
diff --git a/docs/manual/mod/mod_file_cache.html.en b/docs/manual/mod/mod_file_cache.html.en index cccec3c6e99..30cbfd02cf4 100644 --- a/docs/manual/mod/mod_file_cache.html.en +++ b/docs/manual/mod/mod_file_cache.html.en @@ -168,12 +168,10 @@ with filenames rewritten by mod_alias or mod_rewrite.

-

Example

- 

+    
Example
       CacheFile /usr/local/apache/htdocs/index.html
       

-
-    

+
top
@@ -201,12 +199,10 @@ with filenames rewritten by mod_alias or mod_rewrite.

-

Example

- 

+    
Example
       MMapFile /usr/local/apache/htdocs/index.html
       

-
-    

+
diff --git a/docs/manual/mod/mod_firehose.html.en b/docs/manual/mod/mod_firehose.html.en index fc56a9e605c..af6b936443e 100644 --- a/docs/manual/mod/mod_firehose.html.en +++ b/docs/manual/mod/mod_firehose.html.en @@ -177,12 +177,10 @@ later. requests will be captured within the same connection if keepalive is present.

-

Example

- 

+    
Example
       FirehoseConnectionInput connection-input.firehose
       

-
-    

+
top
@@ -201,12 +199,10 @@ later. Multiple requests will be captured within the same connection if keepalive is present.

-

Example

- 

+    
Example
       FirehoseConnectionOutput connection-output.firehose
       

-
-    

+
top
@@ -223,12 +219,10 @@ later.

Capture traffic being received by mod_proxy.

-

Example

- 

+    
Example
       FirehoseProxyConnectionInput proxy-input.firehose
       

-
-    

+
top
@@ -245,12 +239,10 @@ later.

Capture traffic being sent out by mod_proxy.

-

Example

- 

+    
Example
       FirehoseProxyConnectionOutput proxy-output.firehose
       

-
-    

+
top
@@ -268,12 +260,10 @@ later.

Capture traffic coming into the server on each request. Requests will be captured separately, regardless of the presence of keepalive.

-

Example

- 

+    
Example
       FirehoseRequestInput request-input.firehose
       

-
-    

+
top
@@ -291,12 +281,10 @@ later.

Capture traffic going out of the server on each request. Requests will be captured separately, regardless of the presence of keepalive.

-

Example

- 

+    
Example
       FirehoseRequestOutput request-output.firehose
       

-
-    

+
diff --git a/docs/manual/mod/mod_info.html.en b/docs/manual/mod/mod_info.html.en index d2ad694fdb8..cde83dd9ecc 100644 --- a/docs/manual/mod/mod_info.html.en +++ b/docs/manual/mod/mod_info.html.en @@ -91,8 +91,7 @@ configuration

You will probably want to use mod_authz_host to limit access to your server configuration information.

-

Access control

- 

+    
Access control
 <Location /server-info>
     SetHandler server-info
     Order allow,deny
@@ -102,8 +101,7 @@ configuration
     Allow from 192.168.1.17
 </Location>
       

-
-    

+
top

Selecting the information shown

diff --git a/docs/manual/mod/mod_log_config.html.en b/docs/manual/mod/mod_log_config.html.en index ba1fcb5fb72..d0781a79b64 100644 --- a/docs/manual/mod/mod_log_config.html.en +++ b/docs/manual/mod/mod_log_config.html.en @@ -494,12 +494,10 @@ CustomLog referer.log referer env=!localreferer to define another nickname. Note that the nickname should not contain percent signs (%).

-

Example

- 

+    
Example
       LogFormat "%v %h %l %u %t \"%r\" %>s %b" vhost_common
       

-
-    

+
@@ -521,13 +519,11 @@ CustomLog referer.log referer env=!localreferer which does not define a nickname. Common Log Format is used if no other format has been specified.

-

Example

- 

+    
Example
 LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\""
 TransferLog logs/access_log
       

-
-    

+
diff --git a/docs/manual/mod/mod_lua.html.en b/docs/manual/mod/mod_lua.html.en index 434dd01d98d..dd5a462f4e3 100644 --- a/docs/manual/mod/mod_lua.html.en +++ b/docs/manual/mod/mod_lua.html.en @@ -458,14 +458,12 @@ end

In general stat or forever is good for production, and stat or never for development.

-

Examples:

- 

+    
Examples:
 LuaCodeCache stat
 LuaCodeCache forever
 LuaCodeCache never
     

-
-    

+
@@ -692,12 +690,10 @@ end match groups into both the file path and the function name be careful writing your regular expressions to avoid security issues.

-

Examples:

- 

+   
Examples:
     LuaMapHandler /(\w+)/(/w+) /scripts/$1.lua handle_$2
     

-
-   

+

This would match uri's such as /photos/show?id=9 to the file /scripts/photos.lua and invoke the handler function handle_show on the lua vm after @@ -741,13 +737,11 @@ end conventions as lua. This just munges the package.path in the lua vms.

-

Examples:

- 

+    
Examples:
 LuaPackagePath /scripts/lib/?.lua
 LuaPackagePath /scripts/lib/?/init.lua
     

-
-    

+
top
diff --git a/docs/manual/mod/mod_mime.html.en b/docs/manual/mod/mod_mime.html.en index 2de25da73ca..58fded37ea6 100644 --- a/docs/manual/mod/mod_mime.html.en +++ b/docs/manual/mod/mod_mime.html.en @@ -156,14 +156,12 @@ script, but not the file bar.cgi.html, then instead of using AddHandler cgi-script .cgi, use

-

Configure handler based on final extension only

- 

+    
Configure handler based on final extension only
 <FilesMatch \.cgi$>
   SetHandler cgi-script
 </FilesMatch>
     

-
-    

+
top
@@ -270,15 +268,13 @@ charset overriding any mappings that already exist for the same extension.

-

Example

- 

+    
Example
 AddLanguage ja .ja
 AddCharset EUC-JP .euc
 AddCharset ISO-2022-JP .jis
 AddCharset SHIFT_JIS .sjis
       

-
-    

+

Then the document xxxx.ja.jis will be treated as being a Japanese document whose charset is ISO-2022-JP @@ -321,13 +317,11 @@ type overriding any mappings that already exist for the same extension.

-

Example

- 

+    
Example
 AddEncoding x-gzip .gz
 AddEncoding x-compress .Z
       

-
-    

+

This will cause filenames containing the .gz extension to be marked as encoded using the x-gzip encoding, and @@ -449,14 +443,12 @@ language This directive overrides any mappings that already exist for the same extension.

-

Example

- 

+    
Example
 AddEncoding x-compress .Z
 AddLanguage en .en
 AddLanguage fr .fr
       

-
-    

+

Then the document xxxx.en.Z will be treated as being a compressed English document (as will the document @@ -590,21 +582,17 @@ type TypesConfig file.

-

Example

- 

+    
Example
       AddType image/gif .gif
       

-
-    

+

Or, to specify multiple file extensions in one directive:

-

Example

- 

+    
Example
       AddType image/jpeg jpeg jpg jpe
       

-
-    

+

The extension argument is case-insensitive and can be specified with or without a leading dot. Filenames may have multiple extensions and the @@ -616,12 +604,10 @@ type can be achieved by qualifying a media-type with qs:

-

Example

- 

+    
Example
       AddType application/rss+xml;qs=0.8 .xml
       

-
-    

+

This is useful in situations, e.g. when a client requesting Accept: */* can not actually processes @@ -667,12 +653,10 @@ assigned a language-tag by some other means. by AddLanguage, then no Content-Language header field will be generated.

-

Example

- 

+    
Example
       DefaultLanguage en
       

-
-    

+

See also