diff options
26 files changed, 90 insertions, 90 deletions
diff --git a/htdocs/manual/content-negotiation.html b/htdocs/manual/content-negotiation.html index 75354654d9..b4f035e880 100644 --- a/htdocs/manual/content-negotiation.html +++ b/htdocs/manual/content-negotiation.html @@ -422,9 +422,9 @@ different naming conventions, because files can have more than one extension, and the order of the extensions is normally irrelevant (see <A HREF="mod/mod_mime.html">mod_mime</A> documentation for details). <P> -A typical file has a MIME-type extension (e.g. <SAMP>html</SAMP>), -maybe an encoding extension (e.g. <SAMP>gz</SAMP> and of course a -language extension (e.g. <SAMP>en</SAMP>) when we have different +A typical file has a MIME-type extension (<EM>e.g.</EM>, <SAMP>html</SAMP>), +maybe an encoding extension (<EM>e.g.</EM>, <SAMP>gz</SAMP>), and of course a +language extension (<EM>e.g.</EM>, <SAMP>en</SAMP>) when we have different language variants of this file. <P> @@ -489,7 +489,7 @@ hyperlinks: <P> Looking at the table above you will notice that it is always possible to -use the name without any extensions in an hyperlink (e.g. <SAMP>foo</SAMP>). +use the name without any extensions in an hyperlink (<EM>e.g.</EM>, <SAMP>foo</SAMP>). The advantage is that you can hide the actual type of a document rsp. file and can change it later, e.g. from <SAMP>html</SAMP> to <SAMP>shtml</SAMP> or <SAMP>cgi</SAMP> without changing any @@ -499,7 +499,7 @@ hyperlink references. If you want to continue to use a MIME-type in your hyperlinks (e.g. <SAMP>foo.html</SAMP>) the language extension (including an encoding extension if there is one) must be on the right hand side of the MIME-type extension -(e.g. <SAMP>foo.html.en</SAMP>). +(<EM>e.g.</EM>, <SAMP>foo.html.en</SAMP>). <H2>Note on Caching</H2> diff --git a/htdocs/manual/install.html b/htdocs/manual/install.html index ad532557e1..d15c410b7a 100644 --- a/htdocs/manual/install.html +++ b/htdocs/manual/install.html @@ -65,7 +65,7 @@ directory of the Apache distribution. Change into this directory. <LI> Configure Apache for your operating system. Normally you can just type run the <CODE>Configure</CODE> script as given below. However - if this fails or you have any special requirements (e.g. to include + if this fails or you have any special requirements (<EM>e.g.</EM>, to include an additional library required by an optional module) you might need to edit one or more of the following options in the <CODE>Configuration</CODE> file: diff --git a/htdocs/manual/misc/FAQ.html b/htdocs/manual/misc/FAQ.html index f69907fbf3..f5e9113bb7 100644 --- a/htdocs/manual/misc/FAQ.html +++ b/htdocs/manual/misc/FAQ.html @@ -14,7 +14,7 @@ <!--#include virtual="header.html" --> <H1 ALIGN="CENTER">Apache Server Frequently Asked Questions</H1> <P> - $Revision: 1.127 $ ($Date: 1998/09/09 16:01:03 $) + $Revision: 1.128 $ ($Date: 1998/09/17 12:33:01 $) </P> <P> The latest version of this FAQ is always available from the main @@ -418,7 +418,7 @@ occasional users. </LI> </UL> - <p></P> + <P></P> <HR> </LI> @@ -552,7 +552,7 @@ (dbx) where</CODE> </DD> </DL> - <p></P> + <P></P> <P> (Substitute the appropriate locations for your <SAMP>ServerRoot</SAMP> and your <SAMP>httpd</SAMP> and @@ -618,7 +618,7 @@ <DD><CODE>AddHandler cgi-script .cgi</CODE> </DD> </DL> - <p></P> + <P></P> <P> The server will then recognize that all files in that location (and its logical descendants) that end in "<SAMP>.cgi</SAMP>" @@ -630,7 +630,7 @@ declaration that includes the <SAMP>ExecCGI</SAMP> option. </LI> </OL> - <p></P> + <P></P> <P> In some situations, you might not want to actually allow all files named "<SAMP>*.cgi</SAMP>" to be executable. @@ -652,7 +652,7 @@ RewriteRule ^quux\.cgi$ - [T=application/x-httpd-cgi]</CODE> </DD> </DL> - <p></P> + <P></P> </LI> <LI>Make sure that the directory location is covered by an <A HREF="../mod/core.html#options"><SAMP>Options</SAMP></A> @@ -660,7 +660,7 @@ <SAMP>FollowSymLinks</SAMP> option. </LI> </OL> - <p></P> + <P></P> <HR> </LI> @@ -703,7 +703,7 @@ }</CODE> </DD> </DL> - <p></P> + <P></P> <P> This is generally only necessary when you are calling external programs from your script that send output to stdout, or if there will @@ -764,7 +764,7 @@ <DD><CODE>AddHandler server-parsed .shtml</CODE> </DD> </DL> - <p></P> + <P></P> <P> This indicates that all files ending in ".shtml" in that location (or its descendants) should be parsed. Note that using @@ -1195,7 +1195,7 @@ BrowserMatch JDK/1.0 force-response-1.0</CODE> </DD> </DL> - <p></P> + <P></P> <P> More information about this issue can be found in the <A HREF="http://www.apache.org/info/jdk-102.html" @@ -1308,7 +1308,7 @@ This hurts performance and should only be used as a last resort. </LI> </UL> - <p></P> + <P></P> <HR> </LI> @@ -1381,7 +1381,7 @@ <DD><CODE>EXTRA_CFLAGS=-DMAXIMUM_DNS</CODE> </DD> </DL> - <p></P> + <P></P> <P> This will cause Apache to be very paranoid about making sure a particular host address is <EM>really</EM> assigned to the name it @@ -1459,7 +1459,7 @@ <DD><CODE>AddType audio/x-midi .mid .midi .kar</CODE> </DD> </DL> - <p></P> + <P></P> <P> Note that this may break browsers that <EM>do</EM> recognize the <SAMP>audio/midi</SAMP> MIME type unless they're prepared to also @@ -1600,7 +1600,7 @@ EXTRA_LIBS=-lbind</CODE> </DD> </DL> - <p></P> + <P></P> <HR> </LI> @@ -1710,7 +1710,7 @@ satisfy any</CODE> </DD> </DL> - <p></P> + <P></P> <P> See the <A HREF="#user-authentication">user authentication</A> question and the <A HREF="../mod/mod_access.html">mod_access</A> @@ -2299,7 +2299,7 @@ <P> If you fail to do this, then it is very likely that Apache will fail to build. One of the most common errors is with <CODE>readv</CODE>, - <CODE>writev</CODE>, or <CODE>uio.h</CODE>. This is <B>not</B> a + <CODE>writev</CODE>, or <CODE>uio.h</CODE>. This is <STRONG>not</STRONG> a bug with Apache. You will need to re-install GCC. <HR> </LI> @@ -2324,11 +2324,11 @@ Improvements, modifications and additions should follow these instructions. <P> In general, the first course of action is to be a member of the - <code>new-httpd@apache.org</code> mailing list. This indicates to the Group that + <CODE>new-httpd@apache.org</CODE> mailing list. This indicates to the Group that you are closely following the latest Apache developments. Your patch file should be - generated using either '<code>diff -c</code>' or '<code>diff -u</code>' against the - latest CVS tree. To submit your patch, send Email to <code>new-httpd@apache.org</code> - with a <code>Subject:</code> line that starts with <code>[PATCH]</code> and + generated using either '<CODE>diff -c</CODE>' or '<CODE>diff -u</CODE>' against the + latest CVS tree. To submit your patch, send Email to <CODE>new-httpd@apache.org</CODE> + with a <CODE>Subject:</CODE> line that starts with <CODE>[PATCH]</CODE> and includes a general description of the patch. In the body of the message, the patch should be clearly described and then included at the end of the message. If the patch-file is long, you can note a URL to the file instead of the file diff --git a/htdocs/manual/misc/client_block_api.html b/htdocs/manual/misc/client_block_api.html index e70a8284fc..c451d19fd9 100644 --- a/htdocs/manual/misc/client_block_api.html +++ b/htdocs/manual/misc/client_block_api.html @@ -61,7 +61,7 @@ accomplished while remaining backwards-compatible.</P> <CODE>ap_should_client_block()</CODE>. This will tell the module whether or not to read input. If it is 0, the module should assume that the input is of a non-entity type - (e.g. a GET request). A nonzero response indicates that the module + (<EM>e.g.</EM>, a GET request). A nonzero response indicates that the module should proceed (to step 3). This step also sends a 100 Continue response to HTTP/1.1 clients, so should not be called until the module diff --git a/htdocs/manual/misc/compat_notes.html b/htdocs/manual/misc/compat_notes.html index b62c204b25..25c17558e4 100644 --- a/htdocs/manual/misc/compat_notes.html +++ b/htdocs/manual/misc/compat_notes.html @@ -86,7 +86,7 @@ client problems</A> page. <P> <LI>Apache's <CODE><VirtualHost></CODE> treats all addresses as - "optional" (i.e. the server should continue booting if it can't + "optional" (<EM>i.e.</EM>, the server should continue booting if it can't resolve the address). Whereas in NCSA the default is to fail booting unless an added <CODE>optional</CODE> keyword is included. diff --git a/htdocs/manual/misc/descriptors.html b/htdocs/manual/misc/descriptors.html index 5841e10e1e..dadb7cc78d 100644 --- a/htdocs/manual/misc/descriptors.html +++ b/htdocs/manual/misc/descriptors.html @@ -26,7 +26,7 @@ network socket that it listens on, plus a handful of others. Libraries that Apache uses may also require descriptors. Normal programs don't open up many descriptors at all, and so there are some latent problems that you may experience should you start running Apache with many -descriptors (i.e. with many virtual hosts). +descriptors (<EM>i.e.</EM>, with many virtual hosts). <P>The operating system enforces a limit on the number of descriptors that a program can have open at a time. There are typically three limits diff --git a/htdocs/manual/misc/known_client_problems.html b/htdocs/manual/misc/known_client_problems.html index db80d6e750..aee18cf9c3 100644 --- a/htdocs/manual/misc/known_client_problems.html +++ b/htdocs/manual/misc/known_client_problems.html @@ -245,19 +245,19 @@ BrowserMatch "Java1\.2beta[23]" nokeepalive is usually not a good idea; ideally it gets fixed, new betas or a final release comes out, and no one uses the broken old software anymore. In theory. -<h3><a name="content-type-persistence"><code>Content-Type</code> change -is not noticed after reload</a></h3> +<H3><A NAME="content-type-persistence"><CODE>Content-Type</CODE> change +is not noticed after reload</A></H3> -<p>Navigator (all versions?) will cache the <code>content-type</code> +<P>Navigator (all versions?) will cache the <CODE>content-type</CODE> for an object "forever". Using reload or shift-reload will not cause -Navigator to notice a <code>content-type</code> change. The only +Navigator to notice a <CODE>content-type</CODE> change. The only work-around is for the user to flush their caches (memory and disk). By -way of an example, some folks may be using an old <code>mime.types</code> -file which does not map <code>.htm</code> to <code>text/html</code>, -in this case Apache will default to sending <code>text/plain</code>. -If the user requests the page and it is served as <code>text/plain</code>. +way of an example, some folks may be using an old <CODE>mime.types</CODE> +file which does not map <CODE>.htm</CODE> to <CODE>text/html</CODE>, +in this case Apache will default to sending <CODE>text/plain</CODE>. +If the user requests the page and it is served as <CODE>text/plain</CODE>. After the admin fixes the server, the user will have to flush their caches -before the object will be shown with the correct <code>text/html</code> +before the object will be shown with the correct <CODE>text/html</CODE> type. <!--#include virtual="footer.html" --> diff --git a/htdocs/manual/misc/perf-dec.html b/htdocs/manual/misc/perf-dec.html index 32245e0fbc..61e6314a70 100644 --- a/htdocs/manual/misc/perf-dec.html +++ b/htdocs/manual/misc/perf-dec.html @@ -211,7 +211,7 @@ TUNING tcp_keepinit This is the amount of time a partially established connection will sit on the listen - queue before timing out (e.g. if a client + queue before timing out (<EM>e.g.</EM>, if a client sends a SYN but never answers our SYN/ACK). Partially established connections tie up slots on the listen queue. If the queue starts to diff --git a/htdocs/manual/misc/perf-tuning.html b/htdocs/manual/misc/perf-tuning.html index 8e6178bd03..9ab35a0340 100644 --- a/htdocs/manual/misc/perf-tuning.html +++ b/htdocs/manual/misc/perf-tuning.html @@ -359,7 +359,7 @@ mutex. Unfortunately SysV-style semaphores have some bad side-effects. One is that it's possible Apache will die without cleaning up the semaphore (see the <CODE>ipcs(8)</CODE> man page). The other is that the semaphore API allows for a denial of service attack by any CGIs running under the -same uid as the webserver (i.e. all CGIs unless you use something +same uid as the webserver (<EM>i.e.</EM>, all CGIs unless you use something like suexec or cgiwrapper). For these reasons this method is not used on any architecture except IRIX (where the previous two are prohibitively expensive on most IRIX boxes). @@ -447,13 +447,13 @@ timeout, but it doesn't prohibit it. On systems without the timeout, Apache 1.2 induces many sockets stuck forever in the FIN_WAIT_2 state. In many cases this can be avoided by simply upgrading to the latest TCP/IP patches supplied by the vendor, in cases where the vendor has -never released patches (i.e. SunOS4 -- although folks with a source +never released patches (<EM>i.e.</EM>, SunOS4 -- although folks with a source license can patch it themselves) we have decided to disable this feature. <P>There are two ways of accomplishing this. One is the socket option <CODE>SO_LINGER</CODE>. But as fate would have it, this has never been implemented properly in most TCP/IP stacks. Even -on those stacks with a proper implementation (i.e. Linux 2.0.31) this +on those stacks with a proper implementation (<EM>i.e.</EM>, Linux 2.0.31) this method proves to be more expensive (cputime) than the next solution. <P>For the most part, Apache implements this in a function called @@ -610,7 +610,7 @@ connection. If the connection was a keep-alive connection and the request being serviced was not the first request then the browser will quietly reissue the request on a new connection. It has to do this because the server is always free to close a keep-alive connection in between requests -(i.e. due to a timeout or because of a maximum number of requests). +(<EM>i.e.</EM>, due to a timeout or because of a maximum number of requests). But, if the connection is closed before the first response has been received the typical browser will display a "document contains no data" dialogue (or a broken image icon). This is done on the assumption that @@ -750,7 +750,7 @@ can be deferred by defining <CODE>BUFFERED_LOGS</CODE>. In this case up to <CODE>PIPE_BUF</CODE> bytes (a POSIX defined constant) of log entries are buffered before writing. At no time does it split a log entry across a <CODE>PIPE_BUF</CODE> boundary because those writes may not -be atomic. (i.e. entries from multiple children could become mixed together). +be atomic. (<EM>i.e.</EM>, entries from multiple children could become mixed together). The code does it best to flush this buffer when a child dies. <P>The lingering close code causes four system calls: diff --git a/htdocs/manual/mod/core.html b/htdocs/manual/mod/core.html index 6d64e93eeb..53e8787860 100644 --- a/htdocs/manual/mod/core.html +++ b/htdocs/manual/mod/core.html @@ -739,7 +739,7 @@ then an access to <CODE>http://www.my.host.com/index.html</CODE> refers to <CODE>/usr/web/index.html</CODE>. <P>There appears to be a bug in mod_dir which causes problems when the -DocumentRoot has a trailing slash (i.e. "DocumentRoot /usr/web/") so +DocumentRoot has a trailing slash (<EM>i.e.</EM>, "DocumentRoot /usr/web/") so please avoid that. <P><HR> @@ -1704,7 +1704,7 @@ from browsers at foo.com, you might use: character has special meaning depending on where in a URL it appears. People may be used to its behaviour in the filesystem where multiple adjacent slashes are -frequently collapsed to a single slash (i.e. <CODE>/home///foo</CODE> +frequently collapsed to a single slash (<EM>i.e.</EM>, <CODE>/home///foo</CODE> is the same as <CODE>/home/foo</CODE>). In URL-space this is not necessarily true. The <CODE><LocationMatch></CODE> directive and the regex version of <CODE><Location></CODE> require you @@ -2111,12 +2111,12 @@ Execution of CGI scripts is permitted. <DD> <!--%plaintext <?INDEX {\tt FollowSymLinks} option> --> The server will follow symbolic links in this directory. -<br> +<BR> <STRONG>Note</STRONG>: even though the server follows the symlink it does <EM>not</EM> change the pathname used to match against <CODE><Directory></CODE> sections. -<br> +<BR> <STRONG>Note</STRONG>: this option gets ignored if set inside a <Location> section. @@ -2133,7 +2133,7 @@ Server-side includes are permitted, but the #exec command and <DD> <!--%plaintext <?INDEX {\tt Indexes} option> --> If a URL which maps to a directory is requested, and the there is no -DirectoryIndex (e.g. index.html) in that directory, then the server will +DirectoryIndex (<EM>e.g.</EM>, index.html) in that directory, then the server will return a formatted listing of the directory. <DT>MultiViews <DD> @@ -2145,7 +2145,7 @@ allowed. <!--%plaintext <?INDEX {\tt SymLinksIfOwnerMatch} option> --> The server will only follow symbolic links for which the target file or directory is owned by the same user id as the link. -<br> +<BR> <STRONG>Note</STRONG>: this option gets ignored if set inside a <Location> section. </DL> @@ -2258,7 +2258,7 @@ Apache).<P> In the absence of any <A HREF="#listen">Listen</A> or <A HREF="#bindaddress">BindAddress</A> directives specifying a port number, a Port directive given in the "main server" -(i.e. outside any <A HREF="#virtualhost"><VirtualHost></A> section) +(<EM>i.e.</EM>, outside any <A HREF="#virtualhost"><VirtualHost></A> section) sets the network port on which the server listens. If there are any Listen or BindAddress directives specifying <CODE>:number</CODE> then Port has no effect on what address the server @@ -2608,7 +2608,7 @@ release. (Prior to 1.3b4, <CODE>HAVE_SHMGET</CODE> would have sufficed.)<P> The server will set the TCP buffer size to the number of bytes specified. Very useful to increase past standard OS defaults on high -speed high latency (i.e. 100ms or so, such as transcontinental +speed high latency (<EM>i.e.</EM>, 100ms or so, such as transcontinental fast pipes) <P><HR> @@ -3085,7 +3085,7 @@ meant for httpd requests. It is recommended that you set up a new user and group specifically for running the server. Some admins use user <CODE>nobody</CODE>, but this is not always possible or desirable. For example mod_proxy's cache, when enabled, must be accessible to this user -(see the <A href="mod_proxy.html#cacheroot"><CODE>CacheRoot</CODE> +(see the <A HREF="mod_proxy.html#cacheroot"><CODE>CacheRoot</CODE> directive</A>).<P> Notes: If you start the server as a non-root user, it will fail to change diff --git a/htdocs/manual/mod/mod_access.html b/htdocs/manual/mod/mod_access.html index 3e5675b3d6..0c3bb9178c 100644 --- a/htdocs/manual/mod/mod_access.html +++ b/htdocs/manual/mod/mod_access.html @@ -70,10 +70,10 @@ The allow directive affects which hosts can access a given directory. <DD>The first 1 to 3 bytes of an IP address, for subnet restriction. <DT>A network/netmask pair (<STRONG>Apache 1.3 and later</STRONG>) <DD>A network a.b.c.d, and a netmask w.x.y.z. For more fine-grained subnet - restriction. (i.e. 10.1.0.0/255.255.0.0) + restriction. (<EM>i.e.</EM>, 10.1.0.0/255.255.0.0) <DT>A network/nnn CIDR specification (<STRONG>Apache 1.3 and later</STRONG>) <DD>Similar to the previous case, except the netmask consists of nnn - high-order 1 bits. (i.e. 10.1.0.0/16 is the same as 10.1.0.0/255.255.0.0) + high-order 1 bits. (<EM>i.e.</EM>, 10.1.0.0/16 is the same as 10.1.0.0/255.255.0.0) </DL> <P> Example: @@ -177,10 +177,10 @@ The deny directive affects which hosts can access a given directory. <DD>The first 1 to 3 bytes of an IP address, for subnet restriction. <DT>A network/netmask pair (<STRONG>Apache 1.3 and later</STRONG>) <DD>A network a.b.c.d, and a netmask w.x.y.z. For more fine-grained subnet - restriction. (i.e. 10.1.0.0/255.255.0.0) + restriction. (<EM>i.e.</EM>, 10.1.0.0/255.255.0.0) <DT>A network/nnn CIDR specification (<STRONG>Apache 1.3 and later</STRONG>) <DD>Similar to the previous case, except the netmask consists of nnn - high-order 1 bits. (i.e. 10.1.0.0/16 is the same as 10.1.0.0/255.255.0.0) + high-order 1 bits. (<EM>i.e.</EM>, 10.1.0.0/16 is the same as 10.1.0.0/255.255.0.0) </DL> <P> Example: diff --git a/htdocs/manual/mod/mod_actions.html b/htdocs/manual/mod/mod_actions.html index 58682094dd..60e11a88ba 100644 --- a/htdocs/manual/mod/mod_actions.html +++ b/htdocs/manual/mod/mod_actions.html @@ -109,7 +109,7 @@ Note that the Script command defines default actions only. If a CGI script is called, or some other resource that is capable of handling the requested method internally, it will do so. Also note that Script with a method of <CODE>GET</CODE> will only be called if there are -query arguments present (e.g. foo.html?hi). Otherwise, the request +query arguments present (<EM>e.g.</EM>, foo.html?hi). Otherwise, the request will proceed normally. </P> <P> diff --git a/htdocs/manual/mod/mod_auth_db.html b/htdocs/manual/mod/mod_auth_db.html index c325e65a51..2df31ba261 100644 --- a/htdocs/manual/mod/mod_auth_db.html +++ b/htdocs/manual/mod/mod_auth_db.html @@ -22,7 +22,7 @@ files for those systems which support DB and not DBM. It is only available in Apache 1.1 and later. <P> -On some BSD systems (e.g. FreeBSD and NetBSD) dbm is automatically mapped to +On some BSD systems (<EM>e.g.</EM>, FreeBSD and NetBSD) dbm is automatically mapped to Berkeley DB. You can use either <A HREF="mod_auth_dbm.html">mod_auth_dbm</A> or mod_auth_db. The latter makes it more obvious that it's Berkeley DB. On other platforms where you want to use the DB library you usually have to diff --git a/htdocs/manual/mod/mod_log_config.html b/htdocs/manual/mod/mod_log_config.html index f23ac3daf4..246899c291 100644 --- a/htdocs/manual/mod/mod_log_config.html +++ b/htdocs/manual/mod/mod_log_config.html @@ -130,7 +130,7 @@ by the values as follows: %...v: The canonical ServerName of the server serving the request. </PRE> -The `...' can be nothing at all (e.g. <CODE>"%h %u %r %s %b"</CODE>), or it can +The `...' can be nothing at all (<EM>e.g.</EM>, <CODE>"%h %u %r %s %b"</CODE>), or it can indicate conditions for inclusion of the item (which will cause it to be replaced with `-' if the condition is not met). Note that there is no escaping performed on the strings from %r, %...i and @@ -151,7 +151,7 @@ requests which did <STRONG>not</STRONG> return some sort of normal status. 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 -extending for format if desired (e.g. to add extra fields at the end). +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>. <P> diff --git a/htdocs/manual/mod/mod_mime.html b/htdocs/manual/mod/mod_mime.html index e0431b1851..fb3f9fe630 100644 --- a/htdocs/manual/mod/mod_mime.html +++ b/htdocs/manual/mod/mod_mime.html @@ -39,7 +39,7 @@ directive <A HREF="#typesconfig">TypesConfig</A> is used to specify a file which also maps extensions onto mime types. The directives <A HREF="#forcetype">ForceType</A> and <A HREF="#sethandler">SetHandler</A> are used to associated all the files -in a given location (e.g. a particular directory) onto a particular +in a given location (<EM>e.g.</EM>, a particular directory) onto a particular mime type or handler. <P> @@ -123,7 +123,7 @@ Old clients expect <CODE>x-gzip</CODE> and <CODE>x-compress</CODE>, however the standard dictates that they're equivalent to <CODE>gzip</CODE> and <CODE>compress</CODE> respectively. Apache does content encoding comparisons by ignoring any leading <CODE>x-</CODE>. When responding -with an encoding Apache will use whatever form (i.e. <CODE>x-foo</CODE> +with an encoding Apache will use whatever form (<EM>i.e.</EM>, <CODE>x-foo</CODE> or <CODE>foo</CODE>) the client requested. If the client didn't specifically request a particular form Apache will use the form given by the <CODE>AddEncoding</CODE> directive. To make this long story short, diff --git a/htdocs/manual/mod/mod_mime_magic.html b/htdocs/manual/mod/mod_mime_magic.html index 8efde7ea56..a85e6b46b5 100644 --- a/htdocs/manual/mod/mod_mime_magic.html +++ b/htdocs/manual/mod/mod_mime_magic.html @@ -255,7 +255,7 @@ * - Memory allocation is done through the Apache API's pool structure. * - All functions have had necessary Apache API request or server * structures passed to them where necessary to call other Apache API - * routines. (i.e. usually for logging, files, or memory allocation in + * routines. (<EM>i.e.</EM>, usually for logging, files, or memory allocation in * itself or a called function.) * - struct magic has been converted from an array to a single-ended linked * list because it only grows one record at a time, it's only accessed diff --git a/htdocs/manual/mod/mod_proxy.html b/htdocs/manual/mod/mod_proxy.html index 3711c09e38..c6563f436e 100644 --- a/htdocs/manual/mod/mod_proxy.html +++ b/htdocs/manual/mod/mod_proxy.html @@ -467,7 +467,7 @@ The arguments to the NoProxy directive are one of the following type list: <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 - domain or zone (i.e. the suffixes of the hostnames are all ending in + domain or zone (<EM>i.e.</EM>, the suffixes of the hostnames are all ending in <EM>Domain</EM>).<BR> Examples: <SAMP>.com</SAMP> <SAMP>.apache.org.</SAMP><BR> To distinguish <EM>Domain</EM>s from <A HREF="#hostname"><EM>Hostname</EM></A>s (both @@ -722,7 +722,7 @@ Apache 1.1 and later.<P> Sets the name of the directory to contain cache files; this must be writable by the httpd server. -(see the <A href="core.html#user"><CODE>User</CODE></a> directive</a>).<BR> +(see the <A HREF="core.html#user"><CODE>User</CODE></A> directive</A>).<BR> Setting <CODE>CacheRoot</CODE> enables proxy cacheing; without defining a <CODE>CacheRoot</CODE>, proxy functionality will be available if <CODE>ProxyRequests</CODE> are set to <CODE>On</CODE>, but no diff --git a/htdocs/manual/mod/mod_rewrite.html b/htdocs/manual/mod/mod_rewrite.html index 69e23e3cdf..2b0d0a318f 100644 --- a/htdocs/manual/mod/mod_rewrite.html +++ b/htdocs/manual/mod/mod_rewrite.html @@ -743,7 +743,7 @@ close(TXT)</PRE></TD></TR> <P> Here the source is a Unix program, not a map file. To create it you can use the language of your choice, but the result has to be a run-able Unix - executable (i.e. either object-code or a script with the + executable (<EM>i.e.</EM>, either object-code or a script with the magic cookie trick '<CODE>#!/path/to/interpreter</CODE>' as the first line). <P> This program gets started once at startup of the Apache servers and then @@ -752,9 +752,9 @@ close(TXT)</PRE></TD></TR> receive the key to lookup as a newline-terminated string on <CODE>stdin</CODE>. It then has to give back the looked-up value as a newline-terminated string on <CODE>stdout</CODE> or the four-character string - ``<CODE>NULL</CODE>'' if it fails (i.e. there is no corresponding value + ``<CODE>NULL</CODE>'' if it fails (<EM>i.e.</EM>, there is no corresponding value for the given key). A trivial program which will implement a 1:1 map - (i.e. key == value) could be: + (<EM>i.e.</EM>, key == value) could be: <P> <TABLE BORDER=0 CELLSPACING=1 CELLPADDING=5 BGCOLOR="#F0F0F0"> <TR><TD><PRE> @@ -1491,9 +1491,9 @@ comma-separated list of the following flags: <P> <LI>'<STRONG><CODE>proxy|P</CODE></STRONG>' (force <STRONG>p</STRONG>roxy)<BR> This flag forces the substitution part to be internally forced as a proxy - request and immediately (i.e. rewriting rule processing stops here) put + request and immediately (<EM>i.e.</EM>, rewriting rule processing stops here) put through the <A HREF="mod_proxy.html">proxy module</A>. You have to make - sure that the substitution string is a valid URI (e.g. typically starting + sure that the substitution string is a valid URI (<EM>e.g.</EM>, typically starting with <CODE>http://</CODE><EM>hostname</EM>) which can be handled by the Apache proxy module. If not you get an error from the proxy module. Use this flag to achieve a more powerful implementation of the <A @@ -1699,7 +1699,7 @@ for request ``<CODE>GET /somepath/pathinfo</CODE>'':</STRONG><BR> <P> <STRONG>Inside per-directory configuration for <CODE>/somepath</CODE><BR> -(i.e. file <CODE>.htaccess</CODE> in dir <CODE>/physical/path/to/somepath</CODE> containing +(<EM>i.e.</EM>, file <CODE>.htaccess</CODE> in dir <CODE>/physical/path/to/somepath</CODE> containing <CODE>RewriteBase /somepath</CODE>)<BR> for request ``<CODE>GET /somepath/localpath/pathinfo</CODE>'':</STRONG><BR> diff --git a/htdocs/manual/mod/mod_unique_id.html b/htdocs/manual/mod/mod_unique_id.html index 6756824c96..c9c4d3afe9 100644 --- a/htdocs/manual/mod/mod_unique_id.html +++ b/htdocs/manual/mod/mod_unique_id.html @@ -101,7 +101,7 @@ too far forward, is reset correctly, and then revisits the future time). In this case we can easily show that we can get pid and time stamp reuse. The choice of initializer for the counter is intended to help defeat this. Note that we really want a random number to initialize the counter, -but there aren't any readily available numbers on most systems (i.e. you +but there aren't any readily available numbers on most systems (<EM>i.e.</EM>, you can't use rand() because you need to seed the generator, and can't seed it with the time because time, at least at one second resolution, has repeated itself). This is not a perfect defense. diff --git a/htdocs/manual/new_features_1_1.html b/htdocs/manual/new_features_1_1.html index f0084cada2..478c919a60 100644 --- a/htdocs/manual/new_features_1_1.html +++ b/htdocs/manual/new_features_1_1.html @@ -161,7 +161,7 @@ have different error messages for different sections of a site. <BR> This new directive, in <CODE><Directory></CODE> sections or .htaccess files, allows you to override the filename extensions and -force a single content type. (e.g. <CODE>ForceType +force a single content type. (<EM>e.g.</EM>, <CODE>ForceType application/octet-stream</CODE>) <LI><STRONG>File Owner Available to Included CGI Scripts</STRONG> diff --git a/htdocs/manual/new_features_1_2.html b/htdocs/manual/new_features_1_2.html index 3d2c194d3c..ea15f14204 100644 --- a/htdocs/manual/new_features_1_2.html +++ b/htdocs/manual/new_features_1_2.html @@ -139,7 +139,7 @@ scripts much easier to debug. <LI><STRONG><A HREF="mod/core.html#rlimit">Resource Limits for CGI Scripts</A></STRONG><BR> New directives allow the limiting of resources used by CGI scripts -(e.g. max CPU time). This is helpful in preventing 'runaway' CGI +(<EM>e.g.</EM>, max CPU time). This is helpful in preventing 'runaway' CGI processes. <LI><STRONG><A HREF="mod/mod_alias.html">Redirect Directive Can Return diff --git a/htdocs/manual/sourcereorg.html b/htdocs/manual/sourcereorg.html index fa449f6fa6..fa4565c246 100644 --- a/htdocs/manual/sourcereorg.html +++ b/htdocs/manual/sourcereorg.html @@ -253,7 +253,7 @@ from the compiler. Anything between the lines which contains The <CODE>Name:</CODE> line gives the module's structure name. This is not really necessary in this case since if not present <CODE>Configure</CODE> will guess at a name based on the filename -(e.g. given "mod_demo" it will remove the leading "mod_" and append +(<EM>e.g.</EM>, given "mod_demo" it will remove the leading "mod_" and append "_module" to get a structure name. This works with all modules distributed with Apache). diff --git a/htdocs/manual/upgrading_to_1_3.html b/htdocs/manual/upgrading_to_1_3.html index 1462d96864..e72a85317d 100644 --- a/htdocs/manual/upgrading_to_1_3.html +++ b/htdocs/manual/upgrading_to_1_3.html @@ -208,7 +208,7 @@ document, or in the <CODE>src/CHANGES</CODE> file. could result in the user viewing an empty page until the CGI finished or output a complete buffer. It is no longer necessary to use an "nph-" CGI to get unbuffered output. Given that most CGIs are written - in a language that by default does buffering (e.g. perl) this + in a language that by default does buffering (<EM>e.g.</EM>, perl) this shouldn't have a detrimental effect on performance. <P>"nph-" CGIs, which formerly provided a direct socket to the client diff --git a/htdocs/manual/vhosts/host.html b/htdocs/manual/vhosts/host.html index c0b0566715..502b63a59c 100644 --- a/htdocs/manual/vhosts/host.html +++ b/htdocs/manual/vhosts/host.html @@ -152,10 +152,10 @@ new browsers can also access it as to <CODE>http://www.apache.org/apache/</CODE> (Note: Do not use <CODE>http://www.apache.org/</CODE> - this would create an endless loop). Then, in the virtual host's pages, be sure to use either purely -relative links (e.g. "<CODE>file.html</CODE>" or +relative links (<EM>e.g.</EM>, "<CODE>file.html</CODE>" or "<CODE>../icons/image.gif</CODE>" or links containing the prefacing <CODE>/apache/</CODE> -(e.g. "<CODE>http://www.apache.org/apache/file.html</CODE>" or +(<EM>e.g.</EM>, "<CODE>http://www.apache.org/apache/file.html</CODE>" or "<CODE>/apache/docs/1.1/index.html</CODE>").</P> <P>This requires a bit of diff --git a/htdocs/manual/vhosts/name-based.html b/htdocs/manual/vhosts/name-based.html index 1a86a32f70..4f3c4fde90 100644 --- a/htdocs/manual/vhosts/name-based.html +++ b/htdocs/manual/vhosts/name-based.html @@ -128,10 +128,10 @@ clients sending a <SAMP>Host:</SAMP> header can also access it as <P>In order to make this work, put a link on your primary virtual host's page to <SAMP>http://www.domain.tld/domain/</SAMP> Then, in the virtual host's pages, be sure to use either purely -relative links (e.g. "<SAMP>file.html</SAMP>" or +relative links (<EM>e.g.</EM>, "<SAMP>file.html</SAMP>" or "<SAMP>../icons/image.gif</SAMP>" or links containing the prefacing <SAMP>/domain/</SAMP> -(e.g. "<SAMP>http://www.domain.tld/domain/misc/file.html</SAMP>" or +(<EM>e.g.</EM>, "<SAMP>http://www.domain.tld/domain/misc/file.html</SAMP>" or "<SAMP>/domain/misc/file.html</SAMP>").</P> <P>This requires a bit of diff --git a/htdocs/manual/windows.html b/htdocs/manual/windows.html index 7071e9163e..249357cc5e 100644 --- a/htdocs/manual/windows.html +++ b/htdocs/manual/windows.html @@ -161,7 +161,7 @@ There are two ways you can run Apache: you want Apache to automatically start when you machine boots, and to keep Apache running when you log-off. - <LI>From a <a ref="#cmdline">console window</a>. This is the only option available for + <LI>From a <A ref="#cmdline">console window</A>. This is the only option available for Windows 95 users. </UL> @@ -275,13 +275,13 @@ work from the command line. When working with Apache it is important to know how it will find the configuration files. Apache will try one of the following, in this order. -<ul> -<li>A ServerRoot directive via a -C switch. -<li>The -f switch on the command line. -<li>The -d switch on the command line. -<li>A registry entry, created if you did a binary install. -<li>The server root compiled into the server. -</ul> +<UL> +<LI>A ServerRoot directive via a -C switch. +<LI>The -f switch on the command line. +<LI>The -d switch on the command line. +<LI>A registry entry, created if you did a binary install. +<LI>The server root compiled into the server. +</UL> <P> The server root compiled into the server is usually "/apache". @@ -384,7 +384,7 @@ and to remove the Apache service, use to compile Apache if the command-line tools are not installed. Project files (<CODE>.DSP</CODE>) are included for each of the portions of Apache. To build Apache from the these projects files - you will need to build the following projects <i>in this order</i>: + you will need to build the following projects <EM>in this order</EM>: <OL> <LI><CODE>os\win32\ApacheOS.dsp</CODE> |