Sync with source for copyright vs license.

[privoxy.git] / privoxy.1

diff --git a/privoxy.1 b/privoxy.1
index 4384046..3928b96 100644 (file)
--- a/privoxy.1
+++ b/privoxy.1
@@ -3,7 +3,7 @@
 .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
 .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.

-.TH "PRIVOXY" "1" "25 April 2002" "Privoxy 2.9.14 beta" ""
+.TH "PRIVOXY" "1" "05 May 2002" "Privoxy 2.9.15 beta" ""

 .SH NAME
 privoxy \- Privacy Enhancing Proxy
 .SH SYNOPSIS
 .SH NAME
 privoxy \- Privacy Enhancing Proxy
 .SH SYNOPSIS


@@ -242,8 +242,7 @@ http://p.p/, access
 http://config.privoxy.org
 may work in some situations where the first does not.
 
 http://config.privoxy.org
 may work in some situations where the first does not.
 

-http://p.p/  
-to submit ``misses'' to the developers. 
+http://p.p/ to submit ``misses'' to the developers. 

 
 http://www.junkbusters.com/ht/en/cookies.html
 
 
 http://www.junkbusters.com/ht/en/cookies.html
 


@@ -271,6 +270,15 @@ http://www.squid-cache.org/
  Sarantis Paskalis
 .fi
 .SH "COPYRIGHT AND LICENSE"
  Sarantis Paskalis
 .fi
 .SH "COPYRIGHT AND LICENSE"

+.SS "COPYRIGHT"
+.PP
+Permission is granted to copy, distribute and/or modify this document under
+the terms of the \fIGNU Free
+Documentation License\fR, Version 1.1 or any later version
+published by the Free Software Foundation with no Invariant Sections, no
+Front-Cover Texts, and no Back-Cover Texts.  A copy of the license can be
+found http://www.gnu.org/licenses/fdl.html.
+.SS "LICENSE"

 .PP
 \fBPrivoxy\fR is free software; you can
 redistribute it and/or modify it under the terms of the GNU General Public
 .PP
 \fBPrivoxy\fR is free software; you can
 redistribute it and/or modify it under the terms of the GNU General Public