SVN devscripts commit: r575 - in trunk: . debian scripts

[Adam D. Barratt]

Author: adam-guest
Date: 2007-03-19 23:58:43 +0000 (Mon, 19 Mar 2007)
New Revision: 575

Modified:
   trunk/README
   trunk/debian/changelog
   trunk/debian/control
   trunk/scripts/dscverify.pl
   trunk/scripts/nmudiff.1
Log:
Documentation fixes (closes #415486)


Modified: trunk/README
===================================================================
--- trunk/README	2007-03-19 23:12:55 UTC (rev 574)
+++ trunk/README	2007-03-19 23:58:43 UTC (rev 575)
@@ -59,7 +59,7 @@
   the .diffs and original files, though, so that the binaries and
   other files can be rebuilt if necessary.
 
-- debcommit [cvs | subversion | tla | bazaar | git]: Commits changes to 
+- debcommit [cvs | subversion | tla | bzr | git]: Commits changes to 
   cvs, svn, arch or git, using new entries in debian/changelog as the
   commit message. Also supports tagging Debian package releases.
 
@@ -70,7 +70,7 @@
   on the changes between source versions.
 
 - debi: Installs the current package by using the setuid root debpkg
-  script described above.  It assumes that the current package has
+  script described below.  It assumes that the current package has
   just been built (for example by debuild), and the .deb lives in the
   parent directory, and will effectively run dpkg -i on the .deb.  The
   ability to install the package with a very short command is very

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2007-03-19 23:12:55 UTC (rev 574)
+++ trunk/debian/changelog	2007-03-19 23:58:43 UTC (rev 575)
@@ -5,15 +5,21 @@
     version string actually gets written to the scripts
   * Fix encoding of French manpages (Closes: #415240)
   * bts
-    - Update prunecache() for maintainer / status mboxes and version graphs
-    - Simplify version graph handling code (should now handle all graphs
+    + Update prunecache() for maintainer / status mboxes and version graphs
+    + Simplify version graph handling code (should now handle all graphs
       correctly)
+  * Documentation fixes, based on suggestions from Adeodato Simó
+    + debian/control: update description of debcommit
+    + README: replace reference to bazaar with bzr
+    + nmudiff.1: add missing unbold after an option
+    + dscverify.pl: remove obsolete comment
+    (Closes: #415486)
 
   [ Martin Zobel-Helas ]
   * Adding myself to Uploaders
   * tagpending should not use pend-excl=done (Closes: #415309)
 
- -- Adam D. Barratt <debian-bts at adam-barratt.org.uk>  Mon, 19 Mar 2007 21:39:41 +0000
+ -- Adam D. Barratt <debian-bts at adam-barratt.org.uk>  Mon, 19 Mar 2007 23:50:29 +0000
 
 devscripts (2.10.1) unstable; urgency=low
 

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2007-03-19 23:12:55 UTC (rev 574)
+++ trunk/debian/control	2007-03-19 23:58:43 UTC (rev 575)
@@ -37,8 +37,8 @@
   - debc: display the contents of just-built .debs
   - debchange/dch: automagically add entries to debian/changelog files [wget]
   - debclean: purge a Debian source tree [fakeroot]
-  - debcommit: commit changes to cvs or svn, basing commit message on
-    changelog [cvs | subversion]
+  - debcommit: commit changes to cvs, svn, arch or git, basing commit
+    message on changelog [cvs | subversion | tla | bzr | git]
   - debdiff: compare two versions of a Debian package to check for
     added and removed files [wdiff, patchutils]
   - debi: install a just-built package

Modified: trunk/scripts/dscverify.pl
===================================================================
--- trunk/scripts/dscverify.pl	2007-03-19 23:12:55 UTC (rev 574)
+++ trunk/scripts/dscverify.pl	2007-03-19 23:58:43 UTC (rev 575)
@@ -85,10 +85,6 @@
     die xwarndie_mess @_;
 }
 
-# We retain the reference to Guy's directory on master even though
-# it won't be of use other than on master.  In this way, this program
-# may be installed on merkel without any changes being necessary,
-# and it is hardly likely to cause any ill effects elsewhere.
 sub get_rings {
     my @rings = @_;
     for (qw(/org/keyring.debian.org/keyrings/debian-keyring.gpg

Modified: trunk/scripts/nmudiff.1
===================================================================
--- trunk/scripts/nmudiff.1	2007-03-19 23:12:55 UTC (rev 574)
+++ trunk/scripts/nmudiff.1	2007-03-19 23:58:43 UTC (rev 575)
@@ -50,7 +50,7 @@
 devscripts configuration files; see below.
 .TP
 \fB\-\-from\fR \fIEMAIL\fR
-If using the sendmail (\fB\-\-no\-mutt) option, then the email to the
+If using the sendmail (\fB\-\-no\-mutt\fR) option, then the email to the
 BTS will be sent using the name and address in the environment
 variable DEBEMAIL.  If this is not set, then the variable EMAIL will
 be used instead.  These can be overridden using the \fB\-\-from\fR