From: Fabian Keil Date: Wed, 22 Jul 2020 12:26:13 +0000 (+0200) Subject: Rebuild man page X-Git-Tag: v_3_0_29~249 X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=416fb84eaeaeaef12a88f4cc5885cf0ec7f74dd7 Rebuild man page --- diff --git a/privoxy.1 b/privoxy.1 index 22b6065d..0e9660cd 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" "30 December 2018" "Privoxy 3.0.28" "" +.TH "PRIVOXY" "1" "22 July 2020" "Privoxy 3.0.29 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 @@ -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" @@ -210,7 +213,7 @@ configuration related suggestions to the developers. .SH "COPYRIGHT AND LICENSE" .SS "COPYRIGHT" .PP -Copyright (C) 2001-2018 by Privoxy Developers +Copyright (C) 2001-2020 by Privoxy Developers .PP Some source code is based on code Copyright (C) 1997 by Anonymous Coders and Junkbusters, Inc. and licensed under the \fIGNU General Public @@ -218,9 +221,18 @@ License\fR. .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 +mbed TLS in which +case you can redistribute them and/or modify them 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