Sync with user-manual.sgml 2.73.

[privoxy.git] / doc / webserver / user-manual / copyright.html

diff --git a/doc/webserver/user-manual/copyright.html b/doc/webserver/user-manual/copyright.html
index 25427c2..2304bb1 100644 (file)
--- a/doc/webserver/user-manual/copyright.html
+++ b/doc/webserver/user-manual/copyright.html
@@ -102,7 +102,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN5092"
+NAME="AEN4927"
 >12.1. License</A
 ></H2
 ><P
@@ -113,28 +113,24 @@ CLASS="APPLICATION"
  redistribute it and/or modify it under the terms of the 
  <I
 CLASS="CITETITLE"
->GNU General Public
- License</I
->, version 2, as published by the Free Software Foundation.</P
+>GNU General Public License</I
+>, version 2,
+ as published by the Free Software Foundation.</P
 ><P
 > 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 
- <I
-CLASS="CITETITLE"
->GNU General Public License</I
-> for
- 
- more details, which is available from the Free Software Foundation, Inc, 
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA</P
-><P
-> You should have received a copy of the <A
-HREF="http://www.gnu.org/copyleft/gpl.html"
+ FITNESS FOR A PARTICULAR PURPOSE.  See the <A
+HREF="http://www.gnu.org/licenses/old-licenses/gpl-2.0.html"
 TARGET="_top"
 > <I
 CLASS="CITETITLE"
 >GNU General Public License</I
 ></A
+> for details.</P
+><P
+> You should have received a copy of the <I
+CLASS="CITETITLE"
+>GNU GPL</I
 >
  along with this program; if not, write to the <P
 CLASS="ADDRESS"
@@ -262,6 +258,7 @@ CLASS="LITERALLAYOUT"
 &nbsp;David&nbsp;Schmidt,&nbsp;developer<br>
 &nbsp;<br>
 &nbsp;Hal&nbsp;Burgiss<br>
+&nbsp;Mark&nbsp;Miller<br>
 &nbsp;Gerry&nbsp;Murphy<br>
 &nbsp;Roland&nbsp;Rosenfeld<br>
 &nbsp;Jörg&nbsp;Strohmayer</P