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