[install-guide] Updated btrfs creation procedure; placed shared paras in their own files

Jack Reed jjr at fedoraproject.org
Tue May 21 06:10:54 UTC 2013


commit 79bab0f955ed7d77ac72a2354d84919ba2681977
Author: Jack Reed <jreed at redhat.com>
Date:   Tue May 21 16:10:44 2013 +1000

    Updated btrfs creation procedure; placed shared paras in their own files

 en-US/Create_Btrfs-common-procedure.xml            |   26 +++++++++++--------
 en-US/Create_LVM-Btrfs-common-para-1.xml           |    8 ++++++
 en-US/Create_LVM-Btrfs-common-para-2.xml           |    8 ++++++
 en-US/Create_LVM-Btrfs-common-para-3.xml           |    8 ++++++
 en-US/Create_LVM-x86.xml                           |   17 ++++--------
 ...Software_RAID-Btrfs-common-procedure-para-5.xml |    2 +-
 6 files changed, 46 insertions(+), 23 deletions(-)
---
diff --git a/en-US/Create_Btrfs-common-procedure.xml b/en-US/Create_Btrfs-common-procedure.xml
index f83ac7c..5050ccc 100644
--- a/en-US/Create_Btrfs-common-procedure.xml
+++ b/en-US/Create_Btrfs-common-procedure.xml
@@ -18,18 +18,22 @@
 	  
 	  <step>
 	    <para>
-		 Two checkboxes will appear beneath the <guilabel>File System</guilabel> dropdown menu, which is grayed out for Btrfs. If you want to add a RAID level to the subvolume, choose one by checking the required boxes. If not, skip to step 5.
+	      Beneath the <guilabel>File System</guilabel> dropdown menu (which is grayed out for Btrfs), an additional menu will appear: <guilabel>Volume Group</guilabel>. This menu will display a newly-created volume group name, such as <guilabel>fedora00</guilabel>. If this group and its default settings (no RAID level, automatic sizing) are acceptable, skip to step 5.
 	    </para>
-	    
-	    <xi:include href="Create_Software_RAID-Btrfs-common-procedure-para-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> 
-	      <!--  Next to each checkbox, any disk space that will be gained or lost  -->
-	      
-	    <xi:include href="Create_Software_RAID-Btrfs-common-procedure-para-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> 
-	      <!--  The checkboxes required for each RAID level are:  -->
-	    
-	      <xi:include href="Create_Btrfs-common-variablelist-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> 
-	      <!--  Optimized performance (stripe)  --> <xi:include href="Create_Software_RAID-common-note-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> 
-	      <!--  If both Redundancy (mirror) and Optimized performance (stripe) are checked  -->	      
+	  </step>
+	  
+	  <step>
+	    <xi:include href="Create_LVM-Btrfs-common-para-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <!--  To edit the group, click Modify  --> <xi:include href="Create_LVM-Btrfs-common-para-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <!--  Alternatively, click the dropdown menu  --> <xi:include href="Create_LVM-Btrfs-common-para-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <!--  Click Save once the group is configured  --> 
+	 
+	 <note>
+	   <para>
+		    Only RAID 0 and RAID 1 are available for btrfs subvolumes.
+	   </para>
+	 </note>
+	 
 	  </step>
 	  <step>
 
diff --git a/en-US/Create_LVM-Btrfs-common-para-1.xml b/en-US/Create_LVM-Btrfs-common-para-1.xml
new file mode 100644
index 0000000..d791049
--- /dev/null
+++ b/en-US/Create_LVM-Btrfs-common-para-1.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!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 "Installation_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<para>
+	To edit the group, click <guibutton>Modify</guibutton> to open the <guilabel>Configure Volume Group</guilabel> dialog. Choose a name and select which disks will be included. Optionally, select a RAID level and a Sizing Policy (choose between <guilabel>Automatic</guilabel>, <guilabel>As large as possible</guilabel>, and <guilabel>Fixed</guilabel>, to set the size manually). For information on RAID levels, refer to <xref linkend="Create_Software_RAID-x86" />.
+</para>
\ No newline at end of file
diff --git a/en-US/Create_LVM-Btrfs-common-para-2.xml b/en-US/Create_LVM-Btrfs-common-para-2.xml
new file mode 100644
index 0000000..dce7b7e
--- /dev/null
+++ b/en-US/Create_LVM-Btrfs-common-para-2.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!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 "Installation_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<para>
+	Alternatively, click the dropdown menu and select <guilabel>Create a new volume group</guilabel> to add an additional group using the same dialog.
+</para>
\ No newline at end of file
diff --git a/en-US/Create_LVM-Btrfs-common-para-3.xml b/en-US/Create_LVM-Btrfs-common-para-3.xml
new file mode 100644
index 0000000..da73b3d
--- /dev/null
+++ b/en-US/Create_LVM-Btrfs-common-para-3.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!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 "Installation_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<para>
+	Click <guibutton>Save</guibutton> once the group is configured.
+</para>
\ No newline at end of file
diff --git a/en-US/Create_LVM-x86.xml b/en-US/Create_LVM-x86.xml
index ba90e2b..e4fe830 100644
--- a/en-US/Create_LVM-x86.xml
+++ b/en-US/Create_LVM-x86.xml
@@ -46,21 +46,16 @@
 	  
 	  <step>
 	    <para>
-		 An additional dropdown menu will appear: <guilabel>Volume Group</guilabel>. The menu will display a newly-created volume group name, such as <guilabel>fedora</guilabel>. If this group and its default settings (no RAID level, automatic sizing) are acceptable, skip to step 5.
-	      </para>
+		An additional dropdown menu will appear: <guilabel>Volume Group</guilabel>. The menu will display a newly-created volume group name, such as <guilabel>fedora</guilabel>. If this group and its default settings (no RAID level, automatic sizing) are acceptable, skip to step 5.
+	    </para>
 	  </step>
 	      
 	  <step>
-	      <para>
-		To edit the group, click <guibutton>Modify</guibutton> to open the <guilabel>Configure Volume Group</guilabel> dialog. Choose a name and select which disks will be included. Optionally, select a RAID level and a Sizing Policy (choose between <guilabel>Automatic</guilabel>, <guilabel>As large as possible</guilabel>, and <guilabel>Fixed</guilabel>, to set the size manually). For information on RAID levels, refer to <xref linkend="Create_Software_RAID-x86" />
-	      </para>
-	      <para>
-		Alternatively, click the dropdown menu and select <guilabel>Create a new volume group</guilabel> to add an additional group using the same dialog.
-	      </para>
+	    <xi:include href="Create_LVM-Btrfs-common-para-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <!--  To edit the group, click Modify  --> <xi:include href="Create_LVM-Btrfs-common-para-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <!--  Alternatively, click the dropdown menu  --> <xi:include href="Create_LVM-Btrfs-common-para-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <!--  Click Save once the group is configured  --> 
 
-	      <para>
-		Click <guibutton>Save</guibutton> once the group is configured.
-	      </para>
 	  </step>
 	  
 	  <step>
diff --git a/en-US/Create_Software_RAID-Btrfs-common-procedure-para-5.xml b/en-US/Create_Software_RAID-Btrfs-common-procedure-para-5.xml
index 0cf9a7a..e1ffda3 100644
--- a/en-US/Create_Software_RAID-Btrfs-common-procedure-para-5.xml
+++ b/en-US/Create_Software_RAID-Btrfs-common-procedure-para-5.xml
@@ -4,6 +4,6 @@
 %BOOK_ENTITIES;
 ]>
 <para>
-	Click <guibutton>Apply Changes</guibutton> to save your changes, and either continue with another partition or click <guibutton>Finish Partitioning</guibutton> to return to the Installation Summary Menu.
+	Click <guibutton>Update Settings</guibutton> to save your changes, and either continue with another partition or click <guibutton>Done</guibutton> to return to the Installation Summary Menu.
 </para>
 


More information about the docs-commits mailing list