Merge branch 'master' of https://github.com/yurchor/util-linux

6 files changed, 7 insertions, 7 deletions

diff --git a/fdisks/fdisk.8 b/fdisks/fdisk.8
index 74e03428..d36318d4 100644
--- a/fdisks/fdisk.8
+++ b/fdisks/fdisk.8
@@ -153,7 +153,7 @@ are known.  And second, even if we know what these numbers should be, the 24
 bits that are available do not suffice.  DOS uses C/H/S only, Windows uses
 both, Linux never uses C/H/S. The
 .B C/H/S addressing is deprecated
-and may be unssuported in some later fdisk version.
+and may be unsupported in some later fdisk version.
 
 .B Please, read the DOS-mode section if you want DOS compatible partitions.
 .B fdisk
@@ -188,7 +188,7 @@ are performed before exiting when the partition table has been updated.
 
 .SH "DOS mode and DOS 6.x WARNING"
 .B Note that all this deprecated. You don't have to care about things like
-.B geomery and cylinders on modern operation systems. If you really want
+.B geometry and cylinders on modern operation systems. If you really want
 .B DOS compatible partitioning then you have to enable DOS-mode and cylinder
 .B units by '-c=dos -u=cylinders' fdisk command line options.
 
diff --git a/libfdisk/src/dos.c b/libfdisk/src/dos.c
index fbadcca0..4340d35b 100644
--- a/libfdisk/src/dos.c
+++ b/libfdisk/src/dos.c
@@ -1421,7 +1421,7 @@ static int dos_set_parttype(
 
 	if (is_dos_partition(t->type) || is_dos_partition(p->sys_ind))
 	    fdisk_info(cxt, _("If you have created or modified any DOS 6.x "
-		"partitions, please see the fdisk documantation for additional "
+		"partitions, please see the fdisk documentation for additional "
 		"information."));
 
 	p->sys_ind = t->type;
diff --git a/libfdisk/src/gpt.c b/libfdisk/src/gpt.c
index 7f34b18f..03c63c1a 100644
--- a/libfdisk/src/gpt.c
+++ b/libfdisk/src/gpt.c
@@ -150,7 +150,7 @@ static struct fdisk_parttype gpt_parttypes[] =
 	DEF_GUID("EBD0A0A2-B9E5-4433-87C0-68B6B72699C7", N_("Microsoft basic data")),
 	DEF_GUID("5808C8AA-7E8F-42E0-85D2-E1E90434CFB3", N_("Microsoft LDM metadata")),
 	DEF_GUID("AF9B60A0-1431-4F62-BC68-3311714A69AD", N_("Microsoft LDM data")),
-	DEF_GUID("DE94BBA4-06D1-4D40-A16A-BFD50179D6AC", N_("Windows recovery evironment")),
+	DEF_GUID("DE94BBA4-06D1-4D40-A16A-BFD50179D6AC", N_("Windows recovery environment")),
 	DEF_GUID("37AFFC90-EF7D-4E96-91C3-2D7AE055B174", N_("IBM General Parallel Fs")),
 
 	/* HP-UX */
diff --git a/sys-utils/losetup.8 b/sys-utils/losetup.8
index 9c4c7c92..c61a61e1 100644
--- a/sys-utils/losetup.8
+++ b/sys-utils/losetup.8
@@ -140,7 +140,7 @@ from determining the status of the device.
 .I /dev/loop[0..N]
 loop block devices
 .TP
-.I /dev/loop-cotrol
+.I /dev/loop-control
 loop control device
 
 .SH EXAMPLE
diff --git a/sys-utils/losetup.c b/sys-utils/losetup.c
index 5775d600..f5141157 100644
--- a/sys-utils/losetup.c
+++ b/sys-utils/losetup.c
@@ -387,7 +387,7 @@ static void usage(FILE *out)
 
 	fputs(_(" -l, --list                    list info about all or specified\n"), out);
 	fputs(_(" -O, --output <cols>           specify columns to output for --list\n"), out);
-	fputs(_(" -n, --noheadings              don't print headings for --list ouput\n"), out);
+	fputs(_(" -n, --noheadings              don't print headings for --list output\n"), out);
 	fputs(_("     --raw                     use raw --list output format\n"), out);
 
 	fputs(USAGE_SEPARATOR, out);
diff --git a/term-utils/agetty.c b/term-utils/agetty.c
index 6ba263c2..92d5a3cc 100644
--- a/term-utils/agetty.c
+++ b/term-utils/agetty.c
@@ -1807,7 +1807,7 @@ static void __attribute__ ((__noreturn__)) usage(FILE *out)
 	fputs(_(" -i, --noissue              do not display issue file\n"), out);
 	fputs(_(" -I, --init-string <string> set init string\n"), out);
 	fputs(_(" -l, --login-program <file> specify login program\n"), out);
-	fputs(_(" -L, --local-line[=<mode>]  cotrol local line flag\n"), out);
+	fputs(_(" -L, --local-line[=<mode>]  control local line flag\n"), out);
 	fputs(_(" -m, --extract-baud         extract baud rate during connect\n"), out);
 	fputs(_(" -n, --skip-login           do not prompt for login\n"), out);
 	fputs(_(" -o, --login-options <opts> options that are passed to login\n"), out);