--- trunk/grubby/grubby.8	2011/06/03 20:32:19	1332
+++ tags/grubby-8_16/grubby.8	2012/10/01 12:07:35	1933
@@ -1,19 +1,20 @@
 .TH GRUBBY 8 "Tue Jan 18 2005"
 .SH NAME
-grubby \- command line tool for configuring grub, lilo, and elilo
+grubby \- command line tool for configuring grub, lilo, elilo, yaboot and zipl
 
 .SH SYNOPSIS
 \fBgrubby\fR [--add-kernel=\fIkernel-path\fR] [--args=\fIargs\fR] 
        [--bad-image-okay] [--boot-filesystem=\fIbootfs\fR] 
-       [--bootloader-probe] [--config-file \fIpath\fR] 
-       [--copy-default] [--default-kernel] 
+       [--bootloader-probe] [--config-file \fIpath\fR] [--copy-default]
+       [--debug] [--default-kernel] [--default-index] [--default-title]
        [--grub] [--lilo] [--yaboot] [--silo] [--zipl]
        [--info=\fIkernel-path\fR] [--initrd=\fIinitrd-path\fR] 
        [--make-default] [-o path] [--version]
        [--remove-kernel=\fIkernel-path\fR] [--remove-args=\fIargs\fR]
-       [--set-default=\fIkernel-path\fR] [--title=entry-title]
-       [--add-multiboot=\fImultiboot-path\fR] [--mbargs=\fIargs\fR]
-       [--remove-multiboot=\fImultiboot-path\fR] [--remove-mbargs=\fIargs\fR]
+       [--set-default=\fIkernel-path\fR] [--set-default-index=\fientry-index\fR]
+       [--title=entry-title] [--add-multiboot=\fImultiboot-path\fR]
+       [--mbargs=\fIargs\fR] [--remove-multiboot=\fImultiboot-path\fR]
+       [--remove-mbargs=\fIargs\fR]
 
 .SH DESCRIPTION
 \fBgrubby\fR is a command line tool for updating and displaying information
@@ -94,10 +95,22 @@
 and initrd path will never be copied.
 
 .TP
+\fB-\-debug\fR
+Display extra debugging information for failures.
+
+.TP
 \fB-\-default-kernel\fR
 Display the full path to the current default kernel and exit.
 
 .TP
+\fB-\-default-index\fR
+Display the numeric index of the current default boot entry and exit.
+
+.TP
+\fB-\-default-title\fR
+Display the title of the current default boot entry and exit.
+
+.TP
 \fB-\-elilo\fR
 Use an \fBelilo\fR style configuration file.
 
@@ -142,6 +155,10 @@
 boot entry.
 
 .TP
+\fB-\-set-default-index\fR=\fIentry-index\fR
+Makes the given entry number the default boot entry.
+
+.TP
 \fB-\-title\fR=\fIentry-title\fR
 When a new kernel entry is added \fIentry-title\fR is used as the title
 (\fBlilo\fR label) for the entry. If \fIentry-title\fR is longer then maximum