X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=privoxy.1;h=62e8c34a2fb863c398a83b687d3bf6ca67bd81eb;hp=0e9660cd3fa1684bf2c9633576b46702a61fd0ee;hb=008f9c881691d244c7c513257cd8f9461114622f;hpb=416fb84eaeaeaef12a88f4cc5885cf0ec7f74dd7 diff --git a/privoxy.1 b/privoxy.1 index 0e9660cd..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" "22 July 2020" "Privoxy 3.0.29 UNRELEASED" "" +.TH "PRIVOXY" "1" "16 December 2020" "Privoxy 3.0.30 UNRELEASED" "" .SH NAME privoxy \- Privacy Enhancing Proxy .SH SYNOPSIS @@ -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 @@ -199,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" @@ -216,8 +216,7 @@ configuration related suggestions to the 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 -License\fR. +and Junkbusters, Inc. .SS "LICENSE" .PP \fBPrivoxy\fR is free software; you can @@ -227,10 +226,11 @@ 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 +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