X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=doc%2Fwebserver%2Fuser-manual%2Findex.html;h=12b516e85edb32f3e9a24718b4f1286887c37573;hb=cc7452192610d37782ec1ba651698e00afa48de5;hp=b5c3160a295de5f5f3659e42abf6f1f79c66c64f;hpb=d0194faafeb1b286783e649b0628e51bc81840d5;p=privoxy.git

diff --git a/doc/webserver/user-manual/index.html b/doc/webserver/user-manual/index.html
index b5c3160a..12b516e8 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.11 User Manual</TITLE
+>Privoxy 3.0.16 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.11 User Manual</A
+>Privoxy 3.0.16 User Manual</A
 ></H1
 ><P
 CLASS="PUBDATE"
@@ -40,7 +40,7 @@ CLASS="PUBDATE"
 > <A
 HREF="copyright.html"
 >Copyright</A
-> © 2001 - 2008 by 
+> © 2001-2009 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.87 2008/08/30 15:37:35 fabiankeil Exp $<BR></P
+>$Id: user-manual.sgml,v 2.116 2009/11/15 14:24:12 fabiankeil Exp $<BR></P
 ><DIV
 ><DIV
 CLASS="ABSTRACT"
@@ -71,25 +71,20 @@ TARGET="_top"
 >.
  </P
 ><P
-> Privoxy is a non-caching
- <A
-HREF="http://en.wikipedia.org/wiki/Proxy_server"
-TARGET="_top"
->web proxy</A
->
- with advanced filtering capabilities for enhancing privacy,
- modifying web page data, managing HTTP
+> 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 GPL2.</P
+><P
+> Privoxy is an associated project of Software in the Public Interest (SPI).
  <A
-HREF="http://en.wikipedia.org/wiki/Browser_cookie"
+HREF="http://www.privoxy.org/faq/general.html#DONATE"
 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
-> Privoxy is based on Internet Junkbuster (tm).</P
+>Donations are welcome</A
+>.</P
 ><P
 >  You can find the latest version of the <I
 CLASS="CITETITLE"
@@ -295,7 +290,7 @@ HREF="configuration.html"
 ><DL
 ><DT
 >6.1. <A
-HREF="configuration.html#AEN813"
+HREF="configuration.html#AEN839"
 >Controlling Privoxy with Your Web Browser</A
 ></DT
 ><DT
@@ -485,25 +480,59 @@ 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
 ></DL
 ></DD
 ><DT
->7.6. <A
+>7.7. <A
 HREF="config.html#WINDOWS-GUI"
 >Windows GUI Options</A
 ></DT
@@ -518,12 +547,12 @@ HREF="actions-file.html"
 ><DL
 ><DT
 >8.1. <A
-HREF="actions-file.html#AEN2269"
+HREF="actions-file.html#AEN2518"
 >Finding the Right Mix</A
 ></DT
 ><DT
 >8.2. <A
-HREF="actions-file.html#AEN2276"
+HREF="actions-file.html#AEN2525"
 >How to Edit</A
 ></DT
 ><DT
@@ -540,12 +569,12 @@ HREF="actions-file.html#AF-PATTERNS"
 ><DL
 ><DT
 >8.4.1. <A
-HREF="actions-file.html#AEN2367"
+HREF="actions-file.html#AEN2632"
 >The Domain Pattern</A
 ></DT
 ><DT
 >8.4.2. <A
-HREF="actions-file.html#AEN2443"
+HREF="actions-file.html#AEN2708"
 >The Path Pattern</A
 ></DT
 ><DT
@@ -729,7 +758,7 @@ HREF="actions-file.html#SET-IMAGE-BLOCKER"
 ></DT
 ><DT
 >8.5.34. <A
-HREF="actions-file.html#AEN4074"
+HREF="actions-file.html#AEN4339"
 >Summary</A
 ></DT
 ></DL
@@ -748,12 +777,17 @@ HREF="actions-file.html#ACT-EXAMPLES"
 ><DL
 ><DT
 >8.7.1. <A
-HREF="actions-file.html#AEN4137"
->default.action</A
+HREF="actions-file.html#AEN4403"
+>match-all.action</A
 ></DT
 ><DT
 >8.7.2. <A
-HREF="actions-file.html#AEN4271"
+HREF="actions-file.html#AEN4425"
+>default.action</A
+></DT
+><DT
+>8.7.3. <A
+HREF="actions-file.html#AEN4538"
 >user.action</A
 ></DT
 ></DL
@@ -769,7 +803,7 @@ HREF="filter-file.html"
 ><DL
 ><DT
 >9.1. <A
-HREF="filter-file.html#AEN4426"
+HREF="filter-file.html#AEN4693"
 >Filter File Tutorial</A
 ></DT
 ><DT
@@ -837,7 +871,7 @@ HREF="copyright.html"
 ><DL
 ><DT
 >12.1. <A
-HREF="copyright.html#AEN4900"
+HREF="copyright.html#AEN5171"
 >License</A
 ></DT
 ><DT
@@ -871,7 +905,7 @@ HREF="appendix.html#REGEX"
 ></DT
 ><DT
 >14.2. <A
-HREF="appendix.html#AEN5157"
+HREF="appendix.html#AEN5424"
 >Privoxy's Internal Pages</A
 ></DT
 ><DD
