pepper 00/11/21 19:36:22
Modified: htdocs/manual/mod mod_alias.html mod_auth_anon.html
mod_autoindex.html mod_example.html
mod_expires.html mod_include.html mod_info.html
mod_log_config.html mod_mime.html
mod_mime_magic.html mod_proxy.html
mod_setenvif.html mod_speling.html mod_userdir.html
Log:
Cleaned up a bunch of misplaced </p>s (<pre> & <blockquote> implicitly end
<p>).
Encoded &'s in mod_include.html.
Encoded >'s in mod_log_config.html.
Fixed a bunch of misplaced <a name>'s in mod_proxy.html.
Revision Changes Path
1.28 +0 -3 httpd-docs-1.3/htdocs/manual/mod/mod_alias.html
Index: mod_alias.html
===================================================================
RCS file: /home/cvs/httpd-docs-1.3/htdocs/manual/mod/mod_alias.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- mod_alias.html 2000/09/25 21:46:41 1.27
+++ mod_alias.html 2000/11/22 03:36:15 1.28
@@ -157,7 +157,6 @@
<PRE>
AliasMatch ^/icons(.*) /usr/local/apache/icons$1
</PRE>
-</P>
<HR>
@@ -287,7 +286,6 @@
<PRE>
RedirectMatch (.*)\.gif$ http://www.anotherserver.com$1.jpg
</PRE>
-</P>
<HR>
@@ -434,7 +432,6 @@
<PRE>
ScriptAliasMatch ^/cgi-bin(.*) /usr/local/apache/cgi-bin$1
</PRE>
-</P>
<!--#include virtual="footer.html" -->
</BODY>
1.27 +20 -20 httpd-docs-1.3/htdocs/manual/mod/mod_auth_anon.html
Index: mod_auth_anon.html
===================================================================
RCS file: /home/cvs/httpd-docs-1.3/htdocs/manual/mod/mod_auth_anon.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- mod_auth_anon.html 2000/09/27 18:34:10 1.26
+++ mod_auth_anon.html 2000/11/22 03:36:15 1.27
@@ -87,27 +87,27 @@
</UL>
<P>
Excerpt of access.conf:
-<BLOCKQUOTE><CODE>
-Anonymous_NoUserId off<BR>
-Anonymous_MustGiveEmail on<BR>
-Anonymous_VerifyEmail on<BR>
-Anonymous_LogEmail on<BR>
-Anonymous anonymous guest www test welcome<P>
-<P>
-AuthName "Use 'anonymous' & Email address for guest
entry"<BR>
+<BLOCKQUOTE><pre>
+Anonymous_NoUserId off
+Anonymous_MustGiveEmail on
+Anonymous_VerifyEmail on
+Anonymous_LogEmail on
+Anonymous anonymous guest www test welcome
+
+AuthName "Use 'anonymous' & Email address for guest entry"
AuthType basic
-<P>
-# An AuthUserFile/AuthDBUserFile/AuthDBMUserFile<BR>
-# directive must be specified, or use<BR>
-# Anonymous_Authoritative for public access.<BR>
-# In the .htaccess for the public directory, add:<BR>
-<Files *><BR>
-Order Deny,Allow <BR>
-Allow from all <BR>
-<P>
-Require valid-user <BR>
-</Files><BR>
-</CODE></BLOCKQUOTE>
+
+# An AuthUserFile/AuthDBUserFile/AuthDBMUserFile
+# directive must be specified, or use
+# Anonymous_Authoritative for public access.
+# In the .htaccess for the public directory, add:
+<Files *>
+Order Deny,Allow
+Allow from all
+
+Require valid-user
+</Files>
+</pre></BLOCKQUOTE>
<HR>
1.38 +2 -2 httpd-docs-1.3/htdocs/manual/mod/mod_autoindex.html
Index: mod_autoindex.html
===================================================================
RCS file: /home/cvs/httpd-docs-1.3/htdocs/manual/mod/mod_autoindex.html,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- mod_autoindex.html 2000/11/04 04:07:52 1.37
+++ mod_autoindex.html 2000/11/22 03:36:15 1.38
@@ -253,7 +253,7 @@
width of the description column should happen to truncate a tagged
element (such as cutting off the end of a bolded phrase), the results
may affect the rest of the directory listing.
-</P>
+
<HR>
<H2><A NAME="addicon">AddIcon</A> directive</H2>
@@ -735,7 +735,7 @@
</pre></BLOCKQUOTE>
then only <CODE>ScanHTMLTitles</CODE> will be set for the /web/docs/spec
directory.
-</P>
+
</DD>
<DT>Apache 1.3.3 and later:</DT>
<DD>
1.11 +0 -1 httpd-docs-1.3/htdocs/manual/mod/mod_example.html
Index: mod_example.html
===================================================================
RCS file: /home/cvs/httpd-docs-1.3/htdocs/manual/mod/mod_example.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mod_example.html 2000/09/28 22:55:30 1.10
+++ mod_example.html 2000/11/22 03:36:16 1.11
@@ -71,7 +71,6 @@
<LI><A HREF="#example">Example</A>
</LI>
</UL>
- </P>
<h2>Compiling the example module</h2>
<P>
1.16 +0 -2 httpd-docs-1.3/htdocs/manual/mod/mod_expires.html
Index: mod_expires.html
===================================================================
RCS file: /home/cvs/httpd-docs-1.3/htdocs/manual/mod/mod_expires.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mod_expires.html 2000/09/26 19:13:27 1.15
+++ mod_expires.html 2000/11/22 03:36:16 1.16
@@ -267,7 +267,6 @@
<P>
<STRONG>Example:</STRONG>
</P>
- <P>
<PRE>
ExpiresActive On # enable expirations
ExpiresByType image/gif A2592000 # expire GIF images after a month
@@ -276,7 +275,6 @@
# week from the time they were
# changed, period
</PRE>
- </P>
<P>
Note that this directive only has effect if <CODE>ExpiresActive
On</CODE> has been specified. It overrides, for the specified MIME
1.32 +4 -4 httpd-docs-1.3/htdocs/manual/mod/mod_include.html
Index: mod_include.html
===================================================================
RCS file: /home/cvs/httpd-docs-1.3/htdocs/manual/mod/mod_include.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- mod_include.html 2000/11/18 20:20:45 1.31
+++ mod_include.html 2000/11/22 03:36:16 1.32
@@ -376,7 +376,7 @@
<DD>true if <EM>test_condition</EM> is true
<DT>! <EM>test_condition</EM>
<DD>true if <EM>test_condition</EM> is false
-<DT><EM>test_condition1</EM> && <EM>test_condition2</EM>
+<DT><EM>test_condition1</EM> && <EM>test_condition2</EM>
<DD>true if both <EM>test_condition1</EM> and
<EM>test_condition2</EM> are true
<DT><EM>test_condition1</EM> || <EM>test_condition2</EM>
@@ -384,13 +384,13 @@
<EM>test_condition2</EM> is true
</DL>
-<P> "<EM>=</EM>" and "<EM>!=</EM>" bind more tightly than "<EM>&&</EM>" and
+<P> "<EM>=</EM>" and "<EM>!=</EM>" bind more tightly than
"<EM>&&</EM>" and
"<EM>||</EM>".
"<EM>!</EM>" binds most tightly. Thus, the following are equivalent:
<PRE>
- <!--#if expr="$a = test1 && $b = test2" -->
- <!--#if expr="($a = test1) && ($b = test2)" -->
+ <!--#if expr="$a = test1 && $b = test2" -->
+ <!--#if expr="($a = test1) && ($b = test2)" -->
</PRE>
<P> Anything that's not recognized as a variable or an operator is
1.11 +4 -4 httpd-docs-1.3/htdocs/manual/mod/mod_info.html
Index: mod_info.html
===================================================================
RCS file: /home/cvs/httpd-docs-1.3/htdocs/manual/mod/mod_info.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mod_info.html 2000/09/27 02:53:23 1.10
+++ mod_info.html 2000/11/22 03:36:16 1.11
@@ -68,7 +68,7 @@
Once configured, the server information is obtained by accessing
<TT>http://your.host.dom/server-info</TT><P>
<BLOCKQUOTE>
- <STRONG>
+ <p><STRONG>
Note that the configuration files are read by the module at run-time,
and therefore the display may <EM>not</EM> reflect the running
server's active configuration if the files have been changed since the
@@ -78,14 +78,14 @@
HREF="core.html#user"
><SAMP>User</SAMP></A>
directive), or else the directive settings will not be listed.
- <P>
+ </strong></p>
+ <p><strong>
It should also be noted that if <SAMP>mod_info</SAMP> is compiled into
the server, its handler capability is available in <EM>all</EM>
configuration files, including <EM>per</EM>-directory files
(<EM>e.g.</EM>, <SAMP>.htaccess</SAMP>). This may have
security-related ramifications for your site.
- </P>
- </STRONG>
+ </strong></p>
</BLOCKQUOTE>
<HR>
1.41 +3 -3 httpd-docs-1.3/htdocs/manual/mod/mod_log_config.html
Index: mod_log_config.html
===================================================================
RCS file: /home/cvs/httpd-docs-1.3/htdocs/manual/mod/mod_log_config.html,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- mod_log_config.html 2000/11/13 02:01:35 1.40
+++ mod_log_config.html 2000/11/22 03:36:16 1.41
@@ -206,9 +206,9 @@
<P>
Note that the common log format is defined by the string <CODE>"%h %l
-%u %t \"%r\" %>s %b"</CODE>, which can be used as the basis for
+%u %t \"%r\" %>s %b"</CODE>, which can be used as the basis for
extending for format if desired (<EM>e.g.</EM>, to add extra fields at the
end).
-NCSA's extended/combined log format would be <CODE>"%h %l %u %t \"%r\" %>s
%b \"%{Referer}i\" \"%{User-agent}i\""</CODE>.
+NCSA's extended/combined log format would be <CODE>"%h %l %u %t \"%r\"
%>s %b \"%{Referer}i\" \"%{User-agent}i\""</CODE>.
<P>
@@ -389,7 +389,7 @@
HREF="directive-dict.html#Default"
REL="Help"
><STRONG>Default:</STRONG></A> <CODE>LogFormat "%h %l %u %t
\"%r\"
-%>s %b"</CODE><BR>
+%>s %b"</CODE><BR>
<A
HREF="directive-dict.html#Context"
REL="Help"
1.43 +4 -2 httpd-docs-1.3/htdocs/manual/mod/mod_mime.html
Index: mod_mime.html
===================================================================
RCS file: /home/cvs/httpd-docs-1.3/htdocs/manual/mod/mod_mime.html,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- mod_mime.html 2000/09/27 02:53:23 1.42
+++ mod_mime.html 2000/11/22 03:36:17 1.43
@@ -313,10 +313,12 @@
same <EM>extension</EM>.
</P>
<P>
-Example: <BLOCKQUOTE><CODE>
+Example:
+</p>
+<BLOCKQUOTE><CODE>
AddEncoding x-compress Z<BR> AddLanguage en .en<BR> AddLanguage fr
.fr<BR> </CODE></BLOCKQUOTE>
-</P>
+
<P>
Then the document <CODE>xxxx.en.Z</CODE> will be treated as being a
compressed English document (as will the document
1.12 +1 -2 httpd-docs-1.3/htdocs/manual/mod/mod_mime_magic.html
Index: mod_mime_magic.html
===================================================================
RCS file: /home/cvs/httpd-docs-1.3/htdocs/manual/mod/mod_mime_magic.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mod_mime_magic.html 2000/09/28 17:04:57 1.11
+++ mod_mime_magic.html 2000/11/22 03:36:17 1.12
@@ -57,12 +57,11 @@
<H2>Directives</H2>
- <P>
+
<UL>
<LI><A HREF="#mimemagicfile">MimeMagicFile</A>
</LI>
</UL>
- </P>
<h2>Format of the Magic File</h2>
1.53 +4 -8 httpd-docs-1.3/htdocs/manual/mod/mod_proxy.html
Index: mod_proxy.html
===================================================================
RCS file: /home/cvs/httpd-docs-1.3/htdocs/manual/mod/mod_proxy.html,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- mod_proxy.html 2000/09/27 18:34:09 1.52
+++ mod_proxy.html 2000/11/22 03:36:17 1.53
@@ -573,8 +573,7 @@
The arguments to the NoProxy directive are one of the following type list:
<DL>
<!-- ===================== Domain ======================= -->
- <A NAME="domain">
- <DT><EM>Domain</EM></A>
+ <DT><A NAME="domain"><EM>Domain</EM></A>
<DD>A <EM>Domain</EM> is a partially qualified DNS domain name, preceded
by a period.
It represents a list of hosts which logically belong to the same DNS
@@ -593,8 +592,7 @@
lookup, it is much more efficient than subnet comparison.
<!-- ===================== SubNet ======================= -->
- <A NAME="subnet">
- <DT><EM>SubNet</EM></A>
+ <DT><A NAME="subnet"><EM>SubNet</EM></A>
<DD>A <EM>SubNet</EM> is a partially qualified internet address in
numeric (dotted quad) form, optionally followed by a slash and the
netmask, specified as the number of significant bits in the
@@ -618,8 +616,7 @@
<EM>_Default_</EM>, matching any IP address.
<!-- ===================== IPAddr ======================= -->
- <A NAME="ipaddr">
- <DT><EM>IPAddr</EM></A>
+ <DT><A NAME="ipaddr"><EM>IPAddr</EM></A>
<DD>A <EM>IPAddr</EM> represents a fully qualified internet address in
numeric (dotted quad) form. Usually, this address represents a
host, but there need not necessarily be a DNS domain name
@@ -631,8 +628,7 @@
<A HREF="../dns-caveats.html">DNS Issues</A></P>
<!-- ===================== Hostname ======================= -->
- <A NAME="hostname">
- <DT><EM>Hostname</EM></A>
+ <DT><A NAME="hostname"><EM>Hostname</EM></A>
<DD>A <EM>Hostname</EM> is a fully qualified DNS domain name which can
be resolved to one or more <A
HREF="#ipaddr"><EM>IPAddrs</EM></A> via the DNS domain name service.
1.12 +2 -1 httpd-docs-1.3/htdocs/manual/mod/mod_setenvif.html
Index: mod_setenvif.html
===================================================================
RCS file: /home/cvs/httpd-docs-1.3/htdocs/manual/mod/mod_setenvif.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mod_setenvif.html 2000/09/27 18:34:09 1.11
+++ mod_setenvif.html 2000/11/22 03:36:17 1.12
@@ -50,11 +50,12 @@
configuration files. So more complex sequences can be used, such
as this example, which sets <CODE>netscape</CODE> if the browser
is mozilla but not MSIE.
+ </P>
+
<BLOCKQUOTE><PRE>
BrowserMatch ^Mozilla netscape
BrowserMatch MSIE !netscape
</PRE></BLOCKQUOTE>
- </P>
<H2>Directives</H2>
<UL>
1.11 +2 -1 httpd-docs-1.3/htdocs/manual/mod/mod_speling.html
Index: mod_speling.html
===================================================================
RCS file: /home/cvs/httpd-docs-1.3/htdocs/manual/mod/mod_speling.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mod_speling.html 2000/09/28 16:54:38 1.10
+++ mod_speling.html 2000/11/22 03:36:18 1.11
@@ -54,6 +54,8 @@
</P>
<P>
If, after scanning the directory,
+ </P>
+
<UL>
<LI>no matching document was found, Apache will proceed as usual
and return a "document not found" error.
@@ -63,7 +65,6 @@
the list of the matches is returned to the client, and the client
can select the correct candidate.
</UL>
- </P>
<H2>Directives</H2>
1.16 +7 -1 httpd-docs-1.3/htdocs/manual/mod/mod_userdir.html
Index: mod_userdir.html
===================================================================
RCS file: /home/cvs/httpd-docs-1.3/htdocs/manual/mod/mod_userdir.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mod_userdir.html 2000/09/28 16:54:40 1.15
+++ mod_userdir.html 2000/11/22 03:36:18 1.16
@@ -99,18 +99,24 @@
treated as a filename pattern, and is used to turn the name into a
directory specification. A request for
<CODE>http://www.foo.com/~bob/one/two.html</CODE> will be translated to:
+</P>
+
<PRE>
UserDir public_html -> ~bob/public_html/one/two.html
UserDir /usr/web -> /usr/web/bob/one/two.html
UserDir /home/*/www -> /home/bob/www/one/two.html
</PRE>
+
+<p>
The following directives will send redirects to the client:
+</p>
+
<PRE>
UserDir http://www.foo.com/users ->
http://www.foo.com/users/bob/one/two.html
UserDir http://www.foo.com/*/usr ->
http://www.foo.com/bob/usr/one/two.html
UserDir http://www.foo.com/~*/ -> http://www.foo.com/~bob/one/two.html
</PRE>
-</P>
+
<BLOCKQUOTE>
<STRONG>
Be careful when using this directive; for instance,
