diff options
| -rw-r--r-- | ChangeLog.old | 2 | ||||
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | dselect/pkglist.h | 2 | ||||
| -rw-r--r-- | man/deb-buildinfo.man | 2 | ||||
| -rw-r--r-- | man/deb-src-rules.man | 2 | ||||
| -rw-r--r-- | man/dpkg-buildflags.man | 4 | ||||
| -rw-r--r-- | man/dpkg-query.man | 2 | ||||
| -rw-r--r-- | man/start-stop-daemon.man | 2 | ||||
| -rw-r--r-- | scripts/Dpkg/Changelog/Entry/Debian.pm | 2 | ||||
| -rw-r--r-- | t/codespell/stopwords | 13 |
10 files changed, 24 insertions, 10 deletions
diff --git a/ChangeLog.old b/ChangeLog.old index 8cd7ba729..1889f112f 100644 --- a/ChangeLog.old +++ b/ChangeLog.old @@ -8312,7 +8312,7 @@ packages, sort that (rather than the complete list) and use that when calling list1package. This means we only expand to the longest field in the result, not the database. Hopefully the - speed gain of only sorting a filtered list outweighs the slighty + speed gain of only sorting a filtered list outweighs the slightly extra computation time. 2005-03-18 Scott James Remnant <scott@netsplit.com> diff --git a/debian/changelog b/debian/changelog index 29cec6642..b30d204f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,7 @@ dpkg (1.19.7) UNRELEASED; urgency=medium the prototyping section to be less confusing with what is currently implemented. Closes: #929019 - README: Clarify when autopoint is needed. Closes: #929601 + - Fix typos in docs and output strings. Warned by codespell. [ Updated programs translations ] * Catalan (Guillem Jover). @@ -327,7 +328,7 @@ dpkg (1.19.3) unstable; urgency=medium * Test suite: - Add new shellcheck author test. - Add descriptions for the shellcheck exclude codes. - - Update cppcheck supressions. + - Update cppcheck suppressions. [ Updated programs translations ] * Dutch (Frans Spiesschaert). Closes: #912023 diff --git a/dselect/pkglist.h b/dselect/pkglist.h index f60a93169..3d46dcfd8 100644 --- a/dselect/pkglist.h +++ b/dselect/pkglist.h @@ -212,7 +212,7 @@ protected: explicit packagelist(keybindings *kb); // nonrecursive packagelist(keybindings *kb, pkginfo **pkgltab); // recursive - void add(pkginfo **arry) { while (*arry) add(*arry++); } + void add(pkginfo **array) { while (*array) add(*array++); } void add(pkginfo*); void add(pkginfo *, pkgwant); void add(pkginfo*, const char *extrainfo, showpriority displayimportance); diff --git a/man/deb-buildinfo.man b/man/deb-buildinfo.man index 691acb255..6a9d00b40 100644 --- a/man/deb-buildinfo.man +++ b/man/deb-buildinfo.man @@ -152,7 +152,7 @@ will emit this field. .B Build\-Tainted\-By: .TQ .I " taint-reason-list" -This folded field contains a space-separated list of non-exhausitve reason +This folded field contains a space-separated list of non-exhaustive reason tags (formed by alphanumeric and dash characters) which identify why the current build has been tainted (since dpkg 1.19.5). .IP diff --git a/man/deb-src-rules.man b/man/deb-src-rules.man index 19a8f7207..9fd8b30ba 100644 --- a/man/deb-src-rules.man +++ b/man/deb-src-rules.man @@ -40,7 +40,7 @@ This target will be called with root privileges. .B build\-indep Build architecture independent files required to build any architecture independent binary package. -If there are no architecture indepdenent binary packages to generate, +If there are no architecture independent binary packages to generate, the target must still exist but do nothing. This target must not require root privileges. .TP diff --git a/man/dpkg-buildflags.man b/man/dpkg-buildflags.man index ba18dbbb7..f352c18ee 100644 --- a/man/dpkg-buildflags.man +++ b/man/dpkg-buildflags.man @@ -107,7 +107,7 @@ This is a legacy alias for \fBcmdline\fP. .TP .B make Make directives to set and export all the compilation flags in the -environment. Output can be written to a makefile fragment and +environment. Output can be written to a Makefile fragment and evaluated using an \fBinclude\fP directive. .RE .TP @@ -575,7 +575,7 @@ Makefile snippet that will load (and optionally export) all flags supported by \fBdpkg-buildflags\fP into variables (since dpkg 1.16.1). . .SH EXAMPLES -To pass build flags to a build command in a makefile: +To pass build flags to a build command in a Makefile: .PP .RS 4 .nf diff --git a/man/dpkg-query.man b/man/dpkg-query.man index de14b9afe..1358d0c0b 100644 --- a/man/dpkg-query.man +++ b/man/dpkg-query.man @@ -140,7 +140,7 @@ for that, this command will not get removed. Search for packages that own files corresponding to the given pattern. Standard shell wildcard characters can be used in the pattern, where asterisk (\fB*\fP) and question mark (\fB?\fP) will match a slash, -and blackslash (\fB\\\fP) will be used as an escape character. +and backslash (\fB\\\fP) will be used as an escape character. If the first character in the \fIfilename-search-pattern\fP is none of ‘\fB*[?/\fP’ then it will be considered a substring match and will be diff --git a/man/start-stop-daemon.man b/man/start-stop-daemon.man index 2a083f34c..d5a53ccff 100644 --- a/man/start-stop-daemon.man +++ b/man/start-stop-daemon.man @@ -272,7 +272,7 @@ code for them to do this themselves. .BR \-\-notify\-await Wait for the background process to send a readiness notification before considering the service started (since version 1.19.3). -This implements parts of the systemd readiness procotol, as specified +This implements parts of the systemd readiness protocol, as specified in the \fBsd_notify\fP(3) man page. The following variables are supported: .RS diff --git a/scripts/Dpkg/Changelog/Entry/Debian.pm b/scripts/Dpkg/Changelog/Entry/Debian.pm index 3d1888638..5f4c9e569 100644 --- a/scripts/Dpkg/Changelog/Entry/Debian.pm +++ b/scripts/Dpkg/Changelog/Entry/Debian.pm @@ -236,7 +236,7 @@ sub parse_trailer { push @errors, sprintf(g_('invalid abbreviated month name \'%s\''), $8); } } - push @errors, sprintf(g_("cannot parse non-comformant date '%s'"), $7); + push @errors, sprintf(g_("cannot parse non-conformant date '%s'"), $7); }; $self->{trailer_timestamp_date} = $4; } else { diff --git a/t/codespell/stopwords b/t/codespell/stopwords index 1909fdd40..75dcb1767 100644 --- a/t/codespell/stopwords +++ b/t/codespell/stopwords @@ -1,12 +1,25 @@ +accreting +ba cas chage +chang +claus cmo creat +files' +finitel +fo iff isnt +ist +ists lowercased mitre +msdos objext +od +packages' +process' readded rela te |