1e69ac
From: Peter Jones <pjones@redhat.com>
1e69ac
Subject: Improve documentation
1e69ac
Date:   Mon Jan 20 14:12:34 2014 -0500
1e69ac
1e69ac
Resolves: rhbz#948852
1e69ac
b95fbc
diff -urpN syslinux-4.05/libinstaller/syslxopt.c.options syslinux-4.05/libinstaller/syslxopt.c
b95fbc
--- syslinux-4.05/libinstaller/syslxopt.c.options	2014-01-20 14:02:01.634201156 -0500
b95fbc
+++ syslinux-4.05/libinstaller/syslxopt.c	2014-01-20 14:09:39.303778826 -0500
b95fbc
@@ -102,11 +102,11 @@ void __attribute__ ((noreturn)) usage(in
b95fbc
     fprintf(stderr,
b95fbc
 	    "  --install    -i  Install over the current bootsector\n"
b95fbc
 	    "  --update     -U  Update a previous installation\n"
b95fbc
-	    "  --zip        -z  Force zipdrive geometry (-H 64 -S 32)\n"
b95fbc
+	    "  --zipdrive   -z  Force zipdrive geometry (-H 64 -S 32)\n"
b95fbc
 	    "  --sectors=#  -S  Force the number of sectors per track\n"
b95fbc
 	    "  --heads=#    -H  Force number of heads\n"
b95fbc
 	    "  --stupid     -s  Slow, safe and stupid mode\n"
b95fbc
-	    "  --raid       -r  Fall back to the next device on boot failure\n"
b95fbc
+	    "  --raid-mode  -r  Fall back to the next device on boot failure\n"
b95fbc
 	    "  --once=...   %s  Execute a command once upon boot\n"
b95fbc
 	    "  --clear-once -O  Clear the boot-once command\n"
b95fbc
 	    "  --reset-adv      Reset auxilliary data\n",
b95fbc
diff -urpN syslinux-4.05/man/isohybrid.1.options syslinux-4.05/man/isohybrid.1
b95fbc
--- syslinux-4.05/man/isohybrid.1.options	2014-01-20 14:10:08.950685806 -0500
b95fbc
+++ syslinux-4.05/man/isohybrid.1	2014-01-20 14:10:01.468709289 -0500
b95fbc
@@ -0,0 +1,61 @@
b95fbc
+.TH isohybrid 1 "17 Jan 2014" "isohybrid"
b95fbc
+.SH "NAME"
b95fbc
+isohybrid \(em Post-process an ISO 9660 image generated with mkisofs or
b95fbc
+genisoimage to allow hybrid booting as a CD-ROM or as a hard disk.
b95fbc
+.SH "SYNOPSIS"
b95fbc
+.B isohybrid
b95fbc
+[\fBOPTIONS\fP]
b95fbc
+.I <boot.iso>
b95fbc
+.SH "DESCRIPTION"
b95fbc
+.PP
b95fbc
+The \fBisohybrid\fR utility modifies a an ISO 9660 image generated with
b95fbc
+mkisofs, genisoimage, or compatible utilities, to be bootable as a CD-ROM or
b95fbc
+as a hard disk.
b95fbc
+.SH "OPTIONS"
b95fbc
+.TP
b95fbc
+\fB-h\fR \fI<X>\fR\fN
b95fbc
+.br
b95fbc
+Number of default geometry heads
b95fbc
+.TP
b95fbc
+\fB-s\fR \fI<X>\fR
b95fbc
+.br
b95fbc
+Number of default geometry sectors
b95fbc
+.TP
b95fbc
+\fB-e\fR \fI<X>\fR, \fB--entry\fR \fI<X>\fR
b95fbc
+Specify parititon entry number (1-4)
b95fbc
+.TP
b95fbc
+\fB-o\fR \fI<X>\fR, \fB--offset\fR \fI<X>\fR
b95fbc
+.br
b95fbc
+Specify partition offset (default 0)
b95fbc
+.TP
b95fbc
+\fB-t\fR \fI<X>\fR, \fB--type\fR \fI<X>\fR
b95fbc
+.br
b95fbc
+Specify MBR ID (default random)
b95fbc
+.TP
b95fbc
+\fB-u\fR, \fB--uefi\fB
b95fbc
+Build EFI bootable image
b95fbc
+.TP
b95fbc
+\fB-m\fR, \fB--mac\fB
b95fbc
+Add Apple File Protocol partition table support
b95fbc
+.TP
b95fbc
+\fB--forcehd0\fR
b95fbc
+Assume we are laoded as disk ID 0
b95fbc
+.TP
b95fbc
+\fB--ctrlhd0\fR
b95fbc
+Assume disk ID 0 if the Ctrl key is pressed
b95fbc
+.TP
b95fbc
+\fB--partok\fR
b95fbc
+Allow booting from within a partition
b95fbc
+.TP
b95fbc
+\fB-?\fR, \fB--help\fR
b95fbc
+Display help
b95fbc
+.TP
b95fbc
+\fB-v\fR, \fB--verbose\fR
b95fbc
+Display verbose output
b95fbc
+.TP
b95fbc
+\fB-V\fR, \fB--version\fR
b95fbc
+Display version information
b95fbc
+
b95fbc
+.SH "SEE ALSO"
b95fbc
+.PP
b95fbc
+\fBmkisofs\fR(1)
b95fbc
diff -urpN syslinux-4.05/man/memdiskfind.1.options syslinux-4.05/man/memdiskfind.1
b95fbc
--- syslinux-4.05/man/memdiskfind.1.options	2014-01-20 14:10:30.474618196 -0500
b95fbc
+++ syslinux-4.05/man/memdiskfind.1	2014-01-20 14:10:26.087632002 -0500
b95fbc
@@ -0,0 +1,10 @@
b95fbc
+.TH memdiskfind 1 "17 Jan 2014" "memdiskfind"
b95fbc
+.SH "NAME"
b95fbc
+memdiskfind \(em Simple utility to find a resident \fBmemdisk\fR instance.
b95fbc
+.SH "SYNOPSIS"
b95fbc
+.B memdiskfind
b95fbc
+.SH "DESCRIPTION"
b95fbc
+.PP
b95fbc
+The \fBmemdiskfind\fR utility searches memory for a \fBmemdisk\fR instance,
b95fbc
+and, if found, outputs the parameters needed to use the \fphram\fR driver in
b95fbc
+Linux to map it.
b95fbc
diff -urpN syslinux-4.05/man/syslinux.1.options syslinux-4.05/man/syslinux.1
b95fbc
--- syslinux-4.05/man/syslinux.1.options	2014-01-20 14:01:00.005389882 -0500
b95fbc
+++ syslinux-4.05/man/syslinux.1	2014-01-20 14:09:41.886770720 -0500
b95fbc
@@ -83,6 +83,12 @@ Override the detected number of sectors
b95fbc
 .TP
b95fbc
 \fB\-z\fP, \fB\-\-zipdrive\fP
b95fbc
 Assume zipdrive geometry (\fI\-\-heads 64 \-\-sectors 32).
b95fbc
+.TP
b95fbc
+\fB\-\-reset\-adv\fP
b95fbc
+Reset auxilliary data.
b95fbc
+.TP
b95fbc
+\fB\-M\fP, \fB\-\-menu\-save\fP
b95fbc
+Set the label to select as default on the next boot.
b95fbc
 .SH FILES
b95fbc
 .SS "Configuration file"
b95fbc
 All the configurable defaults in \s-1SYSLINUX\s+1 can be changed by putting a