Document the fact that you can install through an HTTP proxy

PR:		21451
Approved by:	jkh

2 files changed, 33 insertions, 11 deletions

diff --git a/release/texts/alpha/INSTALL.TXT b/release/texts/alpha/INSTALL.TXT
index 5fd5244..2c96715 100644
--- a/release/texts/alpha/INSTALL.TXT
+++ b/release/texts/alpha/INSTALL.TXT
@@ -398,13 +398,13 @@ installation can continue over NFS or FTP.
         If you are installing from some other FTP site not listed in
         this menu, or you are having troubles getting your name server
         configured properly, you can also specify your own URL by
-        selecting the ``Other'' choice in that menu.  A URL can
+        selecting the ``URL'' choice in that menu.  A URL can
         contain a hostname or an IP address, so the following would
         work in the absence of a name server:
 
-                ftp://192.216.191.11/pub/FreeBSD/4.0-RELEASE
+                ftp://192.216.191.11/pub/FreeBSD
 
-        There are two FTP installation modes you can use:
+        There are three FTP installation modes you can use:
 
            o FTP:
 
@@ -420,9 +420,19 @@ installation can continue over NFS or FTP.
              the user to pass through firewalls that do not allow
              incoming connections on random port addresses.
 
-        NOTE: ACTIVE AND PASSIVE MODES ARE NOT THE SAME AS A `PROXY'
-        CONNECTIONS, WHERE A PROXY FTP SERVER IS LISTENING ON A
-        DIFFERENT PORT!
+           o FTP via an HTTP proxy:
+             This option instructs FreeBSD to use HTTP (like a web
+             browser) to connect to a proxy for all FTP operations.
+             The proxy will translate the requests and send them to
+             the FTP server.  This allows the user to pass through
+             firewalls that do not allow FTP at all, but offer an
+             HTTP proxy.  You must specify the hostname of the proxy
+             in addition to the FTP server.
+
+        NOTE: THERE IS ANOTHER TYPE OF FTP PROXY OTHER THAN HTTP PROXIES.
+        THIS TYPE IS VERY UNCOMMON, THOUGH.  IF YOU ARE NOT ABSOLUTELY
+        CERTAIN, YOU CAN ASSUME THAT YOU HAVE AN HTTP PROXY AS DESCRIBED
+        ABOVE.
 
         In such instances, you should specify the URL as something like:
 
diff --git a/release/texts/i386/INSTALL.TXT b/release/texts/i386/INSTALL.TXT
index 3f5dfb9..265f07a 100644
--- a/release/texts/i386/INSTALL.TXT
+++ b/release/texts/i386/INSTALL.TXT
@@ -337,7 +337,9 @@ Your system administrator can tell you which values are appropriate to
 your particular network setup.  If you will be referring to other
 hosts by name rather than IP address, you'll also need a name server
 and possibly the address of a gateway (if you're using PPP, it's your
-provider's IP address) to use in talking to it.
+provider's IP address) to use in talking to it.  If you want to install
+by FTP via an HTTP proxy (see below), you will also need the proxy's
+address.
 
 If you do not know the answers to these questions then you should
 really probably talk to your system administrator _first_ before
@@ -395,7 +397,7 @@ installation can continue over NFS or FTP.
 
                 ftp://192.216.191.11/pub/FreeBSD
 
-        There are two FTP installation modes you can use:
+        There are three FTP installation modes you can use:
 
            o FTP:
 
@@ -411,9 +413,19 @@ installation can continue over NFS or FTP.
              the user to pass through firewalls that do not allow
              incoming connections on random port addresses.
 
-        NOTE: ACTIVE AND PASSIVE MODES ARE NOT THE SAME AS A `PROXY'
-        CONNECTIONS, WHERE A PROXY FTP SERVER IS LISTENING ON A
-        DIFFERENT PORT!
+           o FTP via an HTTP proxy:
+             This option instructs FreeBSD to use HTTP (like a web
+             browser) to connect to a proxy for all FTP operations.
+             The proxy will translate the requests and send them to
+             the FTP server.  This allows the user to pass through
+             firewalls that do not allow FTP at all, but offer an
+             HTTP proxy.  You must specify the hostname of the proxy
+             in addition to the FTP server.
+
+        NOTE: THERE IS ANOTHER TYPE OF FTP PROXY OTHER THAN HTTP PROXIES.
+        THIS TYPE IS VERY UNCOMMON, THOUGH.  IF YOU ARE NOT ABSOLUTELY
+        CERTAIN, YOU CAN ASSUME THAT YOU HAVE AN HTTP PROXY AS DESCRIBED
+        ABOVE.
 
         In such instances, you should specify the URL as something like: