- update Japanese translation (not yet complete, step by step...)

[developers-reference.git] / tools.dbk

diff --git a/tools.dbk b/tools.dbk
index de5cfd4b13f639da4e42fd3772aa6ed29a1f28b9..2e5dda24cbac23eb9d489557be085813d201c29c 100644 (file)
--- a/tools.dbk
+++ b/tools.dbk
@@ -1,6 +1,8 @@
 <?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">
+    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
+]>
 <appendix id="tools">
 <title>Overview of Debian Maintainer Tools</title>
 <para>
@@ -24,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>
@@ -93,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
@@ -104,18 +106,9 @@ use Lintian.
 </para>
 <para>
 You can also see a summary of all problems reported by Lintian on your packages
-at <ulink url="http://lintian.debian.org/"></ulink>.  These reports contain the
+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>
 
@@ -134,13 +127,13 @@ help you prevent various accidents.
 You can run it over a pair of binary packages:
 </para>
 <screen>
- package_1-1_arch.deb package_2-1_arch.deb
+debdiff package_1-1_arch.deb package_2-1_arch.deb
 </screen>
 <para>
 Or even a pair of changes files:
 </para>
 <screen>
- package_1-1_arch.changes package_2-1_arch.changes
+debdiff package_1-1_arch.changes package_2-1_arch.changes
 </screen>
 <para>
 For more information please see <citerefentry>
@@ -269,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>
@@ -313,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="http://buildd.debian.org/"></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>
 
@@ -457,7 +450,7 @@ process through <command>dpkg-depcheck</command> will provide you with a good
 first approximation of the build-dependencies.  For example:
 </para>
 <screen>
--depcheck -b debian/rules build
+dpkg-depcheck -b debian/rules build
 </screen>
 <para>
 <command>dpkg-depcheck</command> can also be used to check for run-time
@@ -519,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>
@@ -528,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>