tiny cleanups

[developers-reference.git] / developers-reference.sgml

diff --git a/developers-reference.sgml b/developers-reference.sgml
index 8b59385eb5fa70944b117dccb42a124fa961c50e..4d2bd169bb9ef2bb8de570891096f1950b070365 100644 (file)
--- 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.208 $">
+  <!ENTITY cvs-rev "$Revision: 1.210 $">
   <!-- if you are translating this document, please notate the CVS
        revision of the developers reference here -->
   <!--
@@ -350,14 +350,15 @@ Don't forget to remove the "on vacation" flag when you come back!
        <p>
 A big part of your job as Debian maintainer will be to stay in contact
 with the upstream developers.  Debian users will sometimes report bugs
-to the Bug Tracking System that are not specific to Debian.  You
-must forward these bug reports to the upstream developers so that
-they can be fixed in a future release.  It's not your job to fix
-non-Debian specific bugs.  However, if you are able to do so, you are
-encouraged to contribute to upstream development of the package by
-providing a fix for the bug.  Debian users and developers will often
-submit patches to fix upstream bugs, and you should evaluate and
-forward these patches upstream.
+that are not specific to Debian to our bug tracking system.  You
+have to forward these bug reports to the upstream developers so that
+they can be fixed in a future upstream release.
+       <p>
+While it's not your job to fix non-Debian specific bugs, you may freely
+do so if you're able. When you make such fixes, be sure to pass them on
+to the upstream maintainers as well. Debian users and developers will
+sometimes submit patches to fix upstream bugs -- you should evaluate
+and forward these patches upstream.
         <p>
 If you need to modify the upstream sources in order to build a policy
 compliant package, then you should propose a nice fix to the upstream
@@ -1737,7 +1738,7 @@ if you use anonymous FTP to upload, place them into
          <p>
 If you want to use feature described in <ref id="delayed-incoming">,
 you'll have to upload to <tt>ftp-master</tt>.  It is the only upload
-point that supported delayed incoming.
+point that supports delayed incoming.
          <p>
 Please note that you should transfer
 the changes file last.  Otherwise, your upload may be rejected because the
@@ -1979,9 +1980,8 @@ maintainer address.
       <sect1 id="bug-answering">Responding to bugs
        <p>
 When responding to bugs, make sure that any discussion you have about
-bugs are sent both to
-the original submitter of the bug, and the bug itself (e.g.,
-<email>123@&bugs-host;</email>). If you're writing a new
+bugs is sent both to the original submitter of the bug, and to the bug
+itself (e.g., <email>123@&bugs-host;</email>). If you're writing a new
 mail and you don't remember the submitter email address, you can
 use the <email>123-submitter@&bugs-host;</email> email to
 contact the submitter <em>and</em> to record your mail within the
@@ -2352,13 +2352,13 @@ When packaging the fix, keep the following points in mind:
 
       <sect2 id="bug-security-upload">Uploading the fixed package
 <p>
-<em>DO NOT</em> upload a package to the security upload queue
+Do <strong>NOT</strong> upload a package to the security upload queue
 (oldstable-security, stable-security, etc.) without
 prior authorization from the security team.  If the package does not
 exactly meet the team's requirements, it will cause many problems and
 delays in dealing with the unwanted upload.
 <p>
-<em>DO NOT</em> upload your fix to proposed-updates without
+Do <strong>NOT</strong> upload your fix to proposed-updates without
 coordinating with the security team.  Packages from
 security.debian.org will be copied into the proposed-updates directory
 automatically.  If a package with the same or a higher version number