From a2b535121ebc90b35a0f95d83529d8cf7f4fc69b Mon Sep 17 00:00:00 2001 From: Daniel Gruno Date: Fri, 27 Apr 2012 12:48:31 +0000 Subject: [PATCH] xforms that somehow snuck past the build system git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1331396 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/mod/mod_cache_socache.html.en | 67 +++++++++--------- docs/manual/mod/mod_cern_meta.html.en | 6 +- docs/manual/mod/mod_cgi.html.en | 3 + docs/manual/mod/mod_cgid.html.en | 3 + docs/manual/mod/mod_charset_lite.html.en | 26 +++---- docs/manual/mod/mod_data.html.en | 11 +-- docs/manual/mod/mod_dav.html.en | 82 +++++++++++------------ docs/manual/mod/mod_dav_fs.html.en | 6 ++ docs/manual/mod/mod_dav_lock.html.en | 3 + docs/manual/mod/mod_dialup.html.en | 18 ++--- docs/manual/mod/mod_dir.html.en | 57 +++++++++------- docs/manual/mod/mod_dumpio.html.en | 11 ++- 12 files changed, 165 insertions(+), 128 deletions(-) diff --git a/docs/manual/mod/mod_cache_socache.html.en b/docs/manual/mod/mod_cache_socache.html.en index 349b2ddf57..a019219a6a 100644 --- a/docs/manual/mod/mod_cache_socache.html.en +++ b/docs/manual/mod/mod_cache_socache.html.en @@ -45,26 +45,23 @@ HTTP caching filter. however the caching of partial content is not yet supported by this module.

-

- # Turn on caching
- CacheSocache shmcb
- CacheSocacheMaxSize 102400
- <Location /foo>
- - CacheEnable socache
- - </Location>
-
- # Fall back to the disk cache
- CacheSocache shmcb
- CacheSocacheMaxSize 102400
- <Location /foo>
- - CacheEnable socache
- CacheEnable disk
- - </Location>
-

+ 
+# Turn on caching
+CacheSocache shmcb
+CacheSocacheMaxSize 102400
+<Location /foo>
+    CacheEnable socache
+</Location>
+
+# Fall back to the disk cache
+CacheSocache shmcb
+CacheSocacheMaxSize 102400
+<Location /foo>
+    CacheEnable socache
+    CacheEnable disk
+</Location>
+
+

Note:

mod_cache_socache requires the services of @@ -105,9 +102,10 @@ stored implementations of shared object caches are available to choose from.

-

+ 

       CacheSocache shmcb
-
+ +
top
@@ -134,9 +132,10 @@ cache responses larger than those cacheable within mod_cache_socache.

-

+ 

       CacheSocacheMaxSize 102400
-
+ +
top
@@ -156,9 +155,10 @@ cache the cache. This value overrides the freshness lifetime defined for the document by the HTTP protocol.

-

+ 

       CacheSocacheMaxTime 86400
-
+ +
top
@@ -179,9 +179,10 @@ cache only stored for its freshness lifetime, there will be no opportunity to revalidate the response to make it fresh again.

-

+ 

       CacheSocacheMinTime 600
-
+ +
top
@@ -207,9 +208,10 @@ cache

This directive only takes effect when the data is being saved to the cache, as opposed to data being served from the cache.

-

+ 

       CacheReadSize 102400
-
+ +
top
@@ -239,9 +241,10 @@ cache to ensure that the server does not buffer excessively should data arrive faster than expected.

-

+ 

       CacheSocacheReadTime 1000
-
+ + diff --git a/docs/manual/mod/mod_cern_meta.html.en b/docs/manual/mod/mod_cern_meta.html.en index 749d5f1665..66bc7368e0 100644 --- a/docs/manual/mod/mod_cern_meta.html.en +++ b/docs/manual/mod/mod_cern_meta.html.en @@ -74,12 +74,14 @@ files accessed. Set to "." to look in the same directory as the file:

-

MetaDir .

+ 
MetaDir .
+

Or, to set it to a subdirectory of the directory containing the files:

-

MetaDir .meta

+ 
MetaDir .meta
+
top
diff --git a/docs/manual/mod/mod_cgi.html.en b/docs/manual/mod/mod_cgi.html.en index 32108f4409..096c8591dc 100644 --- a/docs/manual/mod/mod_cgi.html.en +++ b/docs/manual/mod/mod_cgi.html.en @@ -178,7 +178,10 @@

Example

+ 

       ScriptLog logs/cgi_log
+
+

This log will be opened as the user the child processes run diff --git a/docs/manual/mod/mod_cgid.html.en b/docs/manual/mod/mod_cgid.html.en index b91c02b42b..bbc1d05e01 100644 --- a/docs/manual/mod/mod_cgid.html.en +++ b/docs/manual/mod/mod_cgid.html.en @@ -93,7 +93,10 @@ the cgi daemon write in the directory where the socket is located.

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 cc26c0e393..834e7ff3f8 100644 --- a/docs/manual/mod/mod_charset_lite.html.en +++ b/docs/manual/mod/mod_charset_lite.html.en @@ -115,12 +115,13 @@ supported by iconv.

Example

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

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

@@ -186,12 +187,13 @@ supported by iconv.

Example

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

+<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 diff --git a/docs/manual/mod/mod_data.html.en b/docs/manual/mod/mod_data.html.en index 091f41beec..5fca0fd6de 100644 --- a/docs/manual/mod/mod_data.html.en +++ b/docs/manual/mod/mod_data.html.en @@ -59,11 +59,12 @@ module.

Configuring the filter

- <Location /data/images>
- - SetOutputFilter DATA - - </Location>
+ 

+<Location /data/images>
+    SetOutputFilter DATA
+</Location>
+
+

diff --git a/docs/manual/mod/mod_dav.html.en b/docs/manual/mod/mod_dav.html.en index dc3d251e08..42df4d0d63 100644 --- a/docs/manual/mod/mod_dav.html.en +++ b/docs/manual/mod/mod_dav.html.en @@ -64,7 +64,8 @@

To enable mod_dav, add the following to a container in your httpd.conf file:

-

Dav On

+ 
Dav On
+

This enables the DAV file system provider, which is implemented by the mod_dav_fs module. Therefore, that module @@ -76,9 +77,10 @@ file using the DavLockDB directive:

-

+ 

       DavLockDB /usr/local/apache2/var/DavLock
-
+ +

The directory containing the lock database file must be writable by the User @@ -93,24 +95,23 @@ requests.

Full Example

- DavLockDB /usr/local/apache2/var/DavLock
-
- <Directory /usr/local/apache2/htdocs/foo>
- - Require all granted
- Dav On
-
- AuthType Basic
- AuthName DAV
- AuthUserFile user.passwd
-
- <LimitExcept GET POST OPTIONS>
- - Require user admin
- - </LimitExcept>
- - </Directory>
+ 

+DavLockDB /usr/local/apache2/var/DavLock
+
+<Directory /usr/local/apache2/htdocs/foo>
+    Require all granted
+    Dav On
+
+    AuthType Basic
+    AuthName DAV
+    AuthUserFile user.passwd
+
+    <LimitExcept GET POST OPTIONS>
+        Require user admin
+    </LimitExcept>
+</Directory>
+
+

top
@@ -163,16 +164,15 @@ will run the script, and one of which will allow it to be downloaded and manipulated with DAV.

-

-Alias /phparea /home/gstein/php_files
-Alias /php-source /home/gstein/php_files
+

+Alias /phparea /home/gstein/php_files
+Alias /php-source /home/gstein/php_files
 <Location /php-source>
-
-    DAV On

-    ForceType text/plain

-
+    DAV On
+    ForceType text/plain
 </Location>
-
+ +

With this setup, http://example.com/phparea can be used to access the output of the PHP scripts, and @@ -192,13 +192,12 @@ Alias /php-source /home/gstein/php_files

Use the Dav directive to enable the WebDAV HTTP methods for the given container:

-

- <Location /foo>
- - Dav On
- - </Location> -

+ 
+<Location /foo>
+    Dav On
+</Location>
+
+

The value On is actually an alias for the default provider filesystem which is served by the mod_dav_fs module. Note, that once you have DAV enabled @@ -251,11 +250,12 @@ a DAV resource the lock due to network latency.

Example

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

+<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 b42489e4e5..0281e04ca0 100644 --- a/docs/manual/mod/mod_dav_fs.html.en +++ b/docs/manual/mod/mod_dav_fs.html.en @@ -41,7 +41,10 @@ directive:

Example

+ 

       Dav filesystem
+
+

Since filesystem is the default provider for @@ -75,7 +78,10 @@

Example

+ 

       DavLockDB var/DavLock
+
+

The directory containing the lock database file must be diff --git a/docs/manual/mod/mod_dav_lock.html.en b/docs/manual/mod/mod_dav_lock.html.en index 4002103876..53dceff865 100644 --- a/docs/manual/mod/mod_dav_lock.html.en +++ b/docs/manual/mod/mod_dav_lock.html.en @@ -80,7 +80,10 @@ locks.

Example

+ 

       DavGenericLockDB var/DavLock
+
+

The directory containing the lock database file must be diff --git a/docs/manual/mod/mod_dialup.html.en b/docs/manual/mod/mod_dialup.html.en index c46c5ec021..e6a329e938 100644 --- a/docs/manual/mod/mod_dialup.html.en +++ b/docs/manual/mod/mod_dialup.html.en @@ -36,11 +36,12 @@ by the various old modem standards. So, you can browse your site with a 56k V.92 modem, by adding something like this:

-

-<Location /mysite>
-ModemStandard V.92
+

+<Location /mysite>
+    ModemStandard V.92
 </Location>
-
+ +

Previously to do bandwidth rate limiting modules would have to block an entire thread, for each client, and insert sleeps to slow the bandwidth down. @@ -65,11 +66,12 @@ once the timer hits. From there the handler can continue to send data to the cl

Specify what modem standard you wish to simulate.

-

-<Location /mysite>
-ModemStandard V.26bis
+

+<Location /mysite>
+    ModemStandard V.26bis
 </Location>
-
+ + diff --git a/docs/manual/mod/mod_dir.html.en b/docs/manual/mod/mod_dir.html.en index 5f8f15d2cb..56cc07421c 100644 --- a/docs/manual/mod/mod_dir.html.en +++ b/docs/manual/mod/mod_dir.html.en @@ -93,7 +93,10 @@ a directory directory.

Example

+ 

       DirectoryIndex index.html
+
+

then a request for http://example.com/docs/ would @@ -103,9 +106,10 @@ a directory

Note that the documents do not need to be relative to the directory;

-

+ 

       DirectoryIndex index.html index.txt  /cgi-bin/index.pl
-
+ +

would cause the CGI script /cgi-bin/index.pl to be executed if neither index.html or index.txt @@ -138,7 +142,10 @@ a directory to instead be issued.

Example

+ 

       DirectoryIndexRedirect on
+
+

A request for http://example.com/docs/ would @@ -181,15 +188,14 @@ a directory be aware that there are possible security implications to doing this.

-

- # see security warning below!
- <Location /some/path>
- - DirectorySlash Off
- SetHandler some-handler
- - </Location> -

+ 
+# see security warning below!
+<Location /some/path>
+    DirectorySlash Off
+    SetHandler some-handler
+</Location>
+
+

Security Warning

Turning off the trailing slash redirect may result in an information @@ -218,9 +224,10 @@ a directory

Use this to set a handler for any URL that doesn't map to anything in your filesystem, and would otherwise return HTTP 404 (Not Found). For example

-

- FallbackResource /not-404.php -

+ 
+        FallbackResource /not-404.php
+
+

will cause requests for non-existent files to be handled by not-404.php, while requests for files that exist are unaffected.

@@ -232,22 +239,20 @@ a directory mod_rewrite, and the use of the -f and -d tests for file and directory existence. This now requires only one line of configuration.

-

- FallbackResource /index.php -

+ 
+        FallbackResource /index.php
+
+

Existing files, such as images, css files, and so on, will be served normally.

In a sub-URI, such as http://example.com/blog/ this sub-URI has to be supplied as local-url:

-

- - <Directory /web/example.com/htdocs/blog>
- - FallbackResource /blog/index.php
- - </Directory> - -

+ 
+<Directory /web/example.com/htdocs/blog>
+    FallbackResource /blog/index.php
+</Directory>
+
+
diff --git a/docs/manual/mod/mod_dumpio.html.en b/docs/manual/mod/mod_dumpio.html.en index 62f48ec73c..a04e5922aa 100644 --- a/docs/manual/mod/mod_dumpio.html.en +++ b/docs/manual/mod/mod_dumpio.html.en @@ -63,9 +63,10 @@ the below directives. Additionally, mod_dumpio needs to be configured to LogLevel trace7:

-

+ 

       LogLevel dumpio:trace7
-
+ +
top

DumpIOInput Directive

@@ -82,7 +83,10 @@ later.

Enable dumping of all input.

Example

+ 

       DumpIOInput On
+
+

@@ -101,7 +105,10 @@ later.

Enable dumping of all output.

Example

+ 

       DumpIOOutput On
+
+

-- 2.50.0