aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--jffsX-utils/mkfs.jffs2.14
-rw-r--r--misc-utils/lsmtd.82
-rw-r--r--misc-utils/lsmtd.c6
-rw-r--r--misc-utils/lsmtd_scan.c2
-rw-r--r--ubi-utils/mtdinfo.c2
-rw-r--r--ubi-utils/ubinize.c2
-rw-r--r--ubifs-utils/mkfs.ubifs/mkfs.ubifs.c4
7 files changed, 11 insertions, 11 deletions
diff --git a/jffsX-utils/mkfs.jffs2.1 b/jffsX-utils/mkfs.jffs2.1
index 7c57ddc..75f96f5 100644
--- a/jffsX-utils/mkfs.jffs2.1
+++ b/jffsX-utils/mkfs.jffs2.1
@@ -119,13 +119,13 @@ the kernel can be changed with a #define to accept images of the
non-native endianness. Full bi-endian support in the kernel is not
planned.
-It is unlikely that JFFS2 images are useful except in conjuction
+It is unlikely that JFFS2 images are useful except in conjunction
with the MTD (Memory Technology Device) drivers in the Linux
kernel, since the JFFS2 file system driver in the kernel requires
MTD devices.
.SH OPTIONS
Options that take SIZE arguments can be specified as either
-decimal (e.g., 65536), octal (0200000), or hexidecimal (0x1000).
+decimal (e.g., 65536), octal (0200000), or hexadecimal (0x1000).
.TP
.B -p, --pad[=SIZE]
Pad output to SIZE bytes with 0xFF. If SIZE is not specified,
diff --git a/misc-utils/lsmtd.8 b/misc-utils/lsmtd.8
index 3061c40..198c8a7 100644
--- a/misc-utils/lsmtd.8
+++ b/misc-utils/lsmtd.8
@@ -14,7 +14,7 @@ command reads the
.B sysfs
filesystem to gather information. Alternatively, the
.B procfs
-filesystem and ioctl interfaces are used, should the sysfs filesytem not
+filesystem and ioctl interfaces are used, should the sysfs filesystem not
be available.
.PP
The command prints all MTD and UBI devices in a pretty-printed list format by
diff --git a/misc-utils/lsmtd.c b/misc-utils/lsmtd.c
index 24a30ac..b62b69f 100644
--- a/misc-utils/lsmtd.c
+++ b/misc-utils/lsmtd.c
@@ -72,11 +72,11 @@ static struct column cols[] = {
{ "SUB-SIZE", "subpage size", COL_SUBSIZE, COL_DT_SIZE, 0 },
{ "OOB-SIZE", "out of band data size", COL_OOBSIZE, COL_DT_SIZE, 0 },
{ "RO", "read-only device", COL_RO, COL_DT_BOOL, 0 },
- { "CORRUPTED", "wheather an UBI volume is corrupted",
+ { "CORRUPTED", "whether an UBI volume is corrupted",
COL_CORRUPTED, COL_DT_BOOL, 0 },
{ "REGIONS", "number of additional erase regions",
COL_REGION, COL_DT_NUMBER, 0 },
- { "BB", "wheather the MTD device may have bad eraseblocks",
+ { "BB", "whether the MTD device may have bad eraseblocks",
COL_BB, COL_DT_BOOL, 0 },
{ "MAX-EC", "current highest erase counter value on UBI devices",
COL_MAXEC, COL_DT_NUMBER, 0 },
@@ -107,7 +107,7 @@ static NORETURN void usage(int status)
" -r, --raw Use raw output format\n"
" -P, --pairs Use key=\"value\" output format\n"
" -J, --json Use JSON output format\n"
-" -o, --output <list> Comma seperated list of columns to print\n"
+" -o, --output <list> Comma separated list of columns to print\n"
" -O, --output-all Print all columns\n"
" -x, --sort <column> Sort output by <column>\n"
" -m, --no-ubi Do not display information about UBI devices/volumes\n"
diff --git a/misc-utils/lsmtd_scan.c b/misc-utils/lsmtd_scan.c
index cec7b5c..9331c5b 100644
--- a/misc-utils/lsmtd_scan.c
+++ b/misc-utils/lsmtd_scan.c
@@ -162,7 +162,7 @@ int scan_ubi(libubi_t lib_ubi)
}
if (j == num_mtd_devices) {
- fprintf(stderr, "Cannot find mtd device %d refered to "
+ fprintf(stderr, "Cannot find mtd device %d referred to "
"by ubi device %d\n", dev_info.mtd_num,
dev_info.dev_num);
return -1;
diff --git a/ubi-utils/mtdinfo.c b/ubi-utils/mtdinfo.c
index 0606ab0..8bd0fc8 100644
--- a/ubi-utils/mtdinfo.c
+++ b/ubi-utils/mtdinfo.c
@@ -161,7 +161,7 @@ static void print_ubi_info(const struct mtd_info *mtd_info,
struct ubigen_info ui;
if (!mtd_info->sysfs_supported) {
- errmsg("cannot provide UBI info, becasue sub-page size is "
+ errmsg("cannot provide UBI info, because sub-page size is "
"not known");
return;
}
diff --git a/ubi-utils/ubinize.c b/ubi-utils/ubinize.c
index 967b65c..ac8c1e5 100644
--- a/ubi-utils/ubinize.c
+++ b/ubi-utils/ubinize.c
@@ -376,7 +376,7 @@ static int read_section(const struct ubigen_info *ui, const char *sname,
if (vi->alignment == -1)
vi->alignment = 1;
else if (vi->id < 0)
- return errmsg("negative volume alignement %d in section \"%s\"",
+ return errmsg("negative volume alignment %d in section \"%s\"",
vi->alignment, sname);
verbose(args.verbose, "volume alignment: %d", vi->alignment);
diff --git a/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c b/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c
index d4be610..cd66d93 100644
--- a/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c
+++ b/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c
@@ -210,9 +210,9 @@ static const char *helptext =
"Usage: mkfs.ubifs [OPTIONS] target\n"
"Make a UBIFS file system image from an existing directory tree\n\n"
"Examples:\n"
-"Build file system from directory /opt/img, writting the result in the ubifs.img file\n"
+"Build file system from directory /opt/img, writing the result in the ubifs.img file\n"
"\tmkfs.ubifs -m 512 -e 128KiB -c 100 -r /opt/img ubifs.img\n"
-"The same, but writting directly to an UBI volume\n"
+"The same, but writing directly to an UBI volume\n"
"\tmkfs.ubifs -r /opt/img /dev/ubi0_0\n"
"Creating an empty UBIFS filesystem on an UBI volume\n"
"\tmkfs.ubifs /dev/ubi0_0\n\n"