From: joy <joy@313b444b-1b9f-4f58-a734-7bb04f332e8d>
Date: Thu, 18 Oct 2001 19:37:22 +0000 (+0000)
Subject: further cleanups in the section about picking the distribution
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=developers-reference.git;a=commitdiff_plain;h=42c4cf7191cff507d20c27cd5e480e3b934b36f2

further cleanups in the section about picking the distribution


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

diff --git a/developers-reference.sgml b/developers-reference.sgml
index c5fb33c..a21ed3b 100644
--- 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.70 $">
 
   <!-- if you are translating this document, please notate the RCS
        revision of the developers reference here -->
@@ -990,24 +990,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>