Minor changes preparing for new release.

diff --git a/doc/source/privoxy-man-page.sgml b/doc/source/privoxy-man-page.sgml
index 53781f2..afb2465 100644 (file)
--- a/doc/source/privoxy-man-page.sgml
+++ b/doc/source/privoxy-man-page.sgml
@@ -5,7 +5,7 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
                 
- $Id: privoxy-man-page.sgml,v 1.13.2.7 2003/03/26 02:06:21 hal9 Exp $
+ $Id: privoxy-man-page.sgml,v 2.5 2006/07/18 14:48:51 david__schmidt Exp $
 
  Copyright (C) 2001, 2002 Privoxy Developers <developers@privoxy.org>
  See LICENSE.
@@ -42,10 +42,10 @@
 <!entity copyright SYSTEM "copyright.sgml">
 <!entity license SYSTEM "license.sgml">
 <!entity authors SYSTEM "p-authors.sgml">
-<!entity p-version "3.0.2">
-<!entity p-status "stable">
-<!entity % p-not-stable "IGNORE">
-<!entity % p-stable "INCLUDE">
+<!entity p-version "3.0.4">
+<!entity p-status "BETA">
+<!entity % p-not-stable "INCLUDE">
+<!entity % p-stable "IGNORE">
 <!entity % p-text "IGNORE">           <!-- define we are not a text only doc -->
 <!entity % p-authors-formal "IGNORE"> <!-- exclude additional formating      -->
 <!entity my-copy "(C)">               <!-- db2man barfs on copyright symbol  -->
@@ -53,7 +53,7 @@
 
 <refentry id="privoxy">
 <refentryinfo>
- <date>2002-05-14</date>
+ <date>2006-08-24</date>
 </refentryinfo>
 <refmeta>
  <refentrytitle>privoxy</refentrytitle> 
@@ -223,21 +223,18 @@
  <filename>default.filter</filename>, and
  <filename>default.action</filename>. <filename>user.action</filename> should 
  be used for locally defined exceptions to the default rules of
- <filename>default.action</filename> These are all well commented.  On Unix
+ <filename>default.action</filename>, and <filename>user.filter</filename> for 
+ locally defined filters. These are well commented.  On Unix
  and Unix-like systems, these are located in
  <filename>/etc/privoxy/</filename> by default. On Windows, OS/2 and AmigaOS,
  these files are in the same directory as the <command>Privoxy</command>
  executable.
 </para>
 <para>
- The name and number of configuration files has changed from previous
- versions<![%p-not-stable;[, and is subject to change as development
- progresses]]>. In fact, the configuration itself is changed  and  much more
- sophisticated. See the <ulink
+ See the <ulink
  url="http://www.privoxy.org/user-manual/">user-manual</ulink> for a complete
- explanation of all configuration options and general usage, and notes for 
- upgrading from <command>Junkbuster</command> and earlier <command>Privoxy</command>
- versions.
+ explanation of general usage, configuration options, new features and notes for 
+ upgrading.
 </para>
 <para>
  The actions list (ad blocks, etc) can also be configured with your
@@ -273,25 +270,38 @@
  { \
  -add-header \
  -block \
+ -content-type-overwrite \
+ -crunch-if-none-match \
+ +crunch-incoming-cookies \
+ +crunch-outgoing-cookies \
+ +crunch-server-header {no-cache} \
  +deanimate-gifs{last} \
  -downgrade-http-version \
  -fast-redirects \
- +filter{html-annoyances} \
- +filter{js-annoyances} \
+ -force-text-mode \
+ -filter{html-annoyances} \
+ -filter{js-annoyances} \
  +filter{content-cookies} \
  +filter{webbugs} \
- +filter{banners-by-size} \
+ -filter{banners-by-size} \
+ -handle-as-empty-document \
+ +hide-accept-language{en-ca} \
+ +hide-content-disposition {block} \
  +hide-forwarded-for-headers \
  +hide-from-header{block} \
+ +hide-if-modified-since {-1} \
  +hide-referrer{forge} \
  -hide-user-agent \
  -handle-as-image \
+ -inspect-jpegs \
+ -kill-popups \
  +set-image-blocker{pattern} \
  -limit-connect \
+ +overwrite-last-modified {randomize} \
  +prevent-compression \
  +session-cookies-only \
+ +treat-forbidden-connects-like-blocks \
  -crunch-cookies \
- -kill-popups \
  }
  /   # '/' Matches *all* URL patterns
  
@@ -365,6 +375,7 @@
  <filename>/etc/privoxy/standard.action</filename>
  <filename>/etc/privoxy/user.action</filename>
  <filename>/etc/privoxy/default.filter</filename>
+ <filename>/etc/privoxy/user.filter</filename>
  <filename>/etc/privoxy/trust</filename>
  <filename>/etc/privoxy/templates/*</filename>
  <filename>/var/log/privoxy/logfile</filename>
@@ -403,7 +414,7 @@
 </para>]]>
 <para>
  Please see the <citetitle>User Manual</citetitle> on how to contact the
- developers for feature requests, reporting problems, and other questions.
+ developers, for feature requests, reporting problems, and other questions.
 </para>
 
 </refsect1>

diff --git a/privoxy.1 b/privoxy.1
index 982dd19..b4585f5 100644 (file)
--- a/privoxy.1
+++ b/privoxy.1
@@ -3,7 +3,7 @@
 .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "PRIVOXY" "1" "31 Januar 2004" "Privoxy 3.0.3" ""
+.TH "PRIVOXY" "1" "25 August 2006" "Privoxy 3.0.4 BETA" ""
 .SH NAME
 privoxy \- Privacy Enhancing Proxy
 .SH SYNOPSIS
@@ -94,18 +94,16 @@ files. The default configuration files are: \fIconfig\fR,
 \fIdefault.filter\fR, and
 \fIdefault.action\fR. \fIuser.action\fR should 
 be used for locally defined exceptions to the default rules of
-\fIdefault.action\fR These are all well commented.  On Unix
+\fIdefault.action\fR, and \fIuser.filter\fR for 
+locally defined filters. These are well commented.  On Unix
 and Unix-like systems, these are located in
 \fI/etc/privoxy/\fR by default. On Windows, OS/2 and AmigaOS,
 these files are in the same directory as the \fBPrivoxy\fR
 executable.
 .PP
-The name and number of configuration files has changed from previous
-versions. In fact, the configuration itself is changed  and  much more
-sophisticated. See the user-manual for a complete
-explanation of all configuration options and general usage, and notes for 
-upgrading from \fBJunkbuster\fR and earlier \fBPrivoxy\fR
-versions.
+See the user-manual for a complete
+explanation of general usage, configuration options, new features and notes for 
+upgrading.
 .PP
 The actions list (ad blocks, etc) can also be configured with your
 web browser at http://config.privoxy.org/.
@@ -134,25 +132,38 @@ configuration might look like:
  { \\
  -add-header \\
  -block \\
+ -content-type-overwrite \\
+ -crunch-if-none-match \\
+ +crunch-incoming-cookies \\
+ +crunch-outgoing-cookies \\
+ +crunch-server-header {no-cache} \\
  +deanimate-gifs{last} \\
  -downgrade-http-version \\
  -fast-redirects \\
- +filter{html-annoyances} \\
- +filter{js-annoyances} \\
+ -force-text-mode \\
+ -filter{html-annoyances} \\
+ -filter{js-annoyances} \\
  +filter{content-cookies} \\
  +filter{webbugs} \\
- +filter{banners-by-size} \\
+ -filter{banners-by-size} \\
+ -handle-as-empty-document \\
+ +hide-accept-language{en-ca} \\
+ +hide-content-disposition {block} \\
  +hide-forwarded-for-headers \\
  +hide-from-header{block} \\
+ +hide-if-modified-since {-1} \\
  +hide-referrer{forge} \\
  -hide-user-agent \\
  -handle-as-image \\
+ -inspect-jpegs \\
+ -kill-popups \\
  +set-image-blocker{pattern} \\
  -limit-connect \\
+ +overwrite-last-modified {randomize} \\
  +prevent-compression \\
  +session-cookies-only \\
+ +treat-forbidden-connects-like-blocks \\
  -crunch-cookies \\
- -kill-popups \\
  }
  /   # '/' Matches *all* URL patterns
  
@@ -216,6 +227,7 @@ configuration options.
  \fI/etc/privoxy/standard.action\fR
  \fI/etc/privoxy/user.action\fR
  \fI/etc/privoxy/default.filter\fR
+ \fI/etc/privoxy/user.filter\fR
  \fI/etc/privoxy/trust\fR
  \fI/etc/privoxy/templates/*\fR
  \fI/var/log/privoxy/logfile\fR
@@ -235,8 +247,11 @@ config file changes by \fBSIGHUP\fR -- it will detect them
 automatically. 
 .SH "NOTES"
 .PP
+This is a BETA version of \fBPrivoxy\fR. Not 
+all features are well tested.
+.PP
 Please see the \fIUser Manual\fR on how to contact the
-developers for feature requests, reporting problems, and other questions.
+developers, for feature requests, reporting problems, and other questions.
 .SH "SEE ALSO"
 .PP
 Other references and sites of interest to \fBPrivoxy\fR
@@ -283,15 +298,13 @@ the \fBPrivoxy\fR developer manual.
 .SH "DEVELOPMENT TEAM"
 
 .nf
- Hal Burgiss (docs)
- Andreas Oesterhelt
- David Schmidt (OS/2, Mac OSX ports)
+ David Schmidt
+ Fabian Keil
+
 
- Johny Agotnes 
+ Andreas Oesterhelt
  Rodrigo Barbosa (RPM specfiles)
- Moritz Barsnick
  Brian Dessent
- Mattes Dolak 
  Jon Foster
  Karsten Hopp (Red Hat)
  Alexander Lazic
@@ -300,7 +313,6 @@ the \fBPrivoxy\fR developer manual.
  Adam Lock (Win32)
  Guy Laroche
  Haroon Rafique
- Roland Rosenfeld (Debian)
  Georg Sauthoff (Gentoo)
  Thomas Steudten
  Joerg Strohmayer (Amiga)
@@ -312,7 +324,7 @@ the \fBPrivoxy\fR developer manual.
 .SH "COPYRIGHT AND LICENSE"
 .SS "COPYRIGHT"
 .PP
-Copyright (C) 2001 - 2004 by Privoxy Developers <developers@privoxy.org>
+Copyright (C) 2001 - 2006 by Privoxy Developers <ijbswa-developers@lists.sourceforge.net>
 .PP
 Some source code is based on code Copyright (C) 1997 by Anonymous Coders
 and Junkbusters, Inc. and licensed under the \fIGNU General Public