X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=doc%2Fsample.wgetrc;h=1ce90dea24ca576f507ead9834ab6027b39a69fa;hp=6cadbe06190ff95767a33f9e3ae913622742ec32;hb=cb555a94fa5188122569ed3803c463f27ccd0261;hpb=0a8054755cf1fc719e65a8c86d31b56f33308bd6

diff --git a/doc/sample.wgetrc b/doc/sample.wgetrc
index 6cadbe06..1ce90dea 100644
--- a/doc/sample.wgetrc
+++ b/doc/sample.wgetrc
@@ -35,12 +35,22 @@
 # 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.
+# If, instead, you want Wget to wait only between retries of failed
+# downloads, set waitretry to maximum number of seconds to wait (Wget
+# will use "linear backoff", waiting 1 second after the first failure
+# on a file, 2 seconds after the second failure, etc. up to this max).
+#waitretry = 10
+
 
 ##
 ## Local settings (for a user to set in his $HOME/.wgetrc).  It is
@@ -63,9 +73,11 @@
 # 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, https, and ftp.
+# They will override the value in the environment.
+#https_proxy = http://proxy.yoyodyne.com:18023/
 #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
@@ -83,13 +95,6 @@
 # the number of seconds you want Wget to wait.
 #wait = 0
 
-# The "wait" command above makes Wget wait between every connection.
-# If, instead, you want Wget to wait only between retries of failed
-# downloads, set this variable to maximum number of seconds to wait
-# (Wget will use "linear backoff", waiting 1 second after the first
-# failure on a file, up to this max).
-waitretry = 10
-
 # You can force creating directory structure, even if a single is being
 # retrieved, by setting this to on.
 #dirstruct = off
@@ -106,3 +111,15 @@ waitretry = 10
 # To have Wget follow FTP links from HTML files by default, set this
 # to on:
 #follow_ftp = off
+
+# To try ipv6 addresses first:
+#prefer-family = IPv6
+
+# Set default IRI support state
+#iri = off
+
+# Force the default system encoding
+#locale = UTF-8
+
+# Force the default remote server encoding
+#remoteencoding = UTF-8