* [PATCH 1/2] misc: fix typos
@ 2017-11-26 17:27 Sami Kerola
2017-11-26 17:27 ` [PATCH 2/2] man: use long options in text and add example to uuidgen Sami Kerola
0 siblings, 1 reply; 2+ messages in thread
From: Sami Kerola @ 2017-11-26 17:27 UTC (permalink / raw)
To: util-linux; +Cc: Sami Kerola
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
libfdisk/src/context.c | 2 +-
libsmartcols/src/line.c | 2 +-
login-utils/su-common.c | 2 +-
misc-utils/wipefs.8 | 2 +-
text-utils/column.1 | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/libfdisk/src/context.c b/libfdisk/src/context.c
index fb7ad4b44..95d17acde 100644
--- a/libfdisk/src/context.c
+++ b/libfdisk/src/context.c
@@ -433,7 +433,7 @@ const char *fdisk_get_collision(struct fdisk_context *cxt)
* fdisk_is_ptcollision:
* @cxt: fdisk context
*
- * The collision detected by libblkid (usally another partition table). Note
+ * The collision detected by libblkid (usually another partition table). Note
* that libfdisk does not support all partitions tables, so fdisk_has_label()
* may return false, but fdisk_is_ptcollision() may return true.
*
diff --git a/libsmartcols/src/line.c b/libsmartcols/src/line.c
index 6c64e7f62..ace6239ae 100644
--- a/libsmartcols/src/line.c
+++ b/libsmartcols/src/line.c
@@ -160,7 +160,7 @@ int scols_line_move_cells(struct libscols_line *ln, size_t newn, size_t oldn)
/* remember data from old position */
memcpy(&ce, &ln->cells[oldn], sizeof(struct libscols_cell));
- /* remove old possition (move data behind oldn to oldn) */
+ /* remove old position (move data behind oldn to oldn) */
if (oldn + 1 < ln->ncells)
memmove(ln->cells + oldn, ln->cells + oldn + 1,
(ln->ncells - oldn - 1) * sizeof(struct libscols_cell));
diff --git a/login-utils/su-common.c b/login-utils/su-common.c
index b9deeeab1..0ba6d1953 100644
--- a/login-utils/su-common.c
+++ b/login-utils/su-common.c
@@ -130,7 +130,7 @@ struct su_context {
const char *tty_number; /* end of the tty_path */
char *new_user; /* wanted user */
- char *old_user; /* orginal user */
+ char *old_user; /* original user */
pid_t child; /* fork() baby */
int childstatus; /* wait() status */
diff --git a/misc-utils/wipefs.8 b/misc-utils/wipefs.8
index 5d768f2f9..0685c1ac9 100644
--- a/misc-utils/wipefs.8
+++ b/misc-utils/wipefs.8
@@ -114,7 +114,7 @@ Display version information and exit.
.SH EXAMPLES
.TP
.BR "wipefs /dev/sda*"
-Prints infomation about sda and all partitions on sda.
+Prints information about sda and all partitions on sda.
.TP
.BR "wipefs --all --backup /dev/sdb"
Erases all signatures from the device /dev/sdb and creates a signature backup
diff --git a/text-utils/column.1 b/text-utils/column.1
index b22468049..3e6aa3b32 100644
--- a/text-utils/column.1
+++ b/text-utils/column.1
@@ -81,7 +81,7 @@ supplied using the \fB\-\-output\-separator\fP option.
Table output is useful for pretty-printing.
.IP "\fB\-N, \-\-table-columns\fP \fInames\fP"
Specify the columns names by comma separated list of names. The names are used
-for the table header or to addres column in option arguments.
+for the table header or to address column in option arguments.
.IP "\fB\-R, \-\-table-right\fP \fIcolumns\fP"
Right align text in the specified columns.
.IP "\fB\-T, \-\-table-truncate\fP \fIcolumns\fP"
--
2.15.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH 2/2] man: use long options in text and add example to uuidgen
2017-11-26 17:27 [PATCH 1/2] misc: fix typos Sami Kerola
@ 2017-11-26 17:27 ` Sami Kerola
0 siblings, 0 replies; 2+ messages in thread
From: Sami Kerola @ 2017-11-26 17:27 UTC (permalink / raw)
To: util-linux; +Cc: Sami Kerola
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
misc-utils/uuidgen.1 | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/misc-utils/uuidgen.1 b/misc-utils/uuidgen.1
index 4b0fcb60c..d5e1a5675 100644
--- a/misc-utils/uuidgen.1
+++ b/misc-utils/uuidgen.1
@@ -27,19 +27,19 @@ will generate a random-based UUID if a high-quality random number
generator is present. Otherwise, it will choose a time-based UUID.
It is possible to force the generation of one of these first two
UUID types by using the
-.B \-r
+.B \-\-random
or
-.B \-t
+.B \-\-time
options.
.PP
The third type of UUID is generated with the
-.B \-m
+.B \-\-md5
or
-.B \-s
-options (MD5 or SHA1, respectively), followed by
-.BR "\-n " \fInamespace
+.B \-\-sha1
+options, followed by
+\fB\-\-namespace\fR \fInamespace\fR
and
-.BR "\-N " \fIname\fR.
+\fB\-\-name\fR \fIname\fR.
The \fInamespace\fR may either be a well-known UUID, or else
an alias to one of the well-known UUIDs defined in RFC 4122, that is
.BR @dns ,
@@ -89,6 +89,8 @@ Generate the hash of the \fIname\fR.
Interpret name \fIname\fR as a hexidecimal string.
.SH "CONFORMING TO"
OSF DCE 1.1
+.SH EXAMPLES
+uuidgen \-\-sha1 \-\-namespace @dns \-\-name "www.example.com"
.SH AUTHOR
.B uuidgen
was written by Andreas Dilger for libuuid.
--
2.15.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-11-26 17:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-11-26 17:27 [PATCH 1/2] misc: fix typos Sami Kerola
2017-11-26 17:27 ` [PATCH 2/2] man: use long options in text and add example to uuidgen Sami Kerola
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).