X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=developers-reference.git;a=blobdiff_plain;f=tools.dbk;h=7eeb56704a62541e9322c2bd56ae9748643fd17b;hp=b7728ca09a657d0ea49ec93ebfacc237f67f9bd5;hb=20ea8ac97f9556ff2f9198d393710f413184d4a8;hpb=81c0e6409c7dfef4af519821a76dbfadb7dd4758

diff --git a/tools.dbk b/tools.dbk
index b7728ca..7eeb567 100644
--- a/tools.dbk
+++ b/tools.dbk
@@ -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
-<command>apt-cache show <literal>package-name</literal></command>.
+<command>apt-cache show <replaceable>package-name</replaceable></command>.
 </para>
 <section id="tools-core">
 <title>Core tools</title>
@@ -193,24 +193,6 @@ the package entirely functional and Policy-compliant.
 </para>
 </section>
 
-<section id="yada">
-<title><systemitem role="package">yada</systemitem></title>
-<para>
-<systemitem role="package">yada</systemitem> is another packaging helper tool.
-It uses a <filename>debian/packages</filename> file to auto-generate
-<filename>debian/rules</filename> and other necessary files in the
-<filename>debian/</filename> subdirectory.  The
-<filename>debian/packages</filename> file contains instruction to build
-packages and there is no need to create any <filename>Makefile</filename>
-files.  There is possibility to use macro engine similar to the one used in
-SPECS files from RPM source packages.
-</para>
-<para>
-For more informations see <ulink
-url="http://yada.alioth.debian.org/"><literal>YADA</literal> site</ulink>.
-</para>
-</section>
-
 <section id="equivs">
 <title><systemitem role="package">equivs</systemitem></title>
 <para>
@@ -230,17 +212,17 @@ packages.
 The following packages help with the package building process, general driving
 <command>dpkg-buildpackage</command> as well as handling supporting tasks.
 </para>
-<section id="cvs-buildpackage">
-<title><systemitem role="package">cvs-buildpackage</systemitem></title>
+<section id="git-buildpackage">
+<title><systemitem role="package">git-buildpackage</systemitem></title>
 <para>
-<systemitem role="package">cvs-buildpackage</systemitem> provides the
-capability to inject or import Debian source packages into a CVS repository,
-build a Debian package from the CVS repository, and helps in integrating
+<systemitem role="package">git-buildpackage</systemitem> provides the
+capability to inject or import Debian source packages into a Git repository,
+build a Debian package from the Git repository, and helps in integrating
 upstream changes into the repository.
 </para>
 <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
+These utilities provide an infrastructure to facilitate the use of Git by
+Debian maintainers.  This allows one to keep separate Git branches of a package
 for <literal>stable</literal>, <literal>unstable</literal> and possibly
 <literal>experimental</literal> distributions, along with the other benefits
 of a version control system.
@@ -272,9 +254,8 @@ package's build-dependencies are correct, and to be sure that unnecessary and
 wrong build dependencies will not exist in the resulting package.
 </para>
 <para>
-A related package is <systemitem role="package">pbuilder-uml</systemitem>,
-which goes even further by doing the build within a User Mode Linux
-environment.
+A related package is <systemitem role="package">cowbuilder</systemitem>,
+which speeds up the build process using COW filesystem on any standard Linux filesystem.
 </para>
 </section>