Fixed remaining entities.

git-svn-id: svn://anonscm.debian.org/ddp/developers-reference/trunk@4911 313b444b-1b9f-4f58-a734-7bb04f332e8d

diff --git a/best-pkging-practices.dbk b/best-pkging-practices.dbk
index 981c35fe9ae15f3fc8c01deac1b091b7c6fcb5f7..ca1bfb38ffe1ee40eb9538d01e66b17c364f11ab 100644 (file)
--- a/best-pkging-practices.dbk
+++ b/best-pkging-practices.dbk
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
     "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE chapter 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;

 ]>
 <chapter id="best-pkging-practices">
 <title>Best Packaging Practices</title>
 ]>
 <chapter id="best-pkging-practices">
 <title>Best Packaging Practices</title>


@@ -80,7 +80,7 @@ Some people feel that vanilla <filename>debian/rules</filename> files are
 better, since you don't have to learn the intricacies of any helper system.
 This decision is completely up to you.  Use what works for you.  Many examples
 of vanilla <filename>debian/rules</filename> files are available at <ulink
 better, since you don't have to learn the intricacies of any helper system.
 This decision is completely up to you.  Use what works for you.  Many examples
 of vanilla <filename>debian/rules</filename> files are available at <ulink

-url="http://arch.debian.org/arch/private/srivasta/"></ulink>.
+url="&url-rules-files;"></ulink>.

 </para>
 </section>
 
 </para>
 </section>
 


@@ -203,8 +203,7 @@ Postscript or postscript.
 </para>
 <para>
 If you are having problems writing your description, you may wish to send it
 </para>
 <para>
 If you are having problems writing your description, you may wish to send it

-along to <email>debian-l10n-english@&lists-host;</email> and request
-feedback.
+along to &email-debian-l10n-english; and request feedback.

 </para>
 </section>
 
 </para>
 </section>
 


@@ -343,7 +342,7 @@ added at the end of description, using the following format:
 <para>
 Note the spaces prepending the line, which serves to break the lines correctly.
 To see an example of how this displays, see <ulink
 <para>
 Note the spaces prepending the line, which serves to break the lines correctly.
 To see an example of how this displays, see <ulink

-url="http://&packages-host;/unstable/web/wml"></ulink>.
+url="&url-eg-desc-upstream-info;"></ulink>.

 </para>
 <para>
 If there is no home page for the software, this should naturally be left out.
 </para>
 <para>
 If there is no home page for the software, this should naturally be left out.


@@ -740,8 +739,8 @@ Most Debian package maintainers are not native English speakers.  So, writing
 properly phrased templates may not be easy for them.
 </para>
 <para>
 properly phrased templates may not be easy for them.
 </para>
 <para>

-Please use (and abuse) <email>debian-l10n-english@&lists-host;</email>
-mailing list.  Have your templates proofread.
+Please use (and abuse) &email-debian-l10n-english; mailing
+list.  Have your templates proofread.

 </para>
 <para>
 Badly written templates give a poor image of your package, of your work...or
 </para>
 <para>
 Badly written templates give a poor image of your package, of your work...or


@@ -784,14 +783,14 @@ translations and request them for updates.
 <para>
 If in doubt, you may also contact the translation team for a given language
 (debian-l10n-xxxxx@&lists-host;), or the
 <para>
 If in doubt, you may also contact the translation team for a given language
 (debian-l10n-xxxxx@&lists-host;), or the

-<email>debian-i18n@&lists-host;</email> mailing list.
+&email-debian-i18n; mailing list.

 </para>
 <para>
 </para>
 <para>

-Calls for translations posted to <email>debian-i18n@&lists-host;</email>
-with the <filename>debian/po/templates.pot</filename> file attached or
-referenced in a URL are encouraged.  Be sure to mentions in these calls for new
-translations which languages you have existing translations for, in order to
-avoid duplicate work.
+Calls for translations posted to &email-debian-i18n; with the
+<filename>debian/po/templates.pot</filename> file attached or referenced in a
+URL are encouraged.  Be sure to mentions in these calls for new translations
+which languages you have existing translations for, in order to avoid duplicate
+work.

 </para>
 </section>
 
 </para>
 </section>
 


@@ -1283,13 +1282,12 @@ differences between two versions of the documentation, so, for instance, they
 can see what needs to be retranslated.  It is recommended that the translated
 documentation maintain a note about what source control revision the
 translation is based on.  An interesting system is provided by <ulink
 can see what needs to be retranslated.  It is recommended that the translated
 documentation maintain a note about what source control revision the
 translation is based on.  An interesting system is provided by <ulink

-url="&url-cvsweb;boot-floppies/documentation/doc-check?rev=HEAD\|[amp
-]\|content-type=text/vnd.viewcvs-markup">doc-check</ulink> in the <systemitem
-role="package">boot-floppies</systemitem> package, which shows an overview of
-the translation status for any given language, using structured comments for
-the current revision of the file to be translated and, for a translated file,
-the revision of the original file the translation is based on.  You might wish
-to adapt and provide that in your CVS area.
+url="&url-i18n-doc-check;">doc-check</ulink> in the
+<systemitem role="package">boot-floppies</systemitem> package, which shows an
+overview of the translation status for any given language, using structured
+comments for the current revision of the file to be translated and, for a
+translated file, the revision of the original file the translation is based on.
+You might wish to adapt and provide that in your CVS area.

 </para>
 <para>
 If you maintain XML or SGML documentation, we suggest that you isolate any
 </para>
 <para>
 If you maintain XML or SGML documentation, we suggest that you isolate any


@@ -1387,8 +1385,8 @@ role="package">libmldbm-perl</systemitem> (arch independent perl module).
 <listitem>
 <para>
 Python related packages have their python policy; see
 <listitem>
 <para>
 Python related packages have their python policy; see

-<filename>/usr/share/doc/python/python-policy.txt.gz</filename> in the
-<systemitem role="package">python</systemitem> package.
+&file-python-policy; in the <systemitem
+role="package">python</systemitem> package.

 </para>
 </listitem>
 <listitem>
 </para>
 </listitem>
 <listitem>


@@ -1408,9 +1406,9 @@ policy</ulink>.
 <listitem>
 <para>
 Ocaml related packages have their own policy, found in
 <listitem>
 <para>
 Ocaml related packages have their own policy, found in

-<filename>/usr/share/doc/ocaml/ocaml_packaging_policy.gz</filename> from the
-<systemitem role="package">ocaml</systemitem> package.  A good example is the
-<systemitem role="package">camlzip</systemitem> source package.
+&file-ocaml-policy; from the <systemitem
+role="package">ocaml</systemitem> package.  A good example is the <systemitem
+role="package">camlzip</systemitem> source package.

 </para>
 </listitem>
 <listitem>
 </para>
 </listitem>
 <listitem>


@@ -1478,7 +1476,7 @@ If you need a certain locale during build, you can create a temporary file via
 this trick:
 </para>
 <para>
 this trick:
 </para>
 <para>

-If you set <varname>LOCPATH</varname> to the equivalent of <literal>/usr/lib/locale</literal>, and <varname>LC_ALL</varname> to the name
+If you set <varname>LOCPATH</varname> to the equivalent of <filename>/usr/lib/locale</filename>, and <varname>LC_ALL</varname> to the name

 of the locale you generate, you should get what you want without being root.
 Something like this:
 </para>
 of the locale you generate, you should get what you want without being root.
 Something like this:
 </para>

diff --git a/beyond-pkging.dbk b/beyond-pkging.dbk
index 9b8de929d6cef00f5f8fd8a01daa6f47e431baeb..0d27668977c723d4f15da1cf50964b05fa1f119b 100644 (file)
--- a/beyond-pkging.dbk
+++ b/beyond-pkging.dbk
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
     "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE chapter 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;

 ]>
 <chapter id="beyond-pkging">
 <title>Beyond Packaging</title>
 ]>
 <chapter id="beyond-pkging">
 <title>Beyond Packaging</title>


@@ -77,17 +77,17 @@ role="package">lintian</systemitem> so that an error or warning is emitted.
 </para>
 <para>
 If you report more than 10 bugs on the same topic at once, it is recommended
 </para>
 <para>
 If you report more than 10 bugs on the same topic at once, it is recommended

-that you send a message to <email>debian-devel@&lists-host;</email>
-describing your intention before submitting the report, and mentioning the fact
-in the subject of your mail.  This will allow other developers to verify that
-the bug is a real problem.  In addition, it will help prevent a situation in
-which several maintainers start filing the same bug report simultaneously.
+that you send a message to &email-debian-devel; describing
+your intention before submitting the report, and mentioning the fact in the
+subject of your mail.  This will allow other developers to verify that the bug
+is a real problem.  In addition, it will help prevent a situation in which
+several maintainers start filing the same bug report simultaneously.

 </para>
 <para>
 Please use the programms <command>dd-list</command> and if appropriate
 <command>whodepends</command> (from the package devscripts) to generate a list
 of all affected packages, and include the output in your mail to
 </para>
 <para>
 Please use the programms <command>dd-list</command> and if appropriate
 <command>whodepends</command> (from the package devscripts) to generate a list
 of all affected packages, and include the output in your mail to

-<email>debian-devel@&lists-host;</email>.
+&email-debian-devel;.

 </para>
 <para>
 Note that when sending lots of bugs on the same subject, you should send the
 </para>
 <para>
 Note that when sending lots of bugs on the same subject, you should send the


@@ -110,9 +110,9 @@ linkend="lintian"/> ) as possible.  If you do not find that possible, then you
 should consider orphaning some of your packages (see <xref
 linkend="orphaning"/> ).  Alternatively, you may ask the help of other people
 in order to catch up with the backlog of bugs that you have (you can ask for
 should consider orphaning some of your packages (see <xref
 linkend="orphaning"/> ).  Alternatively, you may ask the help of other people
 in order to catch up with the backlog of bugs that you have (you can ask for

-help on <email>debian-qa@&lists-host;</email> or
-<email>debian-devel@&lists-host;</email>).  At the same time, you can look
-for co-maintainers (see <xref linkend="collaborative-maint"/> ).
+help on &email-debian-qa; or
+&email-debian-devel;).  At the same time, you can look for
+co-maintainers (see <xref linkend="collaborative-maint"/> ).

 </para>
 </section>
 
 </para>
 </section>
 


@@ -121,10 +121,10 @@ for co-maintainers (see <xref linkend="collaborative-maint"/> ).
 <para>
 From time to time the QA group organizes bug squashing parties to get rid of as
 many problems as possible.  They are announced on
 <para>
 From time to time the QA group organizes bug squashing parties to get rid of as
 many problems as possible.  They are announced on

-<email>debian-devel-announce@&lists-host;</email> and the announcement
-explains which area will be the focus of the party: usually they focus on
-release critical bugs but it may happen that they decide to help finish a major
-upgrade (like a new perl version which requires recompilation of all the binary
+&email-debian-devel-announce; and the announcement explains
+which area will be the focus of the party: usually they focus on release
+critical bugs but it may happen that they decide to help finish a major upgrade
+(like a new perl version which requires recompilation of all the binary

 modules).
 </para>
 <para>
 modules).
 </para>
 <para>


@@ -244,13 +244,13 @@ package, they're responsible for the upload anyhow, and are likely to know what
 happened to the person they sponsored.
 </para>
 <para>
 happened to the person they sponsored.
 </para>
 <para>

-It is also allowed to post a query to
-<email>debian-devel@&lists-host;</email>, asking if anyone is aware of the
-whereabouts of the missing maintainer.  Please Cc: the person in question.
+It is also allowed to post a query to &email-debian-devel;,
+asking if anyone is aware of the whereabouts of the missing maintainer.  Please
+Cc: the person in question.

 </para>
 <para>
 Once you have gathered all of this, you can contact
 </para>
 <para>
 Once you have gathered all of this, you can contact

-<email>mia@qa.debian.org</email>.  People on this alias will use the
+&email-mia;.  People on this alias will use the

 information you provide in order to decide how to proceed.  For example, they
 might orphan one or all of the packages of the maintainer.  If a package has
 been NMUed, they might prefer to contact the NMUer before orphaning the package
 information you provide in order to decide how to proceed.  For example, they
 might orphan one or all of the packages of the maintainer.  If a package has
 been NMUed, they might prefer to contact the NMUer before orphaning the package


@@ -274,7 +274,7 @@ someone with more time.
 If you are interested in working in the MIA team, please have a look at the
 README file in /org/qa.debian.org/mia on qa.debian.org where the technical
 details and the MIA procedures are documented and contact
 If you are interested in working in the MIA team, please have a look at the
 README file in /org/qa.debian.org/mia on qa.debian.org where the technical
 details and the MIA procedures are documented and contact

-<email>mia@qa.debian.org</email>.
+&email-mia;.

 </para>
 </section>
 
 </para>
 </section>
 


@@ -372,7 +372,7 @@ linkend="pkg-tracking-system"/> .
 <title>Advocating new developers</title>
 <para>
 See the page about <ulink
 <title>Advocating new developers</title>
 <para>
 See the page about <ulink

-url="&url-devel-docs;join/nm-advocate">advocating a prospective
+url="&url-newmaint-advocate;">advocating a prospective

 developer</ulink> at the Debian web site.
 </para>
 </section>
 developer</ulink> at the Debian web site.
 </para>
 </section>


@@ -380,9 +380,8 @@ developer</ulink> at the Debian web site.
 <section id="s7.5.4">
 <title>Handling new maintainer applications</title>
 <para>
 <section id="s7.5.4">
 <title>Handling new maintainer applications</title>
 <para>

-Please see <ulink
-url="&url-devel-docs;join/nm-amchecklist">Checklist for Application
-Managers</ulink> at the Debian web site.
+Please see <ulink url="&url-newmaint-amchecklist;">Checklist
+for Application Managers</ulink> at the Debian web site.

 </para>
 </section>
 
 </para>
 </section>
 

diff --git a/common.ent b/common.ent
index 5a09ece9a38131543c5eaa96c0b6c8f070fb7c03..e90fad8fec4428bb85f96aa0bb36f31975987ff5 100644 (file)
--- a/common.ent
+++ b/common.ent
@@ -53,7 +53,6 @@
 <!ENTITY url-bts-devel "&url-bts;Developer">
 <!ENTITY url-bts-control "&url-bts;server-control">
 <!ENTITY url-debian-mirrors "http://&www-debian-org;/mirror/">
 <!ENTITY url-bts-devel "&url-bts;Developer">
 <!ENTITY url-bts-control "&url-bts;server-control">
 <!ENTITY url-debian-mirrors "http://&www-debian-org;/mirror/">

-<!ENTITY url-debian-mirroring "&url-debian-mirrors;">

 <!ENTITY url-debian-ports "http://&www-debian-org;/ports/">
 <!ENTITY url-debian-port-lists "http://&lists-host;/ports.html">
 <!ENTITY url-wnpp "http://&www-debian-org;/devel/wnpp/">
 <!ENTITY url-debian-ports "http://&www-debian-org;/ports/">
 <!ENTITY url-debian-port-lists "http://&lists-host;/ports.html">
 <!ENTITY url-wnpp "http://&www-debian-org;/devel/wnpp/">


@@ -81,27 +80,14 @@
 <!ENTITY url-tech-ctte "http://&www-debian-org;/devel/tech-ctte">
 <!ENTITY url-ddpo "http://qa.debian.org/developer.php">
 
 <!ENTITY url-tech-ctte "http://&www-debian-org;/devel/tech-ctte">
 <!ENTITY url-ddpo "http://qa.debian.org/developer.php">
 

-<!ENTITY url-debian-keyring "http://&ftp-debian-org;/debian/doc/debian-keyring.tar.gz">
-<!ENTITY url-readme-non-us "http://&ftp-debian-org;/debian/README.non-US">

 <!ENTITY url-incoming "http://incoming.debian.org/">
 <!ENTITY url-testing-maint "http://www.debian.org/devel/testing">
 <!-- deprecated -->
 <!ENTITY url-incoming "http://incoming.debian.org/">
 <!ENTITY url-testing-maint "http://www.debian.org/devel/testing">
 <!-- deprecated -->

-<!ENTITY url-testing-faq "&url-testing-maint;">
-
-<!ENTITY us-upload-dir "<filename>/org/ftp.debian.org/incoming/</filename>">
-<!ENTITY non-us-upload-dir "<filename>/org/non-us.debian.org/incoming/</filename>">
-<!ENTITY url-chiark-readme "ftp://ftp.chiark.greenend.org.uk/pub/debian/private/project/README.how-to-upload">
-<!ENTITY url-upload-erlangen "ftp://ftp.uni-erlangen.de/pub/Linux/debian/UploadQueue/">
-<!ENTITY url-upload-samosa "ftp://samosa.debian.org/pub/UploadQueue/">
-<!ENTITY url-upload-jp "ftp://master.debian.or.jp/pub/Incoming/upload/">

 
 <!ENTITY url-mentors "http://people.debian.org/~mpalmer/debian-mentors_FAQ.html">
 
 <!ENTITY url-mentors "http://people.debian.org/~mpalmer/debian-mentors_FAQ.html">

-<!ENTITY url-sponsors "http://www.internatif.org/bortzmeyer/debian/sponsor/">

 
 <!ENTITY url-rules-files "http://arch.debian.org/arch/private/srivasta/">
 
 
 <!ENTITY url-rules-files "http://arch.debian.org/arch/private/srivasta/">
 

-<!ENTITY url-debconf-l10n-help "http://&www-debian-org;/intl/l10n/templates/hints">
-

 <!ENTITY url-dmup "http://&www-debian-org;/devel/dmup">
 <!ENTITY url-worldmap "http://&www-debian-org;/devel/developers.loc">
 
 <!ENTITY url-dmup "http://&www-debian-org;/devel/dmup">
 <!ENTITY url-worldmap "http://&www-debian-org;/devel/developers.loc">
 


@@ -118,14 +104,11 @@
 <!ENTITY url-gpl "http://www.gnu.org/copyleft/gpl.html">
 <!ENTITY url-pgp-faq "http://www.cam.ac.uk.pgp.net/pgpnet/pgp-faq/">
 <!ENTITY url-rfc2440 "http://www.rfc-editor.org/rfc/rfc2440.txt">
 <!ENTITY url-gpl "http://www.gnu.org/copyleft/gpl.html">
 <!ENTITY url-pgp-faq "http://www.cam.ac.uk.pgp.net/pgpnet/pgp-faq/">
 <!ENTITY url-rfc2440 "http://www.rfc-editor.org/rfc/rfc2440.txt">

-<!ENTITY url-u.s.-export "http://www.bxa.doc.gov/Encryption/PubAvailEncSourceCodeNofify.html">
-<!ENTITY url-notification-of-export "http://www.bxa.doc.gov/Encryption/">

 <!ENTITY url-openprojects "http://www.freenode.net/">
 <!ENTITY url-oftc "http://www.oftc.net/oftc/">
 
 <!-- Debian email addresses -->
 <!ENTITY email-listmaster "<email>listmaster@&lists-host;</email>">
 <!ENTITY url-openprojects "http://www.freenode.net/">
 <!ENTITY url-oftc "http://www.oftc.net/oftc/">
 
 <!-- Debian email addresses -->
 <!ENTITY email-listmaster "<email>listmaster@&lists-host;</email>">

-<!ENTITY email-debian-announce "<email>debian-announce@&lists-host;</email>">

 <!ENTITY email-devel-ref "<email>developers-reference@&packages-host;</email>">
 <!ENTITY email-debian-changes "<email>debian-changes@lists.debian.org</email>">
 <!ENTITY email-debian-devel "<email>debian-devel@&lists-host;</email>">
 <!ENTITY email-devel-ref "<email>developers-reference@&packages-host;</email>">
 <!ENTITY email-debian-changes "<email>debian-changes@lists.debian.org</email>">
 <!ENTITY email-debian-devel "<email>debian-devel@&lists-host;</email>">


@@ -137,7 +120,6 @@
 <!ENTITY email-debian-private "<email>debian-private@&lists-host;</email>">
 <!ENTITY email-debian-project "<email>debian-project@&lists-host;</email>">
 <!ENTITY email-debian-policy "<email>debian-policy@&lists-host;</email>">
 <!ENTITY email-debian-private "<email>debian-private@&lists-host;</email>">
 <!ENTITY email-debian-project "<email>debian-project@&lists-host;</email>">
 <!ENTITY email-debian-policy "<email>debian-policy@&lists-host;</email>">

-<!ENTITY email-debian-user "<email>debian-user@&lists-host;</email>">

 <!ENTITY orphan-address "&lt;packages@qa.debian.org&gt;">
 <!ENTITY email-debian-qa "<email>debian-qa@&lists-host;</email>">
 <!ENTITY email-debian-release "<email>debian-release@&lists-host;</email>">
 <!ENTITY orphan-address "&lt;packages@qa.debian.org&gt;">
 <!ENTITY email-debian-qa "<email>debian-qa@&lists-host;</email>">
 <!ENTITY email-debian-release "<email>debian-release@&lists-host;</email>">


@@ -147,17 +129,13 @@
 <!ENTITY email-debian-l10n-english "<email>debian-l10n-english@&lists-host;</email>">
 <!ENTITY email-mia "<email>mia@qa.debian.org</email>">
 
 <!ENTITY email-debian-l10n-english "<email>debian-l10n-english@&lists-host;</email>">
 <!ENTITY email-mia "<email>mia@qa.debian.org</email>">
 

-<!ENTITY email-new-maintainer "<email>new-maintainer@debian.org</email>">
-<!ENTITY email-debian-keyring "<email>keyring-maint@debian.org</email>">

 <!ENTITY email-debian-admin "<email>debian-admin@debian.org</email>">
 <!ENTITY email-ftpmaster "<email>ftpmaster@debian.org</email>">
 <!ENTITY email-override "<email>override-change@debian.org</email>">
 <!ENTITY email-debian-admin "<email>debian-admin@debian.org</email>">
 <!ENTITY email-ftpmaster "<email>ftpmaster@debian.org</email>">
 <!ENTITY email-override "<email>override-change@debian.org</email>">

-<!ENTITY email-wnpp "<email>wnpp@debian.org</email>">

 <!ENTITY email-bts-control "<email>control@&bugs-host;</email>">
 <!ENTITY email-security-team "<email>team@security.debian.org</email>">
 
 <!-- misc Debian info -->
 <!ENTITY email-bts-control "<email>control@&bugs-host;</email>">
 <!ENTITY email-security-team "<email>team@security.debian.org</email>">
 
 <!-- misc Debian info -->

-<!ENTITY file-mail-lists "<filename>/usr/share/doc/debian/mailing-lists.txt</filename>">

 <!ENTITY file-bts-docs "<filename>/usr/share/doc/debian/bug-*</filename>">
 <!ENTITY file-python-policy "<filename>/usr/share/doc/python/python-policy.txt.gz</filename>">
 <!ENTITY file-ocaml-policy "<filename>/usr/share/doc/ocaml/ocaml_packaging_policy.gz</filename>">
 <!ENTITY file-bts-docs "<filename>/usr/share/doc/debian/bug-*</filename>">
 <!ENTITY file-python-policy "<filename>/usr/share/doc/python/python-policy.txt.gz</filename>">
 <!ENTITY file-ocaml-policy "<filename>/usr/share/doc/ocaml/ocaml_packaging_policy.gz</filename>">

diff --git a/developer-duties.dbk b/developer-duties.dbk
index 5a444e76a034e9fc0898f94fb958b7421ca3b710..2e501f3069cf876bdabd480c891b0531dedc99c9 100644 (file)
--- a/developer-duties.dbk
+++ b/developer-duties.dbk
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
     "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE chapter 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;

 ]>
 <chapter id="developer-duties">
 <title>Debian Developer's Duties</title>
 ]>
 <chapter id="developer-duties">
 <title>Debian Developer's Duties</title>


@@ -28,7 +28,7 @@ Be very careful with your private keys.  Do not place them on any public
 servers or multiuser machines, such as the Debian servers (see <xref
 linkend="server-machines"/> ).  Back your keys up; keep a copy offline.  Read
 the documentation that comes with your software; read the <ulink
 servers or multiuser machines, such as the Debian servers (see <xref
 linkend="server-machines"/> ).  Back your keys up; keep a copy offline.  Read
 the documentation that comes with your software; read the <ulink

-url="http://www.cam.ac.uk.pgp.net/pgpnet/pgp-faq/">PGP FAQ</ulink>.
+url="&url-pgp-faq;">PGP FAQ</ulink>.

 </para>
 <para>
 You need to ensure not only that your key is secure against being stolen, but
 </para>
 <para>
 You need to ensure not only that your key is secure against being stolen, but


@@ -71,16 +71,16 @@ Constitution</ulink>.
 <para>
 Other than the yearly leader election, votes are not routinely held, and they
 are not undertaken lightly.  Each proposal is first discussed on the
 <para>
 Other than the yearly leader election, votes are not routinely held, and they
 are not undertaken lightly.  Each proposal is first discussed on the

-<email>debian-vote@&lists-host;</email> mailing list and it requires
-several endorsements before the project secretary starts the voting procedure.
+&email-debian-vote; mailing list and it requires several
+endorsements before the project secretary starts the voting procedure.

 </para>
 <para>
 You don't have to track the pre-vote discussions, as the secretary will issue
 </para>
 <para>
 You don't have to track the pre-vote discussions, as the secretary will issue

-several calls for votes on
-<email>debian-devel-announce@&lists-host;</email> (and all developers are
-expected to be subscribed to that list).  Democracy doesn't work well if people
-don't take part in the vote, which is why we encourage all developers to vote.
-Voting is conducted via GPG-signed/encrypted email messages.
+several calls for votes on &email-debian-devel-announce; (and
+all developers are expected to be subscribed to that list).  Democracy doesn't
+work well if people don't take part in the vote, which is why we encourage all
+developers to vote.  Voting is conducted via GPG-signed/encrypted email
+messages.

 </para>
 <para>
 The list of all proposals (past and current) is available on the <ulink
 </para>
 <para>
 The list of all proposals (past and current) is available on the <ulink

diff --git a/index.dbk b/index.dbk
index 5312fdee598732a99ffb380b57bc53c9b91a7ccb..af81e0220308ebf39a8f8b117888e5c091ec489c 100644 (file)
--- a/index.dbk
+++ b/index.dbk
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
     "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE book 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;

 ]>
 <book lang="en">
 
 ]>
 <book lang="en">
 


@@ -9,7 +9,7 @@
 <bookinfo>
 <author>
 <othername>Developer's Reference Team</othername>
 <bookinfo>
 <author>
 <othername>Developer's Reference Team</othername>

-<email>developers-reference@&packages-host;</email> 
+<email>&email-devel-ref;</email> 

 </author>
 <author>
 <firstname>Andreas</firstname> <surname>Barth</surname>
 </author>
 <author>
 <firstname>Andreas</firstname> <surname>Barth</surname>


@@ -70,8 +70,8 @@ more details.
 A copy of the GNU General Public License is available as
 &file-GPL; in the &debian-formal;
 distribution or on the World Wide Web at <ulink
 A copy of the GNU General Public License is available as
 &file-GPL; in the &debian-formal;
 distribution or on the World Wide Web at <ulink

-url="http://www.gnu.org/copyleft/gpl.html">the GNU web site</ulink>.  You can
-also obtain it by writing to the &fsf-addr;.
+url="&url-gpl;">the GNU web site</ulink>.  You can also obtain
+it by writing to the &fsf-addr;.

 </para>
 <para>
 If you want to print this reference, you should use the <ulink
 </para>
 <para>
 If you want to print this reference, you should use the <ulink

diff --git a/l10n.dbk b/l10n.dbk
index dd555864937067e91429c5c898fffbca244bc884..c3c7f569b634bd786bae78c8a15b9d2a624bc6a4 100644 (file)
--- a/l10n.dbk
+++ b/l10n.dbk
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
     "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE chapter 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;

 ]>
 <chapter id="l10n">
 <title>Internationalizing, translating, being internationalized and being translated</title>
 ]>
 <chapter id="l10n">
 <title>Internationalizing, translating, being internationalized and being translated</title>

diff --git a/new-maintainer.dbk b/new-maintainer.dbk
index 615d85ea5c3268315430f702245e57fe3a0b8954..3f71082311098a80cb946a5d2410d4e6b3dc61eb 100644 (file)
--- a/new-maintainer.dbk
+++ b/new-maintainer.dbk
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
     "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE chapter 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;

 ]>
 <chapter id="new-maintainer">
 <title>Applying to Become a Maintainer</title>
 ]>
 <chapter id="new-maintainer">
 <title>Applying to Become a Maintainer</title>


@@ -9,21 +9,20 @@
 <title>Getting started</title>
 <para>
 So, you've read all the documentation, you've gone through the <ulink
 <title>Getting started</title>
 <para>
 So, you've read all the documentation, you've gone through the <ulink

-url="http://&www-debian-org;/doc/maint-guide/">Debian New Maintainers'
+url="&url-newmaint-guide;">Debian New Maintainers'

 Guide</ulink>, understand what everything in the <systemitem
 role="package">hello</systemitem> example package is for, and you're about to
 Debianize your favorite piece of software.  How do you actually become a Debian
 developer so that your work can be incorporated into the Project?
 </para>
 <para>
 Guide</ulink>, understand what everything in the <systemitem
 role="package">hello</systemitem> example package is for, and you're about to
 Debianize your favorite piece of software.  How do you actually become a Debian
 developer so that your work can be incorporated into the Project?
 </para>
 <para>

-Firstly, subscribe to <email>debian-devel@&lists-host;</email> if you
-haven't already.  Send the word <literal>subscribe</literal> in the
+Firstly, subscribe to &email-debian-devel; if you haven't
+already.  Send the word <literal>subscribe</literal> in the

 <emphasis>Subject</emphasis> of an email to
 <emphasis>Subject</emphasis> of an email to

-<email>debian-devel-REQUEST@&lists-host;</email>.  In case of problems,
-contact the list administrator at <email>listmaster@&lists-host;</email>.
-More information on available mailing lists can be found in <xref
-linkend="mailing-lists"/> .
-<email>debian-devel-announce@&lists-host;</email> is another list which is
+&email-debian-devel-req;.  In case of problems, contact the
+list administrator at &email-listmaster;.  More information on
+available mailing lists can be found in <xref linkend="mailing-lists"/> .
+&email-debian-devel-announce; is another list which is

 mandatory for anyone who wishes to follow Debian's development.
 </para>
 <para>
 mandatory for anyone who wishes to follow Debian's development.
 </para>
 <para>


@@ -32,28 +31,27 @@ doing any coding, and you should post about your intentions to work on
 something to avoid duplicated effort.
 </para>
 <para>
 something to avoid duplicated effort.
 </para>
 <para>

-Another good list to subscribe to is
-<email>debian-mentors@&lists-host;</email>.  See <xref linkend="mentors"/>
-for details.  The IRC channel <literal>#debian</literal> can also be helpful;
-see <xref linkend="irc-channels"/> .
+Another good list to subscribe to is &email-debian-mentors;.
+See <xref linkend="mentors"/> for details.  The IRC channel
+<literal>#debian</literal> can also be helpful; see <xref
+linkend="irc-channels"/> .

 </para>
 <para>
 </para>
 <para>

-When you know how you want to contribute to &debian-formal;, you should get in
-contact with existing Debian maintainers who are working on similar tasks.
-That way, you can learn from experienced developers.  For example, if you are
-interested in packaging existing software for Debian, you should try to get a
-sponsor.  A sponsor will work together with you on your package and upload it
-to the Debian archive once they are happy with the packaging work you have
-done.  You can find a sponsor by mailing the
-<email>debian-mentors@&lists-host;</email> mailing list, describing your
-package and yourself and asking for a sponsor (see <xref linkend="sponsoring"/>
-and <ulink
-url="http://people.debian.org/~mpalmer/debian-mentors_FAQ.html"></ulink> for
-more information on sponsoring).  On the other hand, if you are interested in
-porting Debian to alternative architectures or kernels you can subscribe to
-port specific mailing lists and ask there how to get started.  Finally, if you
-are interested in documentation or Quality Assurance (QA) work you can join
-maintainers already working on these tasks and submit patches and improvements.
+When you know how you want to contribute to &debian-formal;,
+you should get in contact with existing Debian maintainers who are working on
+similar tasks.  That way, you can learn from experienced developers.  For
+example, if you are interested in packaging existing software for Debian, you
+should try to get a sponsor.  A sponsor will work together with you on your
+package and upload it to the Debian archive once they are happy with the
+packaging work you have done.  You can find a sponsor by mailing the
+&email-debian-mentors; mailing list, describing your package
+and yourself and asking for a sponsor (see <xref linkend="sponsoring"/> and
+<ulink url="&url-mentors;"></ulink> for more information on
+sponsoring).  On the other hand, if you are interested in porting Debian to
+alternative architectures or kernels you can subscribe to port specific mailing
+lists and ask there how to get started.  Finally, if you are interested in
+documentation or Quality Assurance (QA) work you can join maintainers already
+working on these tasks and submit patches and improvements.

 </para>
 <para>
 One pitfall could be a too-generic local part in your mailadress: Terms like
 </para>
 <para>
 One pitfall could be a too-generic local part in your mailadress: Terms like


@@ -65,8 +63,8 @@ url="&url-debian-lists;"></ulink> for details.
 <section id="mentors">
 <title>Debian mentors and sponsors</title>
 <para>
 <section id="mentors">
 <title>Debian mentors and sponsors</title>
 <para>

-The mailing list <email>debian-mentors@&lists-host;</email> has been set up
-for novice maintainers who seek help with initial packaging and other
+The mailing list &email-debian-mentors; has been set up for
+novice maintainers who seek help with initial packaging and other

 developer-related issues.  Every new developer is invited to subscribe to that
 list (see <xref linkend="mailing-lists"/> for details).
 </para>
 developer-related issues.  Every new developer is invited to subscribe to that
 list (see <xref linkend="mailing-lists"/> for details).
 </para>


@@ -85,7 +83,7 @@ Those who are seeking a
 sponsor can request one at <ulink url="http://www.internatif.org/bortzmeyer/debian/sponsor/"></ulink>.
 -->
 Please read the unofficial debian-mentors FAQ at <ulink
 sponsor can request one at <ulink url="http://www.internatif.org/bortzmeyer/debian/sponsor/"></ulink>.
 -->
 Please read the unofficial debian-mentors FAQ at <ulink

-url="http://people.debian.org/~mpalmer/debian-mentors_FAQ.html"></ulink> first.
+url="&url-mentors;"></ulink> first.

 </para>
 <para>
 If you wish to be a mentor and/or sponsor, more information is available in
 </para>
 <para>
 If you wish to be a mentor and/or sponsor, more information is available in


@@ -96,25 +94,27 @@ If you wish to be a mentor and/or sponsor, more information is available in
 <section id="registering">
 <title>Registering as a Debian developer</title>
 <para>
 <section id="registering">
 <title>Registering as a Debian developer</title>
 <para>

-Before you decide to register with &debian-formal;, you will need to read all
-the information available at the <ulink
-url="&url-newmaint;">New Maintainer's
-Corner</ulink>.  It describes in detail the preparations you have to do before
-you can register to become a Debian developer.  For example, before you apply,
-you have to read the <ulink url="&url-social-contract;">Debian
-Social Contract</ulink>.  Registering as a developer means that you agree with
-and pledge to uphold the Debian Social Contract; it is very important that
-maintainers are in accord with the essential ideas behind &debian-formal;.
-Reading the <ulink url="http://www.gnu.org/gnu/manifesto.html">GNU
-Manifesto</ulink> would also be a good idea.
+Before you decide to register with &debian-formal;, you will
+need to read all the information available at the <ulink
+url="&url-newmaint;">New Maintainer's Corner</ulink>.  It
+describes in detail the preparations you have to do before you can register to
+become a Debian developer.  For example, before you apply, you have to read the
+<ulink url="&url-social-contract;">Debian Social
+Contract</ulink>.  Registering as a developer means that you agree with and
+pledge to uphold the Debian Social Contract; it is very important that
+maintainers are in accord with the essential ideas behind
+&debian-formal;.  Reading the <ulink
+url="&url-gnu-manifesto;">GNU Manifesto</ulink> would also be
+a good idea.

 </para>
 <para>
 The process of registering as a developer is a process of verifying your
 identity and intentions, and checking your technical skills.  As the number of
 </para>
 <para>
 The process of registering as a developer is a process of verifying your
 identity and intentions, and checking your technical skills.  As the number of

-people working on &debian-formal; has grown to over &number-of-maintainers; and our systems are
-used in several very important places, we have to be careful about being
-compromised.  Therefore, we need to verify new maintainers before we can give
-them accounts on our servers and let them upload packages.
+people working on &debian-formal; has grown to over
+&number-of-maintainers; and our systems are used in several
+very important places, we have to be careful about being compromised.
+Therefore, we need to verify new maintainers before we can give them accounts
+on our servers and let them upload packages.

 </para>
 <para>
 Before you actually register you should have shown that you can do competent
 </para>
 <para>
 Before you actually register you should have shown that you can do competent


@@ -130,13 +130,13 @@ Registration requires that you are familiar with Debian's philosophy and
 technical documentation.  Furthermore, you need a GnuPG key which has been
 signed by an existing Debian maintainer.  If your GnuPG key is not signed yet,
 you should try to meet a Debian Developer in person to get your key signed.
 technical documentation.  Furthermore, you need a GnuPG key which has been
 signed by an existing Debian maintainer.  If your GnuPG key is not signed yet,
 you should try to meet a Debian Developer in person to get your key signed.

-There's a <ulink url="&url-newmaint-db;gpg.php">GnuPG Key Signing
+There's a <ulink url="&url-gpg-coord;">GnuPG Key Signing

 Coordination page</ulink> which should help you find a Debian Developer close
 to you.  (If there is no Debian Developer close to you, alternative ways to
 pass the ID check may be permitted as an absolute exception on a
 case-by-case-basis.  See the <ulink
 Coordination page</ulink> which should help you find a Debian Developer close
 to you.  (If there is no Debian Developer close to you, alternative ways to
 pass the ID check may be permitted as an absolute exception on a
 case-by-case-basis.  See the <ulink

-url="&url-devel-docs;join/nm-step2">identification page</ulink> for
-more information.)
+url="&url-newmaint-id;">identification page</ulink> for more
+information.)

 </para>
 <para>
 If you do not have an OpenPGP key yet, generate one.  Every developer needs an
 </para>
 <para>
 If you do not have an OpenPGP key yet, generate one.  Every developer needs an


@@ -151,7 +151,7 @@ Debian uses the <command>GNU Privacy Guard</command> (package <systemitem
 role="package">gnupg</systemitem> version 1 or better) as its baseline
 standard.  You can use some other implementation of OpenPGP as well.  Note that
 OpenPGP is an open standard based on <ulink
 role="package">gnupg</systemitem> version 1 or better) as its baseline
 standard.  You can use some other implementation of OpenPGP as well.  Note that
 OpenPGP is an open standard based on <ulink

-url="http://www.rfc-editor.org/rfc/rfc2440.txt">RFC 2440</ulink>.
+url="&url-rfc2440;">RFC 2440</ulink>.

 </para>
 <para>
 You need a version 4 key for use in Debian Development.  Your key length must
 </para>
 <para>
 You need a version 4 key for use in Debian Development.  Your key length must


@@ -181,7 +181,7 @@ have to manually add those signatures.  </para> </footnote>
 <para>
 If your public key isn't on a public key server such as
 &pgp-keyserv;, please read the documentation available at
 <para>
 If your public key isn't on a public key server such as
 &pgp-keyserv;, please read the documentation available at

-<ulink url="&url-devel-docs;join/nm-step2">NM Step 2:
+<ulink url="&url-newmaint-id;">NM Step 2:

 Identification</ulink>.  That document contains instructions on how to put your
 key on the public key servers.  The New Maintainer Group will put your public
 key on the servers if it isn't already there.
 Identification</ulink>.  That document contains instructions on how to put your
 key on the public key servers.  The New Maintainer Group will put your public
 key on the servers if it isn't already there.


@@ -204,7 +204,7 @@ has to express their belief that you can contribute to Debian successfully.
 <para>
 When you have found an advocate, have your GnuPG key signed and have already
 contributed to Debian for a while, you're ready to apply.  You can simply
 <para>
 When you have found an advocate, have your GnuPG key signed and have already
 contributed to Debian for a while, you're ready to apply.  You can simply

-register on our <ulink url="&url-newmaint-db;newnm.php">application
+register on our <ulink url="&url-newmaint-apply;">application

 page</ulink>.  After you have signed up, your advocate has to confirm your
 application.  When your advocate has completed this step you will be assigned
 an Application Manager who will go with you through the necessary steps of the
 page</ulink>.  After you have signed up, your advocate has to confirm your
 application.  When your advocate has completed this step you will be assigned
 an Application Manager who will go with you through the necessary steps of the


@@ -213,10 +213,10 @@ url="&url-newmaint-db;">applications status board</ulink>.
 </para>
 <para>
 For more details, please consult <ulink
 </para>
 <para>
 For more details, please consult <ulink

-url="&url-newmaint;">New Maintainer's Corner</ulink>
-at the Debian web site.  Make sure that you are familiar with the necessary
-steps of the New Maintainer process before actually applying.  If you are well
-prepared, you can save a lot of time later on.
+url="&url-newmaint;">New Maintainer's Corner</ulink> at the
+Debian web site.  Make sure that you are familiar with the necessary steps of
+the New Maintainer process before actually applying.  If you are well prepared,
+you can save a lot of time later on.

 </para>
 </section>
 
 </para>
 </section>
 

diff --git a/pkgs.dbk b/pkgs.dbk
index fdf7a0fc2ea957c584c74a47e9d1548227e0f7c6..f63c3442b6e35351803edba175ffeb1b24436cf0 100644 (file)
--- a/pkgs.dbk
+++ b/pkgs.dbk
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
     "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE chapter 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;

 ]>
 <chapter id="pkgs">
 <title>Managing Packages</title>
 ]>
 <chapter id="pkgs">
 <title>Managing Packages</title>


@@ -32,8 +32,8 @@ You should set the subject of the bug to ``ITP: <replaceable>foo</replaceable>
 -- <replaceable>short description</replaceable>'', substituting the name of the
 new package for <replaceable>foo</replaceable>.  The severity of the bug report
 must be set to <emphasis>wishlist</emphasis>.  If you feel it's necessary, send
 -- <replaceable>short description</replaceable>'', substituting the name of the
 new package for <replaceable>foo</replaceable>.  The severity of the bug report
 must be set to <emphasis>wishlist</emphasis>.  If you feel it's necessary, send

-a copy to <email>debian-devel@&lists-host;</email> by putting the address
-in the <literal>X-Debbugs-CC:</literal> header of the message (no, don't use
+a copy to &email-debian-devel; by putting the address in the
+<literal>X-Debbugs-CC:</literal> header of the message (no, don't use

 <literal>CC:</literal>, because that way the message's subject won't indicate
 the bug number).
 </para>
 <literal>CC:</literal>, because that way the message's subject won't indicate
 the bug number).
 </para>


@@ -338,10 +338,10 @@ packages uninstallable, is strongly discouraged.
 </para>
 <para>
 The Release Team (which can be reached at
 </para>
 <para>
 The Release Team (which can be reached at

-<email>debian-release@&lists-host;</email>) will regularly evaluate the
-uploads To <emphasis>stable-proposed-updates</emphasis> and decide if your
-package can be included in <emphasis>stable</emphasis>.  Please be clear (and
-verbose, if necessary) in your changelog entries for uploads to
+&email-debian-release;) will regularly evaluate the uploads To
+<emphasis>stable-proposed-updates</emphasis> and decide if your package can be
+included in <emphasis>stable</emphasis>.  Please be clear (and verbose, if
+necessary) in your changelog entries for uploads to

 <emphasis>stable</emphasis>, because otherwise the package won't be considered
 for inclusion.
 </para>
 <emphasis>stable</emphasis>, because otherwise the package won't be considered
 for inclusion.
 </para>


@@ -512,10 +512,10 @@ file</emphasis>.
 <para>
 To alter the actual section that a package is put in, you need to first make
 sure that the <filename>debian/control</filename> file in your package is
 <para>
 To alter the actual section that a package is put in, you need to first make
 sure that the <filename>debian/control</filename> file in your package is

-accurate.  Next, send an email <email>override-change@debian.org</email> or
-submit a bug against <systemitem role="package">&ftp-debian-org;</systemitem>
-requesting that the section or priority for your package be changed from the
-old section or priority to the new one.  Be sure to explain your reasoning.
+accurate.  Next, send an email &email-override; or submit a
+bug against <systemitem role="package">ftp.debian.org</systemitem> requesting
+that the section or priority for your package be changed from the old section
+or priority to the new one.  Be sure to explain your reasoning.

 </para>
 <para>
 For more information about <emphasis>override files</emphasis>, see
 </para>
 <para>
 For more information about <emphasis>override files</emphasis>, see


@@ -565,10 +565,10 @@ can check them by browsing this page:
 </para>
 <para>
 Maintainers interact with the BTS via email addresses at
 </para>
 <para>
 Maintainers interact with the BTS via email addresses at

-<literal>&bugs-host;</literal>.  Documentation on available commands can be
-found at <ulink url="&url-bts;"></ulink>, or, if you have
-installed the <systemitem role="package">doc-debian</systemitem> package, you
-can look at the local files <filename>/usr/share/doc/debian/bug-*</filename>.
+<literal>&bugs-host;</literal>.  Documentation on available
+commands can be found at <ulink url="&url-bts;"></ulink>, or,
+if you have installed the <systemitem role="package">doc-debian</systemitem>
+package, you can look at the local files &file-bts-docs;.

 </para>
 <para>
 Some find it useful to get periodic reports on open bugs.  You can add a cron
 </para>
 <para>
 Some find it useful to get periodic reports on open bugs.  You can add a cron


@@ -609,9 +609,9 @@ linkend="upload-bugfix"/> .
 </para>
 <para>
 You should <emphasis>never</emphasis> close bugs via the bug server
 </para>
 <para>
 You should <emphasis>never</emphasis> close bugs via the bug server

-<literal>close</literal> command sent to
-<email>control@&bugs-host;</email>.  If you do so, the original submitter
-will not receive any information about why the bug was closed.
+<literal>close</literal> command sent to &email-bts-control;.
+If you do so, the original submitter will not receive any information about why
+the bug was closed.

 </para>
 </section>
 
 </para>
 </section>
 


@@ -657,7 +657,7 @@ unacceptable, you (or the submitter) may want to require a decision of the
 technical committee by reassigning the bug to <systemitem
 role="package">tech-ctte</systemitem> (you may use the clone command of the BTS
 if you wish to keep it reported against your package).  Before doing so, please
 technical committee by reassigning the bug to <systemitem
 role="package">tech-ctte</systemitem> (you may use the clone command of the BTS
 if you wish to keep it reported against your package).  Before doing so, please

-read the <ulink url="&url-devel-docs;tech-ctte">recommended
+read the <ulink url="&url-tech-ctte;">recommended

 procedure</ulink>.
 </para>
 </listitem>
 procedure</ulink>.
 </para>
 </listitem>


@@ -666,7 +666,7 @@ procedure</ulink>.
 If the bug is real but it's caused by another package, just reassign the bug to
 the right package.  If you don't know which package it should be reassigned to,
 you should ask for help on <link linkend="irc-channels">IRC</link> or
 If the bug is real but it's caused by another package, just reassign the bug to
 the right package.  If you don't know which package it should be reassigned to,
 you should ask for help on <link linkend="irc-channels">IRC</link> or

-on <email>debian-devel@&lists-host;</email>.  Please make sure that the
+on &email-debian-devel;.  Please make sure that the

 maintainer(s) of the package the bug is reassigned to know why you reassigned
 it.
 </para>
 maintainer(s) of the package the bug is reassigned to know why you reassigned
 it.
 </para>


@@ -703,14 +703,14 @@ someone, the bug may be closed.
 <para>
 If the bug is related to the packaging, you just fix it.  If you are not able
 to fix it yourself, then tag the bug as <literal>help</literal>.  You can also
 <para>
 If the bug is related to the packaging, you just fix it.  If you are not able
 to fix it yourself, then tag the bug as <literal>help</literal>.  You can also

-ask for help on <email>debian-devel@&lists-host;</email> or
-<email>debian-qa@&lists-host;</email>.  If it's an upstream problem, you
-have to forward it to the upstream author.  Forwarding a bug is not enough, you
-have to check at each release if the bug has been fixed or not.  If it has, you
-just close it, otherwise you have to remind the author about it.  If you have
-the required skills you can prepare a patch that fixes the bug and send it to
-the author at the same time.  Make sure to send the patch to the BTS and to tag
-the bug as <literal>patch</literal>.
+ask for help on &email-debian-devel; or
+&email-debian-qa;.  If it's an upstream problem, you have to
+forward it to the upstream author.  Forwarding a bug is not enough, you have to
+check at each release if the bug has been fixed or not.  If it has, you just
+close it, otherwise you have to remind the author about it.  If you have the
+required skills you can prepare a patch that fixes the bug and send it to the
+author at the same time.  Make sure to send the patch to the BTS and to tag the
+bug as <literal>patch</literal>.

 </para>
 </listitem>
 <listitem>
 </para>
 </listitem>
 <listitem>


@@ -784,7 +784,7 @@ If you happen to mistype a bug number or forget a bug in the changelog entries,
 don't hesitate to undo any damage the error caused.  To reopen wrongly closed
 bugs, send a <literal>reopen <replaceable>XXX</replaceable></literal> command
 to the bug tracking system's control address,
 don't hesitate to undo any damage the error caused.  To reopen wrongly closed
 bugs, send a <literal>reopen <replaceable>XXX</replaceable></literal> command
 to the bug tracking system's control address,

-<email>control@&bugs-host;</email>.  To close any remaining bugs that were
+&email-bts-control;.  To close any remaining bugs that were

 fixed by your upload, email the <filename>.changes</filename> file to
 <email>XXX-done@&bugs-host;</email>, where <replaceable>XXX</replaceable>
 is the bug number, and put Version: YYY and an empty line as the first two
 fixed by your upload, email the <filename>.changes</filename> file to
 <email>XXX-done@&bugs-host;</email>, where <replaceable>XXX</replaceable>
 is the bug number, and put Version: YYY and an empty line as the first two


@@ -820,7 +820,7 @@ security.debian.org.
 When you become aware of a security-related bug in a Debian package, whether or
 not you are the maintainer, collect pertinent information about the problem,
 and promptly contact the security team at
 When you become aware of a security-related bug in a Debian package, whether or
 not you are the maintainer, collect pertinent information about the problem,
 and promptly contact the security team at

-<email>team@security.debian.org</email> as soon as possible.  <emphasis
+&email-security-team; as soon as possible.  <emphasis

 role="strong">DO NOT UPLOAD</emphasis> any packages for stable; the security
 team will do that.  Useful information includes, for example:
 </para>
 role="strong">DO NOT UPLOAD</emphasis> any packages for stable; the security
 team will do that.  Useful information includes, for example:
 </para>


@@ -933,8 +933,8 @@ has become public.
 Security advisories are only issued for the current, released stable
 distribution, and <emphasis>not</emphasis> for testing or unstable.  When
 released, advisories are sent to the
 Security advisories are only issued for the current, released stable
 distribution, and <emphasis>not</emphasis> for testing or unstable.  When
 released, advisories are sent to the

-<email>debian-security-announce@&lists-host;</email> mailing list and
-posted on <ulink url="http://&www-debian-org;/security/">the security web
+&email-debian-security-announce; mailing list and posted on
+<ulink url="&url-debian-security-advisories;">the security web

 page</ulink>.  Security advisories are written and posted by the security team.
 However they certainly do not mind if a maintainer can supply some of the
 information for them, or write part of the text.  Information that should be in
 page</ulink>.  Security advisories are written and posted by the security team.
 However they certainly do not mind if a maintainer can supply some of the
 information for them, or write part of the text.  Information that should be in


@@ -1222,7 +1222,7 @@ described in <xref linkend="override-file"/> .
 <para>
 If for some reason you want to completely remove a package (say, if it is an
 old compatibility library which is no longer required), you need to file a bug
 <para>
 If for some reason you want to completely remove a package (say, if it is an
 old compatibility library which is no longer required), you need to file a bug

-against <literal>&ftp-debian-org;</literal> asking that the package be removed;
+against <literal>ftp.debian.org</literal> asking that the package be removed;

 as all bugs, this bug should normally have normal severity.  Make sure you
 indicate which distribution the package should be removed from.  Normally, you
 can only have packages removed from <emphasis>unstable</emphasis> and
 as all bugs, this bug should normally have normal severity.  Make sure you
 indicate which distribution the package should be removed from.  Normally, you
 can only have packages removed from <emphasis>unstable</emphasis> and


@@ -1259,14 +1259,14 @@ and <ulink url="&url-debian-qa;howto-remove.html"></ulink>.
 </para>
 <para>
 If in doubt concerning whether a package is disposable, email
 </para>
 <para>
 If in doubt concerning whether a package is disposable, email

-<email>debian-devel@&lists-host;</email> asking for opinions.  Also of
-interest is the <command>apt-cache</command> program from the <systemitem
+&email-debian-devel; asking for opinions.  Also of interest is
+the <command>apt-cache</command> program from the <systemitem

 role="package">apt</systemitem> package.  When invoked as <literal>apt-cache
 showpkg <replaceable>package</replaceable></literal>, the program will show
 details for <replaceable>package</replaceable>, including reverse depends.
 Other useful programs include <literal>apt-cache rdepends</literal>,
 <command>apt-rdepends</command> and <command>grep-dctrl</command>.  Removal of
 role="package">apt</systemitem> package.  When invoked as <literal>apt-cache
 showpkg <replaceable>package</replaceable></literal>, the program will show
 details for <replaceable>package</replaceable>, including reverse depends.
 Other useful programs include <literal>apt-cache rdepends</literal>,
 <command>apt-rdepends</command> and <command>grep-dctrl</command>.  Removal of

-orphaned packages is discussed on <email>debian-qa@&lists-host;</email>.
+orphaned packages is discussed on &email-debian-qa;.

 </para>
 <para>
 Once the package has been removed, the package's bugs should be handled.  They
 </para>
 <para>
 Once the package has been removed, the package's bugs should be handled.  They


@@ -1300,7 +1300,7 @@ process to rename it.  First, set your <filename>debian/control</filename> file
 to replace and conflict with the obsolete name of the package (see the <ulink
 url="&url-debian-policy;">Debian Policy Manual</ulink> for
 details).  Once you've uploaded the package and the package has moved into the
 to replace and conflict with the obsolete name of the package (see the <ulink
 url="&url-debian-policy;">Debian Policy Manual</ulink> for
 details).  Once you've uploaded the package and the package has moved into the

-archive, file a bug against <literal>&ftp-debian-org;</literal> asking to remove
+archive, file a bug against <literal>ftp.debian.org</literal> asking to remove

 the package with the obsolete name.  Do not forget to properly reassign the
 package's bugs at the same time.
 </para>
 the package with the obsolete name.  Do not forget to properly reassign the
 package's bugs at the same time.
 </para>


@@ -1323,15 +1323,15 @@ mirror network.
 <para>
 If you can no longer maintain a package, you need to inform others, and see
 that the package is marked as orphaned.  You should set the package maintainer
 <para>
 If you can no longer maintain a package, you need to inform others, and see
 that the package is marked as orphaned.  You should set the package maintainer

-to <literal>Debian QA Group &lt;&pts-host;&gt;</literal> and submit
-a bug report against the pseudo package <systemitem
+to <literal>Debian QA Group &orphan-address;</literal> and
+submit a bug report against the pseudo package <systemitem

 role="package">wnpp</systemitem>.  The bug report should be titled <literal>O:
 <replaceable>package</replaceable> -- <replaceable>short
 description</replaceable></literal> indicating that the package is now
 orphaned.  The severity of the bug should be set to
 <emphasis>normal</emphasis>; if the package has a priority of standard or
 higher, it should be set to important.  If you feel it's necessary, send a copy
 role="package">wnpp</systemitem>.  The bug report should be titled <literal>O:
 <replaceable>package</replaceable> -- <replaceable>short
 description</replaceable></literal> indicating that the package is now
 orphaned.  The severity of the bug should be set to
 <emphasis>normal</emphasis>; if the package has a priority of standard or
 higher, it should be set to important.  If you feel it's necessary, send a copy

-to <email>debian-devel@&lists-host;</email> by putting the address in the
+to &email-debian-devel; by putting the address in the

 X-Debbugs-CC: header of the message (no, don't use CC:, because that way the
 message's subject won't indicate the bug number).
 </para>
 X-Debbugs-CC: header of the message (no, don't use CC:, because that way the
 message's subject won't indicate the bug number).
 </para>


@@ -1371,8 +1371,8 @@ package.  Complaints about maintainers should be brought up on the developers'
 mailing list.  If the discussion doesn't end with a positive conclusion, and
 the issue is of a technical nature, consider bringing it to the attention of
 the technical committee (see the <ulink
 mailing list.  If the discussion doesn't end with a positive conclusion, and
 the issue is of a technical nature, consider bringing it to the attention of
 the technical committee (see the <ulink

-url="&url-devel-docs;tech-ctte">technical committee web
-page</ulink> for more information).
+url="&url-tech-ctte;">technical committee web page</ulink> for
+more information).

 </para>
 <para>
 If you take over an old package, you probably want to be listed as the
 </para>
 <para>
 If you take over an old package, you probably want to be listed as the


@@ -1758,7 +1758,7 @@ architectures: A porter or any other person trying to build your package might
 accidently upload it without noticing it doesn't work.  If in the past some
 binary packages were uploaded on unsupported architectures, request their
 removal by filing a bug against <systemitem
 accidently upload it without noticing it doesn't work.  If in the past some
 binary packages were uploaded on unsupported architectures, request their
 removal by filing a bug against <systemitem

-role="package">&ftp-debian-org;</systemitem>
+role="package">ftp.debian.org</systemitem>

 </para>
 </section>
 
 </para>
 </section>
 


@@ -2032,8 +2032,8 @@ Unless you know the maintainer is still active, it is wise to check the package
 to see if it has been orphaned.  The current list of orphaned packages which
 haven't had their maintainer set correctly is available at <ulink
 url="&url-debian-qa-orphaned;"></ulink>.  If you perform an NMU on an
 to see if it has been orphaned.  The current list of orphaned packages which
 haven't had their maintainer set correctly is available at <ulink
 url="&url-debian-qa-orphaned;"></ulink>.  If you perform an NMU on an

-improperly orphaned package, please set the maintainer to ``Debian QA Group
-&lt;&pts-host;&gt;''.
+improperly orphaned package, please set the maintainer to <literal>Debian QA Group
+&lt;packages@qa.debian.org&gt;</literal>.

 </para>
 </section>
 
 </para>
 </section>
 


@@ -2238,7 +2238,7 @@ all the necessary criteria);
 <para>
 To find out whether a package is progressing into testing or not, see the
 testing script output on the <ulink
 <para>
 To find out whether a package is progressing into testing or not, see the
 testing script output on the <ulink

-url="&url-devel-docs;testing">web page of the testing
+url="&url-testing-maint;">web page of the testing

 distribution</ulink>, or use the program <command>grep-excuses</command> which
 is in the <systemitem role="package">devscripts</systemitem> package.  This
 utility can easily be used in a <citerefentry>
 distribution</ulink>, or use the program <command>grep-excuses</command> which
 is in the <systemitem role="package">devscripts</systemitem> package.  This
 utility can easily be used in a <citerefentry>


@@ -2250,7 +2250,7 @@ to keep yourself informed of the progression of your packages into
 The <filename>update_excuses</filename> file does not always give the precise
 reason why the package is refused; you may have to find it on your own by
 looking for what would break with the inclusion of the package.  The <ulink
 The <filename>update_excuses</filename> file does not always give the precise
 reason why the package is refused; you may have to find it on your own by
 looking for what would break with the inclusion of the package.  The <ulink

-url="&url-devel-docs;testing">testing web page</ulink> gives some
+url="&url-testing-maint;">testing web page</ulink> gives some

 more information about the usual problems which may be causing such troubles.
 </para>
 <para>
 more information about the usual problems which may be causing such troubles.
 </para>
 <para>


@@ -2403,8 +2403,8 @@ considered for update.
 </para>
 <para>
 Currently, this requires some manual hinting from the release team.  Please
 </para>
 <para>
 Currently, this requires some manual hinting from the release team.  Please

-contact them by sending mail to <email>debian-release@&lists-host;</email>
-if this happens to one of your packages.
+contact them by sending mail to &email-debian-release; if this
+happens to one of your packages.

 </para>
 </section>
 
 </para>
 </section>
 


@@ -2477,7 +2477,7 @@ Keep in mind that packages uploaded there are not automatically processed, they
 have to go through the hands of the release manager.  So you'd better have a
 good reason to upload there.  In order to know what a good reason is in the
 release managers' eyes, you should read the instructions that they regularly
 have to go through the hands of the release manager.  So you'd better have a
 good reason to upload there.  In order to know what a good reason is in the
 release managers' eyes, you should read the instructions that they regularly

-give on <email>debian-devel-announce@&lists-host;</email>.
+give on &email-debian-devel-announce;.

 </para>
 <para>
 You should not upload to <emphasis>testing-proposed-updates</emphasis> when you
 </para>
 <para>
 You should not upload to <emphasis>testing-proposed-updates</emphasis> when you


@@ -2535,8 +2535,7 @@ and lower than in <emphasis>unstable</emphasis>;
 <listitem>
 <para>
 After uploading and successful build on all platforms, contact the release team
 <listitem>
 <para>
 After uploading and successful build on all platforms, contact the release team

-at <email>debian-release@&lists-host;</email> and ask them to approve your
-upload.
+at &email-debian-release; and ask them to approve your upload.

 </para>
 </listitem>
 </itemizedlist>
 </para>
 </listitem>
 </itemizedlist>

diff --git a/resources.dbk b/resources.dbk
index 373bc5583ed8ac8636cad18983a08c1a78b47a3a..8a008914954e61c11e429dd6d3331af5a16efc19 100644 (file)
--- a/resources.dbk
+++ b/resources.dbk
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
     "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE chapter 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;

 ]>
 <chapter id="resources">
 <title>Resources for Debian Developers</title>
 ]>
 <chapter id="resources">
 <title>Resources for Debian Developers</title>


@@ -15,12 +15,13 @@ all the other resources that are available to help you in your maintainer work.
 <para>
 Much of the conversation between Debian developers (and users) is managed
 through a wide array of mailing lists we host at <literal><ulink
 <para>
 Much of the conversation between Debian developers (and users) is managed
 through a wide array of mailing lists we host at <literal><ulink

-url="http://&lists-host;/">&lists-host;</ulink></literal>.  To find out
-more on how to subscribe or unsubscribe, how to post and how not to post, where
-to find old posts and how to search them, how to contact the list maintainers
-and see various other information about the mailing lists, please read <ulink
-url="&url-debian-lists;"></ulink>.  This section will only
-cover aspects of mailing lists that are of particular interest to developers.
+url="http://&lists-host;/">&lists-host;</ulink></literal>.
+To find out more on how to subscribe or unsubscribe, how to post and how not to
+post, where to find old posts and how to search them, how to contact the list
+maintainers and see various other information about the mailing lists, please
+read <ulink url="&url-debian-lists;"></ulink>.  This section
+will only cover aspects of mailing lists that are of particular interest to
+developers.

 </para>
 <section id="mailing-lists-rules">
 <title>Basic rules for use</title>
 </para>
 <section id="mailing-lists-rules">
 <title>Basic rules for use</title>


@@ -50,27 +51,27 @@ The core Debian mailing lists that developers should use are:
 <itemizedlist>
 <listitem>
 <para>
 <itemizedlist>
 <listitem>
 <para>

-<email>debian-devel-announce@&lists-host;</email>, used to announce
-important things to developers.  All developers are expected to be subscribed
-to this list.
+&email-debian-devel-announce;, used to announce important
+things to developers.  All developers are expected to be subscribed to this
+list.

 </para>
 </listitem>
 <listitem>
 <para>
 </para>
 </listitem>
 <listitem>
 <para>

-<email>debian-devel@&lists-host;</email>, used to discuss various
-development related technical issues.
+&email-debian-devel;, used to discuss various development
+related technical issues.

 </para>
 </listitem>
 <listitem>
 <para>
 </para>
 </listitem>
 <listitem>
 <para>

-<email>debian-policy@&lists-host;</email>, where the Debian Policy is
-discussed and voted on.
+&email-debian-policy;, where the Debian Policy is discussed
+and voted on.

 </para>
 </listitem>
 <listitem>
 <para>
 </para>
 </listitem>
 <listitem>
 <para>

-<email>debian-project@&lists-host;</email>, used to discuss various
-non-technical issues related to the project.
+&email-debian-project;, used to discuss various non-technical
+issues related to the project.

 </para>
 </listitem>
 </itemizedlist>
 </para>
 </listitem>
 </itemizedlist>


@@ -83,11 +84,11 @@ There are other mailing lists available for a variety of special topics; see
 <section id="mailing-lists-special">
 <title>Special lists</title>
 <para>
 <section id="mailing-lists-special">
 <title>Special lists</title>
 <para>

-<email>debian-private@&lists-host;</email> is a special mailing list for
-private discussions amongst Debian developers.  It is meant to be used for
-posts which for whatever reason should not be published publicly.  As such, it
-is a low volume list, and users are urged not to use
-<email>debian-private@&lists-host;</email> unless it is really necessary.
+&email-debian-private; is a special mailing list for private
+discussions amongst Debian developers.  It is meant to be used for posts which
+for whatever reason should not be published publicly.  As such, it is a low
+volume list, and users are urged not to use
+&email-debian-private; unless it is really necessary.

 Moreover, do <emphasis>not</emphasis> forward email from that list to anyone.
 Archives of this list are not available on the web for obvious reasons, but you
 can see them using your shell account on <literal>&lists-host;</literal>
 Moreover, do <emphasis>not</emphasis> forward email from that list to anyone.
 Archives of this list are not available on the web for obvious reasons, but you
 can see them using your shell account on <literal>&lists-host;</literal>


@@ -95,10 +96,10 @@ and looking in the <filename>&file-debian-private-archive;</filename>
 directory.
 </para>
 <para>
 directory.
 </para>
 <para>

-<email>debian-email@&lists-host;</email> is a special mailing list used as
-a grab-bag for Debian related correspondence such as contacting upstream
-authors about licenses, bugs, etc.  or discussing the project with others where
-it might be useful to have the discussion archived somewhere.
+&email-debian-email; is a special mailing list used as a
+grab-bag for Debian related correspondence such as contacting upstream authors
+about licenses, bugs, etc.  or discussing the project with others where it
+might be useful to have the discussion archived somewhere.

 </para>
 </section>
 
 </para>
 </section>
 


@@ -125,7 +126,7 @@ url="&url-debian-lists-new;">the HOWTO</ulink>.
 <title>IRC channels</title>
 <para>
 Several IRC channels are dedicated to Debian's development.  They are mainly
 <title>IRC channels</title>
 <para>
 Several IRC channels are dedicated to Debian's development.  They are mainly

-hosted on the <ulink url="http://www.oftc.net/oftc/">Open and free technology
+hosted on the <ulink url="&url-oftc;">Open and free technology

 community (OFTC)</ulink> network.  The <literal>irc.debian.org</literal> DNS
 entry is an alias to <literal>irc.oftc.net</literal>.
 </para>
 community (OFTC)</ulink> network.  The <literal>irc.debian.org</literal> DNS
 entry is an alias to <literal>irc.oftc.net</literal>.
 </para>


@@ -148,12 +149,12 @@ information for developers.
 <para>
 Since <emphasis>#debian-devel</emphasis> is an open channel, you should not
 speak there of issues that are discussed in
 <para>
 Since <emphasis>#debian-devel</emphasis> is an open channel, you should not
 speak there of issues that are discussed in

-<email>debian-private@&lists-host;</email>.  There's another channel for
-this purpose, it's called <emphasis>#debian-private</emphasis> and it's
-protected by a key.  This key is available in the archives of debian-private in
-<filename>master.debian.org:&file-debian-private-archive;</filename>, just
-<command>zgrep</command> for <emphasis>#debian-private</emphasis> in all the
-files.
+&email-debian-private;.  There's another channel for this
+purpose, it's called <emphasis>#debian-private</emphasis> and it's protected by
+a key.  This key is available in the archives of debian-private in
+<filename>master.debian.org:&file-debian-private-archive;</filename>,
+just <command>zgrep</command> for <emphasis>#debian-private</emphasis> in all
+the files.

 </para>
 <para>
 There are other additional channels dedicated to specific subjects.
 </para>
 <para>
 There are other additional channels dedicated to specific subjects.


@@ -174,8 +175,9 @@ Debian's development.
 </para>
 <para>
 Channels dedicated to Debian also exist on other IRC networks, notably on the
 </para>
 <para>
 Channels dedicated to Debian also exist on other IRC networks, notably on the

-<ulink url="http://www.freenode.net/">freenode</ulink> IRC network, which was
-pointed at by the <literal>irc.debian.org</literal> alias until 4th June 2006.
+<ulink url="&url-openprojects;">freenode</ulink> IRC network,
+which was pointed at by the <literal>irc.debian.org</literal> alias until 4th
+June 2006.

 </para>
 <para>
 To get a cloak on freenode, you send Jörg Jaspert &lt;joerg@debian.org&gt; a
 </para>
 <para>
 To get a cloak on freenode, you send Jörg Jaspert &lt;joerg@debian.org&gt; a


@@ -209,7 +211,7 @@ activities, and they all have a permanent connection to the Internet.
 <para>
 Most of the machines are available for individual developers to use, as long as
 the developers follow the rules set forth in the <ulink
 <para>
 Most of the machines are available for individual developers to use, as long as
 the developers follow the rules set forth in the <ulink

-url="&url-devel-docs;dmup">Debian Machine Usage Policies</ulink>.
+url="&url-dmup;">Debian Machine Usage Policies</ulink>.

 </para>
 <para>
 Generally speaking, you can use these machines for Debian-related purposes as
 </para>
 <para>
 Generally speaking, you can use these machines for Debian-related purposes as


@@ -253,8 +255,8 @@ mirrored to another server.
 <section id="servers-bugs">
 <title>The bugs server</title>
 <para>
 <section id="servers-bugs">
 <title>The bugs server</title>
 <para>

-<literal>&bugs-host;</literal> is the canonical location for the Bug
-Tracking System (BTS).
+<literal>&bugs-host;</literal> is the canonical location for
+the Bug Tracking System (BTS).

 </para>
 <para>
 It is restricted; a mirror is available on <literal>merkel</literal>.
 </para>
 <para>
 It is restricted; a mirror is available on <literal>merkel</literal>.


@@ -262,8 +264,8 @@ It is restricted; a mirror is available on <literal>merkel</literal>.
 <para>
 If you plan on doing some statistical analysis or processing of Debian bugs,
 this would be the place to do it.  Please describe your plans on
 <para>
 If you plan on doing some statistical analysis or processing of Debian bugs,
 this would be the place to do it.  Please describe your plans on

-<email>debian-devel@&lists-host;</email> before implementing anything,
-however, to reduce unnecessary duplication of effort or wasted processing time.
+&email-debian-devel; before implementing anything, however, to
+reduce unnecessary duplication of effort or wasted processing time.

 </para>
 </section>
 
 </para>
 </section>
 


@@ -280,7 +282,7 @@ It is restricted; a mirror is available on <literal>merkel</literal>.
 <para>
 Problems with the Debian FTP archive generally need to be reported as bugs
 against the <systemitem role="package">&ftp-debian-org;</systemitem>
 <para>
 Problems with the Debian FTP archive generally need to be reported as bugs
 against the <systemitem role="package">&ftp-debian-org;</systemitem>

-pseudo-package or an email to <email>ftpmaster@debian.org</email>, but also see
+pseudo-package or an email to &email-ftpmaster;, but also see

 the procedures in <xref linkend="archive-manip"/> .
 </para>
 </section>
 the procedures in <xref linkend="archive-manip"/> .
 </para>
 </section>


@@ -303,7 +305,7 @@ official web pages, the face of Debian for most newbies.
 <para>
 If you find a problem with the Debian web server, you should generally submit a
 bug against the pseudo-package, <systemitem
 <para>
 If you find a problem with the Debian web server, you should generally submit a
 bug against the pseudo-package, <systemitem

-role="package">&www-debian-org;</systemitem>.  Remember to check whether or not
+role="package">www.debian.org</systemitem>.  Remember to check whether or not

 someone else has already reported the problem to the <ulink
 url="http://&bugs-host;/&www-debian-org;">Bug Tracking System</ulink>.
 </para>
 someone else has already reported the problem to the <ulink
 url="http://&bugs-host;/&www-debian-org;">Bug Tracking System</ulink>.
 </para>


@@ -332,8 +334,7 @@ materials subject to the U.S.  export restrictions, in which case you can use
 one of the other servers located outside the United States.
 </para>
 <para>
 one of the other servers located outside the United States.
 </para>
 <para>

-Send mail to <email>debian-devel@&lists-host;</email> if you have any
-questions.
+Send mail to &email-debian-devel; if you have any questions.

 </para>
 </section>
 
 </para>
 </section>
 


@@ -356,7 +357,7 @@ via the Web at <ulink url="&url-cvsweb;"></ulink>.
 </para>
 <para>
 To request a CVS area, send a request via email to
 </para>
 <para>
 To request a CVS area, send a request via email to

-<email>debian-admin@debian.org</email>.  Include the name of the requested CVS
+&email-debian-admin;.  Include the name of the requested CVS

 area, the Debian account that should own the CVS root area, and why you need
 it.
 </para>
 area, the Debian account that should own the CVS root area, and why you need
 it.
 </para>


@@ -384,11 +385,12 @@ out which chroots are available via
 <section id="devel-db">
 <title>The Developers Database</title>
 <para>
 <section id="devel-db">
 <title>The Developers Database</title>
 <para>

-The Developers Database, at <ulink url="&url-debian-db;"></ulink>, is an
-LDAP directory for managing Debian developer attributes.  You can use this
-resource to search the list of Debian developers.  Part of this information is
-also available through the finger service on Debian servers, try
-<command>finger yourlogin@db.debian.org</command> to see what it reports.
+The Developers Database, at <ulink
+url="&url-debian-db;"></ulink>, is an LDAP directory for
+managing Debian developer attributes.  You can use this resource to search the
+list of Debian developers.  Part of this information is also available through
+the finger service on Debian servers, try <command>finger
+yourlogin@db.debian.org</command> to see what it reports.

 </para>
 <para>
 Developers can <ulink url="&url-debian-db-login;">log into the
 </para>
 <para>
 Developers can <ulink url="&url-debian-db-login;">log into the


@@ -414,7 +416,7 @@ whether you are on vacation
 <para>
 personal information such as your address, country, the latitude and longitude
 of the place where you live for use in <ulink
 <para>
 personal information such as your address, country, the latitude and longitude
 of the place where you live for use in <ulink

-url="&url-devel-docs;developers.loc">the world map of Debian
+url="&url-worldmap;">the world map of Debian

 developers</ulink>, phone and fax numbers, IRC nickname and web page
 </para>
 </listitem>
 developers</ulink>, phone and fax numbers, IRC nickname and web page
 </para>
 </listitem>


@@ -441,8 +443,9 @@ url="&url-debian-db-mail-gw;"></ulink>.
 <title>The Debian archive</title>
 <para>
 The &debian-formal; distribution consists of a lot of packages
 <title>The Debian archive</title>
 <para>
 The &debian-formal; distribution consists of a lot of packages

-(<filename>.deb</filename>'s, currently around &number-of-pkgs;) and a few additional files
-(such as documentation and installation disk images).
+(<filename>.deb</filename>'s, currently around
+&number-of-pkgs;) and a few additional files (such as
+documentation and installation disk images).

 </para>
 <para>
 Here is an example directory tree of a complete Debian archive:
 </para>
 <para>
 Here is an example directory tree of a complete Debian archive:


@@ -831,9 +834,9 @@ push mirroring).
 <para>
 All the information on Debian mirrors, including a list of the available public
 FTP/HTTP servers, can be found at <ulink
 <para>
 All the information on Debian mirrors, including a list of the available public
 FTP/HTTP servers, can be found at <ulink

-url="url-debian-mirroring"></ulink>.  This useful page also includes
-information and tools which can be helpful if you are interested in setting up
-your own mirror, either for internal or public access.
+url="&url-debian-mirrors;"></ulink>.  This useful page also
+includes information and tools which can be helpful if you are interested in
+setting up your own mirror, either for internal or public access.

 </para>
 <para>
 Note that mirrors are generally run by third-parties who are interested in
 </para>
 <para>
 Note that mirrors are generally run by third-parties who are interested in


@@ -872,7 +875,7 @@ package is refused and is moved to the <filename>reject</filename> directory.
 Once the package is accepted, the system sends a confirmation mail to the
 maintainer and closes all the bugs marked as fixed by the upload, and the
 auto-builders may start recompiling it.  The package is now publicly accessible
 Once the package is accepted, the system sends a confirmation mail to the
 maintainer and closes all the bugs marked as fixed by the upload, and the
 auto-builders may start recompiling it.  The package is now publicly accessible

-at <ulink url="http://incoming.debian.org/"></ulink> until it is really
+at <ulink url="&url-incoming;"></ulink> until it is really

 installed in the Debian archive.  This happens only once a day (and is also
 called the `dinstall run' for historical reasons); the package is then removed
 from incoming and installed in the pool along with all the other packages.
 installed in the Debian archive.  This happens only once a day (and is also
 called the `dinstall run' for historical reasons); the package is then removed
 from incoming and installed in the pool along with all the other packages.


@@ -885,10 +888,10 @@ The archive maintenance software will also send the OpenPGP/GnuPG signed
 <filename>.changes</filename> file that you uploaded to the appropriate mailing
 lists.  If a package is released with the <literal>Distribution:</literal> set
 to `stable', the announcement is sent to
 <filename>.changes</filename> file that you uploaded to the appropriate mailing
 lists.  If a package is released with the <literal>Distribution:</literal> set
 to `stable', the announcement is sent to

-<email>debian-changes@&lists-host;</email>.  If a package is released with
+&email-debian-changes;.  If a package is released with

 <literal>Distribution:</literal> set to `unstable' or `experimental', the
 <literal>Distribution:</literal> set to `unstable' or `experimental', the

-announcement will be posted to
-<email>debian-devel-changes@&lists-host;</email> instead.
+announcement will be posted to &email-debian-devel-changes;
+instead.

 </para>
 <para>
 Though ftp-master is restricted, a copy of the installation is available to all
 </para>
 <para>
 Though ftp-master is restricted, a copy of the installation is available to all


@@ -1178,7 +1181,7 @@ summary:
 <listitem>
 <para>
 <literal>bts-control</literal>: reply to mails sent to
 <listitem>
 <para>
 <literal>bts-control</literal>: reply to mails sent to

-<email>control@&bugs-host;</email>
+&email-bts-control;

 </para>
 </listitem>
 <listitem>
 </para>
 </listitem>
 <listitem>


@@ -1474,12 +1477,12 @@ contained in the previous one.
 <title>Developer's packages overview</title>
 <para>
 A QA (quality assurance) web portal is available at <ulink
 <title>Developer's packages overview</title>
 <para>
 A QA (quality assurance) web portal is available at <ulink

-url="&url-debian-qa;developer.php"></ulink> which displays a table
-listing all the packages of a single developer (including those where the party
-is listed as a co-maintainer).  The table gives a good summary about the
-developer's packages: number of bugs by severity, list of available versions in
-each distribution, testing status and much more including links to any other
-useful information.
+url="&url-ddpo;"></ulink> which displays a table listing all
+the packages of a single developer (including those where the party is listed
+as a co-maintainer).  The table gives a good summary about the developer's
+packages: number of bugs by severity, list of available versions in each
+distribution, testing status and much more including links to any other useful
+information.

 </para>
 <para>
 It is a good idea to look up your own data regularly so that you don't forget
 </para>
 <para>
 It is a good idea to look up your own data regularly so that you don't forget


@@ -1510,7 +1513,7 @@ request guest accounts on Alioth.
 </para>
 <para>
 For more information please visit <ulink
 </para>
 <para>
 For more information please visit <ulink

-url="http://alioth.debian.org/"></ulink>.
+url="&url-alioth;"></ulink>.

 </para>
 </section>
 
 </para>
 </section>
 

diff --git a/scope.dbk b/scope.dbk
index ea7b71a8bcf7b8c5d9e3979625a4ba2cd8477791..c990b1e710db045242aae846d030e02f177d6937 100644 (file)
--- a/scope.dbk
+++ b/scope.dbk
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
     "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE chapter 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;

 ]>
 <chapter id="scope">
 <title>Scope of This Document</title>
 ]>
 <chapter id="scope">
 <title>Scope of This Document</title>


@@ -31,8 +31,8 @@ maintainers with the quality of their packages (<xref linkend="tools"/> ).
 It should be clear that this reference does not discuss the technical details
 of Debian packages nor how to generate them.  Nor does this reference detail
 the standards to which Debian software must comply.  All of such information
 It should be clear that this reference does not discuss the technical details
 of Debian packages nor how to generate them.  Nor does this reference detail
 the standards to which Debian software must comply.  All of such information

-can be found in the <ulink
-url="&url-debian-policy;">Debian Policy Manual</ulink>.
+can be found in the <ulink url="&url-debian-policy;">Debian
+Policy Manual</ulink>.

 </para>
 <para>
 Furthermore, this document is <emphasis>not an expression of formal
 </para>
 <para>
 Furthermore, this document is <emphasis>not an expression of formal

diff --git a/tools.dbk b/tools.dbk
index 25d61a0ffca7b49402cb00c90f4cc57f40381d03..1590c75b3818c5faba3ab732a7c0cac041bb753e 100644 (file)
--- 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" [
 <?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>
 ]>
 <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
 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>
 </para>
 <section id="tools-core">
 <title>Core tools</title>