en-US/Automatic_Partitioning_common-para-1.xml en-US/Automatic_Partitioning_common-para-2.xml en-US/Automatic_Partitioning_common-para-5.xml en-US/Automatic_Partitioning_x86-variablelist-1.xml en-US/Disk_Partitioning_Setup_common-para-1.xml en-US/Disk_Partitioning_Setup_common-para-2.xml en-US/Encrypt_common-figure-1.xml en-US/Encrypt_common-para-1.xml en-US/Encrypt_common-para-2.xml en-US/Encrypt_common-title-1.xml en-US/Encrypt-x86.xml en-US/Graphical_Installation-x86.xml
Rüdiger Landmann
rlandmann at fedoraproject.org
Thu Apr 29 11:54:21 UTC 2010
en-US/Automatic_Partitioning_common-para-1.xml | 5 +++--
en-US/Automatic_Partitioning_common-para-2.xml | 5 +++--
en-US/Automatic_Partitioning_common-para-5.xml | 9 ++++-----
en-US/Automatic_Partitioning_x86-variablelist-1.xml | 2 +-
en-US/Disk_Partitioning_Setup_common-para-1.xml | 5 +++--
en-US/Disk_Partitioning_Setup_common-para-2.xml | 8 +++-----
en-US/Encrypt-x86.xml | 19 +++++++++++++++++++
en-US/Encrypt_common-figure-1.xml | 19 +++++++++++++++++++
en-US/Encrypt_common-para-1.xml | 7 +++++++
en-US/Encrypt_common-para-2.xml | 7 +++++++
en-US/Encrypt_common-title-1.xml | 7 +++++++
en-US/Graphical_Installation-x86.xml | 4 ++--
12 files changed, 78 insertions(+), 19 deletions(-)
New commits:
commit f0926a04e561127e1ec6e83e731176800fb190be
Author: Ruediger Landmann <r.landmann at redhat.com>
Date: Thu Apr 29 21:53:28 2010 +1000
Update section 7.18, add Encryption step
diff --git a/en-US/Automatic_Partitioning_common-para-1.xml b/en-US/Automatic_Partitioning_common-para-1.xml
index e9c9d2a..75368cd 100644
--- a/en-US/Automatic_Partitioning_common-para-1.xml
+++ b/en-US/Automatic_Partitioning_common-para-1.xml
@@ -6,5 +6,6 @@
]>
<para>
- Create default layout allows you to have some control concerning what data is removed (if any) from your system. Your options are:
-</para>
\ No newline at end of file
+ Your options are:
+</para>
+
diff --git a/en-US/Automatic_Partitioning_common-para-2.xml b/en-US/Automatic_Partitioning_common-para-2.xml
index 2ebd0ad..9eda6af 100644
--- a/en-US/Automatic_Partitioning_common-para-2.xml
+++ b/en-US/Automatic_Partitioning_common-para-2.xml
@@ -3,5 +3,6 @@
]>
<para>
- Using your mouse, choose the storage drive(s) on which you want Fedora to be installed. If you have two or more drives, you can choose which drive(s) should contain this installation. Unselected drives, and any data on them, are not touched.
-</para>
\ No newline at end of file
+ Choose your preferred partitioning method by clicking the radio button to the left of its description in the dialog box.
+</para>
+
diff --git a/en-US/Automatic_Partitioning_common-para-5.xml b/en-US/Automatic_Partitioning_common-para-5.xml
index f5e6498..2b7e439 100644
--- a/en-US/Automatic_Partitioning_common-para-5.xml
+++ b/en-US/Automatic_Partitioning_common-para-5.xml
@@ -3,9 +3,8 @@
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
- <para>
- Select <guilabel>Encrypt system</guilabel> to encrypt all
- partitions except the <filename class="partition">/boot</filename>
- partition.
- </para>
+<para>
+ Select <guilabel>Encrypt system</guilabel> to encrypt all partitions except the <filename class="partition">/boot</filename> partition. Refer to <xref linkend="Disk_Encryption_Guide"/> for information on encryption.
+</para>
+
diff --git a/en-US/Automatic_Partitioning_x86-variablelist-1.xml b/en-US/Automatic_Partitioning_x86-variablelist-1.xml
index def1351..e47d35c 100644
--- a/en-US/Automatic_Partitioning_x86-variablelist-1.xml
+++ b/en-US/Automatic_Partitioning_x86-variablelist-1.xml
@@ -16,7 +16,7 @@
<term>Use Free Space</term>
<listitem>
<para>
- Select this option to retain your current data and partitions and install Red Hat Enterprise Linux in the unused space available on the storage drives. Ensure that there is sufficient space available on the storage drives before you select this option — refer to <xref linkend="Disk_Space-x86"/>.
+ Select this option to retain your current data and partitions and install Fedora in the unused space available on the storage drives. Ensure that there is sufficient space available on the storage drives before you select this option — refer to <xref linkend="Disk_Space-x86"/>.
</para>
</listitem>
</varlistentry>
diff --git a/en-US/Disk_Partitioning_Setup_common-para-1.xml b/en-US/Disk_Partitioning_Setup_common-para-1.xml
index dbe51bc..dfd253f 100644
--- a/en-US/Disk_Partitioning_Setup_common-para-1.xml
+++ b/en-US/Disk_Partitioning_Setup_common-para-1.xml
@@ -3,5 +3,6 @@
]>
<para>
- On this screen you can choose to create the default layout or choose to manual partition using the <guimenuitem>Create custom layout</guimenuitem> option.
-</para>
\ No newline at end of file
+ On this screen you can choose to create the default partition layout in one of four different ways, or choose to partition storage devices manually to create a custom layout.
+</para>
+
diff --git a/en-US/Disk_Partitioning_Setup_common-para-2.xml b/en-US/Disk_Partitioning_Setup_common-para-2.xml
index def803e..3798e1c 100644
--- a/en-US/Disk_Partitioning_Setup_common-para-2.xml
+++ b/en-US/Disk_Partitioning_Setup_common-para-2.xml
@@ -1,10 +1,8 @@
<?xml version="1.0"?>
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-
-
-
]>
<para>
- The first four options allow you to perform an automated installation without having to partition your drive(s) yourself. If you do not feel comfortable with partitioning your system, it is recommended that you <emphasis>do not</emphasis> choose to create a custom layout and instead let the installation program partition for you.
-</para>
\ No newline at end of file
+ The first four options allow you to perform an automated installation without having to partition your storage devices yourself. If you do not feel comfortable with partitioning your system, choose one of these options and let the installation program partition the storage devices for you. Depending on the option that you choose, you can still control what data (if any) is removed from the system.
+</para>
+
diff --git a/en-US/Encrypt-x86.xml b/en-US/Encrypt-x86.xml
new file mode 100644
index 0000000..f69e010
--- /dev/null
+++ b/en-US/Encrypt-x86.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<section id="encrypt-x86">
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Encrypt_common-title-1.xml"/>
+ <!-- Encrypt Partitions -->
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Encrypt_common-para-1.xml"/>
+ <!-- Encrypt Partitions -->
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Encrypt_common-figure-1.xml"/>
+ <!-- Enter passphrase for encrypted partition -->
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Encrypt_common-para-2.xml"/>
+ <!-- Choose a phassphrase -->
+
+</section>
+
diff --git a/en-US/Encrypt_common-figure-1.xml b/en-US/Encrypt_common-figure-1.xml
new file mode 100644
index 0000000..5c3e3ec
--- /dev/null
+++ b/en-US/Encrypt_common-figure-1.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!DOCTYPE figure PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<figure>
+ <title>
+ Enter passphrase for encrypted partition
+ </title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/encrypt/passphrase.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <para>
+ The dialog contains text boxes to enter a passphrase and to confirm it.
+ </para>
+ </textobject>
+ </mediaobject>
+</figure>
diff --git a/en-US/Encrypt_common-para-1.xml b/en-US/Encrypt_common-para-1.xml
new file mode 100644
index 0000000..f407c75
--- /dev/null
+++ b/en-US/Encrypt_common-para-1.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<para>
+ If you selected the <guilabel>Encrypt System</guilabel> option, the installater prompts you for a passphrase with which to encrypt the partitions on the system.
+</para>
diff --git a/en-US/Encrypt_common-para-2.xml b/en-US/Encrypt_common-para-2.xml
new file mode 100644
index 0000000..116b7ba
--- /dev/null
+++ b/en-US/Encrypt_common-para-2.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<para>
+ Choose a passphrase and type it into each of the two fields in the dialog box. You must provide this passphrase every time that the system boots.
+</para>
diff --git a/en-US/Encrypt_common-title-1.xml b/en-US/Encrypt_common-title-1.xml
new file mode 100644
index 0000000..2782f83
--- /dev/null
+++ b/en-US/Encrypt_common-title-1.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<title>
+ Encrypt Partitions
+</title>
diff --git a/en-US/Graphical_Installation-x86.xml b/en-US/Graphical_Installation-x86.xml
index 5d405b4..adc61ab 100644
--- a/en-US/Graphical_Installation-x86.xml
+++ b/en-US/Graphical_Installation-x86.xml
@@ -261,8 +261,8 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Disk_Partitioning_Setup-x86.xml"/>
<!-- Disk Partitioning Setup -->
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Automatic_Partitioning-x86.xml"/>
- <!-- Default Layout -->
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Encrypt-x86.xml"/>
+ <!-- Disk Encryption -->
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Disk_Partitioning-x86.xml"/>
<!-- Partitioning Your System
More information about the docs-commits
mailing list