Small typo fixes and clarifications/rewordings suggested by Karl Goetz. Closes: ...

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

diff --git a/debian/changelog b/debian/changelog
index e97b9e68a6402abbb4505a72d0669eb10fb4714d..75f01af025bd54c0f790d5085efff69627a67a2a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -44,6 +44,8 @@ developers-reference (3.4.4) UNRELEASED; urgency=low
   * Update number of source packages. Thanks Karl Goetz. Closes: #567235
   * Update and simplify list of architectures. Thanks Karl Goetz.
     Closes: #567234
   * Update number of source packages. Thanks Karl Goetz. Closes: #567235
   * Update and simplify list of architectures. Thanks Karl Goetz.
     Closes: #567234

+  * Small typo fixes and clarifications/rewordings suggested by Karl Goetz.
+    Closes: #567233

 
  -- Lucas Nussbaum <lucas@lucas-nussbaum.net>  Tue, 22 Dec 2009 22:49:40 +0900
 
 
  -- Lucas Nussbaum <lucas@lucas-nussbaum.net>  Tue, 22 Dec 2009 22:49:40 +0900
 

diff --git a/pkgs.dbk b/pkgs.dbk
index 40ace63772f27819c5a533f4a79e5800c5b3caf3..f40e7f3d873b5a7b04cb75db6106ebac6590711c 100644 (file)
--- a/pkgs.dbk
+++ b/pkgs.dbk
@@ -37,15 +37,15 @@ Please send a copy to &email-debian-devel; by using the X-Debbugs-CC
 header (don't use CC:, because that way the message's subject won't
 indicate the bug number). If you are packaging so many new packages (>10)
 that notifying the mailing list in seperate messages is too disruptive,
 header (don't use CC:, because that way the message's subject won't
 indicate the bug number). If you are packaging so many new packages (>10)
 that notifying the mailing list in seperate messages is too disruptive,

-do send a summary after filing the bugs to the debian-devel list instead.
+send a summary after filing the bugs to the debian-devel list instead.

 This will inform the other developers about upcoming packages and will
 allow a review of your description and package name.
 </para>
 <para>
 This will inform the other developers about upcoming packages and will
 allow a review of your description and package name.
 </para>
 <para>

-Please include a <literal>Closes:
-bug#<replaceable>nnnnn</replaceable></literal> entry in the changelog of the
-new package in order for the bug report to be automatically closed once the new
-package is installed in the archive (see <xref linkend="upload-bugfix"/> ).
+Please include a <literal>Closes: #<replaceable>nnnnn</replaceable></literal>
+entry in the changelog of the new package in order for the bug report to
+be automatically closed once the new package is installed in the archive
+(see <xref linkend="upload-bugfix"/>).

 </para>
 <para>
 If you think your package needs some explanations for the administrators of the
 </para>
 <para>
 If you think your package needs some explanations for the administrators of the

diff --git a/resources.dbk b/resources.dbk
index 57b3824f18faf2c02783c0a0f65be812ea79f1bd..8bab31baa86267f0ce8231e3b9fbece1ccccf483 100644 (file)
--- a/resources.dbk
+++ b/resources.dbk
@@ -141,7 +141,8 @@ similarly named channels for speakers of other languages.
 </para>
 <para>
 The main channel for Debian development is <literal>#debian-devel</literal>.
 </para>
 <para>
 The main channel for Debian development is <literal>#debian-devel</literal>.

-It is a very active channel since usually over 150 people are always logged in.
+It is a very active channel; it will typically have a minimum of 150 people
+at any time of day.

 It's a channel for people who work on Debian, it's not a support channel
 (there's <literal>#debian</literal> for that).  It is however open to anyone
 who wants to lurk (and learn).  Its topic is commonly full of interesting
 It's a channel for people who work on Debian, it's not a support channel
 (there's <literal>#debian</literal> for that).  It is however open to anyone
 who wants to lurk (and learn).  Its topic is commonly full of interesting


@@ -487,7 +488,7 @@ non-free packages.
 <para>
 Packages which do not conform to the DFSG are placed in the
 <literal>non-free</literal> section.  These packages are not considered as
 <para>
 Packages which do not conform to the DFSG are placed in the
 <literal>non-free</literal> section.  These packages are not considered as

-part of the Debian distribution, though we support their use, and we provide
+part of the Debian distribution, though we enable their use, and we provide

 infrastructure (such as our bug-tracking system and mailing lists) for non-free
 software packages.
 </para>
 infrastructure (such as our bug-tracking system and mailing lists) for non-free
 software packages.
 </para>


@@ -1354,7 +1355,7 @@ Once you set up the VCS repository to generate commit notifications, you just
 have to make sure it sends a copy of those mails to
 <literal><replaceable>sourcepackage</replaceable>_cvs@&pts-host;</literal>.
 Only the people who accept the <literal>cvs</literal> keyword will receive
 have to make sure it sends a copy of those mails to
 <literal><replaceable>sourcepackage</replaceable>_cvs@&pts-host;</literal>.
 Only the people who accept the <literal>cvs</literal> keyword will receive

-these notifications. Note that the mail need to be sent from a
+these notifications. Note that the mail needs to be sent from a

 <literal>debian.org</literal> machine, otherwise you'll have to add
 the <literal>X-PTS-Approved: 1</literal> header.
 </para>
 <literal>debian.org</literal> machine, otherwise you'll have to add
 the <literal>X-PTS-Approved: 1</literal> header.
 </para>