Bump entities for 3.0.22 UNRELEASED

[privoxy.git] / doc / source / developer-manual.sgml

diff --git a/doc/source/developer-manual.sgml b/doc/source/developer-manual.sgml
index efe7b40..ce6aa42 100644 (file)
--- a/doc/source/developer-manual.sgml
+++ b/doc/source/developer-manual.sgml
@@ -5,10 +5,7 @@
 <!entity p-intro SYSTEM "privoxy.sgml">
 <!entity history SYSTEM "history.sgml">
 <!entity seealso SYSTEM "seealso.sgml">
-<!entity contacting SYSTEM "contacting.sgml">
-<!entity copyright SYSTEM "copyright.sgml">
-<!entity license SYSTEM "license.sgml">
-<!entity p-version "3.0.21">
+<!entity p-version "3.0.22">
 <!entity p-status "UNRELEASED">
 <!entity % p-not-stable "INCLUDE">
 <!entity % p-stable "IGNORE">
@@ -24,7 +21,7 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
 
- $Id: developer-manual.sgml,v 2.53 2013/02/26 15:09:35 fabiankeil Exp $
+ $Id: developer-manual.sgml,v 2.57 2013/03/01 17:44:24 fabiankeil Exp $
 
  Copyright (C) 2001-2012 Privoxy Developers http://www.privoxy.org/
  See LICENSE.
@@ -45,13 +42,14 @@
      <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-2009 by
+      <ulink url="http://www.privoxy.org/user-manual/copyright.html">Copyright</ulink>
+      &my-copy; 2001-2013 by
       <ulink url="http://www.privoxy.org/">Privoxy Developers</ulink>
      </subscript>
     </pubdate>
 
 
-    <pubdate>$Id: developer-manual.sgml,v 2.53 2013/02/26 15:09:35 fabiankeil Exp $</pubdate>
+    <pubdate>$Id: developer-manual.sgml,v 2.57 2013/03/01 17:44:24 fabiankeil Exp $</pubdate>
 
 <!--
 
@@ -101,8 +99,9 @@ Hal.
  the state at the release of version &p-version;.
  You can find the latest version of the this manual at <ulink
  url="http://www.privoxy.org/developer-manual/">http://www.privoxy.org/developer-manual/</ulink>.
- Please see <link linkend="contact">the Contact section</link>
- on how to contact the developers.
+ Please have a look at the
+ <ulink url="http://www.privoxy.org/user-manual/contact.html">contact section in the user manual</ulink>
+ if you are interested in contacting the developers.
 </para>
 <!--        <para> -->
 <!--    Feel free to send a note to the developers at <email>ijbswa-developers@lists.sourceforge.net</email>. -->
@@ -2151,7 +2150,7 @@ at sourceforge. Three simple steps:
         Finished docs should be then be committed to CVS (for those
         without the ability to build these). Some docs may require
         rather obscure processing tools. <filename>config</filename>,
-        the man page (and the html version of the man page), and the PDF docs
+        the man page (and the html version of the man page)
         fall in this category. REAMDE, the man page, AUTHORS, and config
         should all also be committed to CVS for other packagers. The
         formal docs should be uploaded to the webserver. See the
@@ -2935,14 +2934,13 @@ at sourceforge. Three simple steps:
    </para>
    <para>
     <programlisting>
-  make dok dok-pdf # (or 'make redhat-dok dok-pdf' if 'make dok' doesn't work for you)
+  make dok
 </programlisting>
    </para>
    <para>
     That will generate <filename>doc/webserver/user-manual</filename>,
     <filename>doc/webserver/developer-manual</filename>,
     <filename>doc/webserver/faq</filename>,
-    <filename>doc/pdf/*.pdf</filename> and
     <filename>doc/webserver/index.html</filename> automatically.
    </para>
    <para>
@@ -2979,46 +2977,6 @@ at sourceforge. Three simple steps:
    </para>
   </sect1>
 
-  <!--   ~~~~~       New section      ~~~~~     -->
-  <sect1 id="contact"><title>Contacting the developers, Bug Reporting and Feature Requests</title>
-<!-- Include contacting.sgml  -->
- &contacting;
-<!-- end contacting -->
-  </sect1>
-
-
-<!--   ~~~~~~~~       New section Header    ~~~~~~~~~     -->
-<sect1 id="copyright"><title>Privoxy Copyright, License and History</title>
-
-<!-- Include copyright.sgml -->
- &copyright;
-<!-- end -->
-
-<!--   ~~~~~       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>
-
-  <!--   ~~~~~       New section      ~~~~~     -->
-  <sect1 id="seealso"><title>See also</title>
-<!-- Include seealso.sgml -->
- &seealso;
-<!-- end  -->
-
-  </sect1>
-
   <!--
 
   This program is free software; you can redistribute it