Browse Source

doc: Fix typos in documentation and code comments

Warned-by: codespell, spellintian
Guillem Jover 4 years ago
parent
commit
83b5b8fe54

+ 18 - 18
ChangeLog.old

@@ -2242,7 +2242,7 @@
 	from the name of the automatically generated patch. It will
 	facilitate the switch to this format: packages using
 	patch system that apply debian/patches/*.{patch,diff}
-	will not be bothered by the presence of the quilt serie
+	will not be bothered by the presence of the quilt series
 	created by dpkg-source itself.
 	* man/dpkg-source.1: Update the documentation accordingly.
 
@@ -2645,7 +2645,7 @@
 	(post_postinst_tasks_core): Likewise. New prototype.
 	(enum debugflags): Add dbg_triggers, dbg_triggersdetail and
 	dbg_triggersstupid items.
-	(trigproc_install_hooks, trigproc_run_deferred): New protoypes.
+	(trigproc_install_hooks, trigproc_run_deferred): New prototypes.
 	(trigproc_reset_cycle, trigproc): Likewise.
 	(trig_activate_packageprocessing): Likewise.
 	* src/main.c (usage): Document '--triggers-only' and
@@ -2867,7 +2867,7 @@
 	* lib/log.c: ... here.
 	* lib/dpkg-db.h (struct pipef, status_pipes): Move declarations to ...
 	* lib/dpkg.h: ... here.
-	(statusfd_send): New function protoype.
+	(statusfd_send): New function prototype.
 	* lib/log.c: Include <assert.h> and <unistd.h>.
 	(statusfd_send): New function.
 	* lib/dbmodify.c: Use statusfd_send instead of duplicate code.
@@ -4050,7 +4050,7 @@
 	negative values.
 	* dpkg-deb/info.c (info_spew): Use %zu in a format string instead of
 	%lu to print pathlen, a size_t variable.
-	* dpkg-split/queue.c (do_auto): Change j from unsinged int to int.
+	* dpkg-split/queue.c (do_auto): Change j from unsigned int to int.
 	Cast j to unsigned int when comparing it to i.
 	* lib/varbuf.c (varbufprintf): Change ou from unsigned int to size_t.
 	Change r from unsigned int to int. Cast value compared to r to int.
@@ -5107,7 +5107,7 @@
 
 	* scripts/dpkg-buildpackage.pl (withecho): Remove
 	empty strings at the begin of the command array.
-	These can be caused by e.g. an emtpy $rootcommando.
+	These can be caused by e.g. an empty $rootcommand.
 	It is easiest to filter them out here.
 
 2007-09-24  Guillem Jover  <guillem@debian.org>
@@ -6186,7 +6186,7 @@
 	* man/start-stop-daemon.8: Likewise.
 
 	* man/dpkg-divert.8: Remove redundant '<>' characters to delimit a
-	replacable argument.
+	replaceable argument.
 	* man/dpkg-statoverride.8: Likewise.
 
 	* man/update-alternatives.8: Mark commands in examples as bold.
@@ -6485,7 +6485,7 @@
 	* lib/fields.c (f_dependency): Bail out if the Breaks field has an
 	alternative through a '|'.
 	* lib/parse.c (fieldinfos): Add support for the Breaks field when
-	parsing them as a depedency field.
+	parsing them as a dependency field.
 	* src/depcon.c (describedepcon): Support displaying the Breaks
 	relationship.
 	(depisok): Ignore the Breaks field by adding dep_breaks to the assert
@@ -6822,7 +6822,7 @@
 2006-05-19  Frank Lichtenheld  <djpig@debian.org>
 
 	* src/help.c (hasdirectoryconffiles): New function
-	to test wether a directory contains conffiles of
+	to test whether a directory contains conffiles of
 	a given package.
 	* src/main.h: Add declaration of hasdirectoryconffiles.
 	* src/remove.c (removal_bulk_remove_files): Don't
@@ -7220,7 +7220,7 @@
 	* man/C/822-date.1: Lower case title header. Put options in bold,
 	files and arguments to options in italic. Escape hyphens used in
 	command line. Unescape dashes. Remove spaces after full stops and
-	after end of line. Separete sections with a dot. Do not put the
+	after end of line. Separate sections with a dot. Do not put the
 	manpage section number in bold.
 	* man/C/cleanup-info.8: Likewise.
 	* man/C/deb.5: Likewise.
@@ -7583,7 +7583,7 @@
 2006-01-28  Guillem Jover  <guillem@debian.org>
 
 	* scripts/dpkg-architecture.pl: Do not print the warning about a
-	missmatch between gcc target machine type and GNU target system
+	mismatch between gcc target machine type and GNU target system
 	type if the actions are '-e' or '-i'.
 
 2006-01-27  Frank Lichtenheld  <djpig@debian.org>
@@ -7723,7 +7723,7 @@
 	man page with correct section (8->1).
 
 	* scripts/dpkg-source.pl: Warn on -b if we add a file with
-	special (i.e. exectuable or set{u,g}id) permission in the
+	special (i.e. executable or set{u,g}id) permission in the
 	diff since this mode will get lost.
 
 2005-10-07  Frank Lichtenheld  <djpig@debian.org>
@@ -10490,7 +10490,7 @@ Tue Apr 15 11:32:22 CDT 2003 Adam Heath <doogie@debian.org>
 
   * archtable, utils/start-stop-daemon.c,  scripts/dpkg-architecture.pl:
     Add netbsd support.
-  * scripts/dpkg-architecture.pl: Support hypenated values.
+  * scripts/dpkg-architecture.pl: Support hyphenated values.
 
 Tue Apr 15 01:05:04 CDT 2003 Adam Heath <doogie@debian.org>
 
@@ -11473,7 +11473,7 @@ Mon Sep 10 09:44:54 PDT 2001 Wichert Akkerman <wakkerma@debian.org>
 
   * lib/dump.c: make w_booleandefno get the fieldname from the fip
     instead of hardcoding Essential
-  * lib/fields.c: don't harcode `essential' fieldname in f_boolean
+  * lib/fields.c: don't hardcode `essential' fieldname in f_boolean
      convert_string call
 
 Sun Aug 19 15:20:53 CEST 2001 Wichert Akkerman <wakkerma@debian.org>
@@ -12102,7 +12102,7 @@ Wed Apr 25 13:15:41 CEST 2001 Wichert Akkerman <wakkerma@debian.org>
 
 Wed Apr 25 13:05:13 CEST 2001 Wichert Akkerman <wakkerma@debian.org>
 
-  * main/dpkg.8: Fix formating error
+  * main/dpkg.8: Fix formatting error
 
 Wed Apr 25 02:20:40 CEST 2001 Wichert Akkerman <wakkerma@debian.org>
 
@@ -12448,7 +12448,7 @@ Thu Apr 19 00:03:16 CDT 2001 Adam Heath <doogie@debian.org>
 
 Wed Apr 18 23:53:40 CDT 2001 Adam Heath <doogie@debian.org>
 
-  * lib/database.c: In blankpackage, intialize ->installed and ->available.
+  * lib/database.c: In blankpackage, initialize ->installed and ->available.
     Found by me and Fumitoshi UKAI <ukai@debian.or.jp>.  This should help
     several segfaults that people have been seeing in dpkg.
 
@@ -13135,7 +13135,7 @@ Sat Dec  9 01:51:51 CET 2000 Wichert Akkerman <wakkerma@debian.org>
   * debian/rules: default to using static libz
   * include/{dpkg-db.h,dpkg.h.in}, lib/mlib.c, lib/varbuf.c: generalize
     fd copy loops
-  * main/filesdb.c: udpates to use read_fd_buf
+  * main/filesdb.c: updates to use read_fd_buf
 
 Tue Dec 05 07:43:05 CET 2000 peter karlsson <peterk@debian.org>
 
@@ -13300,7 +13300,7 @@ Thu Oct 19 00:59:40 CEST 2000 Wichert Akkerman <wakkerma@debian.org>
   * utils/start-stop-daemon.c
     + fix a buffer overflow in cmdname handling
     + Only abort if we fail to open an existing pidfile
-  * utils/start-stop-daemon.8: update formating
+  * utils/start-stop-daemon.8: update formatting
 
 Wed Oct 18 17:48:15 CEST 2000 Wichert Akkerman <wakkerma@debian.org>
 
@@ -13445,7 +13445,7 @@ Tue Aug  1 10:56:52 EDT 2000 Ben Collins <bcollins@debian.org>
 Mon Jul 31 23:38:56 EDT 2000 Ben Collins <bcollins@debian.org>
 
   * archtable: add ia64; revert sparc64 so that it turns into sparc. There
-    wont be a full binary-sparc64 port.
+    won't be a full binary-sparc64 port.
   * dselect/main.cc: small fixups to get it to compile with gcc-2.96
 
 Wed Jul 26 21:27:30 CEST 2000 peter karlsson <peterk@debian.org>

+ 1 - 1
README.l10n

@@ -46,7 +46,7 @@ dpkg (1.13.15) unstable; urgency=low
   a detailed/long description. For example:
 
 ==========================================================
-Update german translation of manual pages
+Update German translation of manual pages
 
 Update to 1354t.
 ==========================================================

+ 1 - 1
TODO

@@ -33,7 +33,7 @@ TODO
      filetriggers_edited, etc).
    - Do not use nfmalloc (and friends) for non in-core db memory.
    - Call nffreeall on exit (need to detangle nfmalloc from non-db first).
-   - Add a size parameter to the buffer api to avoid some useless
+   - Add a size parameter to the buffer API to avoid some useless
      pipe+fork+copy.
    - Handle instdir '/' separator consistently.
    - Check if caching selinux context for second call is possible.

+ 12 - 11
debian/changelog

@@ -18,6 +18,7 @@ dpkg (1.18.19) UNRELEASED; urgency=medium
   * Documentation:
     - Cleanup software requirements in README.
     - Move control member file references from dpkg(1) to deb(5).
+    - Fix typos in docs and code comments.
   * Packaging:
     - Add debsig-verify to dpkg Suggests. The code optionally supports this
       specific signed .deb verification program.
@@ -326,7 +327,7 @@ dpkg (1.18.11) unstable; urgency=medium
   * Fix dpkg to not fail when removing non-existent backup files on read-only
     filesystems. Closes: #838877
   * Enable PIE on all supported architectures and handle PIE enabled by
-    default in gcc. On achitectures where gcc enables them by default,
+    default in gcc. On architectures where gcc enables them by default,
     stop setting -fPIE and -pie, and set -fno-PIE and -no-pie when disabling
     «pie» via gcc specs files, so that we do not emit them on situations
     where it would be inappropriate. Closes: #835149
@@ -4432,7 +4433,7 @@ dpkg (1.15.7) unstable; urgency=low
   * Fix dpkg to not lose package metadata on filesystems where readdir()
     returns new files added after the opendir() call, btrfs in particular
     triggered the problematic behaviour. Closes: #575891
-  * Tigthen the regex used by dpkg-source to match the component name of
+  * Tighten the regex used by dpkg-source to match the component name of
     supplementary tarballs so that underscore (_) are not allowed as it was
     supposed to be.
   * Introduce a new script called dpkg-buildflags: its purpose is to retrieve
@@ -4676,7 +4677,7 @@ dpkg (1.15.6) experimental; urgency=low
     appropriate pkg-config binary for the build or host system in the same
     way pkg.m4 is handling it now. Closes: #551118
   * Dynamically link against all external libraries. This includes libbz2
-    and zlib for dpkg-deb and and libselinux for dpkg on GNU/Linux.
+    and zlib for dpkg-deb and libselinux for dpkg on GNU/Linux.
   * Mark the libdpkg.a API as volatile and require any possible users to set
     LIBDPKG_VOLATILE_API to acknowledge that fact.
   * Add a new libdpkg-dev package with the headers and the static library,
@@ -4895,7 +4896,7 @@ dpkg (1.15.5) unstable; urgency=low
   * Use the size from stat to allocate the buffers for readlink, instead of
     indefinitely calling readlink and growing the buffer. This should reduce
     memory usage when handling lots of symlinks, and be slightly faster.
-  * Rework varbuf api to avoid increasing buffers indefinitely when adding
+  * Rework varbuf API to avoid increasing buffers indefinitely when adding
     content to them, regardless of space being already available.
   * Fix build macros to allow start-stop-deaemon to use TIOCNOTTY.
   * Generate the autoconf version from git to make it easier to see when a
@@ -6618,7 +6619,7 @@ dpkg (1.14.8) unstable; urgency=low
   * Move build and host arch detection code from dpkg-architecture to
     Dpkg::Arch.
   * Add initial udeb support:
-    - Support new fields fields Package-Type, Subarchitecture, Kernel-Version
+    - Support new fields Package-Type, Subarchitecture, Kernel-Version
       and Installer-Menu-Item. Closes: #383916
     - New '--type' option for dpkg-scanpackages.
   * Make dpkg-dev Conflict on dpkg-cross << 2.0.0 which was sourcing
@@ -8703,7 +8704,7 @@ dpkg (1.10.10) unstable; urgency=low
     #184239.
   * Modified to use autotools-dev.  Closes: #179656.
   * Add netbsd support.  Closes: #179658, #179659.
-  * Support hypenated values in dpkg-architeture. Closes: #179661
+  * Support hyphenated values in dpkg-architeture. Closes: #179661
   * No longer managed the /usr/doc symlinks.
 
  -- Adam Heath <doogie@debian.org>  Sat, 26 Apr 2003 15:10:24 -0500
@@ -9194,7 +9195,7 @@ dpkg (1.9.0) unstable; urgency=low
     use about the same amount of memory, and largemem is faster.  Both
     --largemem and --smallmem are now obselete options, and will print
     a warning if used. Closes: Bug#84905, #67528
-  * Initialize unitialized variables.  This should solve several
+  * Initialize uninitialized variables.  This should solve several
     segfaults. Closes: Bug#25317(plus 9 others, thru the beauty of
     merges)
   * Found that when working with dependency cycles, and part of the cycle
@@ -9207,7 +9208,7 @@ dpkg (1.9.0) unstable; urgency=low
   * Add Danish translation
   * Remove spurious '%s' in Polish translation, Closes: Bug#74814
   * Add French manpages, courtesy of Philippe Batailler
-  * Ingore vim swapfiles in dpkg-source, Closes: Bug#81630
+  * Ignore vim swapfiles in dpkg-source, Closes: Bug#81630
   * remove --import option from dpkg-statoverride, Closes: Bug#81358
   * Replace nfmalloc implementation with obstack. Added obstack.[ch] to
     optlib, for non-GNU systems.
@@ -9285,7 +9286,7 @@ dpkg (1.9.0) unstable; urgency=low
     Closes: Bug# 31620
   * Fix wrong ENOENT test in dpkg-divert. Closes: Bug#95088
   * Add support for more SuperH variants (sh[34]{,eb}-linux-gnu)
-  * Fix formating and a typo in the dpkg manpage
+  * Fix formatting and a typo in the dpkg manpage
   * Document the dpkg.cfg configuration file in dpkg(8)
 
  -- Wichert Akkerman <wakkerma@debian.org>  Thu, 26 Apr 2001 12:39:16 +0200
@@ -9438,7 +9439,7 @@ dpkg (1.7.0) unstable; urgency=low
   * Corrections and updates to Swedish translation.
   * Add Galician, German, Dutch and Brazilian translations
   * archtable: add ia64 and sh; revert sparc64 so that it turns into sparc.
-    There wont be a full binary-sparc64 port. Closes: Bug#70788
+    There won't be a full binary-sparc64 port. Closes: Bug#70788
   * dselect/main.cc: small fixups to get it to compile with gcc-2.96
   * Clean up fd handling in some places. Closes: Bug#69359,#69360,#69361
   * Document -k option for dpkg-buildpackage. Closes: Bug#71808
@@ -9451,7 +9452,7 @@ dpkg (1.7.0) unstable; urgency=low
     Closes: Bug#75103
   * Don't abort if start-stop-daemon tries to read a non-existing pidfile.
     Closes: Bug#75105
-  * Update formating of start-stop-daemon manpage. Closes: Bug#75110
+  * Update formatting of start-stop-daemon manpage. Closes: Bug#75110
   * Make a missing package a warning instead of an error in dpkg-genchanges
 
  -- Wichert Akkerman <wakkerma@debian.org>  Sun,  5 Nov 2000 17:28:39 +0100

+ 1 - 1
doc/README.feature-removal-schedule

@@ -23,7 +23,7 @@ What: --control-path (dpkg-query option)
 Status: deprecated
 When: 1.18.x
 Warning: man page
- This was a semi-public interface now superceded by --control-list and
+ This was a semi-public interface now superseded by --control-list and
  --control-show, which are a better interface as they do not rely on any
  specific database layout. Although there might still be cases where it's
  required to avoid hardcoding the database layout, and it will be kept as

+ 1 - 1
dselect/methods/disk/setup

@@ -434,7 +434,7 @@ esac
 check_binary () {
 	# args: area-in-messages directory
 	# eg:   main             "$hierbase/main/binary-$iarch"
-	# checks wether $2 contains *.deb
+	# checks whether $2 contains *.deb
 	if ! [ -d "$mountpoint$2/" ]
 	then
 		echo "'$2' does not exist."

+ 1 - 1
lib/dpkg/t/t-ehandle.c

@@ -90,7 +90,7 @@ test_cleanup_error(void)
 
 	if (setjmp(handler_jump)) {
 		/* The ohshit() is not supposed to get us here, as it should
-		 * be catched by the internal recursive error context. */
+		 * be caught by the internal recursive error context. */
 		pass = false;
 
 		pop_cleanup(ehflag_normaltidy);

+ 1 - 1
lib/dpkg/t/t-progname.c

@@ -31,7 +31,7 @@ test_progname(void)
 
 	/* Test initially empty progname. */
 	progname = dpkg_get_progname();
-	/* Handle libtool exectuables. */
+	/* Handle libtool executables. */
 	if (strncmp(progname, "lt-", 3) == 0)
 		progname += 3;
 	test_str(progname, ==, "t-progname");

+ 1 - 1
man/dpkg-source.man

@@ -320,7 +320,7 @@ regenerating the \fB.diff.gz\fP by comparing the source package
 
 If a second non-option argument is supplied it should be the name of the
 original source directory or tarfile or the empty string if the package is
-a Debian-specific one and so has no Debianisation diffs. If no second
+a Debian-specific one and so has no debianisation diffs. If no second
 argument is supplied then
 .B dpkg\-source
 will look for the original source tarfile

+ 3 - 3
man/dselect.man

@@ -38,7 +38,7 @@ system. At the \fBdselect\fP main menu, the system administrator can:
  - Install new packages or upgrade to newer versions.
 .PP
 .B dselect
-operates as a front-end to \fBdpkg\fP(1), the low-level debian package
+operates as a front-end to \fBdpkg\fP(1), the low-level Debian package
 handling tool. It features a full-screen package selections manager
 with package depends and conflicts resolver. When run with administrator
 privileges, packages can be installed, upgraded and removed. Various
@@ -234,7 +234,7 @@ Exits the program with zero (successful) errorcode.
 directly exposes
 the administrator to some of the complexities involved with managing
 large sets of packages with many interdependencies. For a user who is
-unfamiliar with the concepts and the ways of the debian package management
+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 cannot be assumed to be a sufficient substitute for
@@ -277,7 +277,7 @@ package and causing it to be listed.
 .sp
 .SS Packages status list
 .sp
-The main select screen displays a list of all packages known to the debian
+The main select screen displays a list of all packages known to the Debian
 package management system. This includes packages installed on the system
 and packages known from the available packages database.
 .sp

+ 1 - 1
scripts/Dpkg/Control/HashCore.pm

@@ -453,7 +453,7 @@ use parent -norequire, qw(Tie::ExtraHash);
 # $self->[0] is the real hash
 # $self->[1] is a reference to the hash contained by the parent object.
 # This reference bypasses the top-level scalar reference of a
-# Dpkg::Control::Hash, hence ensuring that that reference gets DESTROYed
+# Dpkg::Control::Hash, hence ensuring that reference gets DESTROYed
 # properly.
 
 # Dpkg::Control::Hash->new($parent)

+ 1 - 1
scripts/Dpkg/IPC.pm

@@ -362,7 +362,7 @@ Defaults to "child process".
 =item nocheck
 
 If true do not check the return status of the child (and thus
-do not fail it it has been killed or if it exited with a
+do not fail it has been killed or if it exited with a
 non-zero return code).
 
 =item timeout

+ 1 - 1
scripts/Dpkg/Source/Package/V1.pm

@@ -405,7 +405,7 @@ sub do_build {
     }
 
     $self->add_file($tarname) if $tarname;
-    # XXX: Reenable once a stable dpkg supports extracting upstream signatures
+    # XXX: Re-enable once a stable dpkg supports extracting upstream signatures
     # for source 1.0 format, either in 1.17.x or 1.18.x.
     #$self->add_file($tarsign) if $tarsign and -e $tarsign;
 

+ 1 - 1
scripts/t/dpkg_buildpackage.t

@@ -195,7 +195,7 @@ sub test_build
     diag($stderr) unless $? == 0;
 
     if (build_has_all(BUILD_ARCH_DEP)) {
-        # Rename the file to preserve on consecutive invokations.
+        # Rename the file to preserve on consecutive invocations.
         move("$basename\_amd64.changes", "$basename\_$typename.changes");
     }
 

+ 1 - 1
src/configure.c

@@ -265,7 +265,7 @@ spawn_shell(const char *confold, const char *confnew)
  * @param distedited A flag to indicate whether the file has been updated
  *        between package versions. Set to nonzero to indicate that the file
  *        has been updated.
- * @param what Hints on what action should be taken by defualt.
+ * @param what Hints on what action should be taken by default.
  *
  * @return The action which should be taken based on user input and/or the
  *         default actions as configured by cmdline/configuration options.

+ 1 - 1
src/divertcmd.c

@@ -187,7 +187,7 @@ check_rename(struct file *src, struct file *dst)
 	 * just having +w is not enough, since people do mount things RO,
 	 * and we need to fail before we start mucking around with things.
 	 * So we open a file with the same name as the diversions but with
-	 * an extension that (hopefully) wont overwrite anything. If it
+	 * an extension that (hopefully) won't overwrite anything. If it
 	 * succeeds, we assume a writable filesystem.
 	 */