X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=trust;h=94b066326fa0cf9c5e5935abcf898ff70fe07b2f;hp=8a40dcc44d1f5aaf376304609a072f74cee0731f;hb=6482e058f35d398401f8576fb2de4121c41870d0;hpb=472006f94cd350ff6e734c156cbbb93dab86d864

diff --git a/trust b/trust
index 8a40dcc4..94b06632 100644
--- a/trust
+++ b/trust
@@ -1,12 +1,10 @@
 ######################################################################
 # 
-#  File        :  $Source: /cvsroot/ijbswa/current/basic.action,v $
+#  File        :  trust
 # 
-#  $Id: basic.action,v 1.3 2002/03/26 22:29:54 swa Exp $
-#
-#  Purpose     :  Trustfiles are an experimental feature used for
-#                 building "whitelists" (versus the usual "blacklists"
-#                 in a blockfile).
+#  Purpose     :  Trustfiles are an experimental feature and can be used
+#                 to build "whitelists" (versus the usual "blacklists"
+#                 techniques).
 # 
 #  Copyright   :  Written by and Copyright
 #                 Privoxy team. http://www.privoxy.org/
@@ -23,12 +21,12 @@
 #  * Submit bugs only thru our bug forum:
 #    http://sourceforge.net/tracker/?group_id=11118&atid=111118 
 #    Make sure that the bug has not already been submitted. Please try
-#    to verify that it is a Junkbuster bug, and not a browser or site
+#    to verify that it is a Privoxy bug, and not a browser or site
 #    bug first. If you are using your own custom configuration, please
 #    try the stock configs to see if the problem is a configuration
 #    related bug. And if not using the latest development snapshot,
 #    please try the latest one. Or even better, CVS sources.
-#  * Submit feature requests only thru our feature request forum:
+#  * Submit feature requests only thru our feature request tracker:
 #    http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse
 #      
 # For any other issues, feel free to use the mailing lists:
@@ -41,26 +39,45 @@
 # 
 ######################################################################
 #
-#  Illustrative Trustfile for Privoxy
+#                      Sample Trustfile for Privoxy
 
-# For this file to have any effect, the line beginning "trustfile" must
-# be commented in, with the name of this file following the word "trustfile"
+# For this file to have any effect, the line in the main config file beginning
+# with "trustfile" must be uncommented, with the name of this file following the
+# word "trustfile".
 
 # Trustfiles are an experimental feature used for building "whitelists"
-# (versus the usual "blacklists" in a blockfile). Most people don't use it.
-# For more detail, see http://www.junkbusters.com/ht/en/ijbman.html#trustfile
-#
-# This is like parsed exactly like a blockfile, except that a '+'
-# in column one is treated like a '~' (i.e. doesn't block) and
-# it adds the spec to the trusted-referer list.
-#
-# Also, the default is to block any URL that is NOT mentioned on this list.
-#
-# While browsing, the domains for URLs that are referred by a trusted referer
-# are added to this list.  Thus this acts as a "white-list" of OK places
-# to browse. Note this means that the file will grow longer with use.
-#
-# Example: to allow only links that came from yahooligans, uncomment this line
-# +yahooligans.com
-# and remove the last line (* alone), which unblock everything:
-*
+# of "trusted" sites (versus the usual "blacklists" technique). For more
+# detail, see http://www.privoxy.org/user-manual/config.html#TRUSTFILE.
+
+# List trusted domains here. The default is to block any URL that is NOT
+# referenced. Access to trusted domains includes all paths within that
+# domain.
+
+# Preceding a domain with a '+' character will designate that domain
+# as a "trusted referrer", meaning any requests whose HTTP "Referer" headers
+# contain an URL from that domain will be allowed, and the previously untrusted
+# host will be dynamically added to this file. Thus, this builds a "white-list"
+# of hosts the user is allowed to visit.
+
+# Note this means that the file will grow with use!
+
+# Also note that you can only trust referrers if you control the user's
+# system and make sure that there are no programs available that allow
+# to set arbitrary headers.
+
+# Preceding the domain with '~' character allows access to that domain only
+# (including all paths within that domain), but does not allow access to links
+# to other, outside domains. Sites that are added dynamically by trusted 
+# referrers will include the '~' character, and thus do not become trusted
+# referrers themselves.
+
+# Example: to allow example.com and to white-list domains that appear to
+# be reached through links from example.com, uncomment this line:
+
+# +example.com 
+
+# The next two lines make sure that the user can access Privoxy's
+# CGI pages, without automatically trusting their links.
+
+~config.privoxy.org
+~p.p