[dpkg] 04/192: doc: Spelling fixes

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch pu/reproducible_builds
in repository dpkg.

commit 75033aa803928948d8bc422bf505ab99f72f0095
Author: Guillem Jover <guillem at debian.org>
Date:   Tue Mar 7 02:42:18 2017 +0100

    doc: Spelling fixes
    
    Spotted-by: Josh Soref <jsoref at gmail.com>
---
 ChangeLog.old    | 7 +++----
 debian/changelog | 4 ++--
 src/configure.c  | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/ChangeLog.old b/ChangeLog.old
index 10704a3..2fba4f4 100644
--- a/ChangeLog.old
+++ b/ChangeLog.old
@@ -1106,7 +1106,7 @@
 
 	* src/archives.c (tarobject): Do not call ensure_pathname_nonexisting
 	for .dpkg-tmp and .dpkg-new if we are going to return due to already
-	existing directory or a file to be skept.
+	existing directory or a file to be skipped.
 
 2008-02-02  Raphaël Hertzog  <hertzog at debian.org>
 
@@ -1361,8 +1361,7 @@
 
 2008-08-05  Guillem Jover  <guillem at debian.org>
 
-	* scripts/dpkg-distaddfile.pl: Use _g() instead of wrong and typoed
-	gettetx().
+	* scripts/dpkg-distaddfile.pl: Use _g() instead of mispelled gettext().
 
 2008-08-03  Guillem Jover  <guillem at debian.org>
 
@@ -16747,7 +16746,7 @@ Wed Nov 30 15:38:21 GMT 1994  Ian Jackson  <iwj10 at cus.cam.ac.uk>
 
 	* conffile updating fixed.
 
-	* Message `updgrade' in dpkg changed to `replace'.
+	* Message `upgrade' in dpkg changed to `replace'.
 
 	* install-info now copes with multi-line entries.
 
diff --git a/debian/changelog b/debian/changelog
index d809738..0cd8303 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6249,7 +6249,7 @@ dpkg (1.14.17) experimental; urgency=low
     Thanks to Ian Jackson. Closes: #443338
   * Move test suite invocation to a new check target in debian/rules.
   * Add support for nocheck DEB_BUILD_OPTIONS in debian/rules, so that the
-    dpkg test suite can be skept if desired.
+    dpkg test suite can be skipped if desired.
   * Improve log and status-fd output by printing more status change updates
     and actions. Thanks to Ian Jackson.
   * Implement triggers support. Thanks to Ian Jackson.
@@ -12249,7 +12249,7 @@ Wed Nov 30 15:38:21 GMT 1994  Ian Jackson  <iwj10 at cus.cam.ac.uk>
 
 	* conffile updating fixed.
 
-	* Message `updgrade' in dpkg changed to `replace'.
+	* Message `upgrade' in dpkg changed to `replace'.
 
 	* install-info now copes with multi-line entries.
 
diff --git a/src/configure.c b/src/configure.c
index c57292a..8158824 100644
--- a/src/configure.c
+++ b/src/configure.c
@@ -324,7 +324,7 @@ promptconfaction(struct pkginfo *pkg, const char *cfgfile,
  *
  * When the first instance of a package set is configured, the *.dpkg-new
  * files gets installed into their destination, which makes configuration of
- * conffiles from subsequent package instances be skept along with updates
+ * conffiles from subsequent package instances be skipped along with updates
  * to the Conffiles field hash.
  *
  * In case the conffile has already been processed, sync the hash from an

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git