Blame SOURCES/0189-Clean-up-grub-setpassword-documentation-1290799.patch

a85e8e
From a7211e0dec4a19dfe7ec32113aa1f40c5bdac970 Mon Sep 17 00:00:00 2001
a85e8e
From: Robert Marshall <rmarshall@redhat.com>
a85e8e
Date: Tue, 26 Jan 2016 10:28:35 -0500
a85e8e
Subject: [PATCH 189/260] Clean up grub-setpassword documentation (#1290799)
a85e8e
a85e8e
The output for --help had some errors. Corrected those and polished the
a85e8e
text to be a little easier to follow. Carried verbage over to man page
a85e8e
to maintain internal consistency.
a85e8e
a85e8e
Resolves: rhbz#1290799
a85e8e
---
a85e8e
 util/grub-setpassword.8  |  2 +-
a85e8e
 util/grub-setpassword.in | 15 +++++++--------
a85e8e
 2 files changed, 8 insertions(+), 9 deletions(-)
a85e8e
a85e8e
diff --git a/util/grub-setpassword.8 b/util/grub-setpassword.8
a85e8e
index 49200a848..dc91dd669 100644
a85e8e
--- a/util/grub-setpassword.8
a85e8e
+++ b/util/grub-setpassword.8
a85e8e
@@ -19,7 +19,7 @@ Display program usage and exit.
a85e8e
 -v, --version
a85e8e
 Display the current version.
a85e8e
 .TP
a85e8e
--o, --output[=\fIDIRECTORY PATH\fR]
a85e8e
+-o, --output=<\fIDIRECTORY\fR>
a85e8e
 Choose the file path to which user.cfg will be written.
a85e8e
 
a85e8e
 .SH SEE ALSO
a85e8e
diff --git a/util/grub-setpassword.in b/util/grub-setpassword.in
a85e8e
index fb9d3a3b6..c8c0fa419 100755
a85e8e
--- a/util/grub-setpassword.in
a85e8e
+++ b/util/grub-setpassword.in
a85e8e
@@ -16,15 +16,14 @@ grub_mkpasswd="${bindir}/@grub_mkpasswd_pbkdf2@"
a85e8e
 # Print the usage.
a85e8e
 usage () {
a85e8e
     cat <
a85e8e
-Usage: $0 [OPTION] [SOURCE]
a85e8e
-Run GRUB script in a Qemu instance.
a85e8e
-
a85e8e
-  -h, --help              print this message and exit
a85e8e
-  -v, --version           print the version information and exit
a85e8e
-  -o, --output_path       choose a custom output path for user.cfg
a85e8e
-
a85e8e
+Usage: $0 [OPTION]
a85e8e
 $0 prompts the user to set a password on the grub bootloader. The password
a85e8e
-is written to a file named user.cfg.
a85e8e
+is written to a file named user.cfg which lives in the GRUB directory
a85e8e
+located by default at ${grubdir}.
a85e8e
+
a85e8e
+  -h, --help                     print this message and exit
a85e8e
+  -v, --version                  print the version information and exit
a85e8e
+  -o, --output_path <DIRECTORY>  put user.cfg in a user-selected directory
a85e8e
 
a85e8e
 Report bugs at https://bugzilla.redhat.com.
a85e8e
 EOF
a85e8e
-- 
a85e8e
2.13.0
a85e8e