[SCM] Git repository for devscripts branch, master, updated. v2.12.4-3-g59a6c56

[James McCoy]

The following commit has been merged in the master branch:
commit 59a6c567716cc5bb18c63c63361da79280167a63
Author: James McCoy <jamessan at debian.org>
Date:   Sat Oct 6 15:39:57 2012 -0400

    Reword a couple phrases in the man pages.
    
    Signed-off-by: James McCoy <jamessan at debian.org>

diff --git a/scripts/debchange.1 b/scripts/debchange.1
index ef0be38..991d93d 100644
--- a/scripts/debchange.1
+++ b/scripts/debchange.1
@@ -182,9 +182,9 @@ no previous changelog entries and an explicit distribution has not been
 specified, \fBunstable\fR will be used.
 .TP
 .BR \-\-force\-save\-on\-release
-When \fB\-\-release\fR is used and an editor opened to allow inspection
-of the changelog, require the user to save the changelog their editor opened.
-Otherwise, the original changelog will not be modified. (default)
+When \fB\-\-release\fR is used, an editor is opened to allow inspection
+of the changelog.  Require the user to save the file to accept the modified
+changelog, otherwise the original will be kept (default).
 .TP
 .BR \-\-no\-force\-save\-on\-release
 Do not do so. Note that a dummy changelog entry may be supplied
diff --git a/scripts/devscripts.conf.5 b/scripts/devscripts.conf.5
index cfe7757..a605d66 100644
--- a/scripts/devscripts.conf.5
+++ b/scripts/devscripts.conf.5
@@ -41,7 +41,7 @@ option.
 The currently recognised package-wide variables are:
 .TP
 .BR DEVSCRIPTS_CHECK_DIRNAME_LEVEL ", " DEVSCRIPTS_CHECK_DIRNAME_REGEX
-These control scripts which change directory to find a
+These variables control scripts which change directory to find a
 \fIdebian/changelog\fR file or suchlike, and some other miscellaneous
 cases.  In order to prevent unwanted, even possibly dangerous,
 behaviour, these variables control when actions will be performed.

-- 
Git repository for devscripts