X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=doc%2Fwebserver%2Fuser-manual%2Fcopyright.html;h=7be80d4e8e870bd4ac2f73865ce2f9b31a089736;hp=a1ba87db70d5df1818b182b3acaaac3496be96c3;hb=2727c136ceb730015412df0cf32d8761ffe13930;hpb=d9813d602eb59d009d10e6d3861cd99821a6db70;ds=sidebyside diff --git a/doc/webserver/user-manual/copyright.html b/doc/webserver/user-manual/copyright.html index a1ba87db..7be80d4e 100644 --- a/doc/webserver/user-manual/copyright.html +++ b/doc/webserver/user-manual/copyright.html @@ -4,18 +4,18 @@ Privoxy Copyright, License and History - + - +
- + @@ -26,16 +26,16 @@
-

12. Privoxy Copyright, License and History

-

Copyright � 2001-2017 by Privoxy Developers

-

Some source code is based on code Copyright � 1997 by Anonymous Coders and Junkbusters, Inc. and licensed under - the GNU General Public License.

+

12. Privoxy Copyright, License and History

+

Copyright © 2001-2019 by Privoxy Developers

+

Some source code is based on code Copyright © 1997 by Anonymous Coders and Junkbusters, Inc. and licensed + under the GNU General Public License.

Privoxy is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2, as published by the Free Software Foundation and included in the next section.

-

12.1. License

+

12.1. License

Privoxy 3.0.27 User ManualPrivoxy 3.0.29 User Manual
Prev
@@ -331,8 +331,8 @@ to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -370,7 +370,7 @@ necessary. Here is a sample; alter the names: Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker. - <signature of Ty Coon>, 1 April 1989 + <signature of Ty Coon>, 1 April 1989 Ty Coon, President of Vice This General Public License does not permit incorporating your program into @@ -384,7 +384,7 @@ Public License instead of this License.
-

12.2. History

+

12.2. History

A long time ago, there was the Internet Junkbuster, by Anonymous Coders and Junkbusters Corporation. This saved many users a lot of pain in the early days of web advertising and user tracking.

@@ -409,11 +409,10 @@ Public License instead of this License. is still actively maintained.

-

12.3. Authors

+

12.3. Authors

Current Privoxy Team:

 Fabian Keil, lead developer
 David Schmidt
-  Hal Burgiss
 Lee Rian
 Roland Rosenfeld
 Ian Silvester

@@ -421,13 +420,14 @@ Public License instead of this License.

 Johny Agotnes
 Rodrigo Barbosa
 Moritz Barsnick
+  Hal Burgiss
 Ian Cummings
 Brian Dessent
 Jon Foster
 Karsten Hopp
 Alexander Lazic
 Daniel Leite
-  G�bor Lipt�k
+  Gábor Lipták
 Adam Lock
 Guy Laroche
 Justin McMurtry
@@ -437,7 +437,7 @@ Public License instead of this License.  Haroon Rafique
 Georg Sauthoff
 Thomas Steudten
-  J�rg Strohmayer
+  Jörg Strohmayer
 Rodney Stromlund
 Sviatoslav Sviridov
 Sarantis Paskalis
@@ -451,6 +451,7 @@ Public License instead of this License.  Natxo Asenjo
 Devin Bayer
 Havard Berland
+  David Binderman
 David Bo
 Gergely Bor
 Francois Botha
@@ -463,7 +464,7 @@ Public License instead of this License.  Sam Chen
 Ramkumar Chinchani
 Billy Crook
-  Fr�d�ric Crozat
+  Frédéric Crozat
 Matthew Daley
 Michael T. Davis
 Markus Dittrich
@@ -480,7 +481,7 @@ Public License instead of this License.  Danny Goossen
 Lizik Grelier
 Daniel Griscom
-  Felix Gr�bert
+  Felix Gröbert
 Bernard Guillot
 Jeff H.
 Tim H.
@@ -489,6 +490,7 @@ Public License instead of this License.  Magnus Holmgren
 Eric M. Hopper
 Ralf Horstmann
+  Nedžad Hrnjica
 Stefan Huehner
 Basil Hussain
 Peter Hyman
@@ -522,24 +524,28 @@ Public License instead of this License.  Mark Nelson
 Tobias Netzel
 Adam Piggott
-  Petr P�sar
+  Petr Písar
 Dan Price
 Roberto Ragusa
-  F�lix Rauch
+  Félix Rauch
 Kai Raven
 Marvin Renich
 Chris John Riley
 Maynard Riley
+  Ivan Romanov
 Andreas Rutkauskas
+  Sam
 Bart Schelstraete
 Gregory Seidman
 Atman Sense
 Chung-chieh Shan
 Johan Sintorn
 Benjamin C. Wiley Sittler
+  DRS David Soft
 Simon South
 Dan Stahlke
 Oliver Stoeneberg
+  Václav Švec
 Rick Sykes
 Spinor S.
 Peter Thoenen
@@ -553,7 +559,7 @@ Public License instead of this License.  David Wagner
 Glenn Washburn
 Song Weijia
-  J�rg Weinmann
+  Jörg Weinmann
 Darren Wiebe
 Anduin Withers
 Eduard Wulff