From d690846d6f329f7f8a7a74f5dd14412dbe853c61 Mon Sep 17 00:00:00 2001
From: Giorgos Keramidas <keramida@FreeBSD.org>
Date: Tue, 16 Apr 2002 00:00:49 +0000
Subject: [PATCH] Don't mention that HTTP is supposedly more efficient than
 FTP. If we don't have numbers, it's better not to spread rumours. Expand a
 bit on the section of HTTP server choises, mentioning Apache, thttpd and boa
 as alternatives.

PR:		docs/37037
Submitted by:	Dominic Marks <dominic_marks@btinternet.com>
---
 en_US.ISO8859-1/articles/hubs/article.sgml | 36 +++++++++++++++++-----
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/en_US.ISO8859-1/articles/hubs/article.sgml b/en_US.ISO8859-1/articles/hubs/article.sgml
index 51ebc50185..0a948321fe 100644
--- a/en_US.ISO8859-1/articles/hubs/article.sgml
+++ b/en_US.ISO8859-1/articles/hubs/article.sgml
@@ -204,14 +204,36 @@
         <title>HTTP (required for webpages, optional for FTP fileset)</title>
         <para>
           If you want to offer the FreeBSD webpages, you need
-          to install a webserver a.k.a <application>httpd</application>. You may offer
-          the FTP fileset via HTTP, as well, if you like.
-          Some argue HTTP is more efficient for download, but
-          I cannot tell. The most commonly
-          used httpd is Apache, although there are others around,
-          take a look at <filename>/usr/ports/www</filename>.
+          to install a webserver. You may optionally offer the FTP fileset via HTTP.
+          The choice of Webserver software is left up to the mirror administrator.
+          Some of the most popular choises are:
+
           <itemizedlist>
-            <listitem><para><filename role="package">www/apache13</filename></para></listitem>
+            <listitem>
+              <para><filename role="package">www/apache13</filename>:
+                Apache is the most widely deployed Webserver on the Internet. It
+                is used extensively by the FreeBSD Project. You may also
+                wish to use the next generation of the Apache Webserver,
+                available in the ports collection as <filename
+                role="package">www/apache2</filename>.</para>
+            </listitem>
+
+            <listitem>
+              <para><filename role="package">www/thttpd</filename>:
+                If you are going to be serving a lot amount of static content
+                you may find that using an application such as tHttpd is more
+                efficent than Apache. It is optimized for excellent performance
+                on FreeBSD.</para>
+            </listitem>
+
+            <listitem>
+              <para><filename role="package">www/boa</filename>:
+                Boa is another alternative to tHttpd and Apache. It should
+                provide considerably better performance than Apache for purely
+                static content. It does not, at the time of writing, contain the
+                same set of optimizations for FreeBSD that are found in
+                tHttpd.</para>
+            </listitem>
           </itemizedlist>
         </para>
       </sect3>