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

diff --git a/docs/manual/mod/mod_include.xml b/docs/manual/mod/mod_include.xml
index 4894740fbc40aa529af1e6d51eae7fa94f4fe551..f41cb84a3aa13918e5cdec8ff2f54ec073b8f298 100644 (file)
--- a/docs/manual/mod/mod_include.xml
+++ b/docs/manual/mod/mod_include.xml
@@ -41,7 +41,7 @@
     <p>The following directive must be given for the directories
     containing the shtml files (typically in a
     <code>&lt;Directory&gt;</code> section, but this directive is
-    also valid .htaccess files if <code>AllowOverride
+    also valid in .htaccess files if <code>AllowOverride
     Options</code> is set):</p>
 
     <example>
@@ -435,11 +435,11 @@
 
 <example>
     &lt;!--#if expr="\"$DOCUMENT_URI\" = \"/foo/file.html\"" --&gt;<br />
-    in foo<br />
+&nbsp;&nbsp;    in foo<br />
     &lt;!--#elif expr="\"$DOCUMENT_URI\" = \"/bar/file.html\"" --&gt;<br />
-    in bar<br />
+&nbsp;&nbsp;    in bar<br />
     &lt;!--#else --&gt;<br />
-    in neither<br />
+&nbsp;&nbsp;    in neither<br />
     &lt;!--#endif --&gt;
 </example>
 </section>
@@ -556,33 +556,30 @@
 
 <directivesynopsis>
 <name>SSIEndTag</name>
-<description>Changes the string that mod_include looks for to end an
-include command.</description>
+<description>String that ends an include element</description>
 <syntax>SSIEndTag <em>tag</em></syntax>
 <default>SSIEndTag &quot;--&gt;&quot;</default>
 <contextlist><context>server config</context>
 <context>virtual host</context></contextlist>
-<override>FileInfo</override>
 <compatibility>Available in version 2.0.30 and later.
 </compatibility>
 
 <usage>
     <p>This directive changes the string that mod_include looks for 
-    to mark the end of a include command.</p>
+    to mark the end of an include element.</p>
 
 </usage>
-<seealso><directive>SSIStartTag</directive></seealso>
+<seealso><directive module="mod_include">SSIStartTag</directive></seealso>
 </directivesynopsis>
 
 <directivesynopsis>
 <name>SSIUndefinedEcho</name>
-<description>Changes the string that mod_include displays when
-a variable isn't set.</description>
+<description>String displayed when
+an unset variable is echoed</description>
 <syntax>SSIUndefinedEcho <em>tag</em></syntax>
 <default>SSIUndefinedEcho &quot;&lt;!-- undef --&gt;&quot;</default>
 <contextlist><context>server config</context>
 <context>virtual host</context></contextlist>
-<override>FileInfo</override>
 <compatibility>Available in version 2.0.34 and later.
 </compatibility>
 
@@ -594,7 +591,7 @@ a variable isn't set.</description>
 
 <directivesynopsis>
 <name>SSIErrorMsg</name>
-<description>Changes the error message displayed when there is an error</description>
+<description>Error message displayed when there is an SSI error</description>
 <syntax>SSIErrorMsg <em>message</em></syntax>
 <default>SSIErrorMsg 
 &quot;[an error occurred while processing this directive]&quot;</default>
@@ -604,7 +601,7 @@ a variable isn't set.</description>
 <context>directory</context>
 <context>.htaccess</context>
 </contextlist>
-<override></override>
+<override>All</override>
 <compatibility>Available in version 2.0.30 and later.</compatibility>
 
 <usage>
@@ -622,7 +619,7 @@ a variable isn't set.</description>
 
 <directivesynopsis>
 <name>SSIStartTag</name>
-<description></description>
+<description>String that starts an include element</description>
 <syntax>Changes the string that mod_include looks for to start an
 include element</syntax>
 <default>SSIStartTag &quot;&lt;!--&quot;</default>
@@ -630,7 +627,6 @@ include element</syntax>
 <context>server config</context>
 <context>virtual host</context>
 </contextlist>
-<override></override>
 <compatibility>Available in version 2.0.30 and later.</compatibility>
 
 <usage>
@@ -638,12 +634,12 @@ include element</syntax>
     <p>This directive changes the string that mod_include looks for 
     to mark an include element to process.</p>
 
-    <p>You may want to use this option if have 2 servers parsing the
+    <p>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).</p> 
 
 </usage>
-<seealso><directive>SSIEndTag</directive></seealso>
+<seealso><directive module="mod_include">SSIEndTag</directive></seealso>
 </directivesynopsis>
 
 <directivesynopsis>
@@ -658,7 +654,7 @@ displayed</description>
 <context>directory</context>
 <context>.htaccess</context>
 </contextlist>
-<override></override>
+<override>All</override>
 <compatibility>Available in version 2.0.30 and later.</compatibility>
 
 <usage>
@@ -684,7 +680,6 @@ bit set</description>
 <context>.htaccess</context>
 </contextlist>
 <override>Options</override>
-<compatibility></compatibility>
 
 <usage>
     <p>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 b5aee029eb798154a17c0d7393dd84d50ab3ae5a..1c633d9eec2e291b1aeecc215a07ec9f957223d4 100755 (executable)
--- a/docs/manual/mod/mod_so.xml
+++ b/docs/manual/mod/mod_so.xml
@@ -4,14 +4,11 @@
 <modulesynopsis>
 
 <name>mod_so</name>
-<description>
- This module provides for loading of executable code and
- modules into the server at start-up or restart time.
-</description>
-<status>Base (Windows>; Optional (Unix)</status>
+<description>Loading of executable code and
+modules into the server at start-up or restart time</description>
+<status>Base (Windows); Optional (Unix)</status>
 <sourcefile>mod_so.c</sourcefile>
 <identifier>so_module</identifier>
-<compatibility>Available in Apache 1.3 and later.</compatibility>
 
 <summary>
 
@@ -23,14 +20,8 @@
     <p>On Unix, the loaded code typically comes from shared object
     files (usually with <code>.so</code> extension), on Windows
     this may either the <code>.so</code> or <code>.dll</code>
-    extension. This module is only available in Apache 1.3 and
-    up.</p>
-
-    <p>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.</p>
+    extension.</p>
+
     <note type="warning"><title>Warning</title>
     <p>Apache 1.3 modules cannot be directly used
     with Apache 2.0 - the module must be modified to dynamically
@@ -44,6 +35,7 @@
     <p>The module name format changed for Windows
     with Apache 1.3.15 and 2.0 - the modules are now named as
     mod_foo.so</p>
+
     <p>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 @@
 <name>LoadFile</name>
 <description>Link in the named object file or library</description>
 <syntax>LoadFile <em>filename</em> [<em>filename</em>] ...</syntax>
-<default>none</default>
 <contextlist>
 <context>server config</context>
 </contextlist>
@@ -138,7 +129,6 @@
 <description>Links in the object file or library, and adds to the list
 of active modules</description>
 <syntax>LoadModule <em>module filename</em></syntax>
-<default>none</default>
 <contextlist>
 <context>server config</context>
 </contextlist>