wrong tense, noticed by Chris Tillman

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

diff --git a/developers-reference.sgml b/developers-reference.sgml
index c5fb33c28ad7ef95da21e2951ab56249c08452a5..8ff600ef5c98ea6f78e519dcd78c03b1e2c83771 100644 (file)
--- a/developers-reference.sgml
+++ b/developers-reference.sgml
@@ -5,7 +5,7 @@
   <!-- common, language independant entities -->
   <!entity % commondata  SYSTEM "common.ent" > %commondata;
   <!-- CVS revision of this document -->
-  <!entity cvs-rev "$Revision: 1.69 $">
+  <!entity cvs-rev "$Revision: 1.72 $">
 
   <!-- if you are translating this document, please notate the RCS
        revision of the developers reference here -->
@@ -129,7 +129,7 @@ Debian GNU/Linux has grown to over &number-of-maintainers; people 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
-letting them upload packages.
+let them upload packages.
        <p>
 Registration requires that the following information be sent in
 appropriate steps described at <url id="&url-newmaint-checklist;"
@@ -309,10 +309,14 @@ you're on vacation.
 In order to inform the other developers, there's two things that you should do.
 First send a mail to &email-debian-private; giving the period of time when
 you will be on vacation.  You can also give some special instructions on what to
-do if any problem occurs. Next you should update your information
+do if any problem occurs. Be aware that some people don't care for vacation
+notices and don't want to read them; you should prepend "[VAC] " to the
+subject of your message so that it can be easily filtered.
+       <p>
+Next you should update your information
 available in the Debian LDAP database and mark yourself as ``on vacation''
 (this information is only accessible to debian developers). Don't forget
-to remove the ``on vacation'' flag when you come back.
+to remove the ``on vacation'' flag when you come back!
 
       <sect id="upstream-coordination">Coordination With Upstream Developers
        <p>
@@ -990,24 +994,28 @@ flag.
 
        <sect1 id="upload-dist">Picking a distribution
          <p>
-The <tt>Distribution</tt> field, which originates from the
-<file>debian/changelog</file> file, indicates which distribution the
+The <tt>Distribution</tt> field, which originates from the first line of
+the <file>debian/changelog</file> file, indicates which distribution the
 package is intended for.
          <p>
-There are four possible values for this
-field: `stable', `unstable', `frozen', or `experimental'; these values
-can also be combined. Or, if Debian has been frozen, and you
-want to get a bug-fix release into <em>frozen</em>, you would set the
-distribution to `frozen unstable'.  (See <ref id="upload-frozen"> for
-more information on when to upload to <em>frozen</em>.)  Note that it
-never makes sense to combine the <em>experimental</em> distribution with
-anything else.
+There are four possible values for this field: `stable', `unstable',
+`frozen', and `experimental'. Normally, packages are uploaded into
+<em>unstable</em>.
+         <p>
+These values can be combined, but only a few combinations make sense.
+If Debian has been frozen, and you want to get a bug-fix release into
+<em>frozen</em>, you would set the distribution to `frozen unstable'.
+See <ref id="upload-frozen"> for more information on uploading to
+<em>frozen</em>.
          <p>
 You should avoid combining `stable' with others because of potential
 problems with library dependencies (for your package and for the package
 built by the build daemons for other architecture).
 See <ref id="upload-stable"> for more information on when and how to
 upload to <em>stable</em>.
+         <p>
+It never makes sense to combine the <em>experimental</em> distribution
+with anything else.
 
          <sect2 id="upload-frozen">Uploading to <em>frozen</em>
            <p>