[privoxy-commits] current/doc/source user-manual.sgml,2.168,2.169

[Fabian K. <fab...@us...>]

Update of /cvsroot/ijbswa/current/doc/source
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28444/doc/source

Modified Files:
	user-manual.sgml 
Log Message:
Include the whole GPLv2 text in the user manual

.. so Privoxy can serve it itself and the user can read
it without having to wade through GPLv3 ads first.


Index: user-manual.sgml
===================================================================
RCS file: /cvsroot/ijbswa/current/doc/source/user-manual.sgml,v
retrieving revision 2.168
retrieving revision 2.169
diff -C2 -d -r2.168 -r2.169
*** user-manual.sgml	26 Feb 2013 15:09:35 -0000	2.168
--- user-manual.sgml	26 Feb 2013 15:10:49 -0000	2.169
***************
*** 10,13 ****
--- 10,14 ----
  <!entity copyright SYSTEM "copyright.sgml">
  <!entity license SYSTEM "license.sgml">
+ <!entity GPLv2 SYSTEM "../../LICENSE">
  <!entity p-authors SYSTEM "p-authors.sgml">
  <!entity config SYSTEM "p-config.sgml">
***************
*** 7361,7369 ****
  <!-- end copyright -->
  
  <!--   ~~~~~       New section      ~~~~~     -->
  <sect2><title>License</title>
! <!-- Include copyright.sgml: -->
!  &license;
! <!-- end copyright -->
  </sect2>
  <!--  ~  End section  ~  -->
--- 7362,7379 ----
  <!-- end copyright -->
  
+ <para>
+  <application>Privoxy</application> is free software; you can
+  redistribute it and/or modify it under the terms of the
+  <citetitle>GNU General Public License</citetitle>, version 2,
+  as published by the Free Software Foundation and included in
+  the next section.
+ </para>
+ 
  <!--   ~~~~~       New section      ~~~~~     -->
  <sect2><title>License</title>
! <para>
!  <screen><![ RCDATA [ &GPLv2; ]]></screen>
! </para>
! 
  </sect2>
  <!--  ~  End section  ~  -->