X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=privoxy.1;h=62e8c34a2fb863c398a83b687d3bf6ca67bd81eb;hp=bf8c6e08afd826847defb3e74a0b0b972aadea50;hb=34a6a841e529579e2be4457ea0d4cb1befbc840a;hpb=bc53ee8ce70c58b29870c67ae28ae834e5914a6a

diff --git a/privoxy.1 b/privoxy.1
index bf8c6e08..62e8c34a 100644
--- a/privoxy.1
+++ b/privoxy.1
@@ -1,6 +1,6 @@
 .\" This manpage has been generated by docbook2man-spec.pl
 .\" (included in the Privoxy source tarball) from a DocBook document.
-.TH "PRIVOXY" "1" "26 August 2016" "Privoxy 3.0.26" ""
+.TH "PRIVOXY" "1" "16 December 2020" "Privoxy 3.0.30 UNRELEASED" ""
 .SH NAME
 privoxy \- Privacy Enhancing Proxy
 .SH SYNOPSIS
@@ -76,17 +76,18 @@ access, and removing ads and other obnoxious Internet junk. Privoxy has a
 flexible configuration and can be customized to suit individual needs and tastes.
 It has application for both stand-alone systems and multi-user networks.
 .PP
-Privoxy is Free Software and licensed under the GNU GPLv2.
+Privoxy is Free Software and licensed under the GNU GPLv2 or later.
 .PP
 Privoxy is an associated project of Software in the Public Interest (SPI).
 .PP
 Helping hands and donations are welcome:
+.PP
 .TP 0.2i
 \(bu
-https://www.privoxy.org/faq/general.html#PARTICIPATE
+https://www.privoxy.org/participate
 .TP 0.2i
 \(bu
-https://www.privoxy.org/faq/general.html#DONATE
+https://www.privoxy.org/donate
 .SH "INSTALLATION AND USAGE"
 .PP
 Browsers can either be individually configured to use
@@ -171,13 +172,15 @@ automatically. Signals other than the ones listed above aren't explicitly
 handled and result in the default action defined by the operating system.
 .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"
 .PP
 Other references and sites of interest to \fBPrivoxy\fR
 users:
-.PP
 
 https://www.privoxy.org/,
 the \fBPrivoxy\fR Home page.
@@ -196,14 +199,13 @@ http://config.privoxy.org/,
 the web-based user interface. \fBPrivoxy\fR must be
 running for this to work. Shortcut: http://p.p/
 
-https://sourceforge.net/tracker/?group_id=11118&atid=460288, to submit ``misses'' and other
+https://sourceforge.net/p/ijbswa/actionsfile-feedback/, to submit ``misses'' and other
 configuration related suggestions to the developers.
 .SH "DEVELOPMENT TEAM"
 
 .nf
  Fabian Keil, lead developer
  David Schmidt
- Hal Burgiss
  Lee Rian
  Roland Rosenfeld
  Ian Silvester
@@ -211,17 +213,26 @@ configuration related suggestions to the developers.
 .SH "COPYRIGHT AND LICENSE"
 .SS "COPYRIGHT"
 .PP
-Copyright (C) 2001-2016 by Privoxy Developers <privoxy-devel@lists.privoxy.org>
+Copyright (C) 2001-2020 by Privoxy Developers <privoxy-devel@lists.privoxy.org>
 .PP
 Some source code is based on code Copyright (C) 1997 by Anonymous Coders
-and Junkbusters, Inc. and licensed under the \fIGNU General Public
-License\fR.
+and Junkbusters, Inc.
 .SS "LICENSE"
 .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.
+redistribute and/or modify its source code under the terms
+of the \fIGNU General Public License\fR
+as published by the Free Software Foundation, either version 2
+of the license, or (at your option) any later version.
+.PP
+The same is true for \fBPrivoxy\fR binaries
+unless they are linked with a
+mbed TLS version
+that is licensed under the Apache 2.0 license in which
+case you can redistribute and/or modify the \fBPrivoxy\fR
+binaries under the terms of the \fIGNU General Public License\fR
+as published by the Free Software Foundation, either version 3
+of the license, or (at your option) any later version.
 .PP
 \fBPrivoxy\fR is distributed in the hope that
 it will be useful, but WITHOUT ANY WARRANTY; without even the implied