Merge spelling fixes from trunk.

SVN-Revision: 4110

diff --git a/cpio/bsdcpio.1 b/cpio/bsdcpio.1
index f01a70491e67e5e70fdf5726c8921a2dccb40fea..1355130c59116b735063b99ee6895d528fd3f4e6 100644 (file)
--- a/cpio/bsdcpio.1
+++ b/cpio/bsdcpio.1
@@ -59,7 +59,7 @@ is a mode indicator from the following list:
 .Bl -tag -compact -width indent
 .It Fl i
 Input.
-Read an archive from standard input (unless overriden) and extract the
+Read an archive from standard input (unless overridden) and extract the
 contents to disk or (if the
 .Fl t
 option is specified)
@@ -69,7 +69,7 @@ one of the patterns will be extracted.
 .It Fl o
 Output.
 Read a list of filenames from standard input and produce a new archive
-on standard output (unless overriden) containing the specified items.
+on standard output (unless overridden) containing the specified items.
 .It Fl p
 Pass-through.
 Read a list of filenames from standard input and copy the files to the

diff --git a/libarchive/archive_write_set_format_iso9660.c b/libarchive/archive_write_set_format_iso9660.c
index af2070ad9e727607dfa3dc684c9ab940fb3438bd..8e1c01830e4b05ada0fd5fedbacce0773f3eaa4d 100644 (file)
--- a/libarchive/archive_write_set_format_iso9660.c
+++ b/libarchive/archive_write_set_format_iso9660.c
@@ -6272,7 +6272,7 @@ isoent_gen_joliet_identifier(struct archive_write *a, struct isoent *isoent,
                if (parent_len + np->mb_len > 240) {
                        archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
                            "The regulation of Joliet extensions;"
-                           " A lenght of a full-pathname of `%s' is "
+                           " A length of a full-pathname of `%s' is "
                            "longer than 240 bytes, (p=%d, b=%d)",
                            archive_entry_pathname(np->file->entry),
                            (int)parent_len, (int)np->mb_len);

diff --git a/tar/bsdtar.1 b/tar/bsdtar.1
index fe6be7d784ee2b81c8dca84fa3d0643fc7e53708..827a74195e3e2edfbac76b947cefe868e991b683 100644 (file)
--- a/tar/bsdtar.1
+++ b/tar/bsdtar.1
@@ -473,7 +473,7 @@ Attempt to restore the full permissions, including owner, file modes, file
 flags and ACLs, if available, for each item extracted from the archive.
 This is the default, if
 .Nm
-is being run by root and can be overriden by also specifying
+is being run by root and can be overridden by also specifying
 .Fl Fl no-same-owner
 and
 .Fl Fl no-same-permissions .