Merging in the rest of Alex's bundle.

[wget] / doc / sample.wgetrc

diff --git a/doc/sample.wgetrc b/doc/sample.wgetrc
index 67fcc7ddcad463ceb34ac603e3c2f6447eba2c8d..7aeacc74e1dc087f2859d955ce38a986d1d223ef 100644 (file)
--- a/doc/sample.wgetrc
+++ b/doc/sample.wgetrc
@@ -35,10 +35,13 @@
 # the recursive retrieval.  The default is 5.
 #reclevel = 5
 
-# Many sites are behind firewalls that do not allow initiation of
-# connections from the outside.  On these sites you have to use the
-# `passive' feature of FTP.  If you are behind such a firewall, you
-# can turn this on to make Wget use passive FTP by default.
+# By default Wget uses "passive FTP" transfer where the client
+# initiates the data connection to the server rather than the other
+# way around.  That is required on systems behind NAT where the client
+# computer cannot be easily reached from the Internet.  However, some
+# firewalls software explicitly supports active FTP and in fact has
+# problems supporting passive transfer.  If you are in such
+# environment, use "passive_ftp = off" to revert to active FTP.
 #passive_ftp = off
 
 # The "wait" command below makes Wget wait between every connection.
@@ -70,9 +73,10 @@ waitretry = 10
 # is *not* sent by default.
 #header = Accept-Language: en
 
-# You can set the default proxy for Wget to use.  It will override the
-# value in the environment.
+# You can set the default proxies for Wget to use for http and ftp.
+# They will override the value in the environment.
 #http_proxy = http://proxy.yoyodyne.com:18023/
+#ftp_proxy = http://proxy.yoyodyne.com:18023/
 
 # If you do not want to use proxy at all, set this to off.
 #use_proxy = on