[install-guide] Further minor updates to partitioning sections

Jack Reed jjr at fedoraproject.org
Fri May 17 05:56:38 UTC 2013


commit ee6f09386f5cac524377f53767115dd699b165b9
Author: Jack Reed <jreed at redhat.com>
Date:   Fri May 17 15:56:29 2013 +1000

    Further minor updates to partitioning sections

 ...utomatic_Partitioning_common-itemizedlist-1.xml |    4 ++--
 ...utomatic_Partitioning_common-itemizedlist-2.xml |    9 ++-------
 en-US/Automatic_Partitioning_common-para-10.xml    |    2 +-
 en-US/Disk_Partitioning-x86.xml                    |    2 +-
 en-US/Disk_Partitioning_Setup-x86.xml              |    3 +--
 en-US/images/diskpartsetup/install-options.png     |  Bin 15499 -> 23333 bytes
 6 files changed, 7 insertions(+), 13 deletions(-)
---
diff --git a/en-US/Automatic_Partitioning_common-itemizedlist-1.xml b/en-US/Automatic_Partitioning_common-itemizedlist-1.xml
index a7ccecd..f4fc210 100644
--- a/en-US/Automatic_Partitioning_common-itemizedlist-1.xml
+++ b/en-US/Automatic_Partitioning_common-itemizedlist-1.xml
@@ -12,13 +12,13 @@
     
      <listitem>
       <para>
-	click <guibutton>Continue</guibutton> to allow Fedora to automatically configure the partitions for you and return to the Installation Summary Menu
+	select <guilabel>Automatically configure my Fedora installation to the disk(s) I selected...</guilabel> and press <guibutton>Continue</guibutton> to return to the Installation Summary Menu
       </para>
     </listitem>
     
      <listitem>
       <para>
-	check the box labeled <guilabel>Let me customize the partitioning of the disks</guilabel> if you want to create and edit the partitions yourself, then click <guibutton>Continue</guibutton> to reach the <guilabel>Manual Partitioning</guilabel> section (refer to <xref linkend="s1-diskpartitioning-x86" />)
+	select <guilabel>I want to review/modify my disks before continuing</guilabel> to create and edit the partitions yourself, then click <guibutton>Continue</guibutton> to reach the <guilabel>Manual Partitioning</guilabel> section (refer to <xref linkend="s1-diskpartitioning-x86" />)
       </para>
     </listitem>
 </itemizedlist>
diff --git a/en-US/Automatic_Partitioning_common-itemizedlist-2.xml b/en-US/Automatic_Partitioning_common-itemizedlist-2.xml
index bca218e..52f5250 100644
--- a/en-US/Automatic_Partitioning_common-itemizedlist-2.xml
+++ b/en-US/Automatic_Partitioning_common-itemizedlist-2.xml
@@ -10,9 +10,9 @@
       </para>
     </listitem>
     
-     <listitem>
+    <listitem>
       <para>
-	click <guibutton>Modify Software Selection</guibutton> to reduce the number of packages to be installed, which may free enough space for the installation to proceed (refer to <xref linkend="s1-pkgselection-x86" />)
+	click <guibutton>Custom partitioning</guibutton> to reach the <guilabel>Manual Partitioning</guilabel> section (refer to <xref linkend="s1-diskpartitioning-x86" />)
       </para>
     </listitem>
     
@@ -22,9 +22,4 @@
       </para>
     </listitem>
     
-     <listitem>
-      <para>
-	check the box labeled <guilabel>I don't need help; let me customize disk partitioning</guilabel> to edit the existing filesystems manually and click <guibutton>Reclaim space</guibutton> to reach the <guilabel>Manual Partitioning</guilabel> section (refer to <xref linkend="s1-diskpartitioning-x86" />)
-      </para>
-    </listitem>
 </itemizedlist>
\ No newline at end of file
diff --git a/en-US/Automatic_Partitioning_common-para-10.xml b/en-US/Automatic_Partitioning_common-para-10.xml
index 0097fae..9243c27 100644
--- a/en-US/Automatic_Partitioning_common-para-10.xml
+++ b/en-US/Automatic_Partitioning_common-para-10.xml
@@ -4,6 +4,6 @@
 %BOOK_ENTITIES;
 ]>
 <para>
-      If you chose to encrypt your data, you will be prompted to create a passphrase when you click <guibutton>Continue</guibutton> or <guibutton>Reclaim space</guibutton> (refer to <xref linkend="encrypt-x86" />). 
+      To encrypt all partitions except the <filename class="partition">/boot</filename> partition, check the box labeled <guilabel>Encrypt my data. I'll set a passphrase later</guilabel> in the <guilabel>Installation Options</guilabel> dialog (refer to <xref linkend="Disk_Encryption_Guide" /> for information on encryption). You will be prompted to create a passphrase when you click <guibutton>Continue</guibutton> or <guibutton>Reclaim space</guibutton> (refer to <xref linkend="encrypt-x86" />). 
 </para>
 
diff --git a/en-US/Disk_Partitioning-x86.xml b/en-US/Disk_Partitioning-x86.xml
index 15c1d19..f20efcb 100644
--- a/en-US/Disk_Partitioning-x86.xml
+++ b/en-US/Disk_Partitioning-x86.xml
@@ -14,7 +14,7 @@
 		<!-- <xi:include href="Disk_Partitioning_x86_ppc-para-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
 	 <!--  If you chose one of the automatic partitioning options and selected...  --> 
 	 <para>
-		If you checked <guilabel>Let me customize the partitioning of the disks instead</guilabel> and clicked <guibutton>Continue</guibutton> in <xref linkend="s1-diskpartsetup-x86" />, you will reach the <guilabel>Manual Partitioning</guilabel> screen.
+		If you chose to partition your disks manually in <xref linkend="s1-diskpartsetup-x86" /> and clicked <guibutton>Continue</guibutton>, you will reach the <guilabel>Manual Partitioning</guilabel> screen.
 	 </para>
 	 <para>
 		By choosing to create a custom partitioning layout, you must now tell the installation program where to install Fedora. This is done by defining mount points for one or more disk partitions in which Fedora is installed. You may also need to create and/or delete partitions at this time.
diff --git a/en-US/Disk_Partitioning_Setup-x86.xml b/en-US/Disk_Partitioning_Setup-x86.xml
index bb06329..439116e 100644
--- a/en-US/Disk_Partitioning_Setup-x86.xml
+++ b/en-US/Disk_Partitioning_Setup-x86.xml
@@ -36,8 +36,7 @@
 	     Use free space on selected drives and create default layout  --> <xi:include href="Automatic_Partitioning_common-para-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 	 <!--  Choose your preferred partitioning method...  --> <xi:include href="Automatic_Partitioning_common-para-2a.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 	 <!--  Choose your preferred partitioning method...  --> <xi:include href="Automatic_Partitioning_quickstart-para-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="quick-start" />
-	 <!--  You may want to simply install Fedora on all available disks...  --> <xi:include href="Automatic_Partitioning_common-para-5.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
-	 <!--  To encrypt all partitions except the /boot partition...   --> <xi:include href="Automatic_Partitioning_quickstart-note-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="quick-start" />
+	 <!--  You may want to simply install Fedora on all available disks...  --> <xi:include href="Automatic_Partitioning_quickstart-note-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="quick-start" />
 	 <!--  During installation, all data will be erased...  --> <xi:include href="Automatic_Partitioning_common-para-6.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 	 <!--  Click Continue once you have made your selections...   --> <xi:include href="Automatic_Partitioning_common-para-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 	 <!--  The Installation Options dialog now appears...  --> <xi:include href="Disk_Partitioning_Setup_common-figure-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
diff --git a/en-US/images/diskpartsetup/install-options.png b/en-US/images/diskpartsetup/install-options.png
index 18bf42c..eaa979b 100644
Binary files a/en-US/images/diskpartsetup/install-options.png and b/en-US/images/diskpartsetup/install-options.png differ


More information about the docs-commits mailing list