From 21e4d72fa6918226a74b9f034b230172bf2a570c Mon Sep 17 00:00:00 2001
From: Fabian Keil <fk@fabiankeil.de>
Date: Sun, 15 Feb 2009 08:08:33 +0000
Subject: [PATCH] Rebuild with default socket timeout increased to 300 seconds.

---
 doc/webserver/user-manual/actions-file.html  | 18 +++++++-------
 doc/webserver/user-manual/appendix.html      | 18 +++++++-------
 doc/webserver/user-manual/config.html        |  4 +--
 doc/webserver/user-manual/configuration.html |  4 +--
 doc/webserver/user-manual/copyright.html     |  2 +-
 doc/webserver/user-manual/filter-file.html   |  2 +-
 doc/webserver/user-manual/index.html         | 26 ++++++++++----------
 doc/webserver/user-manual/introduction.html  | 13 +++++++++-
 doc/webserver/user-manual/quickstart.html    |  2 +-
 doc/webserver/user-manual/startup.html       |  4 +--
 10 files changed, 52 insertions(+), 41 deletions(-)

diff --git a/doc/webserver/user-manual/actions-file.html b/doc/webserver/user-manual/actions-file.html
index bb00c669..2850f275 100644
--- a/doc/webserver/user-manual/actions-file.html
+++ b/doc/webserver/user-manual/actions-file.html
@@ -233,7 +233,7 @@ CLASS="FILENAME"
 >    <DIV
 CLASS="TABLE"
 ><A
-NAME="AEN2166"
+NAME="AEN2194"
 ></A
 ><P
 ><B
@@ -501,7 +501,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2265"
+NAME="AEN2293"
 >8.1. Finding the Right Mix</A
 ></H2
 ><P
@@ -536,7 +536,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2272"
+NAME="AEN2300"
 >8.2. How to Edit</A
 ></H2
 ><P
@@ -866,7 +866,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2363"
+NAME="AEN2391"
 >8.4.1. The Domain Pattern</A
 ></H3
 ><P
@@ -1106,7 +1106,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2439"
+NAME="AEN2467"
 >8.4.2. The Path Pattern</A
 ></H3
 ><P
@@ -6674,7 +6674,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN4070"
+NAME="AEN4098"
 >8.5.34. Summary</A
 ></H3
 ><P
@@ -6976,7 +6976,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN4134"
+NAME="AEN4162"
 >8.7.1. match-all.action</A
 ></H3
 ><P
@@ -7074,7 +7074,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN4156"
+NAME="AEN4184"
 >8.7.2. default.action</A
 ></H3
 ><P
@@ -7675,7 +7675,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN4269"
+NAME="AEN4297"
 >8.7.3. user.action</A
 ></H3
 ><P
diff --git a/doc/webserver/user-manual/appendix.html b/doc/webserver/user-manual/appendix.html
index 40b6c863..653c89ef 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="AEN5152"
+NAME="AEN5180"
 >14.2. Privoxy's Internal Pages</A
 ></H2
 ><P
@@ -794,7 +794,7 @@ CLASS="APPLICATION"
    Privoxy main page: 
   </P
 ><A
-NAME="AEN5166"
+NAME="AEN5194"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -827,7 +827,7 @@ CLASS="APPLICATION"
     editing of actions files:
   </P
 ><A
-NAME="AEN5174"
+NAME="AEN5202"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -847,7 +847,7 @@ TARGET="_top"
     Show the source code version numbers:
   </P
 ><A
-NAME="AEN5179"
+NAME="AEN5207"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -867,7 +867,7 @@ TARGET="_top"
    Show the browser's request headers:
   </P
 ><A
-NAME="AEN5184"
+NAME="AEN5212"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -887,7 +887,7 @@ TARGET="_top"
    Show which actions apply to a URL and why:
   </P
 ><A
-NAME="AEN5189"
+NAME="AEN5217"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -919,7 +919,7 @@ CLASS="QUOTE"
    place:
   </P
 ><A
-NAME="AEN5197"
+NAME="AEN5225"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -936,7 +936,7 @@ TARGET="_top"
 >   Short cuts. Turn off, then on: 
   </P
 ><A
-NAME="AEN5201"
+NAME="AEN5229"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -950,7 +950,7 @@ TARGET="_top"
    </P
 ></BLOCKQUOTE
 ><A
-NAME="AEN5204"
+NAME="AEN5232"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
diff --git a/doc/webserver/user-manual/config.html b/doc/webserver/user-manual/config.html
index 611a3bfb..2b5fe4e1 100644
--- a/doc/webserver/user-manual/config.html
+++ b/doc/webserver/user-manual/config.html
@@ -3711,7 +3711,7 @@ CLASS="REPLACEABLE"
 >Effect if unset:</DT
 ><DD
 ><P
->    A default value of 180 seconds is used.
+>    A default value of 300 seconds is used.
    </P
 ></DD
 ><DT
@@ -3727,7 +3727,7 @@ CLASS="REPLACEABLE"
 >Examples:</DT
 ><DD
 ><P
->    socket-timeout 180
+>    socket-timeout 300
    </P
 ></DD
 ></DL
diff --git a/doc/webserver/user-manual/configuration.html b/doc/webserver/user-manual/configuration.html
index 32876d6b..09a67129 100644
--- a/doc/webserver/user-manual/configuration.html
+++ b/doc/webserver/user-manual/configuration.html
@@ -98,7 +98,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN761"
+NAME="AEN789"
 >6.1. Controlling Privoxy with Your Web Browser</A
 ></H2
 ><P
@@ -129,7 +129,7 @@ CLASS="SCREEN"
 > <H2
 CLASS="BRIDGEHEAD"
 ><A
-NAME="AEN769"
+NAME="AEN797"
 ></A
 >    Privoxy Menu</H2
 ><P
diff --git a/doc/webserver/user-manual/copyright.html b/doc/webserver/user-manual/copyright.html
index 93a21ee6..08119907 100644
--- a/doc/webserver/user-manual/copyright.html
+++ b/doc/webserver/user-manual/copyright.html
@@ -102,7 +102,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN4898"
+NAME="AEN4926"
 >12.1. License</A
 ></H2
 ><P
diff --git a/doc/webserver/user-manual/filter-file.html b/doc/webserver/user-manual/filter-file.html
index 20fbccce..0b507d82 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="AEN4424"
+NAME="AEN4452"
 >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 4f15c0ab..1f51f88e 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.96 2009/02/14 13:14:03 fabiankeil Exp $<BR></P
+>$Id: user-manual.sgml,v 2.97 2009/02/14 18:01:00 fabiankeil Exp $<BR></P
 ><DIV
 ><DIV
 CLASS="ABSTRACT"
@@ -295,7 +295,7 @@ HREF="configuration.html"
 ><DL
 ><DT
 >6.1. <A
-HREF="configuration.html#AEN761"
+HREF="configuration.html#AEN789"
 >Controlling Privoxy with Your Web Browser</A
 ></DT
 ><DT
@@ -528,12 +528,12 @@ HREF="actions-file.html"
 ><DL
 ><DT
 >8.1. <A
-HREF="actions-file.html#AEN2265"
+HREF="actions-file.html#AEN2293"
 >Finding the Right Mix</A
 ></DT
 ><DT
 >8.2. <A
-HREF="actions-file.html#AEN2272"
+HREF="actions-file.html#AEN2300"
 >How to Edit</A
 ></DT
 ><DT
@@ -550,12 +550,12 @@ HREF="actions-file.html#AF-PATTERNS"
 ><DL
 ><DT
 >8.4.1. <A
-HREF="actions-file.html#AEN2363"
+HREF="actions-file.html#AEN2391"
 >The Domain Pattern</A
 ></DT
 ><DT
 >8.4.2. <A
-HREF="actions-file.html#AEN2439"
+HREF="actions-file.html#AEN2467"
 >The Path Pattern</A
 ></DT
 ><DT
@@ -739,7 +739,7 @@ HREF="actions-file.html#SET-IMAGE-BLOCKER"
 ></DT
 ><DT
 >8.5.34. <A
-HREF="actions-file.html#AEN4070"
+HREF="actions-file.html#AEN4098"
 >Summary</A
 ></DT
 ></DL
@@ -758,17 +758,17 @@ HREF="actions-file.html#ACT-EXAMPLES"
 ><DL
 ><DT
 >8.7.1. <A
-HREF="actions-file.html#AEN4134"
+HREF="actions-file.html#AEN4162"
 >match-all.action</A
 ></DT
 ><DT
 >8.7.2. <A
-HREF="actions-file.html#AEN4156"
+HREF="actions-file.html#AEN4184"
 >default.action</A
 ></DT
 ><DT
 >8.7.3. <A
-HREF="actions-file.html#AEN4269"
+HREF="actions-file.html#AEN4297"
 >user.action</A
 ></DT
 ></DL
@@ -784,7 +784,7 @@ HREF="filter-file.html"
 ><DL
 ><DT
 >9.1. <A
-HREF="filter-file.html#AEN4424"
+HREF="filter-file.html#AEN4452"
 >Filter File Tutorial</A
 ></DT
 ><DT
@@ -852,7 +852,7 @@ HREF="copyright.html"
 ><DL
 ><DT
 >12.1. <A
-HREF="copyright.html#AEN4898"
+HREF="copyright.html#AEN4926"
 >License</A
 ></DT
 ><DT
@@ -886,7 +886,7 @@ HREF="appendix.html#REGEX"
 ></DT
 ><DT
 >14.2. <A
-HREF="appendix.html#AEN5152"
+HREF="appendix.html#AEN5180"
 >Privoxy's Internal Pages</A
 ></DT
 ><DD
diff --git a/doc/webserver/user-manual/introduction.html b/doc/webserver/user-manual/introduction.html
index 745c1381..9f7619aa 100644
--- a/doc/webserver/user-manual/introduction.html
+++ b/doc/webserver/user-manual/introduction.html
@@ -115,6 +115,17 @@ CLASS="APPLICATION"
 ><UL
 ><LI
 ><P
+>     Can keep outgoing connections alive and reuse them later on.
+  </P
+></LI
+><LI
+><P
+>     Supports tagging which allows to change the behaviour
+     based on client and server headers.
+  </P
+></LI
+><LI
+><P
 >     Can be run as an "intercepting" proxy, which obviates the need to
      configure browsers individually.
   </P
@@ -190,7 +201,7 @@ CLASS="QUOTE"
 ></LI
 ><LI
 ><P
->   User-customizable HTML templates for all proxy-generated pages (e.g. "blocked" page).
+>   User-customizable HTML templates for most proxy-generated pages (e.g. "blocked" page).
   </P
 ></LI
 ><LI
diff --git a/doc/webserver/user-manual/quickstart.html b/doc/webserver/user-manual/quickstart.html
index 145f1673..4746ebc1 100644
--- a/doc/webserver/user-manual/quickstart.html
+++ b/doc/webserver/user-manual/quickstart.html
@@ -727,7 +727,7 @@ CLASS="GUIBUTTON"
 >  <DIV
 CLASS="FIGURE"
 ><A
-NAME="AEN515"
+NAME="AEN543"
 ></A
 ><P
 ><B
diff --git a/doc/webserver/user-manual/startup.html b/doc/webserver/user-manual/startup.html
index 060d5169..5acaec6f 100644
--- a/doc/webserver/user-manual/startup.html
+++ b/doc/webserver/user-manual/startup.html
@@ -114,7 +114,7 @@ CLASS="APPLICATION"
 >  <DIV
 CLASS="FIGURE"
 ><A
-NAME="AEN570"
+NAME="AEN598"
 ></A
 ><P
 ><B
@@ -251,7 +251,7 @@ CLASS="EMPHASIS"
 >  <DIV
 CLASS="FIGURE"
 ><A
-NAME="AEN615"
+NAME="AEN643"
 ></A
 ><P
 ><B
-- 
2.39.2