The following commit has been merged in the master branch:
commit 3d8092a4f18294cbf85a465c4d3b2501c7074f4f
Author: Benjamin Drung <[email protected]>
Date: Fri Mar 30 15:15:51 2012 +0200
cowpoke.1, deb-reversion.dbk, dscextract.1: Fix typos "occured",
"transfered", and "addtional".
Thanks: A. Costa
Closes: #655681
diff --git a/debian/changelog b/debian/changelog
index f850f0c..b9373c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,18 @@
devscripts (2.11.6) UNRELEASED; urgency=low
+ [ James McCoy ]
* mk-build-deps: Fix handling of debian/control files. (Closes: #665496)
* uscan: Fix formatting in man page. Thanks to Samuel Bronson for the
patch. (Closes: #665325)
* debsign: Fix quoting in handling of --debs-dir.
(Closes: #666048, LP: #966867)
- -- James McCoy <[email protected]> Sat, 24 Mar 2012 15:24:59 -0400
+ [ Benjamin Drung ]
+ * cowpoke.1, deb-reversion.dbk, dscextract.1: Fix typos "occured",
+ "transfered", and "addtional". Thanks to A. Costa for the patches.
+ (Closes: #655681)
+
+ -- Benjamin Drung <[email protected]> Fri, 30 Mar 2012 15:08:27 +0200
devscripts (2.11.5) unstable; urgency=low
diff --git a/scripts/cowpoke.1 b/scripts/cowpoke.1
index 8930254..f665b70 100644
--- a/scripts/cowpoke.1
+++ b/scripts/cowpoke.1
@@ -211,7 +211,7 @@ Per\-user configuration options. Will override any global
configuration.
Per\-project configuration options. Will override any per-user or global
configuration if \fBcowpoke\fP is called from the directory where they exist.
-If the environment variable \fBCOWPOKE_CONF\fP is set, it specifies an
addtional
+If the environment variable \fBCOWPOKE_CONF\fP is set, it specifies an
additional
configuration file which will override all of those above. Options specified
explicitly on the command line override all configuration files.
diff --git a/scripts/deb-reversion.dbk b/scripts/deb-reversion.dbk
index 12dbdbe..5d2a61a 100644
--- a/scripts/deb-reversion.dbk
+++ b/scripts/deb-reversion.dbk
@@ -283,7 +283,7 @@ and docbook-xsl in your Build-Depends control field.
You are using this tool at your own risk and I shall not shed a tear if
your gerbil goes up in flames, your microwave attacks the stereo, or the
angry slamming of your fist spills your coffee into the keyboard, which
- sets off a chain reaction resulting in a vast amount of money transfered
+ sets off a chain reaction resulting in a vast amount of money transferred
from your account to mine.
</para>
</refsect1>
diff --git a/scripts/dscextract.1 b/scripts/dscextract.1
index 6e3c63d..42b3e58 100644
--- a/scripts/dscextract.1
+++ b/scripts/dscextract.1
@@ -26,7 +26,7 @@ assumed that debian/* are exactly the contents of
debian.tar.gz/bz2.)
\fIfile\fR was not found in the source package.
.TP
2
-An error occured, like \fIdscfile\fR was not found.
+An error occurred, like \fIdscfile\fR was not found.
.SH EXAMPLE
dscextract dds_2.1.1+ddd105-2.dsc debian/watch || test $? = 1
.SH AUTHOR
--
Git repository for devscripts
--
To unsubscribe, send mail to [email protected].
