X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=developers-reference.git;a=blobdiff_plain;f=tools.dbk;h=2e5dda24cbac23eb9d489557be085813d201c29c;hp=1590c75b3818c5faba3ab732a7c0cac041bb753e;hb=927e904966a6ba5bc30ec634fb21a97d4d4c9c2b;hpb=a52b7e8c084a73282543e5e870ae8c68ed2abcb1

diff --git a/tools.dbk b/tools.dbk
index 1590c75..2e5dda2 100644
--- a/tools.dbk
+++ b/tools.dbk
@@ -95,10 +95,10 @@ errors.
 </para>
 <para>
 You should periodically get the newest <systemitem
-role="package">lintian</systemitem> from `unstable' and check over all your
-packages.  Notice that the <literal>-i</literal> option provides detailed
-explanations of what each error or warning means, what its basis in Policy is,
-and commonly how you can fix the problem.
+role="package">lintian</systemitem> from <literal>unstable</literal> and check
+over all your packages.  Notice that the <literal>-i</literal> option provides
+detailed explanations of what each error or warning means, what its basis in
+Policy is, and commonly how you can fix the problem.
 </para>
 <para>
 Refer to <xref linkend="sanitycheck"/> for more information on how and when to
@@ -108,16 +108,7 @@ use Lintian.
 You can also see a summary of all problems reported by Lintian on your packages
 at <ulink url="&url-lintian;"></ulink>.  These reports contain the
 latest <command>lintian</command> output for the whole development distribution
-(unstable).
-</para>
-</section>
-
-<section id="linda">
-<title><systemitem role="package">linda</systemitem></title>
-<para>
-<systemitem role="package">linda</systemitem> is another package linter.  It is
-similar to <systemitem role="package">lintian</systemitem> but has a different
-set of checks.  Its written in Python rather than Perl.
+(<literal>unstable</literal>).
 </para>
 </section>
 
@@ -271,8 +262,8 @@ upstream changes into the repository.
 <para>
 These utilities provide an infrastructure to facilitate the use of CVS by
 Debian maintainers.  This allows one to keep separate CVS branches of a package
-for <emphasis>stable</emphasis>, <emphasis>unstable</emphasis> and possibly
-<emphasis>experimental</emphasis> distributions, along with the other benefits
+for <literal>stable</literal>, <literal>unstable</literal> and possibly
+<literal>experimental</literal> distributions, along with the other benefits
 of a version control system.
 </para>
 </section>
@@ -315,8 +306,8 @@ environment.
 It can use chrooted environments as well.  It can be used stand-alone, or as
 part of a networked, distributed build environment.  As the latter, it is part
 of the system used by porters to build binary packages for all the available
-architectures.  See <xref linkend="buildd"/> for more information, and <ulink
-url="&url-buildd;"></ulink> to see the system in action.
+architectures.  See <xref linkend="wanna-build"/> for more information, and 
+<ulink url="&url-buildd;"></ulink> to see the system in action.
 </para>
 </section>
 
@@ -521,6 +512,22 @@ Documentation for the DTD can be found in the <systemitem
 role="package">debiandoc-sgml-doc</systemitem> package.
 </para>
 </section>
+<!-- TODO: Maybe better:
+<section id="docbook-xml">
+<title><systemitem role="package">docbook-xml</systemitem></title>
+<para>
+<systemitem role="package">docbook-xml</systemitem> provides the
+DocBook XML DTDs, which are commonly used for Debian documentation (as
+is the older debiandoc SGML DTD). This manual, for instance, is written
+in DocBook XML. The <systemitem
+role="package">docbook-xsl</systemitem> package provides the XSL files
+for building and styling the source to various output formats. You
+will need an XSLT processor, such as <systemitem
+role="package">xsltproc</systemitem>, and an FO processor, such as
+<systemitem role="package">fop</systemitem>, to generate documentation.
+</para>
+</section>
+-->
 
 <section id="debian-keyring">
 <title><systemitem role="package">debian-keyring</systemitem></title>
@@ -530,6 +537,14 @@ linkend="key-maint"/> and the package documentation for more information.
 </para>
 </section>
 
+<section id="debian-maintainers">
+<title><systemitem role="package">debian-maintainers</systemitem></title>
+<para>
+Contains the public GPG keys of Debian Maintainers.
+See <ulink url="&url-wiki-dm;"></ulink> for more information.
+</para>
+</section>
+
 <section id="debview">
 <title><systemitem role="package">debview</systemitem></title>
 <para>