From f1a0371c0d499669f174b14f323ae9042092284a Mon Sep 17 00:00:00 2001 From: Joshua Slive Date: Mon, 27 May 2002 00:44:06 +0000 Subject: [PATCH] Small fixes to mod_include and mod_so docs. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95297 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/mod/mod_include.xml | 35 ++++++++++++++------------------- docs/manual/mod/mod_so.xml | 22 ++++++--------------- 2 files changed, 21 insertions(+), 36 deletions(-) diff --git a/docs/manual/mod/mod_include.xml b/docs/manual/mod/mod_include.xml index 4894740fbc..f41cb84a3a 100644 --- a/docs/manual/mod/mod_include.xml +++ b/docs/manual/mod/mod_include.xml @@ -41,7 +41,7 @@

The following directive must be given for the directories containing the shtml files (typically in a <Directory> section, but this directive is - also valid .htaccess files if AllowOverride + also valid in .htaccess files if AllowOverride Options is set):

@@ -435,11 +435,11 @@ <!--#if expr="\"$DOCUMENT_URI\" = \"/foo/file.html\"" -->
- in foo
+   in foo
<!--#elif expr="\"$DOCUMENT_URI\" = \"/bar/file.html\"" -->
- in bar
+   in bar
<!--#else -->
- in neither
+   in neither
<!--#endif --> @@ -556,33 +556,30 @@ SSIEndTag -Changes the string that mod_include looks for to end an -include command. +String that ends an include element SSIEndTag tag SSIEndTag "-->" server config virtual host -FileInfo Available in version 2.0.30 and later.

This directive changes the string that mod_include looks for - to mark the end of a include command.

+ to mark the end of an include element.

 -SSIStartTag +SSIStartTag SSIUndefinedEcho -Changes the string that mod_include displays when -a variable isn't set. +String displayed when +an unset variable is echoed SSIUndefinedEcho tag SSIUndefinedEcho "<!-- undef -->" server config virtual host -FileInfo Available in version 2.0.34 and later. @@ -594,7 +591,7 @@ a variable isn't set. SSIErrorMsg -Changes the error message displayed when there is an error +Error message displayed when there is an SSI error SSIErrorMsg message SSIErrorMsg "[an error occurred while processing this directive]" @@ -604,7 +601,7 @@ a variable isn't set. directory .htaccess - +All Available in version 2.0.30 and later. @@ -622,7 +619,7 @@ a variable isn't set. SSIStartTag - +String that starts an include element Changes the string that mod_include looks for to start an include element SSIStartTag "<!--" @@ -630,7 +627,6 @@ include element server config virtual host - Available in version 2.0.30 and later. @@ -638,12 +634,12 @@ include element

This directive changes the string that mod_include looks for to mark an include element to process.

-

You may want to use this option if have 2 servers parsing the +

You may want to use this option if you have 2 servers parsing the output of a file each processing different commands (possibly at different times).

 -SSIEndTag +SSIEndTag @@ -658,7 +654,7 @@ displayed directory .htaccess - +All Available in version 2.0.30 and later. @@ -684,7 +680,6 @@ bit set .htaccess Options -

The XBitHack directives controls the parsing of ordinary diff --git a/docs/manual/mod/mod_so.xml b/docs/manual/mod/mod_so.xml index b5aee029eb..1c633d9eec 100755 --- a/docs/manual/mod/mod_so.xml +++ b/docs/manual/mod/mod_so.xml @@ -4,14 +4,11 @@ mod_so - - This module provides for loading of executable code and - modules into the server at start-up or restart time. - -Base (Windows>; Optional (Unix) +Loading of executable code and +modules into the server at start-up or restart time +Base (Windows); Optional (Unix) mod_so.c so_module -Available in Apache 1.3 and later.

@@ -23,14 +20,8 @@

On Unix, the loaded code typically comes from shared object files (usually with .so extension), on Windows this may either the .so or .dll - extension. This module is only available in Apache 1.3 and - up.

- -

In previous releases, the functionality of this module was - provided for Unix by mod_dld, and for Windows by mod_dll. On - Windows, mod_dll was used in beta release 1.3b1 through 1.3b5. - mod_so combines these two modules into a single module for all - operating systems.

+ extension.

+ Warning

Apache 1.3 modules cannot be directly used with Apache 2.0 - the module must be modified to dynamically @@ -44,6 +35,7 @@

The module name format changed for Windows with Apache 1.3.15 and 2.0 - the modules are now named as mod_foo.so

+

While mod_so still loads modules with ApacheModuleFoo.dll names, the new naming convention is preferred; if you are converting your loadable module for 2.0, @@ -113,7 +105,6 @@ LoadFile Link in the named object file or library LoadFile filename [filename] ... -none server config @@ -138,7 +129,6 @@ Links in the object file or library, and adds to the list of active modules LoadModule module filename -none server config -- 2.40.0