commit 82c80620d6b32cdb53c64776dbea16f837e178e6
Author: Jack Reed <jreed(a)redhat.com>
Date: Thu Dec 13 16:00:48 2012 +1000
Adding path descriptions to 'Storage and Partitioning' to account for
'Reclaim Space' tool
...utomatic_Partitioning_common-itemizedlist-1.xml | 25 ++++++++++++++++
...utomatic_Partitioning_common-itemizedlist-2.xml | 30 ++++++++++++++++++++
...utomatic_Partitioning_common-itemizedlist-3.xml | 25 ++++++++++++++++
en-US/Automatic_Partitioning_common-list-1.xml | 4 +-
en-US/Automatic_Partitioning_common-para-10.xml | 9 ++++++
en-US/Automatic_Partitioning_common-para-11.xml | 9 ++++++
en-US/Automatic_Partitioning_common-para-4.xml | 2 +-
en-US/Automatic_Partitioning_common-para-7.xml | 2 +-
en-US/Automatic_Partitioning_common-para-8.xml | 2 +-
en-US/Disk_Partitioning_Setup-x86.xml | 15 ++++++---
10 files changed, 113 insertions(+), 10 deletions(-)
---
diff --git a/en-US/Automatic_Partitioning_common-itemizedlist-1.xml
b/en-US/Automatic_Partitioning_common-itemizedlist-1.xml
new file mode 100644
index 0000000..85427ee
--- /dev/null
+++ b/en-US/Automatic_Partitioning_common-itemizedlist-1.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE varlistentry 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;
+]>
+<itemizedlist>
+ <listitem>
+ <para>
+ click <guibutton>Cancel & add more disks</guibutton> if you would
like to add more storage space
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ click <guibutton>Continue</guibutton> to allow Fedora to automatically
configure the partitions for you and return to the Installation Hub
+ </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" />)
+ </para>
+ </listitem>
+</itemizedlist>
+
diff --git a/en-US/Automatic_Partitioning_common-itemizedlist-2.xml
b/en-US/Automatic_Partitioning_common-itemizedlist-2.xml
new file mode 100644
index 0000000..07394d8
--- /dev/null
+++ b/en-US/Automatic_Partitioning_common-itemizedlist-2.xml
@@ -0,0 +1,30 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE varlistentry 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;
+]>
+<itemizedlist>
+ <listitem>
+ <para>
+ click <guibutton>Cancel & add more disks</guibutton> if you would
like to add more storage space
+ </para>
+ </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
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ click <guibutton>Reclaim space</guibutton> to choose how to reassign space
from other filesystems to this installation
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ check the box labeled <guilabel>Let me customize the partitioning of the
disks</guilabel> to edit the existing filesystems manually and click
<guibutton>Continue</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-itemizedlist-3.xml
b/en-US/Automatic_Partitioning_common-itemizedlist-3.xml
new file mode 100644
index 0000000..58e686b
--- /dev/null
+++ b/en-US/Automatic_Partitioning_common-itemizedlist-3.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE varlistentry 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;
+]>
+<itemizedlist>
+ <listitem>
+ <para>
+ Free space available for use
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ Free space unavailable but reclaimable from existing partitions
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ Space in selected disks reclaimable by deleting existing partitions
+ </para>
+ </listitem>
+</itemizedlist>
+
diff --git a/en-US/Automatic_Partitioning_common-list-1.xml
b/en-US/Automatic_Partitioning_common-list-1.xml
index 2f1ef07..f4bdced 100644
--- a/en-US/Automatic_Partitioning_common-list-1.xml
+++ b/en-US/Automatic_Partitioning_common-list-1.xml
@@ -11,12 +11,12 @@
</listitem>
<listitem>
<para>
- <guilabel>BTRFS</guilabel> (B-Tree File System, as described in <xref
linkend="s3-diskpartitioning-file-x86" />
+ <guilabel>BTRFS</guilabel> (B-Tree File System, as described in <xref
linkend="s3-diskpartitioning-file-x86" />)
</para>
</listitem>
<listitem>
<para>
- <guilabel>LVM</guilabel> (Logical Volume Management, as described in
<xref linkend="sn-partitioning-lvm" />
+ <guilabel>LVM</guilabel> (Logical Volume Management, as described in
<xref linkend="sn-partitioning-lvm" />)
</para>
</listitem>
</itemizedlist>
diff --git a/en-US/Automatic_Partitioning_common-para-10.xml
b/en-US/Automatic_Partitioning_common-para-10.xml
new file mode 100644
index 0000000..74c4051
--- /dev/null
+++ b/en-US/Automatic_Partitioning_common-para-10.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE para 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>
+ Whichever path you choose whether you have sufficient or insufficient space, you
will be prompted to create a passphrase when you click
<guibutton>Continue</guibutton> if you chose to encrypt your data (refer to
<xref linkend="encrypt-x86" />).
+</para>
+
diff --git a/en-US/Automatic_Partitioning_common-para-11.xml
b/en-US/Automatic_Partitioning_common-para-11.xml
new file mode 100644
index 0000000..2610808
--- /dev/null
+++ b/en-US/Automatic_Partitioning_common-para-11.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE para 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>
+ Choose from the following paths to generate sufficient space to install Fedora:
+</para>
+
diff --git a/en-US/Automatic_Partitioning_common-para-4.xml
b/en-US/Automatic_Partitioning_common-para-4.xml
index 67f8de2..6d467d2 100644
--- a/en-US/Automatic_Partitioning_common-para-4.xml
+++ b/en-US/Automatic_Partitioning_common-para-4.xml
@@ -4,6 +4,6 @@
%BOOK_ENTITIES;
]>
<para>
- Click <guilabel>Partition Scheme Configuration</guilabel> to choose a
partitioning scheme. This will apply to both automated and manually-generated partitions,
although individual partitions can later be modified during the manual partitioning
process. Choose from:
+ Optionally, click <guilabel>Partition Scheme Configuration</guilabel>
in the <guilabel>Installation Options</guilabel> dialog to choose a
partitioning scheme (the default is LVM). This will apply to both automated and
manually-generated partitions, although individual partitions can later be modified during
the manual partitioning process. Choose from:
</para>
diff --git a/en-US/Automatic_Partitioning_common-para-7.xml
b/en-US/Automatic_Partitioning_common-para-7.xml
index b388bc6..9b79fc0 100644
--- a/en-US/Automatic_Partitioning_common-para-7.xml
+++ b/en-US/Automatic_Partitioning_common-para-7.xml
@@ -4,6 +4,6 @@
%BOOK_ENTITIES;
]>
<para>
- To partition the drive manually, check the box labeled <guilabel>Let me
customize the partitioning of the disks instead</guilabel>.
+ If there is sufficient space to install Fedora, choose from the following paths:
</para>
diff --git a/en-US/Automatic_Partitioning_common-para-8.xml
b/en-US/Automatic_Partitioning_common-para-8.xml
index 55536a6..93cae55 100644
--- a/en-US/Automatic_Partitioning_common-para-8.xml
+++ b/en-US/Automatic_Partitioning_common-para-8.xml
@@ -4,6 +4,6 @@
%BOOK_ENTITIES;
]>
<para>
- Click <guibutton>Continue</guibutton> to proceed. If you chose to encrypt
the partitions, you will now be prompted to create a passphrase (refer to <xref
linkend="encrypt-x86" />. If you chose to partition the disks manually, you
will be directed to <guilabel>Manual Partitioning</guilabel>, which is
addressed in <xref linkend="s1-diskpartitioning-x86" />. If you chose
automatic partitioning, you will be returned to the Installation Hub.
+ If there is not enough space and there are existing filesystems on the selected disk,
you will be informed how much space could be reclaimed by shrinking or deleting these
filesystems. The potential space is presented in three categories:
</para>
diff --git a/en-US/Disk_Partitioning_Setup-x86.xml
b/en-US/Disk_Partitioning_Setup-x86.xml
index e188f9f..bcc5474 100644
--- a/en-US/Disk_Partitioning_Setup-x86.xml
+++ b/en-US/Disk_Partitioning_Setup-x86.xml
@@ -37,13 +37,18 @@
<!-- To encrypt all partitions except the /boot partition... -->
<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" />
- <!-- Choose automatic partitioning or manual partitioning... --> <xi:include
href="Automatic_Partitioning_common-para-4.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Choose automatic partitioning or manual partitioning... --> <xi:include
href="Automatic_Partitioning_common-para-7.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- If there is sufficient space... --> <xi:include
href="Automatic_Partitioning_common-itemizedlist-1.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Click Cancel and add more disks... --> <xi:include
href="Automatic_Partitioning_common-para-8.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- If there is not enough space... --> <xi:include
href="Automatic_Partitioning_common-itemizedlist-3.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Free space available... --> <xi:include
href="Automatic_Partitioning_common-para-11.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Choose from the following paths... --> <xi:include
href="Automatic_Partitioning_common-itemizedlist-2.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Click Cancel and add more disks... --> <xi:include
href="Automatic_Partitioning_common-para-10.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Whichever path you choose... --> <xi:include
href="Automatic_Partitioning_common-para-4.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
<!-- Click Partition Scheme Configuration to choose... --> <xi:include
href="Automatic_Partitioning_common-list-1.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!-- Standard Partition... --> <xi:include
href="Automatic_Partitioning_common-para-7.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!-- To partition the drive manually... --> <xi:include
href="Disk_Partitioning_Setup_common-important-1.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Standard Partition... --> <xi:include
href="Disk_Partitioning_Setup_common-important-1.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
<!-- Important - chain loading... --> <xi:include
href="Disk_Partitioning_Setup_common-important-2.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!-- Important - multipath and non-multipath... --> <xi:include
href="Automatic_Partitioning_common-para-8.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!-- Click Continue to proceed... -->
+ <!-- Important - multipath and non-multipath... -->
<xi:include href="X86_Bootloader.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />