Mass commit to catch a few scattered fixes.

diff --git a/doc/source/authors.sgml b/doc/source/authors.sgml
index 14b4d4a..03a5859 100644 (file)
--- a/doc/source/authors.sgml
+++ b/doc/source/authors.sgml
@@ -3,7 +3,7 @@
 
  Purpose     :  AUTHORS file for Privoxy
                 
 
  Purpose     :  AUTHORS file for Privoxy
                 

- $Id: authors.sgml,v 1.4 2002/04/10 18:45:14 swa Exp $
+ $Id: authors.sgml,v 1.5 2002/04/25 15:17:31 swa Exp $

 
  Written by and Copyright (C) 2001 the SourceForge
  Privoxy team. http://www.privoxy.org/
 
  Written by and Copyright (C) 2001 the SourceForge
  Privoxy team. http://www.privoxy.org/


@@ -28,7 +28,7 @@
 
 -->
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
 
 -->
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [

-<!entity % dummy "INCLUDE"> 
+<!entity % dummy "IGNORE"> 

 <!entity authors SYSTEM "p-authors.sgml">
 <!entity p-version "2.9.14">
 <!entity p-status "beta">
 <!entity authors SYSTEM "p-authors.sgml">
 <!entity p-version "2.9.14">
 <!entity p-status "beta">

diff --git a/doc/source/buildsource.sgml b/doc/source/buildsource.sgml
index 3c05924..e40d991 100644 (file)
--- a/doc/source/buildsource.sgml
+++ b/doc/source/buildsource.sgml
@@ -3,7 +3,7 @@
 
  Purpose     :  Entity included in other project documents.
                 
 
  Purpose     :  Entity included in other project documents.
                 

- $Id: buildsource.sgml,v 1.4 2002/04/18 10:20:53 oes Exp $
+ $Id: buildsource.sgml,v 1.5 2002/04/18 12:11:50 oes Exp $

 
  Written by and Copyright (C) 2001 the SourceForge
  Privoxy team. http://www.privoxy.org/
 
  Written by and Copyright (C) 2001 the SourceForge
  Privoxy team. http://www.privoxy.org/


@@ -83,7 +83,7 @@
 
 <para>
   If you have gnu make, you can have the first four steps 
 
 <para>
   If you have gnu make, you can have the first four steps 

-  automatically done for you by just typing
+  automatically done for you by just typing:

 </para>
 
 <para>
 </para>
 
 <para>


@@ -103,6 +103,7 @@
  url="../developer-manual/newrelease.html">developer manual</ulink>.
 </para>
 
  url="../developer-manual/newrelease.html">developer manual</ulink>.
 </para>
 

+<!-- print for README only -->

  <![%p-readme;[
  <para>
   For binary RPM installation, and other platforms, see the user-manual 
  <![%p-readme;[
  <para>
   For binary RPM installation, and other platforms, see the user-manual 

diff --git a/doc/source/contacting.sgml b/doc/source/contacting.sgml
index 2c6e3f6..daa5fc2 100644 (file)
--- a/doc/source/contacting.sgml
+++ b/doc/source/contacting.sgml
@@ -3,7 +3,7 @@
 
  Purpose     :  Entity included in other project documents.
                 
 
  Purpose     :  Entity included in other project documents.
                 

- $Id: contacting.sgml,v 1.7 2002/04/10 04:06:57 hal9 Exp $
+ $Id: contacting.sgml,v 1.8 2002/04/12 10:20:58 swa Exp $

 
  Written by and Copyright (C) 2001 the SourceForge
  Privoxy team. http://www.privoxy.org/
 
  Written by and Copyright (C) 2001 the SourceForge
  Privoxy team. http://www.privoxy.org/


@@ -36,7 +36,7 @@
  <itemizedlist>
 
   <listitem>
  <itemizedlist>
 
   <listitem>

-   <literallayout>
+   <literallayout class="normal">

 Use the Sourceforge Support Forum to get help:
    
     <ulink url="http://sourceforge.net/tracker/?group_id=11118&#38;atid=211118">http://sourceforge.net/tracker/?group_id=11118&#38;atid=211118</ulink>
 Use the Sourceforge Support Forum to get help:
    
     <ulink url="http://sourceforge.net/tracker/?group_id=11118&#38;atid=211118">http://sourceforge.net/tracker/?group_id=11118&#38;atid=211118</ulink>


@@ -44,7 +44,7 @@ Use the Sourceforge Support Forum to get help:
   </listitem>
  
   <listitem>
   </listitem>
  
   <listitem>

-   <literallayout>
+   <literallayout class="normal">

 Submit bugs only through our Sourceforge Bug Forum:
  
     <ulink url="http://sourceforge.net/tracker/?group_id=11118&#38;atid=111118">http://sourceforge.net/tracker/?group_id=11118&#38;atid=111118</ulink>. 
 Submit bugs only through our Sourceforge Bug Forum:
  
     <ulink url="http://sourceforge.net/tracker/?group_id=11118&#38;atid=111118">http://sourceforge.net/tracker/?group_id=11118&#38;atid=111118</ulink>. 


@@ -64,7 +64,7 @@ Submit bugs only through our Sourceforge Bug Forum:
  </listitem>
  
   <listitem>
  </listitem>
  
   <listitem>

-   <literallayout>
+   <literallayout class="normal">

 Submit feature requests only through our Sourceforge feature request forum:
  
     <ulink url="http://sourceforge.net/tracker/?atid=361118&#38;group_id=11118&#38;func=browse"></ulink>.
 Submit feature requests only through our Sourceforge feature request forum:
  
     <ulink url="http://sourceforge.net/tracker/?atid=361118&#38;group_id=11118&#38;func=browse"></ulink>.


@@ -73,7 +73,7 @@ Submit feature requests only through our Sourceforge feature request forum:
 
 
   <listitem>
 
 
   <listitem>

-   <literallayout>
+   <literallayout class="normal">

 You can also send feedback on websites that Privoxy has problems with. Please bookmark
 the following link: <ulink url="javascript:w=Math.floor(screen.width/2);h=Math.floor(screen.height*0.9);void(window.open('http://www.privoxy.org/actions','Feedback','screenx='+w+',width='+w+',height='+h+',scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());"><quote>Privoxy - Submit Filter Feedback</quote></ulink>. Once you surf to a page with problems, use the
 bookmark to send us feedback. We will look into the issue as soon as possible.
 You can also send feedback on websites that Privoxy has problems with. Please bookmark
 the following link: <ulink url="javascript:w=Math.floor(screen.width/2);h=Math.floor(screen.height*0.9);void(window.open('http://www.privoxy.org/actions','Feedback','screenx='+w+',width='+w+',height='+h+',scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());"><quote>Privoxy - Submit Filter Feedback</quote></ulink>. Once you surf to a page with problems, use the
 bookmark to send us feedback. We will look into the issue as soon as possible.


@@ -82,7 +82,7 @@ bookmark to send us feedback. We will look into the issue as soon as possible.
 
 
  <listitem>
 
 
  <listitem>

-   <literallayout>
+   <literallayout class="normal">

 For any other issues, feel free to use the mailing lists:
  
     <ulink url="http://sourceforge.net/mail/?group_id=11118">http://sourceforge.net/mail/?group_id=11118</ulink>.
 For any other issues, feel free to use the mailing lists:
  
     <ulink url="http://sourceforge.net/mail/?group_id=11118">http://sourceforge.net/mail/?group_id=11118</ulink>.

diff --git a/doc/source/copyright.sgml b/doc/source/copyright.sgml
index 4c5c46d..05a715c 100644 (file)
--- a/doc/source/copyright.sgml
+++ b/doc/source/copyright.sgml
@@ -3,7 +3,7 @@
 
  Purpose     :  Entity included in other project documents.
                 
 
  Purpose     :  Entity included in other project documents.
                 

- $Id: copyright.sgml,v 1.2 2002/04/06 05:07:28 hal9 Exp $
+ $Id: copyright.sgml,v 1.3 2002/04/07 08:10:12 swa Exp $

 
  Written by and Copyright (C) 2001 the SourceForge
  Privoxy team. http://www.privoxy.org/
 
  Written by and Copyright (C) 2001 the SourceForge
  Privoxy team. http://www.privoxy.org/


@@ -33,17 +33,20 @@
  <application>Privoxy</application> is free software; you can
  redistribute it and/or modify it under the terms of the GNU General Public
 <!-- 
  <application>Privoxy</application> is free software; you can
  redistribute it and/or modify it under the terms of the GNU General Public
 <!-- 

- <informalfigure float="0">
+ <informalfigure pgwide="1" float="1">

     <mediaobject>
        <imageobject>
     <mediaobject>
        <imageobject>

-          <imagedata fileref="gnu.jpg" format="jpg">
+          <imagedata align="left" fileref="../gnu.jpg" format="jpg">

        </imageobject>
        <textobject>
           <phrase>GNU's Pet GNU</phrase>
        </textobject>
     </mediaobject>
  </informalfigure>
        </imageobject>
        <textobject>
           <phrase>GNU's Pet GNU</phrase>
        </textobject>
     </mediaobject>
  </informalfigure>

+ or better:
+ <inlinegraphic depth="1" align="left" fileref="../gnu.png"></inlinegraphic> 

 --> 
 --> 

+

  License as published by the Free Software Foundation; either version 2 of the
  License, or (at your option) any later version.
 </para>
  License as published by the Free Software Foundation; either version 2 of the
  License, or (at your option) any later version.
 </para>


@@ -52,6 +55,10 @@
  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
  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

+<!--
+<figure pgwide="0"><title>The Pythagorean Theorum Illustrated</title>
+</figure>
+--> 

  more details, which is available from the Free Software Foundation, Inc, 59
  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 </para>
  more details, which is available from the Free Software Foundation, Inc, 59
  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 </para>

diff --git a/doc/source/developer-manual.sgml b/doc/source/developer-manual.sgml
index 786fdd0..2820f44 100644 (file)
--- a/doc/source/developer-manual.sgml
+++ b/doc/source/developer-manual.sgml
@@ -1,5 +1,5 @@
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook V3.1//EN"[
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook V3.1//EN"[

-<!entity % dummy "INCLUDE"> 
+<!entity % dummy "IGNORE"> 

 <!entity supported SYSTEM "supported.sgml">
 <!entity newfeatures SYSTEM "newfeatures.sgml">
 <!entity p-intro SYSTEM "privoxy.sgml">
 <!entity supported SYSTEM "supported.sgml">
 <!entity newfeatures SYSTEM "newfeatures.sgml">
 <!entity p-intro SYSTEM "privoxy.sgml">


@@ -21,7 +21,7 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
                 
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
                 

- $Id: developer-manual.sgml,v 1.34 2002/04/15 23:39:32 oes Exp $
+ $Id: developer-manual.sgml,v 1.35 2002/04/17 15:16:15 oes Exp $

 
  Written by and Copyright (C) 2001 the SourceForge
  Privoxy team. http://www.privoxy.org/
 
  Written by and Copyright (C) 2001 the SourceForge
  Privoxy team. http://www.privoxy.org/


@@ -44,7 +44,7 @@
   <artheader>
     <title>Privoxy Developer Manual</title>
 
   <artheader>
     <title>Privoxy Developer Manual</title>
 

-    <pubdate>$Id: developer-manual.sgml,v 1.34 2002/04/15 23:39:32 oes Exp $</pubdate>
+    <pubdate>$Id: developer-manual.sgml,v 1.35 2002/04/17 15:16:15 oes Exp $</pubdate>

 
     <authorgroup>
       <author>
 
     <authorgroup>
       <author>


@@ -1720,7 +1720,7 @@ static void unload_re_filterfile( void *f ) { ... }</programlisting>
 
     <para><emphasis>Example for file comments:</emphasis></para>
 <programlisting>
 
     <para><emphasis>Example for file comments:</emphasis></para>
 <programlisting>

-const char FILENAME_rcs[] = "$Id: developer-manual.sgml,v 1.34 2002/04/15 23:39:32 oes Exp $";
+const char FILENAME_rcs[] = "$Id: developer-manual.sgml,v 1.35 2002/04/17 15:16:15 oes Exp $";

 /*********************************************************************
  *
  * File        :  $S<!-- Break CVS Substitution -->ource$
 /*********************************************************************
  *
  * File        :  $S<!-- Break CVS Substitution -->ource$


@@ -1780,7 +1780,7 @@ const char FILENAME_h_rcs[] = FILENAME_H_VERSION;
 <programlisting>
 #ifndef _FILENAME_H
 #define _FILENAME_H
 <programlisting>
 #ifndef _FILENAME_H
 #define _FILENAME_H

-#define FILENAME_H_VERSION "$Id: developer-manual.sgml,v 1.34 2002/04/15 23:39:32 oes Exp $"
+#define FILENAME_H_VERSION "$Id: developer-manual.sgml,v 1.35 2002/04/17 15:16:15 oes Exp $"

 /*********************************************************************
  *
  * File        :  $S<!-- Break CVS Substitution -->ource$
 /*********************************************************************
  *
  * File        :  $S<!-- Break CVS Substitution -->ource$


@@ -2542,6 +2542,9 @@ zip -r privoxyosx_setup_x.y.z.zip Privoxy.pkg
   Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
   $Log: developer-manual.sgml,v $
   Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
   $Log: developer-manual.sgml,v $

+  Revision 1.35  2002/04/17 15:16:15  oes
+  Added link to docbook crash course
+

   Revision 1.34  2002/04/15 23:39:32  oes
    - Extended & fixed the release section
    - Added CVS guideline sections
   Revision 1.34  2002/04/15 23:39:32  oes
    - Extended & fixed the release section
    - Added CVS guideline sections

diff --git a/doc/source/faq.sgml b/doc/source/faq.sgml
index 80d8d26..4a84461 100644 (file)
--- a/doc/source/faq.sgml
+++ b/doc/source/faq.sgml
@@ -1,5 +1,5 @@
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook V3.1//EN"[
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook V3.1//EN"[

-<!entity % dummy "INCLUDE"> 
+<!entity % dummy "IGNORE"> 

 <!entity supported SYSTEM "supported.sgml">
 <!entity newfeatures SYSTEM "newfeatures.sgml">
 <!entity p-intro SYSTEM "privoxy.sgml">
 <!entity supported SYSTEM "supported.sgml">
 <!entity newfeatures SYSTEM "newfeatures.sgml">
 <!entity p-intro SYSTEM "privoxy.sgml">


@@ -22,7 +22,7 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
                 
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
                 

- $Id: faq.sgml,v 1.48 2002/04/10 18:45:15 swa Exp $
+ $Id: faq.sgml,v 1.49 2002/04/12 10:10:18 swa Exp $

 
  Written by and Copyright (C) 2001 the SourceForge
  Privoxy team. http://www.privoxy.org/
 
  Written by and Copyright (C) 2001 the SourceForge
  Privoxy team. http://www.privoxy.org/


@@ -60,7 +60,7 @@
 <artheader>
 <title>Privoxy Frequently Asked Questions</title>
 
 <artheader>
 <title>Privoxy Frequently Asked Questions</title>
 

-<pubdate>$Id: faq.sgml,v 1.48 2002/04/10 18:45:15 swa Exp $</pubdate>
+<pubdate>$Id: faq.sgml,v 1.49 2002/04/12 10:10:18 swa Exp $</pubdate>

 
 <authorgroup>
  <author>
 
 <authorgroup>
  <author>


@@ -86,6 +86,16 @@
  <![%p-stable;[ v.&p-version]]>.
  </para>
 
  <![%p-stable;[ v.&p-version]]>.
  </para>
 

+<![%p-text;[ 
+
+<para>
+
+ Test of text doc only.
+
+</para>
+
+]]>
+

 <!-- Include privoxy.sgml boilerplate: -->
  &p-intro;
 <!-- end boilerplate -->
 <!-- Include privoxy.sgml boilerplate: -->
  &p-intro;
 <!-- end boilerplate -->


@@ -499,7 +509,7 @@ All the ads are there. What's wrong?</title>
 some of these <quote>actions</quote>.</title>
 <para>
  These are all explained in the 
 some of these <quote>actions</quote>.</title>
 <para>
  These are all explained in the 

- <ulink url="../user-manual/configuration.html#ACTIONSFILE">user-manual</ulink>.
+ <ulink url="../user-manual/configuration.html#ACTIONS-FILE">user-manual</ulink>.

  Please refer to that.
 </para>
 </sect2>
  Please refer to that.
 </para>
 </sect2>


@@ -521,7 +531,7 @@ way to do this?</title>
 <para>
  Please see the 
  <ulink
 <para>
  Please see the 
  <ulink

- url="../user-manual/configuration.html#ACTIONSFILE">user-manual</ulink> for a
+ url="../user-manual/configuration.html#ACTIONS-FILE">user-manual</ulink> for a

  detailed explanation of these and other configuration files, and their
  various options and syntax.
 </para>
  detailed explanation of these and other configuration files, and their
  various options and syntax.
 </para>


@@ -1020,7 +1030,7 @@ FIXME: commented out until we have data. HB 03/18/02.
  Beginning with <application>Privoxy v2.9.14</application>, missed ads and 
  banners and other actions file problems, can be submitted by accessing
  <ulink url="javascript:w=Math.floor(screen.width/2);h=Math.floor(screen.height*0.9);void(window.open('http://www.privoxy.org/actions','Feedback','screenx='+w+',width='+w+',height='+h+',scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());"><quote>actions file feedback system</quote></ulink>
  Beginning with <application>Privoxy v2.9.14</application>, missed ads and 
  banners and other actions file problems, can be submitted by accessing
  <ulink url="javascript:w=Math.floor(screen.width/2);h=Math.floor(screen.height*0.9);void(window.open('http://www.privoxy.org/actions','Feedback','screenx='+w+',width='+w+',height='+h+',scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());"><quote>actions file feedback system</quote></ulink>

- from <ulink url="http://p.p/">http://p.p/</ulink>
+ from <ulink url="http://p.p/">http://p.p/</ulink>.

 </para>
 
 <para>
 </para>
 
 <para>


@@ -1443,6 +1453,9 @@ 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 $
  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 $Log: faq.sgml,v $

+Revision 1.49  2002/04/12 10:10:18  swa
+version update
+

 Revision 1.48  2002/04/10 18:45:15  swa
 generated
 
 Revision 1.48  2002/04/10 18:45:15  swa
 generated
 

diff --git a/doc/source/readme.sgml b/doc/source/readme.sgml
index e98450f..26228e6 100644 (file)
--- a/doc/source/readme.sgml
+++ b/doc/source/readme.sgml
@@ -1,5 +1,5 @@
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [

-<!entity % dummy "INCLUDE"> 
+<!entity % dummy "IGNORE"> 

 <!entity supported SYSTEM "supported.sgml">
 <!entity p-intro SYSTEM "privoxy.sgml">
 <!entity contacting SYSTEM "contacting.sgml">
 <!entity supported SYSTEM "supported.sgml">
 <!entity p-intro SYSTEM "privoxy.sgml">
 <!entity contacting SYSTEM "contacting.sgml">


@@ -17,7 +17,7 @@
 
  Purpose     :  README for Privoxy
                 
 
  Purpose     :  README for Privoxy
                 

- $Id: readme.sgml,v 1.8 2002/04/12 10:09:50 swa Exp $
+ $Id: readme.sgml,v 1.9 2002/04/24 04:04:12 hal9 Exp $

 
  Written by and Copyright (C) 2001 the SourceForge
  Privoxy team. http://www.privoxy.org/
 
  Written by and Copyright (C) 2001 the SourceForge
  Privoxy team. http://www.privoxy.org/


@@ -195,13 +195,14 @@
 -------------- </LiteralLayout>
 </para>
 <para>
 -------------- </LiteralLayout>
 </para>
 <para>

- See: 'config', 'default.action', 'standard.action', 'user.action', and
- 'default.filter'. 'user.action' is for personal configuration. These are all
- well commented. Most of the magic is in '*.action' files. On Unix-like
- systems, these files are installed in /etc/privoxy.  On Windows, then
- wherever the executable itself is installed. There are many significant
- changes and advances since Junkbuster v2.0.x. The user-manual has a run down
- of configuration options, and examples: http://www.privoxy.org/user-manual/.
+ See: 'config', 'default.action', 'user.action', and 'default.filter'.
+ 'user.action' is for personal configuration. These are all well commented.
+ Most of the magic is in '*.action' files. 'user.action' should be 
+ used for any actions customizations. On Unix-like systems, these files
+ are installed in /etc/privoxy.  On Windows, then wherever the executable
+ itself is installed. There are many significant changes and advances since
+ Junkbuster v2.0.x. The user-manual has a run down of configuration options,
+ and examples: http://www.privoxy.org/user-manual/.

 </para>
 <para>
  Be sure to set your browser(s) for HTTP/HTTPS Proxy at &lt;IP&gt;:&lt;Port&gt;, or
 </para>
 <para>
  Be sure to set your browser(s) for HTTP/HTTPS Proxy at &lt;IP&gt;:&lt;Port&gt;, or


@@ -260,7 +261,7 @@
  </LiteralLayout>
 </para>
 <para>
  </LiteralLayout>
 </para>
 <para>

- $Id: readme.sgml,v 1.8 2002/04/12 10:09:50 swa Exp $
+ $Id: readme.sgml,v 1.9 2002/04/24 04:04:12 hal9 Exp $

 </para>
 
 </article>
 </para>
 
 </article>