X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=doc%2Fwebserver%2Fuser-manual%2Fcopyright.html;h=ad62f17d731a3380a1ad48af24cd8e703e40cdaf;hb=69b45dc21f48175fb34a8e1e2f45d46870e37941;hp=1ef372afca8fd4127e2ecf4b661fd7fe34d9c08d;hpb=84a6d458b85203e8cc651d7a360b2bf18e458e9f;p=privoxy.git diff --git a/doc/webserver/user-manual/copyright.html b/doc/webserver/user-manual/copyright.html index 1ef372af..ad62f17d 100644 --- a/doc/webserver/user-manual/copyright.html +++ b/doc/webserver/user-manual/copyright.html @@ -3,13 +3,10 @@ - - Privoxy Copyright, License and History - + @@ -17,25 +14,15 @@ - - +
@@ -64,7 +51,7 @@ body { "CITETITLE">GNU General Public License.

-

12.1. License

+

12.1. License

Privoxy is free software; you can redistribute it and/or modify it under the terms of the This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for details.

+ "_top">GNU General Public License for + details.

You should have received a copy of the GNU GPL along with this program; if not, write to the

@@ -140,8 +127,6 @@ body {  Fabian Keil, lead developer
 David Schmidt, developer
 Hal Burgiss
-  Mark Miller
-  Gerry Murphy
 Lee Rian
 Roland Rosenfeld

@@ -160,6 +145,8 @@ body {  Adam Lock
 Guy Laroche
 Justin McMurtry
+  Mark Miller
+  Gerry Murphy
 Andreas Oesterhelt
 Haroon Rafique
 Georg Sauthoff
@@ -256,7 +243,7 @@ body {