Hi,
in the current grub.pdf are quite some overfull hboxes.
Here is my attempt to insert line-breaks (some of them
do not look very nice, but most of them are ok):
regards
--
Bernhard
--------------------------------------------------------------------------------------cut
here ---
--- grub-org.texi 2017-04-25 16:23:16.000000000 +0200
+++ grub.texi 2017-12-18 10:21:15.444608965 +0100
@@ -1261,7 +1261,8 @@
For example, if you have:
@verbatim
-menuentry 'Example GNU/Linux distribution' --class gnu-linux --id
example-gnu-linux {
+menuentry 'Example GNU/Linux distribution' \
+ --class gnu-linux --id example-gnu-linux {
...
}
@end verbatim
@@ -1357,7 +1358,8 @@
@samp{util/spkmodem-recv.c} and run:
@example
-parecord --channels=1 --rate=48000 --format=s16le | ./spkmodem-recv
+parecord --channels=1 --rate=48000 --format=s16le |\
+ ./spkmodem-recv
@end example
The default is to use the platform's native terminal output.
@@ -1785,12 +1787,17 @@
menuentry "FreeBSD" @{
insmod zfs
- search --set=root --label freepool --hint hd0,msdos7
+ search --set=root --label freepool \
+ --hint hd0,msdos7
kfreebsd /freebsd@@/boot/kernel/kernel
- kfreebsd_module_elf /freebsd@@/boot/kernel/opensolaris.ko
- kfreebsd_module_elf /freebsd@@/boot/kernel/zfs.ko
- kfreebsd_module /freebsd@@/boot/zfs/zpool.cache
type=/boot/zfs/zpool.cache
- set kFreeBSD.vfs.root.mountfrom=zfs:freepool/freebsd
+ kfreebsd_module_elf \
+ /freebsd@@/boot/kernel/opensolaris.ko
+ kfreebsd_module_elf \
+ /freebsd@@/boot/kernel/zfs.ko
+ kfreebsd_module /freebsd@@/boot/zfs/zpool.cache \
+ type=/boot/zfs/zpool.cache
+ set kFreeBSD.vfs.root.mountfrom=\
+\ \ zfs:freepool/freebsd
set kFreeBSD.hw.psm.synaptics_support=1
@}
@@ -1801,20 +1808,26 @@
menuentry "Fedora 16 installer" @{
search --set=root --label GRUB --hint hd0,msdos5
- linux /fedora/vmlinuz lang=en_US keymap=sg resolution=1280x800
+ linux /fedora/vmlinuz lang=en_US keymap=sg \
+ resolution=1280x800
initrd /fedora/initrd.img
@}
menuentry "Fedora rawhide installer" @{
search --set=root --label GRUB --hint hd0,msdos5
- linux /fedora/vmlinuz
repo=ftp://mirror.switch.ch/mirror/fedora/linux/development/rawhide/x86_64
lang=en_US keymap=sg resolution=1280x800
+ linux /fedora/vmlinuz \
+ repo=ftp://mirror.switch.ch/mirror/fedora/\
+\ \ \ linux/development/rawhide/x86_64 \
+ lang=en_US keymap=sg resolution=1280x800
initrd /fedora/initrd.img
@}
menuentry "Debian sid installer" @{
search --set=root --label GRUB --hint hd0,msdos5
- linux
/debian/dists/sid/main/installer-amd64/current/images/hd-media/vmlinuz
- initrd
/debian/dists/sid/main/installer-amd64/current/images/hd-media/initrd.gz
+ linux /debian/dists/sid/main/installer-amd64/\
+\ \ current/images/hd-media/vmlinuz
+ initrd /debian/dists/sid/main/installer-amd64/\
+\ \ current/images/hd-media/initrd.gz
@}
@end example
@@ -1882,7 +1895,8 @@
set prefix=($root)/boot/grub
configfile /boot/grub/example/test2.cfg
else
- echo "Could not find an example configuration file!"
+ echo \
+ "Could not find an example configuration file!"
fi
fi
@end group
@@ -2392,7 +2406,8 @@
@example
@group
-grub-mknetdir --net-directory=/srv/tftp --subdir=/boot/grub -d
/usr/lib/grub/<platform>
+grub-mknetdir --net-directory=/srv/tftp \
+ --subdir=/boot/grub -d /usr/lib/grub/<platform>
@end group
@end example
@@ -2400,7 +2415,8 @@
@example
@group
-grub-mknetdir --net-directory=/srv/tftp --subdir=/boot/grub -d
/usr/lib/grub/i386-pc
+grub-mknetdir --net-directory=/srv/tftp \
+ --subdir=/boot/grub -d /usr/lib/grub/i386-pc
@end group
@end example
@@ -2554,13 +2570,13 @@
To discover the address do the following:
@itemize
@item boot normally
-@item
+@item enter manually:
@example
sudo modprobe nvram
sudo cat /dev/nvram | xxd > normal_button.txt
@end example
@item boot using vendor button
-@item
+@item enter manually:
@example
sudo modprobe nvram
sudo cat /dev/nvram | xxd > normal_vendor.txt
@@ -2764,7 +2780,8 @@
The device syntax is like this:
@example
-@code{(@var{device}[,@var{partmap-name1}@var{part-num1}[,@var{partmap-name2}@var{part-num2}[,...]]])}
+@code{(@var{device}[,@var{partmap-name1}@var{part-num1}\
+ [,@var{partmap-name2}@var{part-num2}[,...]]])}
@end example
@samp{[]} means the parameter is optional. @var{device} depends on the disk
@@ -2796,7 +2813,8 @@
(cryptouuid/123456789abcdef0123456789abcdef0)
(mduuid/123456789abcdef0123456789abcdef0)
(lvm/system-root)
-(lvmid/F1ikgD-2RES-306G-il9M-7iwa-4NKW-EbV1NV/eLGuCQ-L4Ka-XUgR-sjtJ-ffch-bajr-fCNfz5)
+(lvmid/F1ikgD-2RES-306G-il9M-7iwa-4NKW-EbV1NV\
+/eLGuCQ-L4Ka-XUgR-sjtJ-ffch-bajr-fCNfz5)
(md/myraid)
(md/0)
(ieee1275/disk2)
@@ -3226,7 +3244,9 @@
For example, if you have:
@verbatim
-menuentry 'Example GNU/Linux distribution' --class gnu-linux --id
example-gnu-linux {
+menuentry 'Example GNU/Linux distribution' \
+ --class gnu-linux \
+ --id example-gnu-linux {
...
}
@end verbatim
@@ -5523,7 +5543,8 @@
@example
@group
set superusers="root"
-password_pbkdf2 root grub.pbkdf2.sha512.10000.biglongstring
+password_pbkdf2 root \
+ grub.pbkdf2.sha512.10000.biglongstring
password user1 insecure
menuentry "May be run by any user" --unrestricted @{
@@ -5536,7 +5557,8 @@
linux /vmlinuz single
@}
-menuentry "May be run by user1 or a superuser" --users user1 @{
+menuentry "May be run by user1 or a superuser" \
+ --users user1 @{
set root=(hd0,2)
chainloader +1
@}
@@ -5601,10 +5623,13 @@
@example
@group
-# Edit /dev/shm/passphrase.txt to contain your signing key's passphrase
-for i in `find /boot -name "*.cfg" -or -name "*.lst" -or \
- -name "*.mod" -or -name "vmlinuz*" -or -name "initrd*" -or \
- -name "grubenv"`;
+# Edit /dev/shm/passphrase.txt to contain your signing
+# key's passphrase
+for i in `find /boot -name "*.cfg" \
+ -or -name "*.lst" \
+ -or -name "*.mod" -or -name "vmlinuz*" \
+ -or -name "initrd*" \
+ -or -name "grubenv"`;
do
gpg --batch --detach-sign --passphrase-fd 0 $i < \
/dev/shm/passphrase.txt
@@ -5941,7 +5966,7 @@
Following variables must be defined:
-@multitable @columnfractions .30 .65
+@multitable @columnfractions .38 .60
@item GRUB_PAYLOADS_DIR @tab directory containing the required kernels
@item GRUB_CBFSTOOL @tab cbfstool from Coreboot package (for coreboot platform
only)
@item GRUB_COREBOOT_ROM @tab empty Coreboot ROM--- grub-org.texi
2017-04-25 16:23:16.000000000 +0200
+++ grub.texi 2017-12-18 10:21:15.444608965 +0100
@@ -1261,7 +1261,8 @@
For example, if you have:
@verbatim
-menuentry 'Example GNU/Linux distribution' --class gnu-linux --id
example-gnu-linux {
+menuentry 'Example GNU/Linux distribution' \
+ --class gnu-linux --id example-gnu-linux {
...
}
@end verbatim
@@ -1357,7 +1358,8 @@
@samp{util/spkmodem-recv.c} and run:
@example
-parecord --channels=1 --rate=48000 --format=s16le | ./spkmodem-recv
+parecord --channels=1 --rate=48000 --format=s16le |\
+ ./spkmodem-recv
@end example
The default is to use the platform's native terminal output.
@@ -1785,12 +1787,17 @@
menuentry "FreeBSD" @{
insmod zfs
- search --set=root --label freepool --hint hd0,msdos7
+ search --set=root --label freepool \
+ --hint hd0,msdos7
kfreebsd /freebsd@@/boot/kernel/kernel
- kfreebsd_module_elf /freebsd@@/boot/kernel/opensolaris.ko
- kfreebsd_module_elf /freebsd@@/boot/kernel/zfs.ko
- kfreebsd_module /freebsd@@/boot/zfs/zpool.cache
type=/boot/zfs/zpool.cache
- set kFreeBSD.vfs.root.mountfrom=zfs:freepool/freebsd
+ kfreebsd_module_elf \
+ /freebsd@@/boot/kernel/opensolaris.ko
+ kfreebsd_module_elf \
+ /freebsd@@/boot/kernel/zfs.ko
+ kfreebsd_module /freebsd@@/boot/zfs/zpool.cache \
+ type=/boot/zfs/zpool.cache
+ set kFreeBSD.vfs.root.mountfrom=\
+\ \ zfs:freepool/freebsd
set kFreeBSD.hw.psm.synaptics_support=1
@}
@@ -1801,20 +1808,26 @@
menuentry "Fedora 16 installer" @{
search --set=root --label GRUB --hint hd0,msdos5
- linux /fedora/vmlinuz lang=en_US keymap=sg resolution=1280x800
+ linux /fedora/vmlinuz lang=en_US keymap=sg \
+ resolution=1280x800
initrd /fedora/initrd.img
@}
menuentry "Fedora rawhide installer" @{
search --set=root --label GRUB --hint hd0,msdos5
- linux /fedora/vmlinuz
repo=ftp://mirror.switch.ch/mirror/fedora/linux/development/rawhide/x86_64
lang=en_US keymap=sg resolution=1280x800
+ linux /fedora/vmlinuz \
+ repo=ftp://mirror.switch.ch/mirror/fedora/\
+\ \ \ linux/development/rawhide/x86_64 \
+ lang=en_US keymap=sg resolution=1280x800
initrd /fedora/initrd.img
@}
menuentry "Debian sid installer" @{
search --set=root --label GRUB --hint hd0,msdos5
- linux
/debian/dists/sid/main/installer-amd64/current/images/hd-media/vmlinuz
- initrd
/debian/dists/sid/main/installer-amd64/current/images/hd-media/initrd.gz
+ linux /debian/dists/sid/main/installer-amd64/\
+\ \ current/images/hd-media/vmlinuz
+ initrd /debian/dists/sid/main/installer-amd64/\
+\ \ current/images/hd-media/initrd.gz
@}
@end example
@@ -1882,7 +1895,8 @@
set prefix=($root)/boot/grub
configfile /boot/grub/example/test2.cfg
else
- echo "Could not find an example configuration file!"
+ echo \
+ "Could not find an example configuration file!"
fi
fi
@end group
@@ -2392,7 +2406,8 @@
@example
@group
-grub-mknetdir --net-directory=/srv/tftp --subdir=/boot/grub -d
/usr/lib/grub/<platform>
+grub-mknetdir --net-directory=/srv/tftp \
+ --subdir=/boot/grub -d /usr/lib/grub/<platform>
@end group
@end example
@@ -2400,7 +2415,8 @@
@example
@group
-grub-mknetdir --net-directory=/srv/tftp --subdir=/boot/grub -d
/usr/lib/grub/i386-pc
+grub-mknetdir --net-directory=/srv/tftp \
+ --subdir=/boot/grub -d /usr/lib/grub/i386-pc
@end group
@end example
@@ -2554,13 +2570,13 @@
To discover the address do the following:
@itemize
@item boot normally
-@item
+@item enter manually:
@example
sudo modprobe nvram
sudo cat /dev/nvram | xxd > normal_button.txt
@end example
@item boot using vendor button
-@item
+@item enter manually:
@example
sudo modprobe nvram
sudo cat /dev/nvram | xxd > normal_vendor.txt
@@ -2764,7 +2780,8 @@
The device syntax is like this:
@example
-@code{(@var{device}[,@var{partmap-name1}@var{part-num1}[,@var{partmap-name2}@var{part-num2}[,...]]])}
+@code{(@var{device}[,@var{partmap-name1}@var{part-num1}\
+ [,@var{partmap-name2}@var{part-num2}[,...]]])}
@end example
@samp{[]} means the parameter is optional. @var{device} depends on the disk
@@ -2796,7 +2813,8 @@
(cryptouuid/123456789abcdef0123456789abcdef0)
(mduuid/123456789abcdef0123456789abcdef0)
(lvm/system-root)
-(lvmid/F1ikgD-2RES-306G-il9M-7iwa-4NKW-EbV1NV/eLGuCQ-L4Ka-XUgR-sjtJ-ffch-bajr-fCNfz5)
+(lvmid/F1ikgD-2RES-306G-il9M-7iwa-4NKW-EbV1NV\
+/eLGuCQ-L4Ka-XUgR-sjtJ-ffch-bajr-fCNfz5)
(md/myraid)
(md/0)
(ieee1275/disk2)
@@ -3226,7 +3244,9 @@
For example, if you have:
@verbatim
-menuentry 'Example GNU/Linux distribution' --class gnu-linux --id
example-gnu-linux {
+menuentry 'Example GNU/Linux distribution' \
+ --class gnu-linux \
+ --id example-gnu-linux {
...
}
@end verbatim
@@ -5523,7 +5543,8 @@
@example
@group
set superusers="root"
-password_pbkdf2 root grub.pbkdf2.sha512.10000.biglongstring
+password_pbkdf2 root \
+ grub.pbkdf2.sha512.10000.biglongstring
password user1 insecure
menuentry "May be run by any user" --unrestricted @{
@@ -5536,7 +5557,8 @@
linux /vmlinuz single
@}
-menuentry "May be run by user1 or a superuser" --users user1 @{
+menuentry "May be run by user1 or a superuser" \
+ --users user1 @{
set root=(hd0,2)
chainloader +1
@}
@@ -5601,10 +5623,13 @@
@example
@group
-# Edit /dev/shm/passphrase.txt to contain your signing key's passphrase
-for i in `find /boot -name "*.cfg" -or -name "*.lst" -or \
- -name "*.mod" -or -name "vmlinuz*" -or -name "initrd*" -or \
- -name "grubenv"`;
+# Edit /dev/shm/passphrase.txt to contain your signing
+# key's passphrase
+for i in `find /boot -name "*.cfg" \
+ -or -name "*.lst" \
+ -or -name "*.mod" -or -name "vmlinuz*" \
+ -or -name "initrd*" \
+ -or -name "grubenv"`;
do
gpg --batch --detach-sign --passphrase-fd 0 $i < \
/dev/shm/passphrase.txt
@@ -5941,7 +5966,7 @@
Following variables must be defined:
-@multitable @columnfractions .30 .65
+@multitable @columnfractions .38 .60
@item GRUB_PAYLOADS_DIR @tab directory containing the required kernels
@item GRUB_CBFSTOOL @tab cbfstool from Coreboot package (for coreboot platform
only)
@item GRUB_COREBOOT_ROM @tab empty Coreboot ROM
_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel
