X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=developers-reference.git;a=blobdiff_plain;f=tools.dbk;h=a9b4b816da0f35085f559c3529edcfbd3dfcda43;hp=25d61a0ffca7b49402cb00c90f4cc57f40381d03;hb=cb8ca9a900618cb2f54a3311378294d549653b37;hpb=c81927355fe51c8a09827d098d0caad05a052d67

diff --git a/tools.dbk b/tools.dbk
index 25d61a0..a9b4b81 100644
--- a/tools.dbk
+++ b/tools.dbk
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
     "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata  SYSTEM "common.ent" > %commondata;
+  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
 ]>
 <appendix id="tools">
 <title>Overview of Debian Maintainer Tools</title>
@@ -26,7 +26,7 @@ exclusion of a competing tool.
 Most of the descriptions of these packages come from the actual package
 descriptions themselves.  Further information can be found in the package
 documentation itself.  You can also see more info with the command
-<literal>apt-cache show &lt;package-name&gt;</literal>.
+<command>apt-cache show &lt;package-name&gt;</command>.
 </para>
 <section id="tools-core">
 <title>Core tools</title>
@@ -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>
 
@@ -508,12 +499,40 @@ enhanced to support cross-compiling.
 The following packages provide information for maintainers or help with
 building documentation.
 </para>
+
+<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.
+</para>
+<para>
+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>, to use the XSL stylesheets.
+Documentation for the stylesheets can be found in the various
+<systemitem role="package">docbook-xsl-doc-*</systemitem> packages.
+</para>
+<para>
+To produce PDF from FO, you need an FO processor, such as <systemitem
+role="package">xmlroff</systemitem> or <systemitem
+role="package">fop</systemitem>. Another tool to generate PDF from
+DocBook XML is <systemitem role="package">dblatex</systemitem>.
+</para>
+</section>
+
 <section id="debiandoc-sgml">
 <title><systemitem role="package">debiandoc-sgml</systemitem></title>
 <para>
 <systemitem role="package">debiandoc-sgml</systemitem> provides the DebianDoc
-SGML DTD, which is commonly used for Debian documentation.  This manual, for
-instance, is written in DebianDoc.  It also provides scripts for building and
+SGML DTD, which is commonly used for Debian documentation,
+but is now deprecated
+(<systemitem role="package">docbook-xml</systemitem>
+should be used instead).
+It also provides scripts for building and
 styling the source to various output formats.
 </para>
 <para>
@@ -530,6 +549,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>