[dpkg] 24/187: doc, man: Fix typos

Sun Nov 6 12:46:19 UTC 2016

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

deki-guest pushed a commit to branch master
in repository dpkg.

commit fa216338f324d5b4041795fd3ef94685a4afb6cd
Author: Jakub Wilk <jwilk at debian.org>
Date:   Fri Aug 19 02:06:04 2016 +0200

    doc, man: Fix typos
    
    Closes: #834584
    Warned-by: mwic, anorack
    Signed-off-by: Guillem Jover <guillem at debian.org>
---
 debian/changelog                    | 2 ++
 doc/README.feature-removal-schedule | 4 ++--
 doc/triggers.txt                    | 2 +-
 man/deb-changes.5                   | 2 +-
 man/deb-src-control.5               | 2 +-
 man/deb-version.5                   | 2 +-
 man/dpkg-architecture.1             | 2 +-
 man/dpkg-buildflags.1               | 2 +-
 man/dselect.1                       | 2 +-
 9 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 160c4fa..3bdb003 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ dpkg (1.18.11) UNRELEASED; urgency=medium
   [ Guillem Jover ]
   * Documentation:
     - Update custom changelog parser API support status in README.api.
+    - Fix typos in docs and man pages. Thanks to Jakub Wilk <jwilk at debian.org>
+      Closes: #834584
   * Build system:
     - Add support for profiling perl modules.
     - Clean up compiler and linker automatic flag usage in configure.
diff --git a/doc/README.feature-removal-schedule b/doc/README.feature-removal-schedule
index 1f65147..b9877fe 100644
--- a/doc/README.feature-removal-schedule
+++ b/doc/README.feature-removal-schedule
@@ -15,7 +15,7 @@ Status: obsolete
 When: 1.16.x
 Warning: lintian (substvar-source-version-is-deprecated)
 Why:
- The semantics of Source-Version are missleading when applied to binNMUs.
+ The semantics of Source-Version are misleading when applied to binNMUs.
  Should switch to use binary:Version or source:Version substvars.
 
 What: --print-installation-architecture (dpkg option)
@@ -137,7 +137,7 @@ Status: removed
 Since: 1.15.6
 Why:
  Having two ways to let the administrator get to a shell on conffile prompt
- is confusing, it also difficults setting up a consistent environment to be
+ is confusing, it also impedes setting up a consistent environment to be
  used by external programs.
 
 What: support for PGP
diff --git a/doc/triggers.txt b/doc/triggers.txt
index 0b78cf4..d5a77d5 100644
--- a/doc/triggers.txt
+++ b/doc/triggers.txt
@@ -483,7 +483,7 @@ scrollkeeper, goes like this:
          care need be taken in packages which supply OMFs.
 
          If an OMF file is placed, modified or removed other than as
-         an file installed in the ordinary way by dpkg, the dpkg file
+         a file installed in the ordinary way by dpkg, the dpkg file
          trigger «/usr/share/omf» should be activated; see the dpkg
          triggers specification for details.
 
diff --git a/man/deb-changes.5 b/man/deb-changes.5
index e5fc1c0..6c37fc1 100644
--- a/man/deb-changes.5
+++ b/man/deb-changes.5
@@ -137,7 +137,7 @@ The exact content depends on the changelog format.
 .BR Files: " (required)"
 .TQ
 .RI " " md5sum " " size " " section " " priority " " filename
-This multiline field contains a list of files with a md5sum, size, section
+This multiline field contains a list of files with an md5sum, size, section
 and priority for each one.
 
 The first line of the field value (the part on the same line as the field
diff --git a/man/deb-src-control.5 b/man/deb-src-control.5
index 26b531d..e4d7aa8 100644
--- a/man/deb-src-control.5
+++ b/man/deb-src-control.5
@@ -350,7 +350,7 @@ manpage.
 It is allowed to add additional user-defined fields to the control file. The
 tools will ignore these fields. If you want the fields to be copied over to
 the output files, such as the binary packages, you need to use a custom naming
-scheme: the fields should start with a X, followed by one or more of the
+scheme: the fields should start with an X, followed by one or more of the
 letters BCS and a hyphen.
 If the letter B is used, the field will appear in the
 control file in the binary package, see
diff --git a/man/deb-version.5 b/man/deb-version.5
index 933601c..73e94e6 100644
--- a/man/deb-version.5
+++ b/man/deb-version.5
@@ -79,7 +79,7 @@ Debian package, and so there is only one \(lqdebianisation\(rq
 of it and therefore no revision indication is required.
 .IP
 It is conventional to restart the
-\fIdebian-revision\fP at \(oq1\(cq each time time the
+\fIdebian-revision\fP at \(oq1\(cq each time the
 \fIupstream-version\fP is increased.
 .IP
 Dpkg will break the version
diff --git a/man/dpkg-architecture.1 b/man/dpkg-architecture.1
index dab9ed8..739cd7f 100644
--- a/man/dpkg-architecture.1
+++ b/man/dpkg-architecture.1
@@ -33,7 +33,7 @@ provides a facility to determine and set the build and
 host architecture for package building.
 .PP
 The build architecture is always determined by an external call to
-\fBdpkg\fP(1), and can not be set at the command line.
+\fBdpkg\fP(1), and cannot be set at the command line.
 .PP
 You can specify the host architecture by providing one or both of the options
 \fB\-\-host\-arch\fR and \fB\-\-host\-type\fR. The default is determined by
diff --git a/man/dpkg-buildflags.1 b/man/dpkg-buildflags.1
index cb157c9..e4e0475 100644
--- a/man/dpkg-buildflags.1
+++ b/man/dpkg-buildflags.1
@@ -30,7 +30,7 @@ dpkg\-buildflags \- returns build flags to use during package build
 build of Debian packages.
 .
 The default flags are defined by the vendor but they can be
-extended/overriden in several ways:
+extended/overridden in several ways:
 .IP 1.
 system-wide with \fB/etc/dpkg/buildflags.conf\fP;
 .IP 2.
diff --git a/man/dselect.1 b/man/dselect.1
index ce5d1cc..f41e5b0 100644
--- a/man/dselect.1
+++ b/man/dselect.1
@@ -236,7 +236,7 @@ large sets of packages with many interdependencies. For a user who is
 unfamiliar with the concepts and the ways of the debian package management
 system, it can be quite overwhelming. Although \fBdselect\fP is aimed
 at easing package management and administration, it is only instrumental
-in doing so and can not be assumed to be a sufficient substitute for
+in doing so and cannot be assumed to be a sufficient substitute for
 administrator skill and understanding. The user is required to
 be familiar with the concepts underlying the Debian packaging system.
 In case of doubt, consult the \fBdpkg\fP(1) manpage and the distribution

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

