general restructuring

5 files changed, 5 insertions, 14 deletions

diff --git a/.gitignore b/.gitignore
index 94a1092..731ffe5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ en-US/*.ent~
 pot/*.pot~
 *.cfg~
 \#*\#
+*.swp
diff --git a/en-US/GRUB-general.xml b/en-US/GRUB-general.xml
deleted file mode 100644
index f682bc1..0000000
--- a/en-US/GRUB-general.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Fedora_Multiboot_Guide.ent">
-%BOOK_ENTITIES;
-
-]>
-<section id="GRUB-general">
-  <title>GRUB basics</title>
-  <para />
-</section>
diff --git a/en-US/GRUB-reinstalling.xml b/en-US/GRUB-reinstalling.xml
index d5ab1b8..7f599c0 100644
--- a/en-US/GRUB-reinstalling.xml
+++ b/en-US/GRUB-reinstalling.xml
@@ -24,7 +24,7 @@
     <section id="GRUB-reinstalling-mkconfig">
       <title>Refreshing GRUB configuration</title>
       <para>
-        To recreate the GRUB configuration from a booted system, use the <command>grub2-mkconfig</command> utility. The program will scan your system and create menu entries for what it finds. You should also use <command>grub2-mkconfig</command> after customizing menu entries, a process described in <ulink linkend="GRUB-customizing" />
+        To recreate the GRUB configuration from a booted system, use the <command>grub2-mkconfig</command> utility. The program will scan your system and create menu entries for what it finds. You should also use <command>grub2-mkconfig</command> after customizing menu entries, a process described in <xref linkend="GRUB-configuration" />
       </para>
       <para>
         Refresh GRUB configuration on a BIOS system:
diff --git a/en-US/GRUB.xml b/en-US/GRUB.xml
index e43d7d8..3cefa3c 100644
--- a/en-US/GRUB.xml
+++ b/en-US/GRUB.xml
@@ -7,12 +7,12 @@
 <section id="GRUB">
   <title>The GRUB Bootloader</title>
   <para />
-  
+  <!-- Basics -->  
   <xi:include href="GRUB-basics.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
   <!-- Reinstalling GRUB -->
   <xi:include href="GRUB-reinstalling.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
   <!-- temporary and persistent menu entry changes -->
-  <xi:include href="GRUB-customizing.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+  <xi:include href="GRUB-configuration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
   
   
 </section>
diff --git a/en-US/Introduction.xml b/en-US/Introduction.xml
index d6489a4..23dc360 100644
--- a/en-US/Introduction.xml
+++ b/en-US/Introduction.xml
@@ -16,7 +16,7 @@
     When your system starts, it first performs self tests, then loads a bootloader, <application>GRUB</application>. GRUB provides a menu so you can select the Fedora kernel or other operating system you would like to boot, and GRUBs configuration file stores options and settings required for initial booting of the selected operating system. Read <xref linkend="GRUB" /> for more information on GRUB.
   </para>
   <para>
-    Changing Fedora's boot options can be helpful, especially when troubleshooting. <xref linkend="GRUB-customizing" /> explains how to change these options once or permanently.
+    Changing Fedora's boot options can be helpful, especially when troubleshooting. <xref linkend="GRUB-configuration" /> explains how to change these options once or permanently.
   </para>
   <para>
     The system's firmware allows basic configuration, performs initial startup, initializes hardware, and brings up the bootloader. Until recently, this firmware was referred to as the <firstterm>BIOS</firstterm>, or <literal>Basic Input Output System</literal>, which is described in <xref linkend="BOOT-basics" />. Newer systems, such as those sold with Windows 8, use a newer type called <firstterm>UEFI</firstterm> or <literal>Universal Extensible Firmware Interface</literal>, which is described in <xref linkend="BOOT-basics" />