X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=doc%2Fwebserver%2Fuser-manual%2Findex.html;h=ead26ef95c628bfbc5aed87041545188dbab08d5;hp=8b87588c175d2d17b00f2e3245a89f127065a2c4;hb=a5b1999794b4b0faa68812c0b8b2861316ae8341;hpb=16e9ef297b4cf15a61876abcc794e5a058500e4b

diff --git a/doc/webserver/user-manual/index.html b/doc/webserver/user-manual/index.html
index 8b87588c..ead26ef9 100644
--- a/doc/webserver/user-manual/index.html
+++ b/doc/webserver/user-manual/index.html
@@ -1,10 +1,11 @@
 <HTML
 ><HEAD
 ><TITLE
->Privoxy User Manual</TITLE
+>Privoxy 3.1.1 User Manual</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.60"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
+"><LINK
 REL="NEXT"
 TITLE="Introduction"
 HREF="introduction.html"><LINK
@@ -25,48 +26,44 @@ CLASS="TITLEPAGE"
 ><H1
 CLASS="TITLE"
 ><A
-NAME="AEN2"
->Privoxy User Manual</A
-></H1
-><DIV
-CLASS="AUTHORGROUP"
-><A
-NAME="AEN5"
-></A
-><H3
-CLASS="AUTHOR"
-><A
-NAME="AEN6"
-></A
-></H3
-><DIV
-CLASS="AFFILIATION"
-><SPAN
-CLASS="ORGNAME"
->By: Privoxy Developers<BR></SPAN
-></DIV
-></DIV
+NAME="AEN2">Privoxy 3.1.1 User Manual</H1
+><P
+CLASS="PUBDATE"
+> <SUB
+> <A
+HREF="copyright.html"
+>Copyright</A
+> © 2001, 2002 by 
+ <A
+HREF="http://www.privoxy.org/"
+TARGET="_top"
+>Privoxy Developers</A
+>
+ </SUB
+><BR></P
 ><P
 CLASS="PUBDATE"
->$Id: user-manual.sgml,v 1.69 2002/04/06 05:07:29 hal9 Exp $<BR></P
+>$Id: user-manual.sgml,v 2.2 2002/09/05 05:45:30 hal9 Exp $<BR></P
 ><DIV
 ><DIV
 CLASS="ABSTRACT"
 ><A
-NAME="AEN9"
-></A
-><P
+NAME="AEN9"><P
 ></P
 ><P
-> 
- </P
-><P
->  The user manual gives users information on how to install, configure and use
-  <SPAN
+>  The <I
+CLASS="CITETITLE"
+>User Manual</I
+> gives users information on how to
+  install, configure and use <A
+HREF="http://www.privoxy.org/"
+TARGET="_top"
+><SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
+></A
 >.
-  </P
+ </P
 ><P
 > <SPAN
 CLASS="APPLICATION"
@@ -88,35 +85,26 @@ CLASS="APPLICATION"
 > <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
-> is based on the code of the 
- <SPAN
-CLASS="APPLICATION"
->Internet Junkbuster</SPAN
-> (tm).
- <SPAN
-CLASS="APPLICATION"
->Junkbuster</SPAN
-> was originally written by JunkBusters
- Corporation, and was released as free open-source software under the GNU GPL.
- Stefan Waldherr made many improvements, and started the SourceForge project
- to continue development.</P
-><P
-> <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> continues the
- <SPAN
+> is based on <SPAN
 CLASS="APPLICATION"
->Junkbuster</SPAN
-> tradition, but adds many 
- refinements, enhancements and new features.</P
+>Internet
+ Junkbuster</SPAN
+> (tm).</P
 ><P
->  You can find the latest version of the user manual at  <A
+>  You can find the latest version of the <I
+CLASS="CITETITLE"
+>User Manual</I
+> at  <A
 HREF="http://www.privoxy.org/user-manual/"
 TARGET="_top"
 >http://www.privoxy.org/user-manual/</A
->. Please see the Contact section on how to contact the developers.
-  </P
+>.
+  Please see the <A
+HREF="contact.html"
+>Contact section</A
+> on how to
+  contact the developers.
+ </P
 ><P
 ></P
 ></DIV
@@ -130,11 +118,6 @@ CLASS="TOC"
 >Table of Contents</B
 ></DT
 ><DT
-><A
-HREF="index.html#INTRO"
-></A
-></DT
-><DT
 >1. <A
 HREF="introduction.html"
 >Introduction</A
@@ -143,55 +126,85 @@ HREF="introduction.html"
 ><DL
 ><DT
 >1.1. <A
-HREF="introduction.html#AEN37"
->New Features</A
+HREF="introduction.html#FEATURES"
+>Features</A
 ></DT
 ></DL
 ></DD
 ><DT
->3. <A
+>2. <A
 HREF="installation.html"
 >Installation</A
 ></DT
 ><DD
 ><DL
 ><DT
->3.1. <A
-HREF="installation.html#INSTALLATION-SOURCE"
->Source</A
+>2.1. <A
+HREF="installation.html#INSTALLATION-PACKAGES"
+>Binary Packages</A
 ></DT
 ><DD
 ><DL
 ><DT
->3.1.1. <A
-HREF="installation.html#INSTALLATION-RH"
->Red Hat</A
+>2.1.1. <A
+HREF="installation.html#INSTALLATION-PACK-RPM"
+>Red Hat, SuSE and Conectiva RPMs</A
 ></DT
 ><DT
->3.1.2. <A
-HREF="installation.html#INSTALLATION-SUSE"
->SuSE</A
+>2.1.2. <A
+HREF="installation.html#INSTALLATION-DEB"
+>Debian</A
 ></DT
 ><DT
->3.1.3. <A
+>2.1.3. <A
+HREF="installation.html#INSTALLATION-PACK-WIN"
+>Windows</A
+></DT
+><DT
+>2.1.4. <A
+HREF="installation.html#INSTALLATION-PACK-BINTGZ"
+>Solaris, NetBSD, FreeBSD, HP-UX</A
+></DT
+><DT
+>2.1.5. <A
 HREF="installation.html#INSTALLATION-OS2"
 >OS/2</A
 ></DT
 ><DT
->3.1.4. <A
-HREF="installation.html#INSTALLATION-WIN"
->Windows</A
+>2.1.6. <A
+HREF="installation.html#INSTALLATION-MAC"
+>Mac OSX</A
 ></DT
 ><DT
->3.1.5. <A
-HREF="installation.html#INSTALLATION-OTHER"
->Other</A
+>2.1.7. <A
+HREF="installation.html#INSTALLATION-AMIGA"
+>AmigaOS</A
+></DT
+><DT
+>2.1.8. <A
+HREF="installation.html#INSTALLATTION-GENTOO"
+>Gentoo</A
 ></DT
 ></DL
 ></DD
+><DT
+>2.2. <A
+HREF="installation.html#INSTALLATION-SOURCE"
+>Building from Source</A
+></DT
+><DT
+>2.3. <A
+HREF="installation.html#INSTALLATION-KEEPUPDATED"
+>Keeping your Installation Up-to-Date</A
+></DT
 ></DL
 ></DD
 ><DT
+>3. <A
+HREF="upgradersnote.html"
+>Note to Upgraders</A
+></DT
+><DT
 >4. <A
 HREF="quickstart.html"
 >Quickstart to Using <SPAN
@@ -203,13 +216,75 @@ CLASS="APPLICATION"
 ><DL
 ><DT
 >4.1. <A
-HREF="quickstart.html#AEN230"
->Command Line Options</A
+HREF="quickstart.html#QUICKSTART-AD-BLOCKING"
+>Quickstart to Ad Blocking</A
 ></DT
 ></DL
 ></DD
 ><DT
 >5. <A
+HREF="startup.html"
+>Starting <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+></A
+></DT
+><DD
+><DL
+><DT
+>5.1. <A
+HREF="startup.html#START-REDHAT"
+>Red Hat and Conectiva</A
+></DT
+><DT
+>5.2. <A
+HREF="startup.html#START-DEBIAN"
+>Debian</A
+></DT
+><DT
+>5.3. <A
+HREF="startup.html#START-SUSE"
+>SuSE</A
+></DT
+><DT
+>5.4. <A
+HREF="startup.html#START-WINDOWS"
+>Windows</A
+></DT
+><DT
+>5.5. <A
+HREF="startup.html#START-UNICES"
+>Solaris, NetBSD, FreeBSD, HP-UX and others</A
+></DT
+><DT
+>5.6. <A
+HREF="startup.html#START-OS2"
+>OS/2</A
+></DT
+><DT
+>5.7. <A
+HREF="startup.html#START-MACOSX"
+>Mac OSX</A
+></DT
+><DT
+>5.8. <A
+HREF="startup.html#START-AMIGAOS"
+>AmigaOS</A
+></DT
+><DT
+>5.9. <A
+HREF="startup.html#START-GENTOO"
+>Gentoo</A
+></DT
+><DT
+>5.10. <A
+HREF="startup.html#CMDOPTIONS"
+>Command Line Options</A
+></DT
+></DL
+></DD
+><DT
+>6. <A
 HREF="configuration.html"
 ><SPAN
 CLASS="APPLICATION"
@@ -219,182 +294,474 @@ CLASS="APPLICATION"
 ><DD
 ><DL
 ><DT
->5.1. <A
-HREF="configuration.html#AEN275"
+>6.1. <A
+HREF="configuration.html#AEN582"
 >Controlling <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
 > with Your Web Browser</A
 ></DT
 ><DT
->5.2. <A
-HREF="configuration.html#AEN293"
+>6.2. <A
+HREF="configuration.html#CONFOVERVIEW"
 >Configuration Files Overview</A
 ></DT
+></DL
+></DD
 ><DT
->5.3. <A
-HREF="configuration.html#AEN324"
+>7. <A
+HREF="config.html"
 >The Main Configuration File</A
 ></DT
 ><DD
 ><DL
 ><DT
->5.3.1. <A
-HREF="configuration.html#AEN357"
->Defining Other Configuration Files</A
+>7.1. <A
+HREF="config.html#CONF-LOG-LOC"
+>Configuration and Log File Locations</A
 ></DT
+><DD
+><DL
 ><DT
->5.3.2. <A
-HREF="configuration.html#AEN450"
->Other Configuration Options</A
+>7.1.1. <A
+HREF="config.html#CONFDIR"
+>confdir</A
 ></DT
 ><DT
->5.3.3. <A
-HREF="configuration.html#AEN587"
->Access Control List (ACL)</A
+>7.1.2. <A
+HREF="config.html#LOGDIR"
+>logdir</A
 ></DT
 ><DT
->5.3.4. <A
-HREF="configuration.html#FORWARDING"
->Forwarding</A
+>7.1.3. <A
+HREF="config.html#ACTIONSFILE"
+>actionsfile</A
 ></DT
 ><DT
->5.3.5. <A
-HREF="configuration.html#AEN785"
->Windows GUI Options</A
+>7.1.4. <A
+HREF="config.html#FILTERFILE"
+>filterfile</A
+></DT
+><DT
+>7.1.5. <A
+HREF="config.html#LOGFILE"
+>logfile</A
+></DT
+><DT
+>7.1.6. <A
+HREF="config.html#JARFILE"
+>jarfile</A
+></DT
+><DT
+>7.1.7. <A
+HREF="config.html#TRUSTFILE"
+>trustfile</A
 ></DT
 ></DL
 ></DD
 ><DT
->5.4. <A
-HREF="configuration.html#ACTIONSFILE"
->The Actions File</A
+>7.2. <A
+HREF="config.html#LOCAL-SET-UP"
+>Local Set-up Documentation</A
 ></DT
 ><DD
 ><DL
 ><DT
->5.4.1. <A
-HREF="configuration.html#AEN887"
->URL Domain and Path Syntax</A
+>7.2.1. <A
+HREF="config.html#USER-MANUAL"
+>user-manual</A
 ></DT
 ><DT
->5.4.2. <A
-HREF="configuration.html#AEN963"
->Actions</A
+>7.2.2. <A
+HREF="config.html#TRUST-INFO-URL"
+>trust-info-url</A
 ></DT
 ><DT
->5.4.3. <A
-HREF="configuration.html#AEN1285"
->Aliases</A
+>7.2.3. <A
+HREF="config.html#ADMIN-ADDRESS"
+>admin-address</A
+></DT
+><DT
+>7.2.4. <A
+HREF="config.html#PROXY-INFO-URL"
+>proxy-info-url</A
 ></DT
 ></DL
 ></DD
 ><DT
->5.5. <A
-HREF="configuration.html#FILTERFILE"
->The Filter File</A
+>7.3. <A
+HREF="config.html#DEBUGGING"
+>Debugging</A
 ></DT
+><DD
+><DL
 ><DT
->5.6. <A
-HREF="configuration.html#AEN1351"
->Templates</A
+>7.3.1. <A
+HREF="config.html#DEBUG"
+>debug</A
+></DT
+><DT
+>7.3.2. <A
+HREF="config.html#SINGLE-THREADED"
+>single-threaded</A
 ></DT
 ></DL
 ></DD
 ><DT
->6. <A
-HREF="contact.html"
->Contacting the Developers, Bug Reporting and Feature
-Requests</A
+>7.4. <A
+HREF="config.html#ACCESS-CONTROL"
+>Access Control and Security</A
 ></DT
+><DD
+><DL
 ><DT
->7. <A
-HREF="copyright.html"
->Copyright and History</A
+>7.4.1. <A
+HREF="config.html#LISTEN-ADDRESS"
+>listen-address</A
+></DT
+><DT
+>7.4.2. <A
+HREF="config.html#TOGGLE"
+>toggle</A
+></DT
+><DT
+>7.4.3. <A
+HREF="config.html#ENABLE-REMOTE-TOGGLE"
+>enable-remote-toggle</A
+></DT
+><DT
+>7.4.4. <A
+HREF="config.html#ENABLE-EDIT-ACTIONS"
+>enable-edit-actions</A
+></DT
+><DT
+>7.4.5. <A
+HREF="config.html#ACLS"
+>ACLs: permit-access and deny-access</A
+></DT
+><DT
+>7.4.6. <A
+HREF="config.html#BUFFER-LIMIT"
+>buffer-limit</A
+></DT
+></DL
+></DD
+><DT
+>7.5. <A
+HREF="config.html#FORWARDING"
+>Forwarding</A
 ></DT
 ><DD
 ><DL
 ><DT
->7.1. <A
-HREF="copyright.html#AEN1385"
->Copyright</A
+>7.5.1. <A
+HREF="config.html#FORWARD"
+>forward</A
 ></DT
 ><DT
->7.2. <A
-HREF="copyright.html#HISTORY"
->History</A
+>7.5.2. <A
+HREF="config.html#SOCKS"
+>forward-socks4 and forward-socks4a</A
+></DT
+><DT
+>7.5.3. <A
+HREF="config.html#ADVANCED-FORWARDING-EXAMPLES"
+>Advanced Forwarding Examples</A
+></DT
+></DL
+></DD
+><DT
+>7.6. <A
+HREF="config.html#WINDOWS-GUI"
+>Windows GUI Options</A
 ></DT
 ></DL
 ></DD
 ><DT
 >8. <A
-HREF="seealso.html"
->See Also</A
+HREF="actions-file.html"
+>Actions Files</A
+></DT
+><DD
+><DL
+><DT
+>8.1. <A
+HREF="actions-file.html#AEN1645"
+>Finding the Right Mix</A
+></DT
+><DT
+>8.2. <A
+HREF="actions-file.html#AEN1652"
+>How to Edit</A
+></DT
+><DT
+>8.3. <A
+HREF="actions-file.html#ACTIONS-APPLY"
+>How Actions are Applied to URLs</A
+></DT
+><DT
+>8.4. <A
+HREF="actions-file.html#AF-PATTERNS"
+>Patterns</A
+></DT
+><DD
+><DL
+><DT
+>8.4.1. <A
+HREF="actions-file.html#AEN1716"
+>The Domain Pattern</A
+></DT
+><DT
+>8.4.2. <A
+HREF="actions-file.html#AEN1778"
+>The Path Pattern</A
+></DT
+></DL
+></DD
+><DT
+>8.5. <A
+HREF="actions-file.html#ACTIONS"
+>Actions</A
+></DT
+><DD
+><DL
+><DT
+>8.5.1. <A
+HREF="actions-file.html#ADD-HEADER"
+>add-header</A
+></DT
+><DT
+>8.5.2. <A
+HREF="actions-file.html#BLOCK"
+>block</A
+></DT
+><DT
+>8.5.3. <A
+HREF="actions-file.html#CRUNCH-INCOMING-COOKIES"
+>crunch-incoming-cookies</A
+></DT
+><DT
+>8.5.4. <A
+HREF="actions-file.html#CRUNCH-OUTGOING-COOKIES"
+>crunch-outgoing-cookies</A
+></DT
+><DT
+>8.5.5. <A
+HREF="actions-file.html#DEANIMATE-GIFS"
+>deanimate-gifs</A
+></DT
+><DT
+>8.5.6. <A
+HREF="actions-file.html#DOWNGRADE-HTTP-VERSION"
+>downgrade-http-version</A
+></DT
+><DT
+>8.5.7. <A
+HREF="actions-file.html#FAST-REDIRECTS"
+>fast-redirects</A
+></DT
+><DT
+>8.5.8. <A
+HREF="actions-file.html#FILTER"
+>filter</A
+></DT
+><DT
+>8.5.9. <A
+HREF="actions-file.html#HANDLE-AS-IMAGE"
+>handle-as-image</A
+></DT
+><DT
+>8.5.10. <A
+HREF="actions-file.html#HIDE-FORWARDED-FOR-HEADERS"
+>hide-forwarded-for-headers</A
+></DT
+><DT
+>8.5.11. <A
+HREF="actions-file.html#HIDE-FROM-HEADER"
+>hide-from-header</A
+></DT
+><DT
+>8.5.12. <A
+HREF="actions-file.html#HIDE-REFERRER"
+>hide-referrer</A
+></DT
+><DT
+>8.5.13. <A
+HREF="actions-file.html#HIDE-USER-AGENT"
+>hide-user-agent</A
+></DT
+><DT
+>8.5.14. <A
+HREF="actions-file.html#KILL-POPUPS"
+>kill-popups<A
+NAME="KILL-POPUP"
+></A
+></A
+></DT
+><DT
+>8.5.15. <A
+HREF="actions-file.html#LIMIT-CONNECT"
+>limit-connect</A
+></DT
+><DT
+>8.5.16. <A
+HREF="actions-file.html#PREVENT-COMPRESSION"
+>prevent-compression</A
+></DT
+><DT
+>8.5.17. <A
+HREF="actions-file.html#SEND-VANILLA-WAFER"
+>send-vanilla-wafer</A
+></DT
+><DT
+>8.5.18. <A
+HREF="actions-file.html#SEND-WAFER"
+>send-wafer</A
+></DT
+><DT
+>8.5.19. <A
+HREF="actions-file.html#SESSION-COOKIES-ONLY"
+>session-cookies-only</A
+></DT
+><DT
+>8.5.20. <A
+HREF="actions-file.html#SET-IMAGE-BLOCKER"
+>set-image-blocker</A
 ></DT
 ><DT
+>8.5.21. <A
+HREF="actions-file.html#AEN2706"
+>Summary</A
+></DT
+></DL
+></DD
+><DT
+>8.6. <A
+HREF="actions-file.html#ALIASES"
+>Aliases</A
+></DT
+><DT
+>8.7. <A
+HREF="actions-file.html#ACT-EXAMPLES"
+>Actions Files Tutorial</A
+></DT
+><DD
+><DL
+><DT
+>8.7.1. <A
+HREF="actions-file.html#AEN2758"
+>default.action</A
+></DT
+><DT
+>8.7.2. <A
+HREF="actions-file.html#AEN2915"
+>user.action</A
+></DT
+></DL
+></DD
+></DL
+></DD
+><DT
 >9. <A
-HREF="appendix.html"
->Appendix</A
+HREF="filter-file.html"
+>The Filter File</A
 ></DT
 ><DD
 ><DL
 ><DT
 >9.1. <A
-HREF="appendix.html#REGEX"
->Regular Expressions</A
+HREF="filter-file.html#AEN3018"
+>Filter File Tutorial</A
+></DT
+></DL
+></DD
+><DT
+>10. <A
+HREF="templates.html"
+>Templates</A
+></DT
+><DT
+>11. <A
+HREF="contact.html"
+>Contacting the Developers, Bug Reporting and Feature
+Requests</A
 ></DT
 ><DD
 ><DL
 ><DT
->21<A
-HREF="appendix.html#AEN1459"
-></A
+>11.1. <A
+HREF="contact.html#CONTACT-SUPPORT"
+>Get Support</A
 ></DT
 ><DT
->22<A
-HREF="appendix.html#AEN1467"
-></A
+>11.2. <A
+HREF="contact.html#CONTACT-BUGS"
+>Report Bugs</A
 ></DT
 ><DT
->23<A
-HREF="appendix.html#AEN1470"
-></A
+>11.3. <A
+HREF="contact.html#CONTACT-FEATURE"
+>Request New Features</A
 ></DT
 ><DT
->24<A
-HREF="appendix.html#AEN1473"
-></A
+>11.4. <A
+HREF="contact.html#CONTACT-ADS"
+>Report Ads or Other Actions-Related Problems</A
 ></DT
 ><DT
->25<A
-HREF="appendix.html#AEN1476"
-></A
+>11.5. <A
+HREF="contact.html#CONTACT-OTHER"
+>Other</A
 ></DT
+></DL
+></DD
 ><DT
->26<A
-HREF="appendix.html#AEN1481"
-></A
+>12. <A
+HREF="copyright.html"
+><SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> Copyright, License and History</A
 ></DT
+><DD
+><DL
 ><DT
->27<A
-HREF="appendix.html#AEN1484"
-></A
+>12.1. <A
+HREF="copyright.html#AEN3220"
+>License</A
 ></DT
 ><DT
->28<A
-HREF="appendix.html#AEN1487"
-></A
+>12.2. <A
+HREF="copyright.html#HISTORY"
+>History</A
 ></DT
 ><DT
->29<A
-HREF="appendix.html#AEN1493"
-></A
+>12.3. <A
+HREF="copyright.html#AUTHORS"
+>Authors</A
 ></DT
 ></DL
 ></DD
 ><DT
->9.2. <A
-HREF="appendix.html#AEN1587"
+>13. <A
+HREF="seealso.html"
+>See Also</A
+></DT
+><DT
+>14. <A
+HREF="appendix.html"
+>Appendix</A
+></DT
+><DD
+><DL
+><DT
+>14.1. <A
+HREF="appendix.html#REGEX"
+>Regular Expressions</A
+></DT
+><DT
+>14.2. <A
+HREF="appendix.html#AEN3474"
 ><SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
@@ -403,14 +770,19 @@ CLASS="APPLICATION"
 ><DD
 ><DL
 ><DT
->9.2.1. <A
+>14.2.1. <A
 HREF="appendix.html#BOOKMARKLETS"
 >Bookmarklets</A
 ></DT
 ></DL
 ></DD
 ><DT
->9.3. <A
+>14.3. <A
+HREF="appendix.html#CHAIN"
+>Chain of Events</A
+></DT
+><DT
+>14.4. <A
 HREF="appendix.html#ACTIONSANAT"
 >Anatomy of an Action</A
 ></DT
@@ -418,23 +790,13 @@ HREF="appendix.html#ACTIONSANAT"
 ></DD
 ></DL
 ></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="INTRO"
-></A
-></H1
-><P
-> </P
-></DIV
 ></DIV
 ><DIV
 CLASS="NAVFOOTER"
 ><HR
 ALIGN="LEFT"
 WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
 WIDTH="100%"
 BORDER="0"
 CELLPADDING="0"
@@ -456,6 +818,7 @@ ALIGN="right"
 VALIGN="top"
 ><A
 HREF="introduction.html"
+ACCESSKEY="N"
 >Next</A
 ></TD
 ></TR
