Make some links in seealso conditional. Man page is now privoxy only links.

diff --git a/doc/source/developer-manual.sgml b/doc/source/developer-manual.sgml
index e2aad35..b914cb5 100644 (file)
--- a/doc/source/developer-manual.sgml
+++ b/doc/source/developer-manual.sgml
@@ -14,6 +14,7 @@
 <!entity % p-stable "INCLUDE">
 <!entity % p-text "IGNORE">        <!-- define we are not a text only doc -->
 <!entity % p-doc "INCLUDE">        <!-- and we are a formal doc           -->
 <!entity % p-stable "INCLUDE">
 <!entity % p-text "IGNORE">        <!-- define we are not a text only doc -->
 <!entity % p-doc "INCLUDE">        <!-- and we are a formal doc           -->

+<!entity % seealso-extra "INCLUDE"> <!-- extra stuff from seealso.sgml    -->

 <!entity  my-copy "&copy;">        <!-- kludge for docbook2man            -->
 ]>
 <!--
 <!entity  my-copy "&copy;">        <!-- kludge for docbook2man            -->
 ]>
 <!--


@@ -23,7 +24,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 2.25 2009/02/12 15:37:05 fabiankeil Exp $
+ $Id: developer-manual.sgml,v 2.26 2009/02/12 16:08:26 fabiankeil Exp $

 
  Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/
  See LICENSE.
 
  Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/
  See LICENSE.


@@ -50,7 +51,7 @@
     </pubdate>
 
 
     </pubdate>
 
 

-    <pubdate>$Id: developer-manual.sgml,v 2.25 2009/02/12 15:37:05 fabiankeil Exp $</pubdate>
+    <pubdate>$Id: developer-manual.sgml,v 2.26 2009/02/12 16:08:26 fabiankeil Exp $</pubdate>

 
 <!--
 
 
 <!--
 


@@ -3010,6 +3011,9 @@ at sourceforge. Three simple steps:
   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 2.26  2009/02/12 16:08:26  fabiankeil
+  Declare the code stable.
+

   Revision 2.25  2009/02/12 15:37:05  fabiankeil
   Update templates.
 
   Revision 2.25  2009/02/12 15:37:05  fabiankeil
   Update templates.
 

diff --git a/doc/source/faq.sgml b/doc/source/faq.sgml
index 896704b..4491c3a 100644 (file)
--- a/doc/source/faq.sgml
+++ b/doc/source/faq.sgml
@@ -17,6 +17,7 @@
 <!entity % p-supp-userman "INCLUDE"> <!-- Include all from supported.sgml -->
 <!entity  my-copy "&copy;">          <!-- kludge for docbook2man          -->
 <!entity % p-newstuff "INCLUDE">      <!-- exclude stuff from devel versions -->
 <!entity % p-supp-userman "INCLUDE"> <!-- Include all from supported.sgml -->
 <!entity  my-copy "&copy;">          <!-- kludge for docbook2man          -->
 <!entity % p-newstuff "INCLUDE">      <!-- exclude stuff from devel versions -->

+<!entity % seealso-extra "INCLUDE"> <!-- extra stuff from seealso.sgml    -->

 <!entity  my-app "<application>Privoxy</application>">
 ]>
 <!--
 <!entity  my-app "<application>Privoxy</application>">
 ]>
 <!--


@@ -26,7 +27,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 2.53 2009/02/15 20:46:13 hal9 Exp $
+ $Id: faq.sgml,v 2.54 2009/02/15 20:47:12 hal9 Exp $

 
  Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/
  See LICENSE.
 
  Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/
  See LICENSE.


@@ -77,7 +78,7 @@
  </subscript>
 </pubdate>
 
  </subscript>
 </pubdate>
 

-<pubdate>$Id: faq.sgml,v 2.53 2009/02/15 20:46:13 hal9 Exp $</pubdate>
+<pubdate>$Id: faq.sgml,v 2.54 2009/02/15 20:47:12 hal9 Exp $</pubdate>

 
 <!--
 
 
 <!--
 


@@ -2898,6 +2899,9 @@ browsing has slowed to a crawl. What gives? </title>
  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 $Log: faq.sgml,v $
  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 $Log: faq.sgml,v $

+Revision 2.54  2009/02/15 20:47:12  hal9
+Fix small typo.
+

 Revision 2.53  2009/02/15 20:46:13  hal9
 Update Outlook HTML rendering engine comments re: Office 2007.
 
 Revision 2.53  2009/02/15 20:46:13  hal9
 Update Outlook HTML rendering engine comments re: Office 2007.
 

diff --git a/doc/source/privoxy-man-page.sgml b/doc/source/privoxy-man-page.sgml
index 8fdd0cf..3bb6021 100644 (file)
--- a/doc/source/privoxy-man-page.sgml
+++ b/doc/source/privoxy-man-page.sgml
@@ -5,7 +5,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: privoxy-man-page.sgml,v 2.27 2009/02/15 17:30:01 fabiankeil Exp $
+ $Id: privoxy-man-page.sgml,v 2.28 2009/02/15 18:58:15 hal9 Exp $

 
  Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/
  See LICENSE.
 
  Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/
  See LICENSE.


@@ -49,6 +49,7 @@
 <!entity % p-text "IGNORE">           <!-- define we are not a text only doc -->
 <!entity % p-authors-formal "IGNORE"> <!-- exclude additional formating      -->
 <!entity my-copy "(C)">               <!-- db2man barfs on copyright symbol  -->
 <!entity % p-text "IGNORE">           <!-- define we are not a text only doc -->
 <!entity % p-authors-formal "IGNORE"> <!-- exclude additional formating      -->
 <!entity my-copy "(C)">               <!-- db2man barfs on copyright symbol  -->

+<!entity % seealso-extra "IGNORE">    <!-- for excluding sections of seealso -->

 ]>
 
 <refentry id="privoxy">
 ]>
 
 <refentry id="privoxy">

diff --git a/doc/source/seealso.sgml b/doc/source/seealso.sgml
index 6c09d0d..4b13a5c 100644 (file)
--- a/doc/source/seealso.sgml
+++ b/doc/source/seealso.sgml
@@ -3,7 +3,7 @@
 
  Purpose     :  Entity included in other project documents.
                 
 
  Purpose     :  Entity included in other project documents.
                 

- $Id: seealso.sgml,v 2.9 2009/01/15 17:25:30 fabiankeil Exp $
+ $Id: seealso.sgml,v 2.10 2009/02/15 18:56:58 hal9 Exp $

 
  Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/
  See LICENSE.
 
  Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/
  See LICENSE.


@@ -67,7 +67,8 @@
    configuration related suggestions to the developers. 
   </member>
  </simplelist>
    configuration related suggestions to the developers. 
   </member>
  </simplelist>

- <!-- HB 2009-02-15, seeing if we can live without these:
+ <![%seealso-extra;[
+ <!-- This part only goes into user-manual -->

  <simplelist>
   <member>
    <ulink url="http://www.junkbusters.com/ht/en/cookies.html">http://www.junkbusters.com/ht/en/cookies.html</ulink>,
  <simplelist>
   <member>
    <ulink url="http://www.junkbusters.com/ht/en/cookies.html">http://www.junkbusters.com/ht/en/cookies.html</ulink>,


@@ -101,7 +102,7 @@
    web publishing, instant messaging, IRC, SSH, and other applications.
   </member>
  </simplelist>
    web publishing, instant messaging, IRC, SSH, and other applications.
   </member>
  </simplelist>

- -->
+ ]]>

  <simplelist>
   <member>
    <ulink
  <simplelist>
   <member>
    <ulink

diff --git a/doc/source/user-manual.sgml b/doc/source/user-manual.sgml
index 9314031..fcf2f94 100644 (file)
--- a/doc/source/user-manual.sgml
+++ b/doc/source/user-manual.sgml
@@ -24,6 +24,7 @@
 <!entity % p-supp-userman "IGNORE"> <!-- Omit some from supported.sgml    -->
 <!entity  my-copy "&copy;">         <!-- kludge for docbook2man           -->
 <!entity % draft "IGNORE">          <!-- WIP stuff    -->
 <!entity % p-supp-userman "IGNORE"> <!-- Omit some from supported.sgml    -->
 <!entity  my-copy "&copy;">         <!-- kludge for docbook2man           -->
 <!entity % draft "IGNORE">          <!-- WIP stuff    -->

+<!entity % seealso-extra "INCLUDE"> <!-- extra stuff from seealso.sgml    -->

 <!entity  my-app "<application>Privoxy</application>">
 ]>
 <!--
 <!entity  my-app "<application>Privoxy</application>">
 ]>
 <!--


@@ -33,7 +34,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: user-manual.sgml,v 2.97 2009/02/14 18:01:00 fabiankeil Exp $
+ $Id: user-manual.sgml,v 2.98 2009/02/16 17:10:33 fabiankeil Exp $

 
  Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/
  See LICENSE.
 
  Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/
  See LICENSE.


@@ -59,7 +60,7 @@
  </subscript>
 </pubdate>
 
  </subscript>
 </pubdate>
 

-<pubdate>$Id: user-manual.sgml,v 2.97 2009/02/14 18:01:00 fabiankeil Exp $</pubdate>
+<pubdate>$Id: user-manual.sgml,v 2.98 2009/02/16 17:10:33 fabiankeil Exp $</pubdate>

 
 <!--
 
 
 <!--
 


@@ -8502,6 +8503,9 @@ In file: user.action <guibutton>[ View ]</guibutton> <guibutton>[ Edit ]</guibut
  USA
 
  $Log: user-manual.sgml,v $
  USA
 
  $Log: user-manual.sgml,v $

+ Revision 2.98  2009/02/16 17:10:33  fabiankeil
+ Fix entry about shortened log messages. Noticed by Lee.
+

  Revision 2.97  2009/02/14 18:01:00  fabiankeil
  Import ChangeLog.
 
  Revision 2.97  2009/02/14 18:01:00  fabiankeil
  Import ChangeLog.