Merge in all of the docs from HEAD, I'll clean it up a bit later.

Reviewed by:
Submitted by:
Obtained from:

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/unlabeled-1.6.2@78392 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/mod/mod_autoindex.html b/docs/manual/mod/mod_autoindex.html
index aebd31a5bb81e9d3c50683ddce6d64440082cfe9..a6cccca610088166607c1f46b73e16c5777d0491 100644 (file)
--- a/docs/manual/mod/mod_autoindex.html
+++ b/docs/manual/mod/mod_autoindex.html
@@ -324,6 +324,26 @@ This will suppress the file size in fancy indexing listings.
 <dd>
 <!--%plaintext &lt;?INDEX {\tt SuppressDescription} index option&gt; -->
 This will suppress the file description in fancy indexing listings.
+<dt>IconHeight[=pixels] (<EM>Apache 1.3 and later</EM>)
+<dd>
+<!--%plaintext &lt;?INDEX {\tt IconHeight} index option&gt; -->
+Presence of this option, when used with IconWidth, will cause the server
+to include <SAMP>HEIGHT</SAMP> and <SAMP>WIDTH</SAMP> attributes in the
+<SAMP>IMG</SAMP> tag for the file icon.  This allows browser to
+precalculate the page layout without having to wait until all the
+images have been loaded.  If no value is given for the option, it
+defaults to the standard height of the icons supplied with the Apache
+software.
+<dt>IconWidth[=pixels] (<EM>Apache 1.3 and later</EM>)
+<dd>
+<!--%plaintext &lt;?INDEX {\tt IconWidth} index option&gt; -->
+Presence of this option, when used with IconHeight, will cause the server
+to include <SAMP>HEIGHT</SAMP> and <SAMP>WIDTH</SAMP> attributes in the
+<SAMP>IMG</SAMP> tag for the file icon.  This allows browser to
+precalculate the page layout without having to wait until all the
+images have been loaded.  If no value is given for the option, it
+defaults to the standard width of the icons supplied with the Apache
+software.
 </dl>
 This default is that no options are enabled. If multiple IndexOptions
 could apply to a directory, then the most specific one is taken complete;

diff --git a/docs/manual/platform/perf-bsd44.html b/docs/manual/platform/perf-bsd44.html
index 0a1661b7ca3b9b8f93a0affef9e49d335ba0a680..f754f213acbfcf30bbc662716934e40048bbd6b7 100644 (file)
--- a/docs/manual/platform/perf-bsd44.html
+++ b/docs/manual/platform/perf-bsd44.html
@@ -219,7 +219,7 @@ helpful suggestions and information.
 <blockquote>It really does help if your kernel and frequently used utilities
 are fully optimized. Rebuilding the FreeBSD kernel on an AMD-133
 (486-class CPU) web-server with<BR>
-<code>    -m486 -fexpensive-optimizations -fomit-frame-ponter -O2</code><BR>
+<code>    -m486 -fexpensive-optimizations -fomit-frame-pointer -O2</code><BR>
 helped reduce the number of "unable" errors, because the CPU was
 often maxed out.</blockquote>
 <P>