X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=doc%2Fsource%2Ffaq.sgml;h=852aa662b2e5025d6e9a21e69420325d9a2ba54d;hb=60280cbce7102b9fa793bf1dfdcc0267c56ba32e;hp=beb3504603e2f54e3ec0dd847a9add0f63fdc571;hpb=51ae576dcda313326c2bb36bc8f05713683425d3;p=privoxy.git

diff --git a/doc/source/faq.sgml b/doc/source/faq.sgml
index beb35046..852aa662 100644
--- a/doc/source/faq.sgml
+++ b/doc/source/faq.sgml
@@ -7,13 +7,15 @@
 <!entity contacting SYSTEM "contacting.sgml">
 <!entity history SYSTEM "history.sgml">
 <!entity copyright SYSTEM "copyright.sgml">
-<!entity p-version "2.9.14">
+<!entity license SYSTEM "license.sgml">
+<!entity p-version "2.9.15">
 <!entity p-status "beta">
 <!entity % p-not-stable "INCLUDE">
 <!entity % p-stable "IGNORE">
 <!entity % p-text "IGNORE">        <!-- define we are not a text only doc -->
 <!entity % p-doc "INCLUDE">        <!-- and we are a formal doc           -->
 <!entity % p-supp-userman "INCLUDE"> <!-- Include all from supported.sgml -->
+<!entity  my-copy "&copy;">          <!-- kludge for docbook2man          -->
 ]>
 <!--
  File        :  $Source: /cvsroot/ijbswa/current/doc/source/faq.sgml,v $
@@ -22,14 +24,14 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
                 
- $Id: faq.sgml,v 1.54 2002/05/03 05:06:44 hal9 Exp $
+ $Id: faq.sgml,v 1.58 2002/05/10 01:48:20 hal9 Exp $
 
- Written by and Copyright (C) 2001 the SourceForge
- Privoxy team. http://www.privoxy.org/
+ Copyright (C) 2001, 2002 Privoxy Developers <developers@privoxy.org>
+ See LICENSE.
 
- Based on the Internet Junkbuster originally written
- by and Copyright (C) 1997 Anonymous Coders and 
- Junkbusters Corporation.  http://www.junkbusters.com
+ Based partially on the Internet Junkbuster FAQ originally written by and
+ Copyright (C) 1997 Anonymous Coders and Junkbusters Corporation.
+ http://www.junkbusters.com
 
  <Qandaset defaultlabel='qanda'>
   <QandAEntry>
@@ -61,8 +63,35 @@
 <artheader>
 <title>Privoxy Frequently Asked Questions</title>
 
-<pubdate>$Id: faq.sgml,v 1.54 2002/05/03 05:06:44 hal9 Exp $</pubdate>
+<pubdate>
+ <subscript>
+<!-- Completely the wrong markup, but very little is allowed  -->
+<!-- in this part of an article. FIXME -->
+ <link linkend="copyright">Copyright</link> &my-copy; 2001, 2002 by 
+ <ulink url="http://www.privoxy.org">Privoxy Developers</ulink>
+ </subscript>
+</pubdate>
 
+<pubdate>$Id: faq.sgml,v 1.58 2002/05/10 01:48:20 hal9 Exp $</pubdate>
+
+<!--
+
+Note: this should generate a separate page, and a live link to it. 
+But it doesn't for some mysterious reason. Please leave commented
+unless it can be fixed proper. For the time being, the copyright 
+statement will be in copyright.smgl.
+
+Hal.
+
+<legalnotice id="legalnotice"> 
+ <para>
+  text goes here ........
+ </para>
+</legalnotice>
+
+-->
+
+<!--
 <authorgroup>
  <author>
   <affiliation>
@@ -70,7 +99,7 @@
    </affiliation>
  </author>
 </authorgroup>
-
+-->
 <abstract>
 <![%dummy;[
 <para>
@@ -288,8 +317,10 @@ warranty? Registration?</title>
  <para>
   <application>Privoxy</application> is licensed under the GNU General Public
   License (GPL). It is free to use, copy, modify or distribute as you wish
-  under the terms of this license.  Please see the Copyright section for more
-  information on the license and copyright.
+  under the terms of this license.  Please see the <link
+  linkend="copyright">Copyright</link> section for more information on the
+  license and copyright. Or the <filename>LICENSE</filename> file 
+  that should be included.
 
   </para>
  <para>
@@ -1069,7 +1100,7 @@ FIXME: commented out until we have data. HB 03/18/02.
 
 <sect2 renderas="sect3" id="newads"><title>How can I submit new ads?</title>
 <para>
-Please see the <ulink url="contact.html">Contact section</ulink>.
+Please see the <link linkend="contact">Contact section</link>.
 </para>
 
 <para>
@@ -1412,22 +1443,37 @@ FIXME: Commented out until we have something to put here. HB 03/18/02.
 <!-- end contacting -->
   </sect1>
   
-  <!--   ~~~~~       New section      ~~~~~     -->
-  <sect1 id="copyright"><title>Copyright and History</title>
-
-<sect2><title>Copyright</title>
-<!-- Include copyright.sgml -->
- &copyright;
-<!-- end -->
-</sect2>
+<!--   ~~~~~       New section      ~~~~~     -->
+<sect1 id="copyright"><title>Privoxy Copyright, License and History</title>
 
-<sect2><title>History</title>
-<!-- Include history.sgml -->
- &history;
-<!-- end -->
-</sect2>
+ <!-- Include copyright.sgml -->
+  &copyright;
+ <!-- end -->
+  
+  <para>
+   Portions of this document are <quote>borrowed</quote> from the original
+   <application>Junkbuster</application> (tm) FAQ, and modified as 
+   appropriate for <application>Privoxy</application>.
+  </para>
 
-  </sect1>
+ <!--   ~~~~~       New section      ~~~~~     -->
+ <sect2><title>License</title>
+ <!-- Include copyright.sgml: -->
+  &license;
+ <!-- end copyright -->
+ </sect2>
+ <!--  ~  End section  ~  -->
+
+ <!--   ~~~~~       New section      ~~~~~     -->
+ <sect2><title>History</title>
+ <!-- Include history.sgml -->
+  &history;
+ <!-- end -->
+ </sect2>
+
+ </sect1>
+ <!--  ~  End section  ~  -->
+ 
   
 <!--   ~~~~~       New section      ~~~~~     -->
 <!--
@@ -1467,6 +1513,20 @@ FIXME: Commented out until we have something to put here. HB 03/18/02.
  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 $Log: faq.sgml,v $
+Revision 1.58  2002/05/10 01:48:20  hal9
+This is mostly proposed copyright/licensing additions and changes. Docs
+are still GPL, but licensing and copyright are more visible. Also, copyright
+changed in doc header comments (eliminate references to JB except FAQ).
+
+Revision 1.57  2002/05/05 20:26:02  hal9
+Sorting out license vs copyright in these docs.
+
+Revision 1.56  2002/05/04 08:44:44  swa
+bumped version
+
+Revision 1.55  2002/05/04 00:41:56  hal9
+-Remove TOC/first page kludge in favor of proper handling via dsl file.
+
 Revision 1.54  2002/05/03 05:06:44  hal9
 Add brief Q/A on transparent proxies.