[install-guide] Removed Advanced Storage Options and network config sections from Specialized and Networked Disks, p

Jack Reed jjr at fedoraproject.org
Thu May 16 03:47:30 UTC 2013


commit 75e1255423089e7a452eb72d16c39c764c74c123
Author: Jack Reed <jreed at redhat.com>
Date:   Thu May 16 13:47:19 2013 +1000

    Removed Advanced Storage Options and network config sections from Specialized and Networked Disks, plus other corrections to reflect new UI

 en-US/Automatic_Partitioning_common-para-2a.xml    |   10 +++
 ...Disk_Partitioning_Advanced_Storage-FCoE-x86.xml |   15 ++++
 ...isk_Partitioning_Advanced_Storage-iSCSI-x86.xml |   23 ++++++
 en-US/Disk_Partitioning_Advanced_Storage-x86.xml   |   74 --------------------
 ...artitioning_Advanced_Storage_common-title-2.xml |    2 +-
 ...artitioning_Advanced_Storage_common-title-3.xml |    2 +-
 en-US/Disk_Partitioning_Setup-x86.xml              |    1 +
 en-US/Specialized_Storage_Devices-x86.xml          |    7 +-
 .../Specialized_Storage_Devices_common-para-1.xml  |    2 +-
 .../Specialized_Storage_Devices_common-para-3.xml  |    2 +-
 ...lized_Storage_Devices_common-variablelist-1.xml |   44 ++++++-----
 11 files changed, 81 insertions(+), 101 deletions(-)
---
diff --git a/en-US/Automatic_Partitioning_common-para-2a.xml b/en-US/Automatic_Partitioning_common-para-2a.xml
new file mode 100644
index 0000000..bb42fc1
--- /dev/null
+++ b/en-US/Automatic_Partitioning_common-para-2a.xml
@@ -0,0 +1,10 @@
+<?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>
+      To install Fedora on specialized storage devices or to configure iSCSI and FCoE connections, click <guibutton>Add a disk</guibutton> under <guilabel>Specialized and Network Disks</guilabel> and refer to <xref linkend="sect-Storage_Device_Selection_Screen-x86" />.
+</para>
+
+
diff --git a/en-US/Disk_Partitioning_Advanced_Storage-FCoE-x86.xml b/en-US/Disk_Partitioning_Advanced_Storage-FCoE-x86.xml
new file mode 100644
index 0000000..5e9dec7
--- /dev/null
+++ b/en-US/Disk_Partitioning_Advanced_Storage-FCoE-x86.xml
@@ -0,0 +1,15 @@
+<?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;
+]>
+<section id="s1-advanced-storage-FCoE-x86">
+		<xi:include href="Disk_Partitioning_Advanced_Storage_common-title-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+		 <!--  Add an FCoE SAN  --> <xi:include href="Disk_Partitioning_Advanced_Storage_common-para-4.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+		 <!--  To configure an FCoE SAN...  --> <xi:include href="Disk_Partitioning_Advanced_Storage_common-para-5.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+		 <!--  On the menu that appears in the next...  --> <xi:include href="Disk_Partitioning_Advanced_Storage_common-figure-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+		 <!--  Configure FCoE Parameters  --> <xi:include href="Disk_Partitioning_Advanced_Storage_common-para-6.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+		 <!--  DCB (Data Center Bridging) is a set of enhancements to the Ethernet protocols   -->
+</section>
+
+
diff --git a/en-US/Disk_Partitioning_Advanced_Storage-iSCSI-x86.xml b/en-US/Disk_Partitioning_Advanced_Storage-iSCSI-x86.xml
new file mode 100644
index 0000000..4874bd2
--- /dev/null
+++ b/en-US/Disk_Partitioning_Advanced_Storage-iSCSI-x86.xml
@@ -0,0 +1,23 @@
+<?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;
+]>
+<section id="s1-advanced-storage-iSCSI-x86">
+		<xi:include href="Disk_Partitioning_Advanced_Storage_common-title-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+		<!-- Add an iSCSI target  --> 
+		
+		<xi:include href="Disk_Partitioning_Advanced_Storage_common-para-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+		<!-- To use iSCSI storage devices for the installation, anaconda must be able to discover them as iSCSI targets  --> 
+		
+		<xi:include href="Disk_Partitioning_Advanced_Storage_common-para-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+		<!--  Repeat the iSCSI discovery and iSCSI login steps as many times as necessary to add all required iSCSI storage.  -->
+		
+		<xi:include href="Disk_Partitioning_Advanced_Storage_common-procedure-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+		<!--  iSCSI discovery  -->
+		
+		<xi:include href="Disk_Partitioning_Advanced_Storage_common-procedure-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+		<!--  Starting an iSCSI session  -->
+</section>
+
+
diff --git a/en-US/Disk_Partitioning_Advanced_Storage_common-title-2.xml b/en-US/Disk_Partitioning_Advanced_Storage_common-title-2.xml
index 8eb1041..43d5d26 100644
--- a/en-US/Disk_Partitioning_Advanced_Storage_common-title-2.xml
+++ b/en-US/Disk_Partitioning_Advanced_Storage_common-title-2.xml
@@ -3,5 +3,5 @@
 <!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
 %BOOK_ENTITIES;
 ]>
-<title>Configure iSCSI parameters</title>
+<title>Add an iSCSI target</title>
 
diff --git a/en-US/Disk_Partitioning_Advanced_Storage_common-title-3.xml b/en-US/Disk_Partitioning_Advanced_Storage_common-title-3.xml
index 19d899e..3f6bacb 100644
--- a/en-US/Disk_Partitioning_Advanced_Storage_common-title-3.xml
+++ b/en-US/Disk_Partitioning_Advanced_Storage_common-title-3.xml
@@ -3,5 +3,5 @@
 <!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
 %BOOK_ENTITIES;
 ]>
-<title> Configure FCoE Parameters </title>
+<title>Add an FCoE SAN </title>
 
diff --git a/en-US/Disk_Partitioning_Setup-x86.xml b/en-US/Disk_Partitioning_Setup-x86.xml
index 1cd9c46..bb06329 100644
--- a/en-US/Disk_Partitioning_Setup-x86.xml
+++ b/en-US/Disk_Partitioning_Setup-x86.xml
@@ -34,6 +34,7 @@
 	     Remove linux partitions on selected drives and create default layout
 	     Caution
 	     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" />
diff --git a/en-US/Specialized_Storage_Devices-x86.xml b/en-US/Specialized_Storage_Devices-x86.xml
index 206767a..610ff9d 100644
--- a/en-US/Specialized_Storage_Devices-x86.xml
+++ b/en-US/Specialized_Storage_Devices-x86.xml
@@ -12,7 +12,7 @@
 	 <!--  The Other SAN tab  --> <xi:include href="Specialized_Storage_Devices_common-para-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 	 <!--  Devices are grouped under the following tabs:  --> <xi:include href="Specialized_Storage_Devices_common-variablelist-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 	 <!--  Basic Devices Basic storage devices directly connected to  --> <para>
-		If you do need to configure iSCSI or FCoE storage, click <guibutton>Add Advanced Target</guibutton> and refer to <xref linkend="s1-advanced-storage-x86" />.
+	      If you do need to configure iSCSI or FCoE storage, click <guibutton>Add iSCSI Target</guibutton> and refer to <xref linkend="s1-advanced-storage-iSCSI-x86" />, or click <guibutton>Add FCoE SAN</guibutton> and refer to <xref linkend="s1-advanced-storage-FCoE-x86" />.
 	</para>
 	<para>
 	  To assign non-friendly multipath device names, click <guibutton>Device Options</guibutton> and uncheck <guilabel>Use friendly names for multipath devices</guilabel>.
@@ -28,8 +28,9 @@
 	 <!--  Important - chain loading  --> <para>
 	   When you have selected the storage devices to make available during installation, click <guibutton>Done</guibutton> to return to the <guilabel>Installation Destination</guilabel> screen.
 	</para>
-	 <xi:include href="Disk_Partitioning_Advanced_Storage-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-	 <!--  Advanced Storage Options  -->
+	 <xi:include href="Disk_Partitioning_Advanced_Storage-iSCSI-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <!--  Add an iSCSI Target  --> <xi:include href="Disk_Partitioning_Advanced_Storage-FCoE-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <!--  Add an FCoE SAN  -->
 </section>
 
 
diff --git a/en-US/Specialized_Storage_Devices_common-para-1.xml b/en-US/Specialized_Storage_Devices_common-para-1.xml
index f8d2055..04c2361 100644
--- a/en-US/Specialized_Storage_Devices_common-para-1.xml
+++ b/en-US/Specialized_Storage_Devices_common-para-1.xml
@@ -4,6 +4,6 @@
 %BOOK_ENTITIES;
 ]>
 <para>
-	The storage devices selection screen displays all storage devices to which <application>anaconda</application> has access.
+      The <guilabel>Specialized and Networked Disks</guilabel> selection screen displays all storage devices to which <application>anaconda</application> has access.
 </para>
 
diff --git a/en-US/Specialized_Storage_Devices_common-para-3.xml b/en-US/Specialized_Storage_Devices_common-para-3.xml
index a464d4e..165c10d 100644
--- a/en-US/Specialized_Storage_Devices_common-para-3.xml
+++ b/en-US/Specialized_Storage_Devices_common-para-3.xml
@@ -4,6 +4,6 @@
 %BOOK_ENTITIES;
 ]>
 <para>
-	The storage devices selection screen also contains a <guilabel>Search</guilabel> tab that allows you to filter storage devices either by their <firstterm>World Wide Identifier</firstterm> (WWID) or by the port, target, or <firstterm>logical unit number</firstterm> (LUN) at which they are accessed.
+      The <guilabel>Specialized and Networked Disks</guilabel> selection screen also contains a <guilabel>Search</guilabel> tab that allows you to filter storage devices either by their <firstterm>World Wide Identifier</firstterm> (WWID) or by the port, target, or <firstterm>logical unit number</firstterm> (LUN) at which they are accessed.
 </para>
 
diff --git a/en-US/Specialized_Storage_Devices_common-variablelist-1.xml b/en-US/Specialized_Storage_Devices_common-variablelist-1.xml
index 570ddee..b53854b 100644
--- a/en-US/Specialized_Storage_Devices_common-variablelist-1.xml
+++ b/en-US/Specialized_Storage_Devices_common-variablelist-1.xml
@@ -3,53 +3,57 @@
 <!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
 %BOOK_ENTITIES;
 ]>
-<variablelist>
-	<varlistentry>
-		<term>Basic Devices</term>
+  <variablelist>
+    	 <varlistentry>
+		<term>Multipath Devices</term>
 		 <listitem>
 			<para>
-				Basic storage devices directly connected to the local system, such as hard disk drives and solid-state drives.
+				Storage devices accessible through more than one path, such as through multiple SCSI controllers or Fiber Channel ports on the same system.
 			</para>
+			 <important>
+				<title>Important — device serial numbers must be 16 or 32 characters</title>
+				 <para>
+					The installer only detects multipath storage devices with serial numbers that are 16 or 32 characters in length.
+				</para>
+
+			</important>
 
 		</listitem>
 
 	</varlistentry>
-	 <varlistentry>
-		<term>Firmware RAID</term>
+	<varlistentry>
+		<term>Other SAN Devices</term>
 		 <listitem>
 			<para>
-				Storage devices attached to a firmware RAID controller.
+				Any other devices available on a storage area network (SAN).
 			</para>
 
 		</listitem>
 
 	</varlistentry>
+
 	 <varlistentry>
-		<term>Multipath Devices</term>
+		<term>Firmware RAID</term>
 		 <listitem>
 			<para>
-				Storage devices accessible through more than one path, such as through multiple SCSI controllers or Fiber Channel ports on the same system.
+				Storage devices attached to a firmware RAID controller.
 			</para>
-			 <important>
-				<title>Important — device serial numbers must be 16 or 32 characters</title>
-				 <para>
-					The installer only detects multipath storage devices with serial numbers that are 16 or 32 characters in length.
-				</para>
-
-			</important>
 
 		</listitem>
 
 	</varlistentry>
-	 <varlistentry>
-		<term>Other SAN Devices</term>
+	
+	<!-- <varlistentry>
+		<term>Basic Devices</term>
 		 <listitem>
 			<para>
-				Any other devices available on a storage area network (SAN).
+				Basic storage devices directly connected to the local system, such as hard disk drives and solid-state drives.
 			</para>
 
 		</listitem>
 
-	</varlistentry>
+	</varlistentry> -->
+
+
 </variablelist>
 


More information about the docs-commits mailing list