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