X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=privoxy.1;h=302ded9efe43cb5b28ccf3b32e81cee643f8a0df;hp=066a2ccdd0548fba9f6e815f55f11920ce14e3f0;hb=d08efb68329798242aa848d30b50fc58254b1aaf;hpb=82194f5cef6a1a9e3a7b4c34b2e3040a31cc596a

diff --git a/privoxy.1 b/privoxy.1
index 066a2ccd..302ded9e 100644
--- a/privoxy.1
+++ b/privoxy.1
@@ -3,35 +3,35 @@
 .\" <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" "19 January 2008" "Privoxy 3.0.8" ""
+.TH "PRIVOXY" "1" "15 January 2009" "Privoxy 3.0.11 UNRELEASED" ""
 .SH NAME
 privoxy \- Privacy Enhancing Proxy
 .SH SYNOPSIS
 
-\fBprivoxy\fR [\fB--help\fR ] [\fB--version\fR ] [\fB--no-daemon\fR ] [\fB--pidfile \fIpidfile\fB\fR ] [\fB--user \fIuser[.group]\fB\fR ] [\fB--chroot\fR ] [\fB--pre-chroot-nslookup \fIhostname\fB\fR ] [\fB\fIconfigfile\fB\fR ]
+\fBprivoxy\fR [\fB\-\-help\fR ] [\fB\-\-version\fR ] [\fB\-\-no-daemon\fR ] [\fB\-\-pidfile \fIpidfile\fB\fR ] [\fB\-\-user \fIuser[.group]\fB\fR ] [\fB\-\-chroot\fR ] [\fB\-\-pre-chroot-nslookup \fIhostname\fB\fR ] [\fB\fIconfigfile\fB\fR ]
 
 .SH "OPTIONS"
 .PP
 \fBPrivoxy\fR may be invoked with the following command line
 options:
 .TP
-\fB--help\fR
+\fB\-\-help\fR
 Print brief usage info and exit.
 .TP
-\fB--version\fR
+\fB\-\-version\fR
 Print version info and exit.
 .TP
-\fB--no-daemon\fR
+\fB\-\-no-daemon\fR
 Don't  become  a daemon, i.e. don't fork and become process group
 leader, don't detach from controlling tty, and do all logging there.
 .TP
-\fB--pidfile \fIpidfile\fB\fR
+\fB\-\-pidfile \fIpidfile\fB\fR
 On startup, write the process ID to \fIpidfile\fR.
 Delete the \fIpidfile\fR on exit.
 Failure to create or delete the \fIpidfile\fR
-is non-fatal. If no \fB--pidfile\fR option is given, no PID file will be used.
+is non-fatal. If no \fB\-\-pidfile\fR option is given, no PID file will be used.
 .TP
-\fB--user \fIuser[.group]\fB\fR
+\fB\-\-user \fIuser[.group]\fB\fR
 After (optionally) writing the PID file, assume the user ID of
 \fIuser\fR and the GID of
 \fIgroup\fR, or, if the optional
@@ -39,15 +39,15 @@ After (optionally) writing the PID file, assume the user ID of
 \fIuser\fR. Exit if the privileges are not
 sufficient to do so.
 .TP
-\fB--chroot\fR
-Before changing to the user ID given in the --user option, chroot to
+\fB\-\-chroot\fR
+Before changing to the user ID given in the \-\-user option, chroot to
 that user's home directory, i.e. make the kernel pretend to the
 \fBPrivoxy\fR process that the directory tree starts
 there. If set up carefully, this can limit the impact of possible
 vulnerabilities in \fBPrivoxy\fR to the files contained in
 that hierarchy. 
 .TP
-\fB--pre-chroot-nslookup \fIhostname\fB\fR
+\fB\-\-pre-chroot-nslookup \fIhostname\fB\fR
 Initialize the resolver library using \fIhostname\fR
 before chroot'ing. On some systems this reduces the number of files
 that must be copied into the chroot tree.
@@ -140,18 +140,19 @@ configuration might look like:
 
  # Useful aliases that combine more than one action
  +crunch-cookies = +crunch-incoming-cookies +crunch-outgoing-cookies
- -crunch-cookies = -crunch-incoming-cookies -crunch-outgoing-cookies
+ \-crunch-cookies = \-crunch-incoming-cookies \-crunch-outgoing-cookies
  +block-as-image = +block +handle-as-image
 
  # Fragile sites should have the minimum changes
- fragile     = -block -deanimate-gifs -fast-redirects -filter \\
-               -hide-referer -prevent-cookies -kill-popups
+ fragile     = \-block \-deanimate-gifs \-fast-redirects \-filter \\
+               \-hide-referer \-prevent-cookies
 
  ## Turn some actions on ################################
  ## NOTE: Actions are off by default, unless explictily turned on 
  ## otherwise with the '+' operator.
 
 { \\
++change-x-forwarded-for{block} \\
 +deanimate-gifs{last} \\
 +filter{refresh-tags} \\
 +filter{img-reorder} \\
@@ -159,7 +160,6 @@ configuration might look like:
 +filter{webbugs} \\
 +filter{jumping-windows} \\
 +filter{ie-exploits} \\
-+hide-forwarded-for-headers \\
 +hide-from-header{block} \\
 +hide-referrer{conditional-block} \\
 +session-cookies-only \\
@@ -187,7 +187,7 @@ configuration might look like:
 
  # Make exceptions for these harmless ones that would be 
  # caught by our +block patterns just above.
- { -block }
+ { \-block }
   adsl.
   adobe.
   advice.
@@ -204,12 +204,12 @@ narrowly defined exceptions:
  {{alias}}
 
  # Useful aliases
- -crunch-cookies = -crunch-incoming-cookies -crunch-outgoing-cookies
+ \-crunch-cookies = \-crunch-incoming-cookies \-crunch-outgoing-cookies
  
  # Set personal exceptions to the policies in default.action #######
 
  # Sites where we want persistent cookies, so allow *all* cookies
- { -crunch-cookies -session-cookies-only }
+ { \-crunch-cookies \-session-cookies-only }
   .redhat.com
   .sun.com
   .msdn.microsoft.com
@@ -235,7 +235,6 @@ configuration options.
  \fI/usr/sbin/privoxy\fR
  \fI/etc/privoxy/config\fR
  \fI/etc/privoxy/default.action\fR
- \fI/etc/privoxy/standard.action\fR
  \fI/etc/privoxy/user.action\fR
  \fI/etc/privoxy/default.filter\fR
  \fI/etc/privoxy/user.filter\fR
@@ -258,6 +257,9 @@ config file changes by \fBSIGHUP\fR -- it will detect them
 automatically. 
 .SH "NOTES"
 .PP
+This is a UNRELEASED 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"
@@ -280,7 +282,7 @@ http://config.privoxy.org/,
 the web-based user interface. \fBPrivoxy\fR must be
 running for this to work. Shortcut: http://p.p/
 
-http://sourceforge.net/tracker/?group_id=11118&atid=460288, to submit ``misses'' and other
+https://sourceforge.net/tracker/?group_id=11118&atid=460288, to submit ``misses'' and other
 configuration related suggestions to the developers. 
 
 http://www.junkbusters.com/ht/en/cookies.html,
@@ -300,7 +302,7 @@ http://www.pps.jussieu.fr/~jch/software/polipo/,
 like pipelining, multiplexing and caching of partial instances. In many setups
 it can be used as \fBSquid\fR replacement.
 
-http://tor.eff.org/, 
+https://www.torproject.org/, 
 \fBTor\fR can help anonymize web browsing, 
 web publishing, instant messaging, IRC, SSH, and other applications.
 
@@ -313,13 +315,16 @@ the \fBPrivoxy\fR developer manual.
  David Schmidt, developer
  
  Hal Burgiss
+ Mark Miller
+ Gerry Murphy
+ Lee Rian
  Roland Rosenfeld
- Jörg Strohmayer
+ J\[:o]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-2009 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
@@ -328,17 +333,14 @@ License\fR.
 .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
-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
-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