Two changes suggested by Roger Dingledine:

[privoxy.git] / privoxy.1

diff --git a/privoxy.1 b/privoxy.1
index 0d3c588..2046f66 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>.
 .\" <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" "14 November 2007" "Privoxy 3.0.7 beta" ""
+.TH "PRIVOXY" "1" "14 August 2008" "Privoxy 3.0.10" ""

 .SH NAME
 privoxy \- Privacy Enhancing Proxy
 .SH SYNOPSIS
 .SH NAME
 privoxy \- Privacy Enhancing Proxy
 .SH SYNOPSIS


@@ -145,7 +145,7 @@ configuration might look like:
 
  # Fragile sites should have the minimum changes
  fragile     = -block -deanimate-gifs -fast-redirects -filter \\
 
  # Fragile sites should have the minimum changes
  fragile     = -block -deanimate-gifs -fast-redirects -filter \\

-               -hide-referer -prevent-cookies -kill-popups
+               -hide-referer -prevent-cookies

 
  ## Turn some actions on ################################
  ## NOTE: Actions are off by default, unless explictily turned on 
 
  ## Turn some actions on ################################
  ## NOTE: Actions are off by default, unless explictily turned on 


@@ -258,9 +258,6 @@ config file changes by \fBSIGHUP\fR -- it will detect them
 automatically. 
 .SH "NOTES"
 .PP
 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.
 .SH "SEE ALSO"
 Please see the \fIUser Manual\fR on how to contact the
 developers, for feature requests, reporting problems, and other questions.
 .SH "SEE ALSO"


@@ -316,13 +313,16 @@ the \fBPrivoxy\fR developer manual.
  David Schmidt, developer
  
  Hal Burgiss
  David Schmidt, developer
  
  Hal Burgiss

+ Mark Miller
+ Gerry Murphy
+ Lee Rian

  Roland Rosenfeld
  Jörg Strohmayer
 .fi
 .SH "COPYRIGHT AND LICENSE"
 .SS "COPYRIGHT"
 .PP
  Roland Rosenfeld
  Jörg Strohmayer
 .fi
 .SH "COPYRIGHT AND LICENSE"
 .SS "COPYRIGHT"
 .PP

-Copyright (C) 2001 - 2007 by Privoxy Developers <ijbswa-developers@lists.sourceforge.net>
+Copyright (C) 2001-2008 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
 .PP
 Some source code is based on code Copyright (C) 1997 by Anonymous Coders
 and Junkbusters, Inc. and licensed under the \fIGNU General Public


@@ -331,17 +331,14 @@ License\fR.
 .PP
 \fBPrivoxy\fR is free software; you can
 redistribute it and/or modify it under the terms of the 
 .PP
 \fBPrivoxy\fR is free software; you can
 redistribute it and/or modify it under the terms of the 

-\fIGNU General Public
-License\fR, version 2, as published by the Free Software Foundation.
+\fIGNU General Public License\fR, version 2,
+as published by the Free Software Foundation.

 .PP
 This program is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 .PP
 This program is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-FITNESS FOR A PARTICULAR PURPOSE.  See the 
-\fIGNU General Public License\fR for
-more details, which is available from the Free Software Foundation, Inc, 
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+FITNESS FOR A PARTICULAR PURPOSE.  See the  \fIGNU General Public License\fR for details.

 .PP
 .PP

-You should have received a copy of the  \fIGNU General Public License\fR
+You should have received a copy of the \fIGNU GPL\fR

 along with this program; if not, write to the  Free Software
 Foundation, Inc. 51 Franklin Street, Fifth Floor
 Boston, MA 02110-1301
 along with this program; if not, write to the  Free Software
 Foundation, Inc. 51 Franklin Street, Fifth Floor
 Boston, MA 02110-1301