[install-guide] Restoring btrfs and re-ordering partition/file system descriptions

[Jack Reed]

commit c47987f56aa8fb8a565bca2d78e2cd7310db4ac3
Author: Jack Reed <jreed(a)redhat.com&gt;
Date:   Fri Dec 7 11:26:32 2012 +1000

    Restoring btrfs and re-ordering partition/file system descriptions

 ...titions-section-2-itemizedlist-1-listitem-0.xml |   24 ++++++++++++++++++++
 .../Adding_Partitions-section-2-itemizedlist-1.xml |    8 +++---
 .../Adding_Partitions-section-2-itemizedlist-2.xml |    6 ++--
 en-US/File_System_Types-x86.xml                    |    4 +-
 4 files changed, 33 insertions(+), 9 deletions(-)
---
diff --git a/en-US/Adding_Partitions-section-2-itemizedlist-1-listitem-0.xml
b/en-US/Adding_Partitions-section-2-itemizedlist-1-listitem-0.xml
new file mode 100644
index 0000000..6326fe2
--- /dev/null
+++ b/en-US/Adding_Partitions-section-2-itemizedlist-1-listitem-0.xml
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE listitem PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<listitem>
+	<para>
+		<guilabel>Btrfs</guilabel> &mdash; Btrfs is under development as a file
system capable of addressing and managing more files, larger files, and larger volumes
than the ext2, ext3, and ext4 file systems. Btrfs is designed to make the file system
tolerant of errors, and to facilitate the detection and repair of errors when they occur.
It uses checksums to ensure the validity of data and metadata, and maintains snapshots of
the file system that can be used for backup or repair.
+	</para>
+	 <para>
+		Because Btrfs is still experimental and under development, the installation program
does not offer it by default. If you want to create a Btrfs partition on a drive, you must
commence the installation process with the boot option <command>
btrfs</command>. Refer to <xref linkend="ap-admin-options" /> for
instructions.
+	</para>
+	 <warning>
+		<title>Btrfs is still experimental</title>
+		 <para>
+			Fedora &PRODVER; includes Btrfs as a technology preview to allow you to experiment
with this file system. You should not choose Btrfs for partitions that will contain
valuable data or that are essential for the operation of important systems.
+		</para>
+	</warning>
+	<note> 
+		<title>Btrfs is not supported for LiveCD installs</title>
+		<para> Installation using Btrfs is not supported for LiveCD installs as the
installer needs the btrfs option passed and btrfs-progs to be installed. 
+		</para>
+	</note>
+</listitem>
\ No newline at end of file
diff --git a/en-US/Adding_Partitions-section-2-itemizedlist-1.xml
b/en-US/Adding_Partitions-section-2-itemizedlist-1.xml
index 1290579..d0a2c8c 100644
--- a/en-US/Adding_Partitions-section-2-itemizedlist-1.xml
+++ b/en-US/Adding_Partitions-section-2-itemizedlist-1.xml
@@ -6,9 +6,9 @@
 <itemizedlist>
 	<!--  Nota Bene that this file is now only used from the x86 version. The list is now
included in Adding_Partitions-ppc.xml as items, as vfat does appear in the PPC list 
--> <title>Partition types</title>
 	 <xi:include
href="Adding_Partitions-section-2-itemizedlist-1-listitem-8.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
-	 <!--  standard partition  --> <xi:include
href="Adding_Partitions-section-2-itemizedlist-1-listitem-5.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
-	 <!--  swap  --> <xi:include
href="Adding_Partitions-section-2-itemizedlist-1-listitem-4.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
-	 <!--  Sofware RAID  --> <xi:include
href="Adding_Partitions-section-2-itemizedlist-1-listitem-3.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
-	 <!--  LVM  -->
+	 <!--  standard partition  --> <xi:include
href="Adding_Partitions-section-2-itemizedlist-1-listitem-3.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <!--  LVM  --> <xi:include
href="Adding_Partitions-section-2-itemizedlist-1-listitem-4.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <!--  Software RAID  -->  <xi:include
href="Adding_Partitions-section-2-itemizedlist-1-listitem-0.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <!--  btrfs  -->
 </itemizedlist>
 
diff --git a/en-US/Adding_Partitions-section-2-itemizedlist-2.xml
b/en-US/Adding_Partitions-section-2-itemizedlist-2.xml
index 119cc23..a523fa1 100644
--- a/en-US/Adding_Partitions-section-2-itemizedlist-2.xml
+++ b/en-US/Adding_Partitions-section-2-itemizedlist-2.xml
@@ -11,9 +11,9 @@
 	</listitem>
 	 <xi:include
href="Adding_Partitions-section-2-itemizedlist-1-listitem-2.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
 	 <!--  ext3  --> <xi:include
href="Adding_Partitions-section-2-itemizedlist-1-listitem-1.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
-	 <!--  ext2  --> <xi:include
href="Adding_Partitions-section-2-itemizedlist-1-listitem-7.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <!--  ext2  --> <xi:include
href="Adding_Partitions-section-2-itemizedlist-1-listitem-5.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <!--  swap  --> <xi:include
href="Adding_Partitions-section-2-itemizedlist-1-listitem-7.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
 	 <!--  xfs  --> <xi:include
href="Adding_Partitions-section-2-itemizedlist-1-listitem-6.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
-	 <!--  vfat  --> <!-- <xi:include
href="Adding_Partitions-section-2-itemizedlist-1-listitem-0.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
-	 <!--  btrfs  -->
+	 <!--  vfat  -->
 </itemizedlist>
 
diff --git a/en-US/File_System_Types-x86.xml b/en-US/File_System_Types-x86.xml
index 582f38b..c51f3b4 100644
--- a/en-US/File_System_Types-x86.xml
+++ b/en-US/File_System_Types-x86.xml
@@ -14,11 +14,11 @@
 		 <!--  Partition types  --> <xi:include
href="Adding_Partitions-section-2-itemizedlist-2.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
 		 <!--  File systems  -->
 		 
-		 <note>
+		 <!-- <note>
 		   <para>
 		     The Btrfs file system is unavailable in Fedora 17.
 		   </para>
-		 </note>  
+		 </note>  -->
 	</section>