diff options
author | Pádraig Brady <P@draigBrady.com> | 2014-04-09 13:37:42 +0100 |
---|---|---|
committer | Pádraig Brady <P@draigBrady.com> | 2014-04-09 14:17:06 +0100 |
commit | 30acfcab5093debf433d966c5666d2e505c389c1 (patch) | |
tree | 3dec6ec795f9fdca8bf4d95dd23d231643805610 /src | |
parent | d695bc8bc60698bdcc07f9ab8c649a77383bcc85 (diff) | |
download | coreutils-30acfcab5093debf433d966c5666d2e505c389c1.tar.xz |
doc: clarify in --help that -Z doesn't take an argument
* NEWS: Fix a confusing old entry.
* cfg.mk (old_NEWS_hash): Adjust accordingly.
* src/cp.c (usage): Separate the -Z and --context descriptions.
* src/install.c: Likewise.
* src/mkdir.c: Likewise.
* src/mkfifo.c: Likewise.
* src/mknod.c: Likewise.
Fixes http://bugs.gnu.org/17220
Diffstat (limited to 'src')
-rw-r--r-- | src/cp.c | 6 | ||||
-rw-r--r-- | src/install.c | 6 | ||||
-rw-r--r-- | src/mkdir.c | 9 | ||||
-rw-r--r-- | src/mkfifo.c | 6 | ||||
-rw-r--r-- | src/mknod.c | 6 |
5 files changed, 20 insertions, 13 deletions
@@ -230,8 +230,10 @@ Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n\ -x, --one-file-system stay on this file system\n\ "), stdout); fputs (_("\ - -Z, --context[=CTX] set SELinux security context of destination\n\ - file to default type, or to CTX if specified\n\ + -Z set SELinux security context of destination\n\ + file to default type\n\ + --context[=CTX] like -Z, or if CTX is specified then set the\n\ + SELinux or SMACK security context to CTX\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); diff --git a/src/install.c b/src/install.c index 055404789..c9bfdaef0 100644 --- a/src/install.c +++ b/src/install.c @@ -647,8 +647,10 @@ In the 4th form, create all components of the given DIRECTORY(ies).\n\ "), stdout); fputs (_("\ --preserve-context preserve SELinux security context\n\ - -Z, --context[=CTX] set SELinux security context of destination file to\n\ - default type, or to CTX if specified\n\ + -Z set SELinux security context of destination\n\ + file to default type\n\ + --context[=CTX] like -Z, or if CTX is specified then set the\n\ + SELinux or SMACK security context to CTX\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); diff --git a/src/mkdir.c b/src/mkdir.c index a6f6c24a6..04367ebf6 100644 --- a/src/mkdir.c +++ b/src/mkdir.c @@ -66,9 +66,12 @@ Create the DIRECTORY(ies), if they do not already exist.\n\ -m, --mode=MODE set file mode (as in chmod), not a=rwx - umask\n\ -p, --parents no error if existing, make parent directories as needed\n\ -v, --verbose print a message for each created directory\n\ - -Z, --context[=CTX] set the SELinux security context of each created\n\ - directory to default type or set the SELinux or\n\ - SMACK security context to CTX if specified\n\ +"), stdout); + fputs (_("\ + -Z set SELinux security context of each created directory\n\ + to the default type\n\ + --context[=CTX] like -Z, or if CTX is specified then set the SELinux\n\ + or SMACK security context to CTX\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); diff --git a/src/mkfifo.c b/src/mkfifo.c index cf970593b..5a52d6a22 100644 --- a/src/mkfifo.c +++ b/src/mkfifo.c @@ -61,9 +61,9 @@ Create named pipes (FIFOs) with the given NAMEs.\n\ -m, --mode=MODE set file permission bits to MODE, not a=rw - umask\n\ "), stdout); fputs (_("\ - -Z, --context[=CTX] set the SELinux security context of each NAME to\n\ - default type, or set the SELinux or SMACK\n\ - security context to CTX if specified\n\ + -Z set the SELinux security context to default type\n\ + --context[=CTX] like -Z, or if CTX is specified then set the SELinux\n\ + or SMACK security context to CTX\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); diff --git a/src/mknod.c b/src/mknod.c index dfb9ef4fc..6e6709492 100644 --- a/src/mknod.c +++ b/src/mknod.c @@ -63,9 +63,9 @@ Create the special file NAME of the given TYPE.\n\ -m, --mode=MODE set file permission bits to MODE, not a=rw - umask\n\ "), stdout); fputs (_("\ - -Z, --context[=CTX] set the SELinux security context of NAME to\n\ - default type, or set the SELinux or SMACK\n\ - security context to CTX if specified\n\ + -Z set the SELinux security context to default type\n\ + --context[=CTX] like -Z, or if CTX is specified then set the SELinux\n\ + or SMACK security context to CTX\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); |