projects
/
privoxy.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2a26530
)
Updated configuration description, contributor list and URLs.
author
Fabian Keil
<fk@fabiankeil.de>
Tue, 10 Feb 2009 20:42:18 +0000
(20:42 +0000)
committer
Fabian Keil
<fk@fabiankeil.de>
Tue, 10 Feb 2009 20:42:18 +0000
(20:42 +0000)
doc/webserver/user-manual/actions-file.html
patch
|
blob
|
history
doc/webserver/user-manual/appendix.html
patch
|
blob
|
history
doc/webserver/user-manual/config.html
patch
|
blob
|
history
doc/webserver/user-manual/copyright.html
patch
|
blob
|
history
doc/webserver/user-manual/filter-file.html
patch
|
blob
|
history
doc/webserver/user-manual/index.html
patch
|
blob
|
history
doc/webserver/user-manual/seealso.html
patch
|
blob
|
history
diff --git
a/doc/webserver/user-manual/actions-file.html
b/doc/webserver/user-manual/actions-file.html
index
4b1bf65
..
c561b68
100644
(file)
--- 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
> <DIV
CLASS="TABLE"
><A
-NAME="AEN21
37
"
+NAME="AEN21
65
"
></A
><P
><B
></A
><P
><B
@@
-505,7
+505,7
@@
CLASS="SECT2"
><H2
CLASS="SECT2"
><A
><H2
CLASS="SECT2"
><A
-NAME="AEN22
36
"
+NAME="AEN22
64
"
>8.1. Finding the Right Mix</A
></H2
><P
>8.1. Finding the Right Mix</A
></H2
><P
@@
-540,7
+540,7
@@
CLASS="SECT2"
><H2
CLASS="SECT2"
><A
><H2
CLASS="SECT2"
><A
-NAME="AEN22
43
"
+NAME="AEN22
71
"
>8.2. How to Edit</A
></H2
><P
>8.2. How to Edit</A
></H2
><P
@@
-870,7
+870,7
@@
CLASS="SECT3"
><H3
CLASS="SECT3"
><A
><H3
CLASS="SECT3"
><A
-NAME="AEN23
34
"
+NAME="AEN23
62
"
>8.4.1. The Domain Pattern</A
></H3
><P
>8.4.1. The Domain Pattern</A
></H3
><P
@@
-1110,7
+1110,7
@@
CLASS="SECT3"
><H3
CLASS="SECT3"
><A
><H3
CLASS="SECT3"
><A
-NAME="AEN24
10
"
+NAME="AEN24
38
"
>8.4.2. The Path Pattern</A
></H3
><P
>8.4.2. The Path Pattern</A
></H3
><P
@@
-6678,7
+6678,7
@@
CLASS="SECT3"
><H3
CLASS="SECT3"
><A
><H3
CLASS="SECT3"
><A
-NAME="AEN40
41
"
+NAME="AEN40
69
"
>8.5.34. Summary</A
></H3
><P
>8.5.34. Summary</A
></H3
><P
@@
-6977,7
+6977,7
@@
CLASS="SECT3"
><H3
CLASS="SECT3"
><A
><H3
CLASS="SECT3"
><A
-NAME="AEN41
04
"
+NAME="AEN41
32
"
>8.7.1. default.action</A
></H3
><P
>8.7.1. default.action</A
></H3
><P
@@
-7692,7
+7692,7
@@
CLASS="SECT3"
><H3
CLASS="SECT3"
><A
><H3
CLASS="SECT3"
><A
-NAME="AEN42
38
"
+NAME="AEN42
66
"
>8.7.2. user.action</A
></H3
><P
>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
055fef5
..
c6896bc
100644
(file)
--- a/
doc/webserver/user-manual/appendix.html
+++ b/
doc/webserver/user-manual/appendix.html
@@
-748,7
+748,7
@@
CLASS="SECT2"
><H2
CLASS="SECT2"
><A
><H2
CLASS="SECT2"
><A
-NAME="AEN51
24
"
+NAME="AEN51
49
"
>14.2. Privoxy's Internal Pages</A
></H2
><P
>14.2. Privoxy's Internal Pages</A
></H2
><P
@@
-794,7
+794,7
@@
CLASS="APPLICATION"
Privoxy main page:
</P
><A
Privoxy main page:
</P
><A
-NAME="AEN51
38
"
+NAME="AEN51
63
"
></A
><BLOCKQUOTE
CLASS="BLOCKQUOTE"
></A
><BLOCKQUOTE
CLASS="BLOCKQUOTE"
@@
-827,7
+827,7
@@
CLASS="APPLICATION"
editing of actions files:
</P
><A
editing of actions files:
</P
><A
-NAME="AEN51
46
"
+NAME="AEN51
71
"
></A
><BLOCKQUOTE
CLASS="BLOCKQUOTE"
></A
><BLOCKQUOTE
CLASS="BLOCKQUOTE"
@@
-847,7
+847,7
@@
TARGET="_top"
Show the source code version numbers:
</P
><A
Show the source code version numbers:
</P
><A
-NAME="AEN51
51
"
+NAME="AEN51
76
"
></A
><BLOCKQUOTE
CLASS="BLOCKQUOTE"
></A
><BLOCKQUOTE
CLASS="BLOCKQUOTE"
@@
-867,7
+867,7
@@
TARGET="_top"
Show the browser's request headers:
</P
><A
Show the browser's request headers:
</P
><A
-NAME="AEN51
56
"
+NAME="AEN51
81
"
></A
><BLOCKQUOTE
CLASS="BLOCKQUOTE"
></A
><BLOCKQUOTE
CLASS="BLOCKQUOTE"
@@
-887,7
+887,7
@@
TARGET="_top"
Show which actions apply to a URL and why:
</P
><A
Show which actions apply to a URL and why:
</P
><A
-NAME="AEN51
61
"
+NAME="AEN51
86
"
></A
><BLOCKQUOTE
CLASS="BLOCKQUOTE"
></A
><BLOCKQUOTE
CLASS="BLOCKQUOTE"
@@
-919,7
+919,7
@@
CLASS="QUOTE"
place:
</P
><A
place:
</P
><A
-NAME="AEN51
69
"
+NAME="AEN51
94
"
></A
><BLOCKQUOTE
CLASS="BLOCKQUOTE"
></A
><BLOCKQUOTE
CLASS="BLOCKQUOTE"
@@
-936,7
+936,7
@@
TARGET="_top"
> Short cuts. Turn off, then on:
</P
><A
> Short cuts. Turn off, then on:
</P
><A
-NAME="AEN51
73
"
+NAME="AEN51
98
"
></A
><BLOCKQUOTE
CLASS="BLOCKQUOTE"
></A
><BLOCKQUOTE
CLASS="BLOCKQUOTE"
@@
-950,7
+950,7
@@
TARGET="_top"
</P
></BLOCKQUOTE
><A
</P
></BLOCKQUOTE
><A
-NAME="AEN5
176
"
+NAME="AEN5
201
"
></A
><BLOCKQUOTE
CLASS="BLOCKQUOTE"
></A
><BLOCKQUOTE
CLASS="BLOCKQUOTE"
diff --git
a/doc/webserver/user-manual/config.html
b/doc/webserver/user-manual/config.html
index
2b18318
..
f0f54e4
100644
(file)
--- 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
>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
></DD
><DT
>Effect if unset:</DT
@@
-816,7
+822,15
@@
BORDER="0"
><TD
> <P
CLASS="LITERALLAYOUT"
><TD
> <P
CLASS="LITERALLAYOUT"
-> default.action # Main actions file</P
+> match-all.action # Actions that are applied to all sites and maybe overruled later on.</P
+>
+ </TD
+></TR
+><TR
+><TD
+> <P
+CLASS="LITERALLAYOUT"
+> default.action # Main actions file</P
>
</TD
></TR
>
</TD
></TR
@@
-824,7
+838,7
@@
CLASS="LITERALLAYOUT"
><TD
> <P
CLASS="LITERALLAYOUT"
><TD
> <P
CLASS="LITERALLAYOUT"
-> user.action
# User customizations</P
+> user.action # User customizations</P
>
</TD
></TR
>
</TD
></TR
@@
-3654,6
+3668,62
@@
CLASS="APPLICATION"
></DL
></DIV
></DIV
></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"
></DIV
><DIV
CLASS="SECT2"
diff --git
a/doc/webserver/user-manual/copyright.html
b/doc/webserver/user-manual/copyright.html
index
22ee8d0
..
569ef8d
100644
(file)
--- 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
>12. Privoxy Copyright, License and History</A
></H1
><P
-> Copyright © 2001-200
8
by Privoxy Developers <CODE
+> Copyright © 2001-200
9
by Privoxy Developers <CODE
CLASS="EMAIL"
><<A
HREF="mailto:ijbswa-developers@lists.sourceforge.net"
CLASS="EMAIL"
><<A
HREF="mailto:ijbswa-developers@lists.sourceforge.net"
@@
-102,7
+102,7
@@
CLASS="SECT2"
><H2
CLASS="SECT2"
><A
><H2
CLASS="SECT2"
><A
-NAME="AEN48
67
"
+NAME="AEN48
95
"
>12.1. License</A
></H2
><P
>12.1. License</A
></H2
><P
@@
-256,7
+256,7
@@
NAME="AUTHORS"
CLASS="LITERALLAYOUT"
> Fabian Keil, lead developer<br>
David Schmidt, developer<br>
CLASS="LITERALLAYOUT"
> Fabian Keil, lead developer<br>
David Schmidt, developer<br>
-
<br>
+<br>
Hal Burgiss<br>
Mark Miller<br>
Gerry Murphy<br>
Hal Burgiss<br>
Mark Miller<br>
Gerry Murphy<br>
@@
-267,7
+267,7
@@
CLASS="LITERALLAYOUT"
> Former Privoxy Team Members:</P
><P
CLASS="LITERALLAYOUT"
> Former Privoxy Team Members:</P
><P
CLASS="LITERALLAYOUT"
-> Johny Agotnes
<br>
+> Johny Agotnes<br>
Rodrigo Barbosa<br>
Moritz Barsnick<br>
Ian Cummings<br>
Rodrigo Barbosa<br>
Moritz Barsnick<br>
Ian Cummings<br>
@@
-279,7
+279,6
@@
CLASS="LITERALLAYOUT"
Gábor Lipták<br>
Adam Lock<br>
Guy Laroche<br>
Gábor Lipták<br>
Adam Lock<br>
Guy Laroche<br>
- Mark Martinec <br>
Justin McMurtry<br>
Andreas Oesterhelt<br>
Haroon Rafique<br>
Justin McMurtry<br>
Andreas Oesterhelt<br>
Haroon Rafique<br>
@@
-290,7
+289,7
@@
CLASS="LITERALLAYOUT"
Sarantis Paskalis<br>
Stefan Waldherr</P
><P
Sarantis Paskalis<br>
Stefan 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
patches, made suggestions or contributed in some way. These include (in
alphabetical order):</P
><P
@@
-303,7
+302,8
@@
CLASS="LITERALLAYOUT"
Clifford Caoile<br>
Frédéric Crozat<br>
Michael T. Davis<br>
Clifford Caoile<br>
Frédéric Crozat<br>
Michael T. Davis<br>
- Mattes Dolak <br>
+ Mattes Dolak<br>
+ Matthias Drochner<br>
Peter E.<br>
Florian Effenberger<br>
Markus Elfring<br>
Peter E.<br>
Florian Effenberger<br>
Markus Elfring<br>
@@
-316,18
+316,18
@@
CLASS="LITERALLAYOUT"
Magnus Holmgren<br>
Eric M. Hopper<br>
Ralf Horstmann<br>
Magnus Holmgren<br>
Eric M. Hopper<br>
Ralf Horstmann<br>
- Stefan Huehner
<br>
+ Stefan Huehner<br>
Peter Hyman<br>
Derek Jennings<br>
Petr Kadlec<br>
David Laight<br>
Bert van Leeuwen<br>
Peter Hyman<br>
Derek Jennings<br>
Petr Kadlec<br>
David Laight<br>
Bert van Leeuwen<br>
- Don Libes
<br>
+ Don Libes<br>
Paul Lieverse<br>
Toby Lyward<br>
Wil Mahan<br>
Paul Lieverse<br>
Toby Lyward<br>
Wil Mahan<br>
- Jindrich Makovicka
<br>
- David Mediavilla
<br>
+ Jindrich Makovicka<br>
+ David Mediavilla<br>
Raphael Moll<br>
Amuro Namie<br>
Adam Piggott<br>
Raphael Moll<br>
Amuro Namie<br>
Adam Piggott<br>
@@
-345,7
+345,7
@@
CLASS="LITERALLAYOUT"
Jochen Voss<br>
Glenn Washburn<br>
Song Weijia<br>
Jochen Voss<br>
Glenn Washburn<br>
Song Weijia<br>
- Jörg Weinmann
<br>
+ Jörg Weinmann<br>
Darren Wiebe<br>
Anduin Withers<br>
Oliver Yeoh<br>
Darren Wiebe<br>
Anduin Withers<br>
Oliver Yeoh<br>
diff --git
a/doc/webserver/user-manual/filter-file.html
b/doc/webserver/user-manual/filter-file.html
index
c17288d
..
f9e9b63
100644
(file)
--- 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
><H2
CLASS="SECT2"
><A
-NAME="AEN4
393
"
+NAME="AEN4
421
"
>9.1. Filter File Tutorial</A
></H2
><P
>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
9adcb64
..
9ed90fc
100644
(file)
--- 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"
><BR></P
><P
CLASS="PUBDATE"
->$Id: user-manual.sgml,v 2.9
0 2008/09/26 16:53:09
fabiankeil Exp $<BR></P
+>$Id: user-manual.sgml,v 2.9
1 2009/01/13 16:50:35
fabiankeil Exp $<BR></P
><DIV
><DIV
CLASS="ABSTRACT"
><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
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
></DL
></DD
><DT
@@
-523,12
+528,12
@@
HREF="actions-file.html"
><DL
><DT
>8.1. <A
><DL
><DT
>8.1. <A
-HREF="actions-file.html#AEN22
36
"
+HREF="actions-file.html#AEN22
64
"
>Finding the Right Mix</A
></DT
><DT
>8.2. <A
>Finding the Right Mix</A
></DT
><DT
>8.2. <A
-HREF="actions-file.html#AEN22
43
"
+HREF="actions-file.html#AEN22
71
"
>How to Edit</A
></DT
><DT
>How to Edit</A
></DT
><DT
@@
-545,12
+550,12
@@
HREF="actions-file.html#AF-PATTERNS"
><DL
><DT
>8.4.1. <A
><DL
><DT
>8.4.1. <A
-HREF="actions-file.html#AEN23
34
"
+HREF="actions-file.html#AEN23
62
"
>The Domain Pattern</A
></DT
><DT
>8.4.2. <A
>The Domain Pattern</A
></DT
><DT
>8.4.2. <A
-HREF="actions-file.html#AEN24
10
"
+HREF="actions-file.html#AEN24
38
"
>The Path Pattern</A
></DT
><DT
>The Path Pattern</A
></DT
><DT
@@
-734,7
+739,7
@@
HREF="actions-file.html#SET-IMAGE-BLOCKER"
></DT
><DT
>8.5.34. <A
></DT
><DT
>8.5.34. <A
-HREF="actions-file.html#AEN40
41
"
+HREF="actions-file.html#AEN40
69
"
>Summary</A
></DT
></DL
>Summary</A
></DT
></DL
@@
-753,12
+758,12
@@
HREF="actions-file.html#ACT-EXAMPLES"
><DL
><DT
>8.7.1. <A
><DL
><DT
>8.7.1. <A
-HREF="actions-file.html#AEN41
04
"
+HREF="actions-file.html#AEN41
32
"
>default.action</A
></DT
><DT
>8.7.2. <A
>default.action</A
></DT
><DT
>8.7.2. <A
-HREF="actions-file.html#AEN42
38
"
+HREF="actions-file.html#AEN42
66
"
>user.action</A
></DT
></DL
>user.action</A
></DT
></DL
@@
-774,7
+779,7
@@
HREF="filter-file.html"
><DL
><DT
>9.1. <A
><DL
><DT
>9.1. <A
-HREF="filter-file.html#AEN4
393
"
+HREF="filter-file.html#AEN4
421
"
>Filter File Tutorial</A
></DT
><DT
>Filter File Tutorial</A
></DT
><DT
@@
-842,7
+847,7
@@
HREF="copyright.html"
><DL
><DT
>12.1. <A
><DL
><DT
>12.1. <A
-HREF="copyright.html#AEN48
67
"
+HREF="copyright.html#AEN48
95
"
>License</A
></DT
><DT
>License</A
></DT
><DT
@@
-876,7
+881,7
@@
HREF="appendix.html#REGEX"
></DT
><DT
>14.2. <A
></DT
><DT
>14.2. <A
-HREF="appendix.html#AEN51
24
"
+HREF="appendix.html#AEN51
49
"
>Privoxy's Internal Pages</A
></DT
><DD
>Privoxy's Internal Pages</A
></DT
><DD
diff --git
a/doc/webserver/user-manual/seealso.html
b/doc/webserver/user-manual/seealso.html
index
d72ce10
..
978881e
100644
(file)
--- a/
doc/webserver/user-manual/seealso.html
+++ b/
doc/webserver/user-manual/seealso.html
@@
-142,9
+142,9
@@
BORDER="0"
><TR
><TD
> <A
><TR
><TD
> <A
-HREF="http://sourceforge.net/projects/ijbswa/"
+HREF="http
s
://sourceforge.net/projects/ijbswa/"
TARGET="_top"
TARGET="_top"
->http://sourceforge.net/projects/ijbswa/</A
+>http
s
://sourceforge.net/projects/ijbswa/</A
>,
the Project Page for <SPAN
CLASS="APPLICATION"
>,
the Project Page for <SPAN
CLASS="APPLICATION"
@@
-198,9
+198,9
@@
BORDER="0"
><TR
><TD
> <A
><TR
><TD
> <A
-HREF="http://sourceforge.net/tracker/?group_id=11118&atid=460288"
+HREF="http
s
://sourceforge.net/tracker/?group_id=11118&atid=460288"
TARGET="_top"
TARGET="_top"
->http://sourceforge.net/tracker/?group_id=11118&atid=460288</A
+>http
s
://sourceforge.net/tracker/?group_id=11118&atid=460288</A
>, to submit <SPAN
CLASS="QUOTE"
>"misses"</SPAN
>, to submit <SPAN
CLASS="QUOTE"
>"misses"</SPAN
@@
-213,7
+213,6
@@
CLASS="QUOTE"
><P
></P
>
><P
></P
>
-
<P
></P
><TABLE
<P
></P
><TABLE
@@
-262,26
+261,6
@@
BORDER="0"
><TR
><TD
> <A
><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
HREF="http://www.squid-cache.org/"
TARGET="_top"
>http://www.squid-cache.org/</A
@@
-333,9
+312,9
@@
BORDER="0"
><TR
><TD
> <A
><TR
><TD
> <A
-HREF="http
://tor.eff
.org/"
+HREF="http
s://www.torproject
.org/"
TARGET="_top"
TARGET="_top"
->http
://tor.eff
.org/</A
+>http
s://www.torproject
.org/</A
>,
<SPAN
CLASS="APPLICATION"
>,
<SPAN
CLASS="APPLICATION"