summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatěj Laitl <matej@laitl.cz>2011-10-11 21:34:21 +0200
committerMatěj Laitl <matej@laitl.cz>2011-10-11 21:34:21 +0200
commit9acebcb3e81dad662f6ada986c2dd9185fc8d181 (patch)
tree79aba129fe64fe3d83820d4f40f1297be36c7fea
parentGRUB 2 Guide: move 'Pre-Configuring GRUB 2 to use EFI' section where it chron... (diff)
downloadscarabeus-9acebcb3e81dad662f6ada986c2dd9185fc8d181.tar.gz
scarabeus-9acebcb3e81dad662f6ada986c2dd9185fc8d181.tar.bz2
scarabeus-9acebcb3e81dad662f6ada986c2dd9185fc8d181.zip
GRUB 2 Guide: minor corrections, mention emerge command not to confuse user when she should emerge
-rw-r--r--docs/grub-2-guide.xml20
1 files changed, 13 insertions, 7 deletions
diff --git a/docs/grub-2-guide.xml b/docs/grub-2-guide.xml
index a0d1e8f..935f111 100644
--- a/docs/grub-2-guide.xml
+++ b/docs/grub-2-guide.xml
@@ -116,7 +116,7 @@ Handbook</uri> for that task.
</section>
<section>
-<title>Setting Useflags</title>
+<title>Setting Useflags and Emerging</title>
<body>
<p>
@@ -143,10 +143,14 @@ GRUB_PLATFORMS="pc"
</note>
<warn>
-One should be really carefull with custom-cflags IUSE, as some CFLAGS can
+One should be really careful with custom-cflags USE flag, as some CFLAGS can
easily render your system impossible to boot.
</warn>
+<pre caption="Emerging GRUB 2">
+# <i>emerge --ask --tree --verbose sys-boot/grub:2</i>
+</pre>
+
</body>
</section>
@@ -155,7 +159,7 @@ easily render your system impossible to boot.
<body>
<note>
-This variant requires that you have "pc" in your GDUB_PLATFORMS. Your hardware
+This variant requires that you have "pc" in your GRUB_PLATFORMS. Your hardware
also needs to have a PC-BIOS or to emulate it.
</note>
@@ -177,14 +181,14 @@ failed.
</section>
<section>
-<title>Variant B: Pre-Configuring GRUB 2 to use EFI</title>
+<title>Variant B: Installing GRUB 2 on Hardware That Supports EFI</title>
<body>
<p>
Some newer PCs (and all Intel Macs) come with
<uri link="http://en.wikipedia.org/wiki/Extensible_Firmware_Interface">EFI</uri>
(UEFI to be correct) as a replacement for legacy
-and aging BIOS firmware. EFI usually can emulate BIOS environment for OS, but
+and ageing BIOS firmware. EFI usually can emulate BIOS environment for OS, but
that also hides some unique features of EFI such as faster boot times, support
for GPT partition tables, etc. EFI firmware comes in two flavours - 32bit and
64bit and unless you have early Intel-based Mac with 32bit processor, your
@@ -208,7 +212,7 @@ or 3.0 in order to successfully boot.
<p>
One big difference between BIOS and EFI is that EFI is able to read partition
tables (both MBR and GPT formats should be supported) and to read from a specially
-labeled FAT32 partition called <b>EFI System Partition</b>. During bootup, EFI
+labelled FAT32 partition called <b>EFI System Partition</b>. During bootup, EFI
firmware can execute <e>EFI applications</e> stored in files in EFI System
Partition. One special EFI application is a bootloader. You may use the EFI
System Partition as your <c>/boot</c> partition if you don't mind limitations
@@ -285,7 +289,9 @@ use it at all.
</p>
<p>
-After you have prepared your HDDs, you can easily proceed with generating the
+TODO: grub image
+
+After you have prepared your GAGA, you can easily proceed with generating the
configuration.
</p>