Add ChangeLog entries for changes from 639c42d7ab7 to 91f9e616645

[privoxy.git] / privoxy.1

diff --git a/privoxy.1 b/privoxy.1
index 22b6065..62e8c34 100644 (file)
--- 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" "30 December 2018" "Privoxy 3.0.28" ""
+.TH "PRIVOXY" "1" "16 December 2020" "Privoxy 3.0.30 UNRELEASED" ""
 .SH NAME
 privoxy \- Privacy Enhancing Proxy
 .SH SYNOPSIS
@@ -76,7 +76,7 @@ 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
@@ -84,10 +84,10 @@ 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
@@ -172,6 +172,9 @@ 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"
@@ -196,7 +199,7 @@ 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"
 
@@ -210,17 +213,26 @@ configuration related suggestions to the developers.
 .SH "COPYRIGHT AND LICENSE"
 .SS "COPYRIGHT"
 .PP
-Copyright (C) 2001-2018 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