[install-guide] Updated Procedure 9.1. iSCSI discovery + merged Procedure 9.2 into 9.1 + updated screenshots

[pbokoc]

commit 63cd0f31afb00ed56b8a4fcef6a9ed9029f98b80
Author: Petr Bokoc <pbokoc(a)redhat.com&gt;
Date:   Fri Jun 28 19:32:55 2013 +0200

    Updated Procedure 9.1. iSCSI discovery + merged Procedure 9.2 into 9.1 + updated
screenshots

 ...isk_Partitioning_Advanced_Storage-iSCSI-x86.xml |    4 +-
 ...tioning_Advanced_Storage_common-procedure-1.xml |   36 ++++++++++++-------
 ...tioning_Advanced_Storage_common-procedure-2.xml |   34 ++----------------
 .../diskpartadvanced/iscsi-discovered-nodes.png    |  Bin 15415 -> 20590 bytes
 .../diskpartadvanced/iscsi-login-results.png       |  Bin 10742 -> 0 bytes
 .../iscsi-session-authentication.png               |  Bin 17647 -> 32735 bytes
 .../diskpartadvanced/iscsi-session-chap-pair.png   |  Bin 17694 -> 25397 bytes
 .../iscsi-session-reverse-pair.png                 |  Bin 23906 -> 30153 bytes
 en-US/images/diskpartadvanced/iscsi-session.png    |  Bin 15517 -> 0 bytes
 9 files changed, 29 insertions(+), 45 deletions(-)
---
diff --git a/en-US/Disk_Partitioning_Advanced_Storage-iSCSI-x86.xml
b/en-US/Disk_Partitioning_Advanced_Storage-iSCSI-x86.xml
index 4874bd2..8603565 100644
--- a/en-US/Disk_Partitioning_Advanced_Storage-iSCSI-x86.xml
+++ b/en-US/Disk_Partitioning_Advanced_Storage-iSCSI-x86.xml
@@ -14,9 +14,9 @@
 		<!--  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  -->
+		<!--  iSCSI discovery and starting an iSCSI session -->
 		
-		<xi:include
href="Disk_Partitioning_Advanced_Storage_common-procedure-2.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
+		<!--<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-procedure-1.xml
b/en-US/Disk_Partitioning_Advanced_Storage_common-procedure-1.xml
index 11cb5b4..85d4170 100644
--- a/en-US/Disk_Partitioning_Advanced_Storage_common-procedure-1.xml
+++ b/en-US/Disk_Partitioning_Advanced_Storage_common-procedure-1.xml
@@ -7,17 +7,17 @@
 <procedure>
 	<title>iSCSI discovery</title>
 	<para>
-		Use the <guilabel>iSCSI Discovery Details</guilabel> dialog to provide
<application>anaconda</application> with the information that it needs to
discover the iSCSI target.
+		Use the <guilabel>Add iSCSI Storage Target</guilabel> dialog to provide
<application>anaconda</application> with the information that it needs to
discover the iSCSI target.
 	</para>
 	<figure float="0">
 		<title>The iSCSI Discovery Details dialog</title>
 		<mediaobject>
 			<imageobject>
-				<imagedata fileref="images/diskpartadvanced/iscsi-discovery.png"
format="PNG" width="444" />
+				<imagedata fileref="images/diskpartadvanced/iscsi-discovery.png"
format="PNG" scalefit="0" />
 			</imageobject>
 			<textobject>
 				<para>
-					The <guilabel>iSCSI Discovery Details</guilabel> dialog. It shows an
example target IP address of <literal>192.168.0.108</literal> and an example
iSCSI initiator name of <literal>iqn.1994-05.com.domain:01b1b85d</literal>.
+					The <guilabel>Add iSCSI Storage Target</guilabel> dialog. It shows an
example target IP address of <literal>192.168.0.108</literal> and an example
iSCSI initiator name of <literal>iqn.1994-05.com.domain:01b1b85d</literal>.
 				</para>
 			</textobject>
 		</mediaobject>
@@ -29,7 +29,7 @@
 	</step>
 	<step>
 		<para>
-			Provide a name in the <guilabel>iSCSI Initiator Name</guilabel> field for
the iSCSI initiator in <firstterm>iSCSI qualified name</firstterm> (IQN)
format<!-- or <firstterm>Extended Unique Identifier</firstterm> (EUI)
format-->.
+			The <guilabel>iSCSI Initiator Name</guilabel> will be automatically filled
by the installer with a generated initiator name. You may change this field to a different
name, provided it follows the <firstterm>iSCSI qualified name</firstterm>
(IQN) format.
 		</para>
 		<para>
 			A valid IQN contains:
@@ -89,7 +89,7 @@
 			<title>iSCSI discovery authentication</title>
 			<mediaobject>
 				<imageobject>
-					<imagedata
fileref="images/diskpartadvanced/iscsi-discovery-authentication.png"
format="PNG" width="444" />
+					<imagedata
fileref="images/diskpartadvanced/iscsi-discovery-authentication.png"
format="PNG" scalefit="0" />
 				</imageobject>
 				<textobject>
 					<para>
@@ -101,7 +101,7 @@
 		<itemizedlist>
 			<listitem>
 				<para>
-					<guimenuitem>no credentials</guimenuitem>
+					<guimenuitem>No credentials</guimenuitem>
 				</para>
 			</listitem>
 			<listitem>
@@ -126,7 +126,7 @@
 					<title>CHAP pair</title>
 					<mediaobject>
 						<imageobject>
-							<imagedata
fileref="images/diskpartadvanced/iscsi-discovery-chap-pair.png"
format="PNG" width="444" />
+							<imagedata
fileref="images/diskpartadvanced/iscsi-discovery-chap-pair.png"
format="PNG" scalefit="0" />
 						</imageobject>
 						<textobject>
 							<para>
@@ -144,7 +144,7 @@
 					<title>CHAP pair and a reverse pair</title>
 					<mediaobject>
 						<imageobject>
-							<imagedata
fileref="images/diskpartadvanced/iscsi-discovery-reverse-pair.png"
format="PNG" width="444" />
+							<imagedata
fileref="images/diskpartadvanced/iscsi-discovery-reverse-pair.png"
format="PNG" scalefit="0" />
 						</imageobject>
 						<textobject>
 							<para>
@@ -158,22 +158,22 @@
 	</step>
 	<step>
 		<para>
-			Click <guibutton>Start Discovery</guibutton>.
<application>Anaconda</application> attempts to discover an iSCSI target based
on the information that you provided. If discovery succeeds, the <guilabel>iSCSI
Discovered Nodes</guilabel> dialog presents you with a list of all the iSCSI nodes
discovered on the target.
+			Click <guibutton>Start Discovery</guibutton>.
<application>Anaconda</application> will attempt to discover an iSCSI target
based on the information that you provided. If the discovery succeeds, a new dialog will
present you with a list of all the iSCSI nodes discovered on the target. if the discovery
fails, an error message will appear describing the nature of the problem.
 		</para>
 	</step>
 	<step>
 		<para>
-			Each node is presented with a checkbox beside it. Click the checkboxes to select the
nodes to use for installation.
+			In the list of discovered nodes, select the one you want to access using the radio
buttons in the left hand side column. Then select an authentification method from the
<guimenu>Node login authentication type</guimenu> drop-down menu. If you
selected <guimenuitem>CHAP pair</guimenuitem> or <guimenuitem>CHAP pair
and a reverse pair</guimenuitem>, fill out the appropriate fields with valid
credentials. To use the same credentials used in the discovery process, select the
<guimenuitem>Use the credentials from discovery</guimenuitem> option.
 		</para>
 		<figure float="0">
 			<title>The iSCSI Discovered Nodes dialog</title>
 			<mediaobject>
 				<imageobject>
-					<imagedata fileref="images/diskpartadvanced/iscsi-discovered-nodes.png"
format="PNG" width="444" />
+					<imagedata
fileref="images/diskpartadvanced/iscsi-session-authentication.png"
format="PNG" scalefit="0" />
 				</imageobject>
 				<textobject>
 					<para>
-						The iSCSI Discovered Nodes dialog displays a list of nodes with checkboxes beside
them. This example shows only a single node, discovered at
<literal>iqn.2009-02.com.example:for.all</literal>.
+						The iSCSI Discovered Nodes dialog displays a list of nodes with radio buttons
beside them. This example shows two nodes, discovered at
<literal>iqn.2009-02.com.example:for.all</literal> and
<literal>iqn.2009-02.com.example:01.sfdae</literal>
 					</para>
 				</textobject>
 			</mediaobject>
@@ -181,7 +181,17 @@
 	</step>
 	<step>
 		<para>
-			Click <guibutton>Login</guibutton> to initiate an iSCSI session.
+			Click <guibutton>Log In</guibutton> to initiate an iSCSI session.
+		</para>
+	</step>
+	<step>
+		<para>
+			If <application>anaconda</application> discovered multiple nodes, you will
be returned to the <guilabel>Add iSCSI Storage Target</guilabel> window, which
will contain a list of discovered nodes you have not logged in to yet. Nodes you have
already logged in to will not be displayed in the list. If you want to configure
additional nodes, repeat step 6 in this procedure.
+		</para>
+	</step>
+	<step>
+		<para>
+			After you log in to all the nodes you want to configure, click
<guilabel>OK</guilabel>. You will then be returned to the
<guilabel>Specialized and Network Disks</guilabel> screen.
 		</para>
 	</step>
 </procedure>
diff --git a/en-US/Disk_Partitioning_Advanced_Storage_common-procedure-2.xml
b/en-US/Disk_Partitioning_Advanced_Storage_common-procedure-2.xml
index 78b4883..82f2137 100644
--- a/en-US/Disk_Partitioning_Advanced_Storage_common-procedure-2.xml
+++ b/en-US/Disk_Partitioning_Advanced_Storage_common-procedure-2.xml
@@ -9,19 +9,6 @@
 	<para>
 		Use the <guilabel>iSCSI Nodes Login</guilabel> dialog to provide
<application>anaconda</application> with the information that it needs to log
into the nodes on the iSCSI target and start an iSCSI session.
 	</para>
-	<figure float="0">
-		<title>The iSCSI Nodes Login dialog</title>
-		<mediaobject>
-			<imageobject>
-				<imagedata fileref="images/diskpartadvanced/iscsi-session.png"
format="PNG" width="444" />
-			</imageobject>
-			<textobject>
-				<para>
-					The <guilabel>iSCSI Nodes Login</guilabel> dialog. 
-				</para>
-			</textobject>
-		</mediaobject>
-	</figure>
 	<step>
 		<para>
 			Use the drop-down menu to specify the type of authentication to use for the iSCSI
session:
@@ -30,7 +17,7 @@
 			<title>iSCSI session authentication</title>
 			<mediaobject>
 				<imageobject>
-					<imagedata
fileref="images/diskpartadvanced/iscsi-session-authentication.png"
format="PNG" width="444" />
+					<imagedata
fileref="images/diskpartadvanced/iscsi-session-authentication.png"
format="PNG" scalefit="0" />
 				</imageobject>
 				<textobject>
 					<para>
@@ -42,7 +29,7 @@
 		<itemizedlist>
 			<listitem>
 				<para>
-					<guimenuitem>no credentials</guimenuitem>
+					<guimenuitem>No credentials</guimenuitem>
 				</para>
 			</listitem>
 			<listitem>
@@ -75,7 +62,7 @@
 					<title>CHAP pair</title>
 					<mediaobject>
 						<imageobject>
-							<imagedata
fileref="images/diskpartadvanced/iscsi-session-chap-pair.png"
format="PNG" width="444" />
+							<imagedata
fileref="images/diskpartadvanced/iscsi-session-chap-pair.png"
format="PNG" scalefit="0" />
 						</imageobject>
 						<textobject>
 							<para>
@@ -93,7 +80,7 @@
 					<title>CHAP pair and a reverse pair</title>
 					<mediaobject>
 						<imageobject>
-							<imagedata
fileref="images/diskpartadvanced/iscsi-session-reverse-pair.png"
format="PNG" width="444" />
+							<imagedata
fileref="images/diskpartadvanced/iscsi-session-reverse-pair.png"
format="PNG" scalefit="0" />
 						</imageobject>
 						<textobject>
 							<para>
@@ -109,19 +96,6 @@
 		<para>
 			Click <guibutton>Login</guibutton>.
<application>Anaconda</application> attempts to log into the nodes on the
iSCSI target based on the information that you provided. The <guilabel>iSCSI Login
Results</guilabel> dialog presents you with the results.
 		</para>
-		<figure float="0">
-			<title>The iSCSI Login Results dialog</title>
-			<mediaobject>
-				<imageobject>
-					<imagedata fileref="images/diskpartadvanced/iscsi-login-results.png"
format="PNG" width="444" />
-				</imageobject>
-				<textobject>
-					<para>
-						The iSCSI Login Results dialog displays a list of attached nodes. This example
shows only a single node attached,
<literal>iqn.2009-02.com.example:for.all</literal>.
-					</para>
-				</textobject>
-			</mediaobject>
-		</figure>
 	</step>
 	<step>
 		<para>
diff --git a/en-US/images/diskpartadvanced/iscsi-discovered-nodes.png
b/en-US/images/diskpartadvanced/iscsi-discovered-nodes.png
index 27fd3cc..181afb4 100644
Binary files a/en-US/images/diskpartadvanced/iscsi-discovered-nodes.png and
b/en-US/images/diskpartadvanced/iscsi-discovered-nodes.png differ
diff --git a/en-US/images/diskpartadvanced/iscsi-session-authentication.png
b/en-US/images/diskpartadvanced/iscsi-session-authentication.png
index 3493d6b..8a7430f 100644
Binary files a/en-US/images/diskpartadvanced/iscsi-session-authentication.png and
b/en-US/images/diskpartadvanced/iscsi-session-authentication.png differ
diff --git a/en-US/images/diskpartadvanced/iscsi-session-chap-pair.png
b/en-US/images/diskpartadvanced/iscsi-session-chap-pair.png
index 1ccfaa7..663feef 100644
Binary files a/en-US/images/diskpartadvanced/iscsi-session-chap-pair.png and
b/en-US/images/diskpartadvanced/iscsi-session-chap-pair.png differ
diff --git a/en-US/images/diskpartadvanced/iscsi-session-reverse-pair.png
b/en-US/images/diskpartadvanced/iscsi-session-reverse-pair.png
index 71b9b6c..0600433 100644
Binary files a/en-US/images/diskpartadvanced/iscsi-session-reverse-pair.png and
b/en-US/images/diskpartadvanced/iscsi-session-reverse-pair.png differ