From bb351be8595d489bc90f06f300aeef011aa2f8f4 Mon Sep 17 00:00:00 2001
From: Fabian Keil <fk@fabiankeil.de>
Date: Tue, 10 Feb 2009 20:42:18 +0000
Subject: [PATCH] Updated configuration description, contributor list and URLs.

---
 doc/webserver/user-manual/actions-file.html | 16 ++---
 doc/webserver/user-manual/appendix.html     | 18 ++---
 doc/webserver/user-manual/config.html       | 76 ++++++++++++++++++++-
 doc/webserver/user-manual/copyright.html    | 24 +++----
 doc/webserver/user-manual/filter-file.html  |  2 +-
 doc/webserver/user-manual/index.html        | 27 +++++---
 doc/webserver/user-manual/seealso.html      | 33 ++-------
 7 files changed, 125 insertions(+), 71 deletions(-)

diff --git a/doc/webserver/user-manual/actions-file.html b/doc/webserver/user-manual/actions-file.html
index 4b1bf65d..c561b689 100644
--- a/doc/webserver/user-manual/actions-file.html
+++ b/doc/webserver/user-manual/actions-file.html
@@ -236,7 +236,7 @@ CLASS="FILENAME"
 >    <DIV
 CLASS="TABLE"
 ><A
-NAME="AEN2137"
+NAME="AEN2165"
 ></A
 ><P
 ><B
@@ -505,7 +505,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2236"
+NAME="AEN2264"
 >8.1. Finding the Right Mix</A
 ></H2
 ><P
@@ -540,7 +540,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2243"
+NAME="AEN2271"
 >8.2. How to Edit</A
 ></H2
 ><P
@@ -870,7 +870,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2334"
+NAME="AEN2362"
 >8.4.1. The Domain Pattern</A
 ></H3
 ><P
@@ -1110,7 +1110,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2410"
+NAME="AEN2438"
 >8.4.2. The Path Pattern</A
 ></H3
 ><P
@@ -6678,7 +6678,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN4041"
+NAME="AEN4069"
 >8.5.34. Summary</A
 ></H3
 ><P
@@ -6977,7 +6977,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN4104"
+NAME="AEN4132"
 >8.7.1. default.action</A
 ></H3
 ><P
@@ -7692,7 +7692,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN4238"
+NAME="AEN4266"
 >8.7.2. user.action</A
 ></H3
 ><P
diff --git a/doc/webserver/user-manual/appendix.html b/doc/webserver/user-manual/appendix.html
index 055fef54..c6896bc3 100644
--- a/doc/webserver/user-manual/appendix.html
+++ b/doc/webserver/user-manual/appendix.html
@@ -748,7 +748,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN5124"
+NAME="AEN5149"
 >14.2. Privoxy's Internal Pages</A
 ></H2
 ><P
@@ -794,7 +794,7 @@ CLASS="APPLICATION"
    Privoxy main page: 
   </P
 ><A
-NAME="AEN5138"
+NAME="AEN5163"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -827,7 +827,7 @@ CLASS="APPLICATION"
     editing of actions files:
   </P
 ><A
-NAME="AEN5146"
+NAME="AEN5171"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -847,7 +847,7 @@ TARGET="_top"
     Show the source code version numbers:
   </P
 ><A
-NAME="AEN5151"
+NAME="AEN5176"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -867,7 +867,7 @@ TARGET="_top"
    Show the browser's request headers:
   </P
 ><A
-NAME="AEN5156"
+NAME="AEN5181"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -887,7 +887,7 @@ TARGET="_top"
    Show which actions apply to a URL and why:
   </P
 ><A
-NAME="AEN5161"
+NAME="AEN5186"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -919,7 +919,7 @@ CLASS="QUOTE"
    place:
   </P
 ><A
-NAME="AEN5169"
+NAME="AEN5194"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -936,7 +936,7 @@ TARGET="_top"
 >   Short cuts. Turn off, then on: 
   </P
 ><A
-NAME="AEN5173"
+NAME="AEN5198"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -950,7 +950,7 @@ TARGET="_top"
    </P
 ></BLOCKQUOTE
 ><A
-NAME="AEN5176"
+NAME="AEN5201"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
diff --git a/doc/webserver/user-manual/config.html b/doc/webserver/user-manual/config.html
index 2b183183..f0f54e42 100644
--- a/doc/webserver/user-manual/config.html
+++ b/doc/webserver/user-manual/config.html
@@ -363,7 +363,13 @@ CLASS="VARIABLELIST"
 >Default value:</DT
 ><DD
 ><P
->Two example URLs are provided</P
+><SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>Unset</I
+></SPAN
+></P
 ></DD
 ><DT
 >Effect if unset:</DT
@@ -816,7 +822,15 @@ BORDER="0"
 ><TD
 >     <P
 CLASS="LITERALLAYOUT"
->&nbsp;&nbsp;default.action&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;#&nbsp;Main&nbsp;actions&nbsp;file</P
+>&nbsp;&nbsp;match-all.action&nbsp;#&nbsp;Actions&nbsp;that&nbsp;are&nbsp;applied&nbsp;to&nbsp;all&nbsp;sites&nbsp;and&nbsp;maybe&nbsp;overruled&nbsp;later&nbsp;on.</P
+>
+    </TD
+></TR
+><TR
+><TD
+>     <P
+CLASS="LITERALLAYOUT"
+>&nbsp;&nbsp;default.action&nbsp;&nbsp;&nbsp;#&nbsp;Main&nbsp;actions&nbsp;file</P
 >
     </TD
 ></TR
@@ -824,7 +838,7 @@ CLASS="LITERALLAYOUT"
 ><TD
 >     <P
 CLASS="LITERALLAYOUT"
->&nbsp;&nbsp;user.action&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;#&nbsp;User&nbsp;customizations</P
+>&nbsp;&nbsp;user.action&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;#&nbsp;User&nbsp;customizations</P
 >
     </TD
 ></TR
@@ -3654,6 +3668,62 @@ CLASS="APPLICATION"
 ></DL
 ></DIV
 ></DIV
+><DIV
+CLASS="SECT3"
+><H4
+CLASS="SECT3"
+><A
+NAME="SOCKET-TIMEOUT"
+>7.5.9. socket-timeout</A
+></H4
+><P
+></P
+><DIV
+CLASS="VARIABLELIST"
+><DL
+><DT
+>Specifies:</DT
+><DD
+><P
+>    Number of seconds after which a socket times out if
+    no data is received.
+   </P
+></DD
+><DT
+>Type of value:</DT
+><DD
+><P
+>    <TT
+CLASS="REPLACEABLE"
+><I
+>Time in seconds.</I
+></TT
+>
+   </P
+></DD
+><DT
+>Default value:</DT
+><DD
+><P
+>None</P
+></DD
+><DT
+>Effect if unset:</DT
+><DD
+><P
+>    A default value of 180 seconds is used.
+   </P
+></DD
+><DT
+>Examples:</DT
+><DD
+><P
+>    socket-timeout 180
+   </P
+></DD
+></DL
+></DIV
+></DIV
 ></DIV
 ><DIV
 CLASS="SECT2"
diff --git a/doc/webserver/user-manual/copyright.html b/doc/webserver/user-manual/copyright.html
index 22ee8d0e..569ef8dc 100644
--- a/doc/webserver/user-manual/copyright.html
+++ b/doc/webserver/user-manual/copyright.html
@@ -83,7 +83,7 @@ NAME="COPYRIGHT"
 >12. Privoxy Copyright, License and History</A
 ></H1
 ><P
-> Copyright © 2001-2008 by Privoxy Developers <CODE
+> Copyright © 2001-2009 by Privoxy Developers <CODE
 CLASS="EMAIL"
 >&#60;<A
 HREF="mailto:ijbswa-developers@lists.sourceforge.net"
@@ -102,7 +102,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN4867"
+NAME="AEN4895"
 >12.1. License</A
 ></H2
 ><P
@@ -256,7 +256,7 @@ NAME="AUTHORS"
 CLASS="LITERALLAYOUT"
 >&nbsp;Fabian&nbsp;Keil,&nbsp;lead&nbsp;developer<br>
 &nbsp;David&nbsp;Schmidt,&nbsp;developer<br>
-&nbsp;<br>
+<br>
 &nbsp;Hal&nbsp;Burgiss<br>
 &nbsp;Mark&nbsp;Miller<br>
 &nbsp;Gerry&nbsp;Murphy<br>
@@ -267,7 +267,7 @@ CLASS="LITERALLAYOUT"
 > Former Privoxy Team Members:</P
 ><P
 CLASS="LITERALLAYOUT"
->&nbsp;Johny&nbsp;Agotnes&nbsp;<br>
+>&nbsp;Johny&nbsp;Agotnes<br>
 &nbsp;Rodrigo&nbsp;Barbosa<br>
 &nbsp;Moritz&nbsp;Barsnick<br>
 &nbsp;Ian&nbsp;Cummings<br>
@@ -279,7 +279,6 @@ CLASS="LITERALLAYOUT"
 &nbsp;Gábor&nbsp;Lipták<br>
 &nbsp;Adam&nbsp;Lock<br>
 &nbsp;Guy&nbsp;Laroche<br>
-&nbsp;Mark&nbsp;Martinec&nbsp;<br>
 &nbsp;Justin&nbsp;McMurtry<br>
 &nbsp;Andreas&nbsp;Oesterhelt<br>
 &nbsp;Haroon&nbsp;Rafique<br>
@@ -290,7 +289,7 @@ CLASS="LITERALLAYOUT"
 &nbsp;Sarantis&nbsp;Paskalis<br>
 &nbsp;Stefan&nbsp;Waldherr</P
 ><P
-> Thanks to the many people who have tested Privoxy, reported bugs, provided 
+> Thanks to the many people who have tested Privoxy, reported bugs, provided
  patches, made suggestions or contributed in some way. These include (in
  alphabetical order):</P
 ><P
@@ -303,7 +302,8 @@ CLASS="LITERALLAYOUT"
 &nbsp;Clifford&nbsp;Caoile<br>
 &nbsp;Frédéric&nbsp;Crozat<br>
 &nbsp;Michael&nbsp;T.&nbsp;Davis<br>
-&nbsp;Mattes&nbsp;Dolak&nbsp;<br>
+&nbsp;Mattes&nbsp;Dolak<br>
+&nbsp;Matthias&nbsp;Drochner<br>
 &nbsp;Peter&nbsp;E.<br>
 &nbsp;Florian&nbsp;Effenberger<br>
 &nbsp;Markus&nbsp;Elfring<br>
@@ -316,18 +316,18 @@ CLASS="LITERALLAYOUT"
 &nbsp;Magnus&nbsp;Holmgren<br>
 &nbsp;Eric&nbsp;M.&nbsp;Hopper<br>
 &nbsp;Ralf&nbsp;Horstmann<br>
-&nbsp;Stefan&nbsp;Huehner&nbsp;<br>
+&nbsp;Stefan&nbsp;Huehner<br>
 &nbsp;Peter&nbsp;Hyman<br>
 &nbsp;Derek&nbsp;Jennings<br>
 &nbsp;Petr&nbsp;Kadlec<br>
 &nbsp;David&nbsp;Laight<br>
 &nbsp;Bert&nbsp;van&nbsp;Leeuwen<br>
-&nbsp;Don&nbsp;Libes&nbsp;&nbsp;<br>
+&nbsp;Don&nbsp;Libes<br>
 &nbsp;Paul&nbsp;Lieverse<br>
 &nbsp;Toby&nbsp;Lyward<br>
 &nbsp;Wil&nbsp;Mahan<br>
-&nbsp;Jindrich&nbsp;Makovicka&nbsp;<br>
-&nbsp;David&nbsp;Mediavilla&nbsp;<br>
+&nbsp;Jindrich&nbsp;Makovicka<br>
+&nbsp;David&nbsp;Mediavilla<br>
 &nbsp;Raphael&nbsp;Moll<br>
 &nbsp;Amuro&nbsp;Namie<br>
 &nbsp;Adam&nbsp;Piggott<br>
@@ -345,7 +345,7 @@ CLASS="LITERALLAYOUT"
 &nbsp;Jochen&nbsp;Voss<br>
 &nbsp;Glenn&nbsp;Washburn<br>
 &nbsp;Song&nbsp;Weijia<br>
-&nbsp;Jörg&nbsp;Weinmann&nbsp;<br>
+&nbsp;Jörg&nbsp;Weinmann<br>
 &nbsp;Darren&nbsp;Wiebe<br>
 &nbsp;Anduin&nbsp;Withers<br>
 &nbsp;Oliver&nbsp;Yeoh<br>
diff --git a/doc/webserver/user-manual/filter-file.html b/doc/webserver/user-manual/filter-file.html
index c17288d4..f9e9b639 100644
--- a/doc/webserver/user-manual/filter-file.html
+++ b/doc/webserver/user-manual/filter-file.html
@@ -366,7 +366,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN4393"
+NAME="AEN4421"
 >9.1. Filter File Tutorial</A
 ></H2
 ><P
diff --git a/doc/webserver/user-manual/index.html b/doc/webserver/user-manual/index.html
index 9adcb646..9ed90fc4 100644
--- a/doc/webserver/user-manual/index.html
+++ b/doc/webserver/user-manual/index.html
@@ -50,7 +50,7 @@ TARGET="_top"
 ><BR></P
 ><P
 CLASS="PUBDATE"
->$Id: user-manual.sgml,v 2.90 2008/09/26 16:53:09 fabiankeil Exp $<BR></P
+>$Id: user-manual.sgml,v 2.91 2009/01/13 16:50:35 fabiankeil Exp $<BR></P
 ><DIV
 ><DIV
 CLASS="ABSTRACT"
@@ -505,6 +505,11 @@ HREF="config.html#SPLIT-LARGE-FORMS"
 HREF="config.html#KEEP-ALIVE-TIMEOUT"
 >keep-alive-timeout</A
 ></DT
+><DT
+>7.5.9. <A
+HREF="config.html#SOCKET-TIMEOUT"
+>socket-timeout</A
+></DT
 ></DL
 ></DD
 ><DT
@@ -523,12 +528,12 @@ HREF="actions-file.html"
 ><DL
 ><DT
 >8.1. <A
-HREF="actions-file.html#AEN2236"
+HREF="actions-file.html#AEN2264"
 >Finding the Right Mix</A
 ></DT
 ><DT
 >8.2. <A
-HREF="actions-file.html#AEN2243"
+HREF="actions-file.html#AEN2271"
 >How to Edit</A
 ></DT
 ><DT
@@ -545,12 +550,12 @@ HREF="actions-file.html#AF-PATTERNS"
 ><DL
 ><DT
 >8.4.1. <A
-HREF="actions-file.html#AEN2334"
+HREF="actions-file.html#AEN2362"
 >The Domain Pattern</A
 ></DT
 ><DT
 >8.4.2. <A
-HREF="actions-file.html#AEN2410"
+HREF="actions-file.html#AEN2438"
 >The Path Pattern</A
 ></DT
 ><DT
@@ -734,7 +739,7 @@ HREF="actions-file.html#SET-IMAGE-BLOCKER"
 ></DT
 ><DT
 >8.5.34. <A
-HREF="actions-file.html#AEN4041"
+HREF="actions-file.html#AEN4069"
 >Summary</A
 ></DT
 ></DL
@@ -753,12 +758,12 @@ HREF="actions-file.html#ACT-EXAMPLES"
 ><DL
 ><DT
 >8.7.1. <A
-HREF="actions-file.html#AEN4104"
+HREF="actions-file.html#AEN4132"
 >default.action</A
 ></DT
 ><DT
 >8.7.2. <A
-HREF="actions-file.html#AEN4238"
+HREF="actions-file.html#AEN4266"
 >user.action</A
 ></DT
 ></DL
@@ -774,7 +779,7 @@ HREF="filter-file.html"
 ><DL
 ><DT
 >9.1. <A
-HREF="filter-file.html#AEN4393"
+HREF="filter-file.html#AEN4421"
 >Filter File Tutorial</A
 ></DT
 ><DT
@@ -842,7 +847,7 @@ HREF="copyright.html"
 ><DL
 ><DT
 >12.1. <A
-HREF="copyright.html#AEN4867"
+HREF="copyright.html#AEN4895"
 >License</A
 ></DT
 ><DT
@@ -876,7 +881,7 @@ HREF="appendix.html#REGEX"
 ></DT
 ><DT
 >14.2. <A
-HREF="appendix.html#AEN5124"
+HREF="appendix.html#AEN5149"
 >Privoxy's Internal Pages</A
 ></DT
 ><DD
diff --git a/doc/webserver/user-manual/seealso.html b/doc/webserver/user-manual/seealso.html
index d72ce108..978881e1 100644
--- a/doc/webserver/user-manual/seealso.html
+++ b/doc/webserver/user-manual/seealso.html
@@ -142,9 +142,9 @@ BORDER="0"
 ><TR
 ><TD
 >   <A
-HREF="http://sourceforge.net/projects/ijbswa/"
+HREF="https://sourceforge.net/projects/ijbswa/"
 TARGET="_top"
->http://sourceforge.net/projects/ijbswa/</A
+>https://sourceforge.net/projects/ijbswa/</A
 >, 
    the Project Page for <SPAN
 CLASS="APPLICATION"
@@ -198,9 +198,9 @@ BORDER="0"
 ><TR
 ><TD
 >   <A
-HREF="http://sourceforge.net/tracker/?group_id=11118&#38;atid=460288"
+HREF="https://sourceforge.net/tracker/?group_id=11118&#38;atid=460288"
 TARGET="_top"
->http://sourceforge.net/tracker/?group_id=11118&#38;atid=460288</A
+>https://sourceforge.net/tracker/?group_id=11118&#38;atid=460288</A
 >, to submit <SPAN
 CLASS="QUOTE"
 >"misses"</SPAN
@@ -213,7 +213,6 @@ CLASS="QUOTE"
 ><P
 ></P
 >
- 
  <P
 ></P
 ><TABLE
@@ -262,26 +261,6 @@ BORDER="0"
 ><TR
 ><TD
 >   <A
-HREF="http://privacy.net/"
-TARGET="_top"
->http://privacy.net/</A
->, a useful site
-   to check what information about you is leaked while you browse the web.
-  </TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
->
- <P
-></P
-><TABLE
-BORDER="0"
-><TBODY
-><TR
-><TD
->   <A
 HREF="http://www.squid-cache.org/"
 TARGET="_top"
 >http://www.squid-cache.org/</A
@@ -333,9 +312,9 @@ BORDER="0"
 ><TR
 ><TD
 >   <A
-HREF="http://tor.eff.org/"
+HREF="https://www.torproject.org/"
 TARGET="_top"
->http://tor.eff.org/</A
+>https://www.torproject.org/</A
 >, 
    <SPAN
 CLASS="APPLICATION"
-- 
2.39.2