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.8.2@78392 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/custom-error.html.en b/docs/manual/custom-error.html.en
index 3f04af058b01c40bb217f5761182b71371290479..3165ec044e66b98730007fa8aafc10ee53875371 100644 (file)
--- a/docs/manual/custom-error.html.en
+++ b/docs/manual/custom-error.html.en
@@ -29,9 +29,9 @@
       response, then this response can be replaced with either some
       friendlier text or by a redirection to another URL (local or
       external).
-       
+        
       <P>
-       
+        
 <DT>Old behavior
 
   <DD>NCSA httpd 1.3 would return some boring old error/problem message 

diff --git a/docs/manual/platform/perf.html b/docs/manual/platform/perf.html
index 96c48ea199281bd2c3c308de28737027128ead0a..566cc0f27193b0a0d1c7aa0c37f7b90b5046c1a8 100644 (file)
--- a/docs/manual/platform/perf.html
+++ b/docs/manual/platform/perf.html
@@ -26,7 +26,6 @@ for the heavier TCP load, hardware/software conflicts that arise, etc.
 <LI><A HREF="#AUX">A/UX (Apple's UNIX)</A>
 <LI><A HREF="#BSD">BSD-based (BSDI, FreeBSD, etc)</A>
 <LI><A HREF="#DEC">Digital UNIX</A>
-<LI><A HREF="#HP">Hewlett-Packard</A>
 <LI><A HREF="#Linux">Linux</A>
 <LI><A HREF="#SGI">SGI</A>
 <LI><A HREF="#Solaris">Solaris</A>
@@ -62,22 +61,13 @@ Digital UNIX
 
 <UL> 
   <LI><A HREF="http://www.digital.com/info/internet/document/ias/tuning.html">DIGITAL
-       UNIX Tuning Parameters for Web Servers</A> 
+        UNIX Tuning Parameters for Web Servers</A> 
   <LI>We have some <A HREF="perf-dec.html">newsgroup postings</A> on how to tune 
-       Digital UNIX 3.2 and 4.0. 
+        Digital UNIX 3.2 and 4.0. 
 </UL>
 
 <P><HR>
 
-<H3><A NAME="HP">
-Hewlett-Packard
-</A></H3>
-
-Some documentation on tuning HP machines can be found at <A
-HREF="http://www.software.hp.com/internet/perf/tuning.html">http://www.software.hp.com/internet/perf/tuning.html</A>.
-
-<P><HR>
-
 <H3><A NAME="Linux">
 Linux
 </A></H3>