You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by nd...@apache.org on 2003/08/29 02:32:17 UTC
cvs commit: httpd-2.0/docs/manual/mod mod_include.html.en mod_include.xml quickreference.html.de quickreference.html.en
nd 2003/08/28 17:32:17
Modified: docs/manual/mod mod_include.html.en mod_include.xml
quickreference.html.de quickreference.html.en
Log:
document the recent mod_include changes
Revision Changes Path
1.29 +8 -2 httpd-2.0/docs/manual/mod/mod_include.html.en
Index: mod_include.html.en
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/mod/mod_include.html.en,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- mod_include.html.en 28 Aug 2003 15:37:16 -0000 1.28
+++ mod_include.html.en 29 Aug 2003 00:32:16 -0000 1.29
@@ -158,10 +158,15 @@
valid attributes are:</p>
<dl>
+ <dt><code>echomsg</code> (<em>Apache 2.1 and later</em>)</dt>
+ <dd>The value is a message that is sent back to the
+ client if the <code><a href="#element.echo">echo</a></code> element
+ attempts to echo an undefined variable. This overrides any <code class="directive"><a href="#ssiundefinedecho">SSIUndefinedEcho</a></code> directives.</dd>
+
<dt><code>errmsg</code></dt>
<dd>The value is a message that is sent back to the
client if an error occurs while parsing the
- document.</dd>
+ document. This overrides any <code class="directive"><a href="#ssierrormsg">SSIErrorMsg</a></code> directives.</dd>
<dt><code>sizefmt</code></dt>
<dd>The value sets the format to be used which displaying
@@ -732,7 +737,8 @@
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>String displayed when an unset variable is echoed</td></tr>
<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSIUndefinedEcho <var>string</var></code></td></tr>
<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>SSIUndefinedEcho "(none)"</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">Override:</a></th><td>All</td></tr>
<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Base</td></tr>
<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_include</td></tr>
<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in version 2.0.34 and later.</td></tr>
1.25 +10 -2 httpd-2.0/docs/manual/mod/mod_include.xml
Index: mod_include.xml
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/mod/mod_include.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- mod_include.xml 28 Aug 2003 15:37:17 -0000 1.24
+++ mod_include.xml 29 Aug 2003 00:32:16 -0000 1.25
@@ -120,10 +120,17 @@
valid attributes are:</p>
<dl>
+ <dt><code>echomsg</code> (<em>Apache 2.1 and later</em>)</dt>
+ <dd>The value is a message that is sent back to the
+ client if the <code><a href="#element.echo">echo</a></code> element
+ attempts to echo an undefined variable. This overrides any <directive
+ module="mod_include">SSIUndefinedEcho</directive> directives.</dd>
+
<dt><code>errmsg</code></dt>
<dd>The value is a message that is sent back to the
client if an error occurs while parsing the
- document.</dd>
+ document. This overrides any <directive
+ module="mod_include">SSIErrorMsg</directive> directives.</dd>
<dt><code>sizefmt</code></dt>
<dd>The value sets the format to be used which displaying
@@ -610,7 +617,8 @@
<syntax>SSIUndefinedEcho <var>string</var></syntax>
<default>SSIUndefinedEcho "(none)"</default>
<contextlist><context>server config</context><context>virtual host</context>
-</contextlist>
+<context>directory</context><context>.htaccess</context></contextlist>
+<override>All</override>
<compatibility>Available in version 2.0.34 and later.</compatibility>
<usage>
1.40 +1 -1 httpd-2.0/docs/manual/mod/quickreference.html.de
Index: quickreference.html.de
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/mod/quickreference.html.de,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- quickreference.html.de 29 Jul 2003 22:31:06 -0000 1.39
+++ quickreference.html.de 29 Aug 2003 00:32:16 -0000 1.40
@@ -624,7 +624,7 @@
<tr><td><a href="mod_include.html#ssistarttag">SSIStartTag <var>tag</var></a></td><td> "<!--#" </td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">String that starts an include element</td></tr>
<tr class="odd"><td><a href="mod_include.html#ssitimeformat">SSITimeFormat <var>formatstring</var></a></td><td> "%A, %d-%b-%Y %H:%M +</td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Configures the format in which date strings are
displayed</td></tr>
-<tr><td><a href="mod_include.html#ssiundefinedecho">SSIUndefinedEcho <var>string</var></a></td><td> "(none)" </td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">String displayed when an unset variable is echoed</td></tr>
+<tr><td><a href="mod_include.html#ssiundefinedecho">SSIUndefinedEcho <var>string</var></a></td><td> "(none)" </td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">String displayed when an unset variable is echoed</td></tr>
<tr class="odd"><td><a href="mod_ssl.html#sslcacertificatefile">SSLCACertificateFile <em>file-path</em></a></td><td /><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">File of concatenated PEM-encoded CA Certificates
for Client Auth</td></tr>
<tr><td><a href="mod_ssl.html#sslcacertificatepath">SSLCACertificatePath <em>directory-path</em></a></td><td /><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Directory of PEM-encoded CA Certificates for
1.95 +1 -1 httpd-2.0/docs/manual/mod/quickreference.html.en
Index: quickreference.html.en
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/mod/quickreference.html.en,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- quickreference.html.en 14 Jul 2003 12:37:56 -0000 1.94
+++ quickreference.html.en 29 Aug 2003 00:32:16 -0000 1.95
@@ -609,7 +609,7 @@
<tr><td><a href="mod_include.html#ssistarttag">SSIStartTag <var>tag</var></a></td><td> "<!--#" </td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">String that starts an include element</td></tr>
<tr class="odd"><td><a href="mod_include.html#ssitimeformat">SSITimeFormat <var>formatstring</var></a></td><td> "%A, %d-%b-%Y %H:%M +</td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Configures the format in which date strings are
displayed</td></tr>
-<tr><td><a href="mod_include.html#ssiundefinedecho">SSIUndefinedEcho <var>string</var></a></td><td> "(none)" </td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">String displayed when an unset variable is echoed</td></tr>
+<tr><td><a href="mod_include.html#ssiundefinedecho">SSIUndefinedEcho <var>string</var></a></td><td> "(none)" </td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">String displayed when an unset variable is echoed</td></tr>
<tr class="odd"><td><a href="mod_ssl.html#sslcacertificatefile">SSLCACertificateFile <em>file-path</em></a></td><td /><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">File of concatenated PEM-encoded CA Certificates
for Client Auth</td></tr>
<tr><td><a href="mod_ssl.html#sslcacertificatepath">SSLCACertificatePath <em>directory-path</em></a></td><td /><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Directory of PEM-encoded CA Certificates for