Fix socks forwarding lines, update port 8000 to 8118

[privoxy.git] / config

diff --git a/config b/config
index 9d97954..345d982 100644 (file)
--- a/config
+++ b/config
@@ -1,7 +1,7 @@
 #  Sample Configuration file for the Internet Junkbuster 2.9.x
 
 #
-# $Id: config,v 1.26 2001/11/05 21:31:09 steudten Exp $
+# $Id: config,v 1.28 2002/03/04 19:32:07 oes Exp $
 #
 
 #  Table of Contents
@@ -177,11 +177,11 @@ proxy-info-url http://www.your-site.com/proxy.html
 #
 #  Listen-address specifies the address and port where Junkbuster will
 #  listen for connections from your Web browser.  The default is to
-#  listen on the local host on port 8000, and this is suitable for
+#  listen on the local host on port 8118, and this is suitable for
 #  most users.  (In your web browser, under proxy configuration, list
-#  the proxy server as 'localhost' and the port as '8000').
+#  the proxy server as 'localhost' and the port as '8118').
 # 
-#  If you already have another service running on port 8000, or if you
+#  If you already have another service running on port 8118, or if you
 #  want to serve requests from other machines (e.g. on your local
 #  network) as well, you will need to override the default. The syntax
 #  is "listen-address [<ip-address>]:<port>" If you leave out the ip
@@ -194,20 +194,20 @@ proxy-info-url http://www.your-site.com/proxy.html
 #  (192.168.0.0) and has another outside connection with a different
 #  address. You want it to serve requests from inside only:
 #
-#     listen-address 192.168.0.1:8000
+#     listen-address 192.168.0.1:8118
 #
 #  If you want it to listen on all addresses (including the outside
 #  connection):
 #
-#     listen-address :8000
+#     listen-address :8118
 #
 #  If you do this, consider using acls (see "aclfile" above).
 #
 #  Note: you will need to point your browser(s) to the address
 #  and port that you have configured here.
 #
-#  Default:  listen-address    localhost:8000 
-#            listen-address    127.0.0.1:8000
+#  Default:  listen-address    localhost:8118 
+#            listen-address    127.0.0.1:8118
 #
 
 
@@ -468,13 +468,13 @@ enable-remote-toggle 1
 #
 # In the following common configuration, everything goes to Lucent's LPWA,
 # except SSL on port 443 (which it doesn't handle)
-#    forward .*    lpwa.com:8000
+#    forward .*    lpwa.com:8118
 #    forward :443 .
 #
 # See the FAQ for instructions on how to automate the login procedure for LPWA.
 # Some users have reported difficulties related to LPWA's use of . as the
 # last element of the domain, and have said that this can be fixed with this:
-#    forward lpwa.  lpwa.com:8000
+#    forward lpwa.  lpwa.com:8118
 # (NOTE: the syntax for specifiying target_domain has changed since the
 # previous paragraph weas written - it will not work now.  More information
 # is welcome.)
@@ -482,7 +482,7 @@ enable-remote-toggle 1
 # In this fictitious example, everything goes via an ISP's caching proxy,
 # except requests to that ISP:
 #
-# forward .* caching.myisp.net:8000
+# forward .* caching.myisp.net:8118
 # forward myisp.net .
 #
 # For the @home network, we're told the forwarding configuration is this:
@@ -495,12 +495,12 @@ enable-remote-toggle 1
 # but everything else goes through Lucent's LPWA by way of the company's
 # SOCKS gateway to the Internet.
 #
-# forward_socks4 .* lpwa.com:8000 firewall.my_company.com:1080
+# forward-socks4 .* lpwa.com:8118 firewall.my_company.com:1080
 # forward my_company.com .
 #
 # This is how you could set up a site that always uses SOCKS but no forwarders
 #
-# forward_socks4a .* . firewall.my_company.com:1080
+# forward-socks4a .* . firewall.my_company.com:1080
 #
 # An advanced example for network administrators:
 #
@@ -516,11 +516,11 @@ enable-remote-toggle 1
 #
 # host-a can run an Internet Junkbuster proxy with forwarding like this:
 #   forward .* .
-#   forward isp-b.com host-b:8000
+#   forward isp-b.com host-b:8118
 #
 # host-b can run an Internet Junkbuster proxy with forwarding like this:
 #   forward .* .
-#   forward isp-a.com host-a:8000
+#   forward isp-a.com host-a:8118
 #
 # Now, *anyone* on the Internet (including users on host-a and host-b)
 # can set their browser's proxy to *either* host-a or host-b and
@@ -546,7 +546,7 @@ enable-remote-toggle 1
 #       Your squid configuration could then look like this:
 #
 #       # Define junkbuster as parent cache 
-#       cache_peer 127.0.0.1 8000 parent 0 no-query 
+#       cache_peer 127.0.0.1 8118 parent 0 no-query 
 #
 #       # Define ACL for protocol FTP 
 #       acl FTP proto FTP