Util-Linux Archive on lore.kernel.org
 help / color / Atom feed
* [PATCH 1/6] lib/colors.c: fix "maybe be" duplication
@ 2019-05-13 18:53 Austin English
  2019-05-13 18:53 ` [PATCH 2/6] libmount/src/utils.c: " Austin English
                   ` (5 more replies)
  0 siblings, 6 replies; 7+ messages in thread
From: Austin English @ 2019-05-13 18:53 UTC (permalink / raw)
  To: util-linux; +Cc: Austin English

Signed-off-by: Austin English <austinenglish@gmail.com>
---
 lib/colors.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/colors.c b/lib/colors.c
index bea7bd1d7..4a6c8afa4 100644
--- a/lib/colors.c
+++ b/lib/colors.c
@@ -36,7 +36,7 @@
 #include "debug.h"
 
 /*
- * Default behavior, maybe be override by terminal-colors.d/{enable,disable}.
+ * Default behavior, may be overriden by terminal-colors.d/{enable,disable}.
  */
 #ifdef USE_COLORS_BY_DEFAULT
 # define UL_COLORMODE_DEFAULT	UL_COLORMODE_AUTO	/* check isatty() */
-- 
2.21.0


^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH 2/6] libmount/src/utils.c: fix "maybe be" duplication
  2019-05-13 18:53 [PATCH 1/6] lib/colors.c: fix "maybe be" duplication Austin English
@ 2019-05-13 18:53 ` " Austin English
  2019-05-13 18:53 ` [PATCH 3/6] misc-utils/lsblk.8: " Austin English
                   ` (4 subsequent siblings)
  5 siblings, 0 replies; 7+ messages in thread
From: Austin English @ 2019-05-13 18:53 UTC (permalink / raw)
  To: util-linux; +Cc: Austin English

Signed-off-by: Austin English <austinenglish@gmail.com>
---
 libmount/src/utils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libmount/src/utils.c b/libmount/src/utils.c
index 7f6cc1405..73166cb91 100644
--- a/libmount/src/utils.c
+++ b/libmount/src/utils.c
@@ -913,7 +913,7 @@ int mnt_open_uniq_filename(const char *filename, char **name)
  * should be canonicalized. The returned pointer should be freed by the caller.
  *
  * WARNING: the function compares st_dev of the @path elements. This traditional
- * way maybe be insufficient on filesystems like Linux "overlay". See also
+ * way may be insufficient on filesystems like Linux "overlay". See also
  * mnt_table_find_target().
  *
  * Returns: allocated string with the target of the mounted device or NULL on error
-- 
2.21.0


^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH 3/6] misc-utils/lsblk.8: fix "maybe be" duplication
  2019-05-13 18:53 [PATCH 1/6] lib/colors.c: fix "maybe be" duplication Austin English
  2019-05-13 18:53 ` [PATCH 2/6] libmount/src/utils.c: " Austin English
@ 2019-05-13 18:53 ` " Austin English
  2019-05-13 18:53 ` [PATCH 4/6] sys-utils/mount.8: " Austin English
                   ` (3 subsequent siblings)
  5 siblings, 0 replies; 7+ messages in thread
From: Austin English @ 2019-05-13 18:53 UTC (permalink / raw)
  To: util-linux; +Cc: Austin English

Signed-off-by: Austin English <austinenglish@gmail.com>
---
 misc-utils/lsblk.8 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/misc-utils/lsblk.8 b/misc-utils/lsblk.8
index 320158278..2910ee356 100644
--- a/misc-utils/lsblk.8
+++ b/misc-utils/lsblk.8
@@ -67,8 +67,8 @@ example by \fB\-E WWN\fR.
 .TP
 .BR \-e , " \-\-exclude " \fIlist\fP
 Exclude the devices specified by the comma-separated \fIlist\fR of major device numbers.
-Note that RAM disks (major=1) are excluded by default if \fB\-\-all\fR is no specified.
-The filter is applied to the top-level devices only. This maybe be confusing for
+Note that RAM disks (major=1) are excluded by default if \fB\-\-all\fR is not specified.
+The filter is applied to the top-level devices only. This may be confusing for
 \fB\-\-list\fR output format where hierarchy of the devices is not obvious.
 .TP
 .BR \-f , " \-\-fs"
@@ -83,7 +83,7 @@ Display help text and exit.
 .TP
 .BR \-I , " \-\-include " \fIlist\fP
 Include devices specified by the comma-separated \fIlist\fR of major device numbers.
-The filter is applied to the top-level devices only. This maybe be confusing for
+The filter is applied to the top-level devices only. This may be confusing for
 \fB\-\-list\fR output format where hierarchy of the devices is not obvious.
 .TP
 .BR \-i , " \-\-ascii"
-- 
2.21.0


^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH 4/6] sys-utils/mount.8: fix "maybe be" duplication
  2019-05-13 18:53 [PATCH 1/6] lib/colors.c: fix "maybe be" duplication Austin English
  2019-05-13 18:53 ` [PATCH 2/6] libmount/src/utils.c: " Austin English
  2019-05-13 18:53 ` [PATCH 3/6] misc-utils/lsblk.8: " Austin English
@ 2019-05-13 18:53 ` " Austin English
  2019-05-13 18:53 ` [PATCH 5/6] sys-utils/rtcwake.8.in: " Austin English
                   ` (2 subsequent siblings)
  5 siblings, 0 replies; 7+ messages in thread
From: Austin English @ 2019-05-13 18:53 UTC (permalink / raw)
  To: util-linux; +Cc: Austin English

Signed-off-by: Austin English <austinenglish@gmail.com>
---
 sys-utils/mount.8 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys-utils/mount.8 b/sys-utils/mount.8
index ccba52c32..b79b4ef5f 100644
--- a/sys-utils/mount.8
+++ b/sys-utils/mount.8
@@ -114,10 +114,10 @@ options to avoid ambivalent interpretation of the given argument.  For example:
 .RE
 
 The same filesystem may be mounted more than once, and in some cases (e.g.
-network filesystems) the same filesystem maybe be mounted on the same
+network filesystems) the same filesystem may be mounted on the same
 mountpoint more times. The mount command does not implement any policy to
-control this behavior. All behavior is controlled by kernel and it is usually
-specific to filesystem driver. The exception is \fB\-\-all\fR, in this case
+control this behavior. All behavior is controlled bythe  kernel and it is usually
+specific to the filesystem driver. The exception is \fB\-\-all\fR, in this case
 already mounted filesystems are ignored (see \fB\-\-all\fR below for more details).
 
 .SS Listing the mounts
@@ -362,7 +362,7 @@ It is important to understand that "bind" does not to create any second-class
 or special node in the kernel VFS. The "bind" is just another operation to
 attach a filesystem. There is nowhere stored information that the filesystem
 has been attached by "bind" operation. The \fIolddir\fR and \fInewdir\fR are
-independent and the \fIolddir\fR maybe be umounted.
+independent and the \fIolddir\fR may be umounted.
 
 One can also remount a single file (on a single file).  It's also
 possible to use the bind mount to create a mountpoint from a regular
-- 
2.21.0


^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH 5/6] sys-utils/rtcwake.8.in: fix "maybe be" duplication
  2019-05-13 18:53 [PATCH 1/6] lib/colors.c: fix "maybe be" duplication Austin English
                   ` (2 preceding siblings ...)
  2019-05-13 18:53 ` [PATCH 4/6] sys-utils/mount.8: " Austin English
@ 2019-05-13 18:53 ` " Austin English
  2019-05-13 18:53 ` [PATCH 6/6] text-utils/column.1: " Austin English
  2019-05-15 11:50 ` [PATCH 1/6] lib/colors.c: " Karel Zak
  5 siblings, 0 replies; 7+ messages in thread
From: Austin English @ 2019-05-13 18:53 UTC (permalink / raw)
  To: util-linux; +Cc: Austin English

Signed-off-by: Austin English <austinenglish@gmail.com>
---
 sys-utils/rtcwake.8.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-utils/rtcwake.8.in b/sys-utils/rtcwake.8.in
index 167f7f9d1..4f70c39c9 100644
--- a/sys-utils/rtcwake.8.in
+++ b/sys-utils/rtcwake.8.in
@@ -43,10 +43,10 @@ On some systems, this can also be used like \fBnvram-wakeup\fP, waking from stat
 like ACPI S4 (suspend to disk).  Not all systems have persistent media that are
 appropriate for such suspend modes.
 .PP
-Note that alarm functionality depends on hardware; not every RTC is able to setup 
+Note that alarm functionality depends on hardware; not every RTC is able to setup
 an alarm up to 24 hours in the future.
 .PP
-The suspend setup maybe be interrupted by active hardware; for example wireless USB
+The suspend setup may be interrupted by active hardware; for example wireless USB
 input devices that continue to send events for some fraction of a second after the
 return key is pressed.
 .B rtcwake
-- 
2.21.0


^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH 6/6] text-utils/column.1: fix "maybe be" duplication
  2019-05-13 18:53 [PATCH 1/6] lib/colors.c: fix "maybe be" duplication Austin English
                   ` (3 preceding siblings ...)
  2019-05-13 18:53 ` [PATCH 5/6] sys-utils/rtcwake.8.in: " Austin English
@ 2019-05-13 18:53 ` " Austin English
  2019-05-15 11:50 ` [PATCH 1/6] lib/colors.c: " Karel Zak
  5 siblings, 0 replies; 7+ messages in thread
From: Austin English @ 2019-05-13 18:53 UTC (permalink / raw)
  To: util-linux; +Cc: Austin English

Signed-off-by: Austin English <austinenglish@gmail.com>
---
 text-utils/column.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/text-utils/column.1 b/text-utils/column.1
index 84243b5bd..fd1aaabed 100644
--- a/text-utils/column.1
+++ b/text-utils/column.1
@@ -100,7 +100,7 @@ Print header line for each page.
 Specify columns where is possible to use multi-line cell for long text when
 necessary.
 .IP "\fB\-H, \-\-table-hide\fP \fIcolumns\fP"
-Don't print specified columns. The special placeholder '-' maybe be used to
+Don't print specified columns. The special placeholder '-' may be used to
 hide all unnamed columns (see --table-columns).
 .IP "\fB\-O, \-\-table-order\fP \fIcolumns\fP"
 Specify columns order on output.
-- 
2.21.0


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 1/6] lib/colors.c: fix "maybe be" duplication
  2019-05-13 18:53 [PATCH 1/6] lib/colors.c: fix "maybe be" duplication Austin English
                   ` (4 preceding siblings ...)
  2019-05-13 18:53 ` [PATCH 6/6] text-utils/column.1: " Austin English
@ 2019-05-15 11:50 ` " Karel Zak
  5 siblings, 0 replies; 7+ messages in thread
From: Karel Zak @ 2019-05-15 11:50 UTC (permalink / raw)
  To: Austin English; +Cc: util-linux

On Mon, May 13, 2019 at 01:53:14PM -0500, Austin English wrote:
>  lib/colors.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

All 6 patches merged. Thanks!

    Karel

-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, back to index

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-13 18:53 [PATCH 1/6] lib/colors.c: fix "maybe be" duplication Austin English
2019-05-13 18:53 ` [PATCH 2/6] libmount/src/utils.c: " Austin English
2019-05-13 18:53 ` [PATCH 3/6] misc-utils/lsblk.8: " Austin English
2019-05-13 18:53 ` [PATCH 4/6] sys-utils/mount.8: " Austin English
2019-05-13 18:53 ` [PATCH 5/6] sys-utils/rtcwake.8.in: " Austin English
2019-05-13 18:53 ` [PATCH 6/6] text-utils/column.1: " Austin English
2019-05-15 11:50 ` [PATCH 1/6] lib/colors.c: " Karel Zak

Util-Linux Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/util-linux/0 util-linux/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 util-linux util-linux/ https://lore.kernel.org/util-linux \
		util-linux@vger.kernel.org util-linux@archiver.kernel.org
	public-inbox-index util-linux


Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.util-linux


AGPL code for this site: git clone https://public-inbox.org/ public-inbox