[multiboot-guide] master: Use correct DOCTYPE in headers (275b62b)
immanetize at fedoraproject.org
immanetize at fedoraproject.org
Mon Jan 26 23:44:28 UTC 2015
Repository : http://git.fedorahosted.org/cgit/docs/multiboot-guide.git
On branch : master
>---------------------------------------------------------------
commit 275b62baa5494ec079c809f65d61a327eca26989
Author: Pete Travis <immanetize at fedoraproject.org>
Date: Mon Jan 26 16:43:24 2015 -0700
Use correct DOCTYPE in headers
Copypasta can be easy to make, but xmllint has more refined tastes.
Also restructured a little to correct a markup error.
>---------------------------------------------------------------
en-US/BIOS-general.xml | 2 +-
en-US/BIOS.xml | 2 +-
en-US/BOOT-BIOS_or_UEFI.xml | 2 +-
en-US/BOOT-general.xml | 2 +-
en-US/FAQ.xml | 2 +-
en-US/Free_Space.xml | 4 ++--
en-US/GRUB-basics.xml | 2 +-
en-US/GRUB-configuration.xml | 2 +-
en-US/GRUB-customizing.xml | 2 +-
en-US/GRUB-reinstalling.xml | 16 ++++++----------
en-US/GRUB-runtime.xml | 2 +-
en-US/GRUB.xml | 2 +-
en-US/Introduction.xml | 3 +--
en-US/TODO.xml | 2 +-
en-US/UEFI-apple.xml | 2 +-
en-US/UEFI-general.xml | 2 +-
en-US/UEFI-win.xml | 2 +-
en-US/UEFI.xml | 2 +-
en-US/boot_arguments.xml | 2 +-
en-US/fast_reboot_admonition.xml | 2 +-
20 files changed, 26 insertions(+), 31 deletions(-)
diff --git a/en-US/BIOS-general.xml b/en-US/BIOS-general.xml
index 7be8122..0d5c15c 100644
--- a/en-US/BIOS-general.xml
+++ b/en-US/BIOS-general.xml
@@ -1,5 +1,5 @@
<?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" [
+<!DOCTYPE section 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;
diff --git a/en-US/BIOS.xml b/en-US/BIOS.xml
index ec8454d..8d3cd70 100644
--- a/en-US/BIOS.xml
+++ b/en-US/BIOS.xml
@@ -1,5 +1,5 @@
<?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" [
+<!DOCTYPE section 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;
diff --git a/en-US/BOOT-BIOS_or_UEFI.xml b/en-US/BOOT-BIOS_or_UEFI.xml
index 33d9f19..e022d3a 100644
--- a/en-US/BOOT-BIOS_or_UEFI.xml
+++ b/en-US/BOOT-BIOS_or_UEFI.xml
@@ -1,5 +1,5 @@
<?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" [
+<!DOCTYPE section 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;
diff --git a/en-US/BOOT-general.xml b/en-US/BOOT-general.xml
index c4833a9..23dedab 100644
--- a/en-US/BOOT-general.xml
+++ b/en-US/BOOT-general.xml
@@ -1,5 +1,5 @@
<?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" [
+<!DOCTYPE section 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;
diff --git a/en-US/FAQ.xml b/en-US/FAQ.xml
index 40c0e78..4cada45 100644
--- a/en-US/FAQ.xml
+++ b/en-US/FAQ.xml
@@ -1,5 +1,5 @@
<?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" [
+<!DOCTYPE section 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;
diff --git a/en-US/Free_Space.xml b/en-US/Free_Space.xml
index 1da78c0..babc641 100644
--- a/en-US/Free_Space.xml
+++ b/en-US/Free_Space.xml
@@ -1,5 +1,5 @@
<?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" [
+<!DOCTYPE section 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;
@@ -8,7 +8,7 @@
<title>Making Room for Fedora</title>
<para>
Fedora requires a volume of <emphasis>unallocated</emphasis> storage space for installation. To make room for Fedora, both the existing filesystem and the partition it resides on must be resized.
- </para>
+ </para>
<warning>
<title>Be cautious when resizing!</title>
<para>
diff --git a/en-US/GRUB-basics.xml b/en-US/GRUB-basics.xml
index 6ce6df2..1d8c611 100644
--- a/en-US/GRUB-basics.xml
+++ b/en-US/GRUB-basics.xml
@@ -1,5 +1,5 @@
<?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" [
+<!DOCTYPE section 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;
diff --git a/en-US/GRUB-configuration.xml b/en-US/GRUB-configuration.xml
index 3cb9e17..7649b6f 100644
--- a/en-US/GRUB-configuration.xml
+++ b/en-US/GRUB-configuration.xml
@@ -1,5 +1,5 @@
<?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" [
+<!DOCTYPE section 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;
diff --git a/en-US/GRUB-customizing.xml b/en-US/GRUB-customizing.xml
index 481c790..06bc3ef 100644
--- a/en-US/GRUB-customizing.xml
+++ b/en-US/GRUB-customizing.xml
@@ -1,5 +1,5 @@
<?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" [
+<!DOCTYPE section 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;
diff --git a/en-US/GRUB-reinstalling.xml b/en-US/GRUB-reinstalling.xml
index 2096c83..0745bc4 100644
--- a/en-US/GRUB-reinstalling.xml
+++ b/en-US/GRUB-reinstalling.xml
@@ -1,5 +1,5 @@
<?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" [
+<!DOCTYPE section 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;
@@ -9,6 +9,7 @@
<title>Recreating GRUB</title>
<para>
This section describes the process for reinstalling the GRUB bootloader and recreating the configuration. Unlike legacy GRUB, which required users to manually create entries, GRUB2 will scan the system for bootable systems and automatically create the menu configuration. There are a number of reasons to reinstall GRUB:
+ </para>
<simplelist>
<member>
The boot menu does not include an available operating systems.
@@ -20,11 +21,10 @@
You have chosen not to use <application>anaconda</application> to install grub.
</member>
</simplelist>
- </para>
<section id="GRUB-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 <xref linkend="GRUB-configuration" />
+ 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" /> If Fedora does not boot because of an invalid GRUB configuration, you can perform this procedure to repair it after following the instructions in <xref linkend="common-chroot_from_live" />.
</para>
<para>
Refresh GRUB configuration on a BIOS system:
@@ -41,9 +41,6 @@
<para>
In most cases, this operation will detect any operating system available on your computer and create entries for them in the GRUB menu. Actually reinstalling the GRUB bootloader isn't required, just reconfiguring.
</para>
- <para>
- If Fedora does not boot because of an invalid GRUB configuration, you can perform the procedure above from a <xref linkend="common-chroot_from_live">chroot</xref> to repair it.
- </para>
</section>
<section id="GRUB-reinstalling">
<title>Reinstalling GRUB</title>
@@ -55,6 +52,7 @@
</para>
<section id="GRUB-reinstalling-UEFI">
<title>Reinstalling GRUB on UEFI systems.</title>
+ <para />
<procedure>
<title>Reinstalling GRUB on UEFI systems.</title>
<step>
@@ -122,13 +120,11 @@
</step>
</procedure>
</section>
-
-
- <para />
- </section>
<section id="GRUB-reinstalling-BIOS">
<title>Reinstalling GRUB on BIOS systems.</title>
<para />
</section>
+ </section>
</section>
+
<!-- see TODO.xml for some additional information you may choose to add -->
diff --git a/en-US/GRUB-runtime.xml b/en-US/GRUB-runtime.xml
index 68c6546..35602ba 100644
--- a/en-US/GRUB-runtime.xml
+++ b/en-US/GRUB-runtime.xml
@@ -1,5 +1,5 @@
<?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" [
+<!DOCTYPE section 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;
diff --git a/en-US/GRUB.xml b/en-US/GRUB.xml
index 101e357..0e78652 100644
--- a/en-US/GRUB.xml
+++ b/en-US/GRUB.xml
@@ -1,5 +1,5 @@
<?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" [
+<!DOCTYPE section 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;
diff --git a/en-US/Introduction.xml b/en-US/Introduction.xml
index 93191e7..e7cdcd3 100644
--- a/en-US/Introduction.xml
+++ b/en-US/Introduction.xml
@@ -1,8 +1,7 @@
<?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" [
+<!DOCTYPE section 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="multiboot-introduction">
<title>Introduction</title>
diff --git a/en-US/TODO.xml b/en-US/TODO.xml
index 78fdb30..6cbdbf3 100644
--- a/en-US/TODO.xml
+++ b/en-US/TODO.xml
@@ -1,5 +1,5 @@
<?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"
+<!DOCTYPE section 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;
diff --git a/en-US/UEFI-apple.xml b/en-US/UEFI-apple.xml
index cc1751a..8dc3561 100644
--- a/en-US/UEFI-apple.xml
+++ b/en-US/UEFI-apple.xml
@@ -1,5 +1,5 @@
<?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" [
+<!DOCTYPE section 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;
diff --git a/en-US/UEFI-general.xml b/en-US/UEFI-general.xml
index 1067a86..efcf271 100644
--- a/en-US/UEFI-general.xml
+++ b/en-US/UEFI-general.xml
@@ -1,5 +1,5 @@
<?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" [
+<!DOCTYPE section 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;
diff --git a/en-US/UEFI-win.xml b/en-US/UEFI-win.xml
index 3f62612..bec8137 100644
--- a/en-US/UEFI-win.xml
+++ b/en-US/UEFI-win.xml
@@ -1,5 +1,5 @@
<?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" [
+<!DOCTYPE section 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;
diff --git a/en-US/UEFI.xml b/en-US/UEFI.xml
index e359118..7864b9b 100644
--- a/en-US/UEFI.xml
+++ b/en-US/UEFI.xml
@@ -1,5 +1,5 @@
<?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" [
+<!DOCTYPE section 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;
diff --git a/en-US/boot_arguments.xml b/en-US/boot_arguments.xml
index 96b3bbe..c05af3b 100644
--- a/en-US/boot_arguments.xml
+++ b/en-US/boot_arguments.xml
@@ -1,5 +1,5 @@
<?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" [
+<!DOCTYPE section 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;
diff --git a/en-US/fast_reboot_admonition.xml b/en-US/fast_reboot_admonition.xml
index 5c803e3..0c5eb70 100644
--- a/en-US/fast_reboot_admonition.xml
+++ b/en-US/fast_reboot_admonition.xml
@@ -1,5 +1,5 @@
<?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" [
+<!DOCTYPE caution 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;
]>
More information about the docs-commits
mailing list