X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=developers-reference.git;a=blobdiff_plain;f=pkgs.dbk;h=5b7b3602a4e0821f186a251fbb4b69b640bcf8b8;hp=86d9273e90783fe8d7f407cdbd262d614e105ba6;hb=7a7dcd755db55f4953bd1fd2057ddc2a279e5fa2;hpb=fc34d7250f853440f2e1a9e89c5fd34419ee0f40

diff --git a/pkgs.dbk b/pkgs.dbk
index 86d9273..5b7b360 100644
--- a/pkgs.dbk
+++ b/pkgs.dbk
@@ -55,7 +55,7 @@ the rejection email in case you are already re-uploading.
 </para>
 <para>
 When closing security bugs include CVE numbers as well as the
-<literal>Closes: #<replaceable>nnnnn</replaceable></literal>
+<literal>Closes: #<replaceable>nnnnn</replaceable></literal>.  
 This is useful for the security team to track vulnerabilities.  If an upload is
 made to fix the bug before the advisory ID is known, it is encouraged to modify
 the historical changelog entry with the next upload.  Even in this case, please
@@ -174,7 +174,7 @@ output a very verbose description of the problem.
 </para>
 <para>
 Normally, a package should <emphasis>not</emphasis> be uploaded if it causes
-lintian to emit errors (they will start with <literal>E</literal>).
+<command>lintian</command> to emit errors (they will start with <literal>E</literal>).
 </para>
 <para>
 For more information on <command>lintian</command>, see <xref
@@ -862,7 +862,7 @@ The nature of the fix, if any is available (patches are especially helpful)
 <listitem>
 <para>
 Any fixed packages that you have prepared yourself (send only the
-<literal>.diff.gz</literal> and <literal>.dsc</literal> files and read <xref
+<filename>.diff.gz</filename> and <filename>.dsc</filename> files and read <xref
 linkend="bug-security-building"/> first)
 </para>
 </listitem>
@@ -1151,12 +1151,13 @@ uploads.
 </listitem>
 <listitem>
 <para>
-Unless the upstream source has been uploaded to <literal>security.debian.org
-</literal> before (by a previous security update), build the upload <emphasis
-role="strong">with full upstream source</emphasis> (<literal>dpkg-buildpackage
--sa</literal>).  If there has been a previous upload to
-<literal>security.debian.org</literal> with the same upstream version, you may
-upload without upstream source (<literal>dpkg-buildpackage -sd</literal>).
+Unless the upstream source has been uploaded to
+<literal>security.debian.org</literal> before (by a previous security update),
+build the upload <emphasis role="strong">with full upstream source</emphasis>
+(<literal>dpkg-buildpackage -sa</literal>).  If there has been a previous
+upload to <literal>security.debian.org</literal> with the same upstream
+version, you may upload without upstream source (<literal>dpkg-buildpackage
+-sd</literal>).
 </para>
 </listitem>
 <listitem>
@@ -1278,7 +1279,7 @@ short summary of the reason for the removal request.
 <replaceable>[architecture list]</replaceable> is optional and only needed
 if the removal request only applies to some architectures, not all. Note
 that the <command>reportbug</command> will create a title conforming
-to these rules when you use it to report a bug against the 
+to these rules when you use it to report a bug against the
 <literal>ftp.debian.org</literal> pseudo-package.
 </para>
 
@@ -2294,7 +2295,7 @@ In any case, it is a bad idea to automatically put all team members in the
 a false sense of good maintenance. For the same reason, team members do
 not need to add themselves to the <literal>Uploaders</literal> field just because they are
 uploading the package once, they can do a “Team upload” (see <xref
-linkend="nmu-team-upload"/>). Conversely, it it a bad idea to keep a
+linkend="nmu-team-upload"/>). Conversely, it is a bad idea to keep a
 package with only the mailing list address as a <literal>Maintainer</literal> and no
 <literal>Uploaders</literal>.
 </para>
@@ -2392,7 +2393,7 @@ more information about the usual problems which may be causing such troubles.
 </para>
 <para>
 Sometimes, some packages never enter <literal>testing</literal> because the
-set of inter-relationship is too complicated and cannot be sorted out by the
+set of interrelationship is too complicated and cannot be sorted out by the
 scripts.  See below for details.
 </para>
 <para>
@@ -2596,11 +2597,8 @@ tests include this package.  Hints from the release team are processed
 before or after this main run, depending on the exact type.
 </para>
 <para>
-If you want to see more details, you can look it up on
-<filename>merkel:/org/&ftp-debian-org;/testing/update_out/</filename> (or
-in <filename>merkel:~aba/testing/update_out</filename> to see a setup with
-a smaller packages file).  Via web, it's at <ulink
-url="http://&ftp-master-host;/testing/update_out_code/"></ulink>.
+If you want to see more details, you can look it up on <ulink
+url="http://&ftp-master-host;/testing/update_output/"></ulink>.
 </para>
 <para>
 The hints are available via <ulink