X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=doc%2Fwebserver%2Fuser-manual%2Findex.html;h=c6eaa496c0821c16e6b7730c29deef91b30a8062;hb=3db7a58b2bbed7b6356b2a0600e93ec4f2846499;hp=664b73a3dc42ab020b3f8b2496982510129ebdf8;hpb=3eabce711503c99e93ad129326b4183e99dd254d;p=privoxy.git

diff --git a/doc/webserver/user-manual/index.html b/doc/webserver/user-manual/index.html
index 664b73a3..c6eaa496 100644
--- a/doc/webserver/user-manual/index.html
+++ b/doc/webserver/user-manual/index.html
@@ -2,7 +2,7 @@
 <HTML
 ><HEAD
 ><TITLE
->Privoxy 3.0.9 User Manual</TITLE
+>Privoxy 3.0.17 User Manual</TITLE
 ><META
 NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
@@ -32,7 +32,7 @@ CLASS="TITLEPAGE"
 CLASS="TITLE"
 ><A
 NAME="AEN2"
->Privoxy 3.0.9 User Manual</A
+>Privoxy 3.0.17 User Manual</A
 ></H1
 ><P
 CLASS="PUBDATE"
@@ -40,7 +40,7 @@ CLASS="PUBDATE"
 > <A
 HREF="copyright.html"
 >Copyright</A
-> © 2001 - 2008 by 
+> © 2001-2010 by
  <A
 HREF="http://www.privoxy.org/"
 TARGET="_top"
@@ -50,7 +50,7 @@ TARGET="_top"
 ><BR></P
 ><P
 CLASS="PUBDATE"
->$Id: user-manual.sgml,v 2.61 2008/02/11 03:41:47 markm68k Exp $<BR></P
+>$Id: user-manual.sgml,v 2.126 2010/11/06 12:55:48 fabiankeil Exp $<BR></P
 ><DIV
 ><DIV
 CLASS="ABSTRACT"
@@ -71,25 +71,40 @@ TARGET="_top"
 >.
  </P
 ><P
-> Privoxy is a non-caching
- <A
-HREF="http://en.wikipedia.org/wiki/Proxy_server"
+> Privoxy is a non-caching web proxy with advanced filtering capabilities
+ for enhancing privacy, modifying web page data and HTTP headers, controlling
+ access, and removing ads and other obnoxious Internet junk. Privoxy has a
+ flexible configuration and can be customized to suit individual needs and tastes.
+ It has application for both stand-alone systems and multi-user networks.</P
+><P
+> Privoxy is Free Software and licensed under the GNU GPLv2.</P
+><P
+> Privoxy is an associated project of Software in the Public Interest (SPI).</P
+><P
+> Helping hands and donations are welcome:
+ <P
+></P
+><UL
+><LI
+><P
+>      <A
+HREF="http://www.privoxy.org/faq/general.html#PARTICIPATE"
 TARGET="_top"
->web proxy</A
+>http://www.privoxy.org/faq/general.html#PARTICIPATE</A
 >
- with advanced filtering capabilities for enhancing privacy,
- modifying web page data, managing HTTP
- <A
-HREF="http://en.wikipedia.org/wiki/Browser_cookie"
-TARGET="_top"
->cookies</A
->, 
- controlling access, and removing ads, banners, pop-ups and other obnoxious
- Internet junk. Privoxy has a flexible configuration and can be
- customized to suit individual needs and tastes. Privoxy has application for
- both stand-alone systems and multi-user networks.</P
+    </P
+></LI
+><LI
 ><P
-> Privoxy is based on Internet Junkbuster (tm).</P
+>     <A
+HREF="http://www.privoxy.org/faq/general.html#DONATE"
+TARGET="_top"
+>http://www.privoxy.org/faq/general.html#DONATE</A
+>
+    </P
+></LI
+></UL
+></P
 ><P
 >  You can find the latest version of the <I
 CLASS="CITETITLE"
@@ -295,7 +310,7 @@ HREF="configuration.html"
 ><DL
 ><DT
 >6.1. <A
-HREF="configuration.html#AEN817"
+HREF="configuration.html#AEN921"
 >Controlling Privoxy with Your Web Browser</A
 ></DT
 ><DT
@@ -380,11 +395,6 @@ HREF="config.html#LOGFILE"
 ></DT
 ><DT
 >7.2.7. <A
-HREF="config.html#JARFILE"
->jarfile</A
-></DT
-><DT
->7.2.8. <A
 HREF="config.html#TRUSTFILE"
 >trustfile</A
 ></DT
@@ -407,6 +417,11 @@ HREF="config.html#DEBUG"
 HREF="config.html#SINGLE-THREADED"
 >single-threaded</A
 ></DT
+><DT
+>7.3.3. <A
+HREF="config.html#HOSTNAME"
+>hostname</A
+></DT
 ></DL
 ></DD
 ><DT
@@ -485,25 +500,64 @@ HREF="config.html#ADVANCED-FORWARDING-EXAMPLES"
 HREF="config.html#FORWARDED-CONNECT-RETRIES"
 >forwarded-connect-retries</A
 ></DT
+></DL
+></DD
+><DT
+>7.6. <A
+HREF="config.html#MISC"
+>Miscellaneous</A
+></DT
+><DD
+><DL
 ><DT
->7.5.5. <A
+>7.6.1. <A
 HREF="config.html#ACCEPT-INTERCEPTED-REQUESTS"
 >accept-intercepted-requests</A
 ></DT
 ><DT
->7.5.6. <A
+>7.6.2. <A
 HREF="config.html#ALLOW-CGI-REQUEST-CRUNCHING"
 >allow-cgi-request-crunching</A
 ></DT
 ><DT
->7.5.7. <A
+>7.6.3. <A
 HREF="config.html#SPLIT-LARGE-FORMS"
 >split-large-forms</A
 ></DT
+><DT
+>7.6.4. <A
+HREF="config.html#KEEP-ALIVE-TIMEOUT"
+>keep-alive-timeout</A
+></DT
+><DT
+>7.6.5. <A
+HREF="config.html#DEFAULT-SERVER-TIMEOUT"
+>default-server-timeout</A
+></DT
+><DT
+>7.6.6. <A
+HREF="config.html#CONNECTION-SHARING"
+>connection-sharing</A
+></DT
+><DT
+>7.6.7. <A
+HREF="config.html#SOCKET-TIMEOUT"
+>socket-timeout</A
+></DT
+><DT
+>7.6.8. <A
+HREF="config.html#MAX-CLIENT-CONNECTIONS"
+>max-client-connections</A
+></DT
+><DT
+>7.6.9. <A
+HREF="config.html#HANDLE-AS-EMPTY-DOC-RETURNS-OK"
+>handle-as-empty-doc-returns-ok</A
+></DT
 ></DL
 ></DD
 ><DT
->7.6. <A
+>7.7. <A
 HREF="config.html#WINDOWS-GUI"
 >Windows GUI Options</A
 ></DT
@@ -518,12 +572,12 @@ HREF="actions-file.html"
 ><DL
 ><DT
 >8.1. <A
-HREF="actions-file.html#AEN2275"
+HREF="actions-file.html#AEN2633"
 >Finding the Right Mix</A
 ></DT
 ><DT
 >8.2. <A
-HREF="actions-file.html#AEN2282"
+HREF="actions-file.html#AEN2640"
 >How to Edit</A
 ></DT
 ><DT
@@ -540,12 +594,12 @@ HREF="actions-file.html#AF-PATTERNS"
 ><DL
 ><DT
 >8.4.1. <A
-HREF="actions-file.html#AEN2373"
+HREF="actions-file.html#AEN2752"
 >The Domain Pattern</A
 ></DT
 ><DT
 >8.4.2. <A
-HREF="actions-file.html#AEN2449"
+HREF="actions-file.html#AEN2828"
 >The Path Pattern</A
 ></DT
 ><DT
@@ -574,105 +628,105 @@ HREF="actions-file.html#BLOCK"
 ></DT
 ><DT
 >8.5.3. <A
+HREF="actions-file.html#CHANGE-X-FORWARDED-FOR"
+>change-x-forwarded-for</A
+></DT
+><DT
+>8.5.4. <A
 HREF="actions-file.html#CLIENT-HEADER-FILTER"
 >client-header-filter</A
 ></DT
 ><DT
->8.5.4. <A
+>8.5.5. <A
 HREF="actions-file.html#CLIENT-HEADER-TAGGER"
 >client-header-tagger</A
 ></DT
 ><DT
->8.5.5. <A
+>8.5.6. <A
 HREF="actions-file.html#CONTENT-TYPE-OVERWRITE"
 >content-type-overwrite</A
 ></DT
 ><DT
->8.5.6. <A
+>8.5.7. <A
 HREF="actions-file.html#CRUNCH-CLIENT-HEADER"
 >crunch-client-header</A
 ></DT
 ><DT
->8.5.7. <A
+>8.5.8. <A
 HREF="actions-file.html#CRUNCH-IF-NONE-MATCH"
 >crunch-if-none-match</A
 ></DT
 ><DT
->8.5.8. <A
+>8.5.9. <A
 HREF="actions-file.html#CRUNCH-INCOMING-COOKIES"
 >crunch-incoming-cookies</A
 ></DT
 ><DT
->8.5.9. <A
+>8.5.10. <A
 HREF="actions-file.html#CRUNCH-SERVER-HEADER"
 >crunch-server-header</A
 ></DT
 ><DT
->8.5.10. <A
+>8.5.11. <A
 HREF="actions-file.html#CRUNCH-OUTGOING-COOKIES"
 >crunch-outgoing-cookies</A
 ></DT
 ><DT
->8.5.11. <A
+>8.5.12. <A
 HREF="actions-file.html#DEANIMATE-GIFS"
 >deanimate-gifs</A
 ></DT
 ><DT
->8.5.12. <A
+>8.5.13. <A
 HREF="actions-file.html#DOWNGRADE-HTTP-VERSION"
 >downgrade-http-version</A
 ></DT
 ><DT
->8.5.13. <A
+>8.5.14. <A
 HREF="actions-file.html#FAST-REDIRECTS"
 >fast-redirects</A
 ></DT
 ><DT
->8.5.14. <A
+>8.5.15. <A
 HREF="actions-file.html#FILTER"
 >filter</A
 ></DT
 ><DT
->8.5.15. <A
+>8.5.16. <A
 HREF="actions-file.html#FORCE-TEXT-MODE"
 >force-text-mode</A
 ></DT
 ><DT
->8.5.16. <A
+>8.5.17. <A
 HREF="actions-file.html#FORWARD-OVERRIDE"
 >forward-override</A
 ></DT
 ><DT
->8.5.17. <A
+>8.5.18. <A
 HREF="actions-file.html#HANDLE-AS-EMPTY-DOCUMENT"
 >handle-as-empty-document</A
 ></DT
 ><DT
->8.5.18. <A
+>8.5.19. <A
 HREF="actions-file.html#HANDLE-AS-IMAGE"
 >handle-as-image</A
 ></DT
 ><DT
->8.5.19. <A
+>8.5.20. <A
 HREF="actions-file.html#HIDE-ACCEPT-LANGUAGE"
 >hide-accept-language</A
 ></DT
 ><DT
->8.5.20. <A
+>8.5.21. <A
 HREF="actions-file.html#HIDE-CONTENT-DISPOSITION"
 >hide-content-disposition</A
 ></DT
 ><DT
->8.5.21. <A
+>8.5.22. <A
 HREF="actions-file.html#HIDE-IF-MODIFIED-SINCE"
 >hide-if-modified-since</A
 ></DT
 ><DT
->8.5.22. <A
-HREF="actions-file.html#HIDE-FORWARDED-FOR-HEADERS"
->hide-forwarded-for-headers</A
-></DT
-><DT
 >8.5.23. <A
 HREF="actions-file.html#HIDE-FROM-HEADER"
 >hide-from-header</A
@@ -689,75 +743,47 @@ HREF="actions-file.html#HIDE-USER-AGENT"
 ></DT
 ><DT
 >8.5.26. <A
-HREF="actions-file.html#INSPECT-JPEGS"
->inspect-jpegs</A
-></DT
-><DT
->8.5.27. <A
-HREF="actions-file.html#KILL-POPUPS"
->kill-popups<A
-NAME="KILL-POPUP"
-></A
-></A
-></DT
-><DT
->8.5.28. <A
 HREF="actions-file.html#LIMIT-CONNECT"
 >limit-connect</A
 ></DT
 ><DT
->8.5.29. <A
+>8.5.27. <A
 HREF="actions-file.html#PREVENT-COMPRESSION"
 >prevent-compression</A
 ></DT
 ><DT
->8.5.30. <A
+>8.5.28. <A
 HREF="actions-file.html#OVERWRITE-LAST-MODIFIED"
 >overwrite-last-modified</A
 ></DT
 ><DT
->8.5.31. <A
+>8.5.29. <A
 HREF="actions-file.html#REDIRECT"
 >redirect</A
 ></DT
 ><DT
->8.5.32. <A
-HREF="actions-file.html#SEND-VANILLA-WAFER"
->send-vanilla-wafer</A
-></DT
-><DT
->8.5.33. <A
-HREF="actions-file.html#SEND-WAFER"
->send-wafer</A
-></DT
-><DT
->8.5.34. <A
+>8.5.30. <A
 HREF="actions-file.html#SERVER-HEADER-FILTER"
 >server-header-filter</A
 ></DT
 ><DT
->8.5.35. <A
+>8.5.31. <A
 HREF="actions-file.html#SERVER-HEADER-TAGGER"
 >server-header-tagger</A
 ></DT
 ><DT
->8.5.36. <A
+>8.5.32. <A
 HREF="actions-file.html#SESSION-COOKIES-ONLY"
 >session-cookies-only</A
 ></DT
 ><DT
->8.5.37. <A
+>8.5.33. <A
 HREF="actions-file.html#SET-IMAGE-BLOCKER"
 >set-image-blocker</A
 ></DT
 ><DT
->8.5.38. <A
-HREF="actions-file.html#TREAT-FORBIDDEN-CONNECTS-LIKE-BLOCKS"
->treat-forbidden-connects-like-blocks</A
-></DT
-><DT
->8.5.39. <A
-HREF="actions-file.html#AEN4263"
+>8.5.34. <A
+HREF="actions-file.html#AEN4460"
 >Summary</A
 ></DT
 ></DL
@@ -776,12 +802,17 @@ HREF="actions-file.html#ACT-EXAMPLES"
 ><DL
 ><DT
 >8.7.1. <A
-HREF="actions-file.html#AEN4328"
->default.action</A
+HREF="actions-file.html#AEN4524"
+>match-all.action</A
 ></DT
 ><DT
 >8.7.2. <A
-HREF="actions-file.html#AEN4464"
+HREF="actions-file.html#AEN4546"
+>default.action</A
+></DT
+><DT
+>8.7.3. <A
+HREF="actions-file.html#AEN4659"
 >user.action</A
 ></DT
 ></DL
@@ -797,7 +828,7 @@ HREF="filter-file.html"
 ><DL
 ><DT
 >9.1. <A
-HREF="filter-file.html#AEN4619"
+HREF="filter-file.html#AEN4814"
 >Filter File Tutorial</A
 ></DT
 ><DT
@@ -865,7 +896,7 @@ HREF="copyright.html"
 ><DL
 ><DT
 >12.1. <A
-HREF="copyright.html#AEN5092"
+HREF="copyright.html#AEN5292"
 >License</A
 ></DT
 ><DT
@@ -899,7 +930,7 @@ HREF="appendix.html#REGEX"
 ></DT
 ><DT
 >14.2. <A
-HREF="appendix.html#AEN5349"
+HREF="appendix.html#AEN5545"
 >Privoxy's Internal Pages</A
 ></DT
 ><DD
