From: aph <aph@313b444b-1b9f-4f58-a734-7bb04f332e8d>
Date: Mon, 11 Nov 2002 20:38:44 +0000 (+0000)
Subject: fix some bad URLs, notably the testing FAQ -- checkbot reports all is well now
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;ds=sidebyside;h=ff9d221294cb704230148c5e9b2084bbdea7f336;p=developers-reference.git

fix some bad URLs, notably the testing FAQ -- checkbot reports all is well now


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

diff --git a/common.ent b/common.ent
index a415a22..86d9210 100644
--- a/common.ent
+++ b/common.ent
@@ -40,10 +40,9 @@
 <!entity url-debian-policy "http://&www-debian-org;/doc/debian-policy/">
 <!entity url-perl-policy "http://&www-debian-org;/doc/packaging-manuals/perl-policy/">
 <!entity url-emacs-policy "http://&www-debian-org;/doc/packaging-manuals/debian-emacs-policy">
-<!entity url-java-policy "http://people.debian.org/~opal/java/policy.html/">
+<!entity url-java-policy "http://www.debian.org/doc/packaging-manuals/java-policy/">
 <!entity url-libpkg-guide "http://www.netfort.gr.jp/~dancer/column/libpkg-guide/">
-<!-- deprecate, this is dead
-  <!entity url-pkg-manual "http://&www-debian-org;/doc/packaging-manuals/packaging.html/"> -->
+
 <!entity url-social-contract "http://&www-debian-org;/social_contract">
 <!entity url-constitution "http://&www-debian-org;/devel/constitution">
 <!entity url-dfsg "&url-social-contract;#guidelines">
@@ -83,10 +82,10 @@
 
 <!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-testing-maint "http://ftp-master.debian.org/testing/">
-<!entity url-testing-faq "http://people.debian.org/~jules/testingfaq.html">
-<!entity url-incoming "http://incoming.debian.org">
+<!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 "<file>/org/ftp.debian.org/incoming/</file>">
 <!entity non-us-upload-dir "<file>/org/non-us.debian.org/incoming/</file>">
@@ -97,7 +96,7 @@
 
 <!entity url-sponsors "http://www.internatif.org/bortzmeyer/debian/sponsor/">
 
-<!entity url-rules-files "http://people.debian.org/~srivasta/rules">
+<!entity url-rules-files "http://people.debian.org/~srivasta/rules/">
 
 <!entity url-debconf-l10n-help "http://&www-debian-org;/intl/l10n/templates/hints">
 
diff --git a/debian/changelog b/debian/changelog
index 4e5b3e1..3fe2659 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,10 +11,10 @@ developers-reference (3.1.1) unstable; urgency=low
     - updated security information, merging in Joey's stuff from the
       Security Team FAQ and various updates and clarifications
   * Adam Di Carlo
-    - fix bad URL, closes: #168357
+    - fix some bad URLs, closes: #168357
     - fix a grammar typo, closes: #166098
 
- -- Adam Di Carlo <aph@debian.org>  UNRELEASED
+ -- UNRELEASED Adam Di Carlo <aph@debian.org>  Mon, 11 Nov 2002 13:37:14 -0600
 
 developers-reference (3.1) unstable; urgency=low
 
diff --git a/developers-reference.sgml b/developers-reference.sgml
index abe9bcb..6402964 100644
--- a/developers-reference.sgml
+++ b/developers-reference.sgml
@@ -6,7 +6,7 @@
   <!entity % commondata  SYSTEM "common.ent" > %commondata;
 
   <!-- CVS revision of this document -->
-  <!entity cvs-rev "$Revision: 1.138 $">
+  <!entity cvs-rev "$Revision: 1.139 $">
   <!-- if you are translating this document, please notate the CVS
        revision of the developers reference here -->
   <!--
@@ -1120,14 +1120,15 @@ if they respect themselves all the criteria);
 The scripts are generating some output files to explain why some packages
 are kept out of testing. They are available at <url
 id="&url-testing-maint;">. Alternatively, it is possible to use
-the <prgn>grep-excuses</prgn> program part of the
-<package>devscripts</package> package. It can be easily put in a crontab
+the <prgn>grep-excuses</prgn> program which is in the
+<package>devscripts</package> package. It can be easily put in a
+<manref name="crontab" section="5">
 to keep someone informed of the progression of his packages in <em>testing</em>.
 	<p>
 The <file>update_excuses</file> file does not always give the precise reason
 why the package is refused, one may have to find it on their own by looking
 what would break with the inclusion of the package. The <url
-id="&url-testing-faq;" name="testing FAQ"> gives some more information
+id="&url-testing-maint;" name="testing overview"> gives some more information
 about the usual problems which may be causing such troubles.
 	<p>
 Sometimes, some packages never enter <em>testing</em> because the set of