From b9186d33d4ce876b4be52b4903143900a70b7818 Mon Sep 17 00:00:00 2001
From: Dru Lavigne <dru@FreeBSD.org>
Date: Fri, 7 Mar 2014 22:02:49 +0000
Subject: [PATCH] Add a bit to the iSCSI intro. Slight tightening of section
 headings.

Sponsored by: iXsystems
---
 .../handbook/network-servers/chapter.xml      | 47 ++++++++++++-------
 1 file changed, 30 insertions(+), 17 deletions(-)

diff --git a/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml b/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
index eb9151d829..c24ef38624 100644
--- a/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
@@ -5657,30 +5657,44 @@ Logging to FILE /var/log/messages</screen>
     <title><acronym>iSCSI</acronym> Initiator and Target
       Configuration</title>
 
-    <para><acronym>iSCSI</acronym> is a way to share storage, to make
-      disk space at one machine (the server, in iSCSI nomenclature
-      known as the <emphasis>target</emphasis>) available to others
-      (clients, called <emphasis>initiators</emphasis> in
-      <acronym>iSCSI</acronym>).  The main difference when compared to
-      <acronym>NFS</acronym> is that <acronym>NFS</acronym> works at a
-      filesystem level, while <acronym>iSCSI</acronym> works at the
-      block device level.  To initiators, remote disks served via
-      <acronym>iSCSI</acronym> are just like physical disks.  Their
-      device nodes appear in <filename>/dev/</filename>, and must be
-      separately mounted.</para>
+    <para><acronym>iSCSI</acronym> is a way to share storage over a
+      network.  Unlike
+      <acronym>NFS</acronym>, which works at the
+      file system level, <acronym>iSCSI</acronym> works at the
+      block device level.</para>
+ 
+    <para>In <acronym>iSCSI</acronym> terminology, the system that
+      shares the storage is
+      known as the <emphasis>target</emphasis>.  The storage can be a
+      physical disk, or an area representing multiple disks or a
+      portion of a physical disk.  For example, if the disk(s) are
+      formatted with <acronym>ZFS</acronym>, a zvol can be created to
+      use as the <acronym>iSCSI</acronym> storage.</para>
+	
+    <para>The clients which access the <acronym>iSCSI</acronym>
+      storage are called <emphasis>initiators</emphasis>.
+      To initiators, the storage available through
+      <acronym>iSCSI</acronym> appears as a raw, unformatted disk
+      known as a <acronym>LUN</acronym>.
+      Device nodes for the disk appear in <filename>/dev/</filename> and the device must be
+      separately formatted and mounted.</para>
+      
+    <para>Beginning with 10.0-RELEASE, &os; provides a native,
+      kernel-based <acronym>iSCSI</acronym> target and initiator.
+      This section describes how to configure a &os; system as a
+      target or an initiator.</para>
 
     <sect2 xml:id="network-iscsi-target">
-      <title><acronym>iSCSI</acronym> Target</title>
+      <title>Configuring an <acronym>iSCSI</acronym> Target</title>
 
+      <note>
       <para>Note: the native <acronym>iSCSI</acronym> target is
 	supported starting with &os; 10.0-RELEASE.  To use
 	<acronym>iSCSI</acronym> in older versions of &os;, install a
 	userspace target from the Ports Collection, such as
 	<package>net/istgt</package>.  This chapter only describes the
 	native target.</para>
-
-      <sect3>
-	<title>Basic Operation</title>
+      </note>
 
 	<para>Configuring an <acronym>iSCSI</acronym> target is
 	  straightforward: create the
@@ -5793,7 +5807,6 @@ target iqn.2012-06.com.example:target0 {
 	  to reread it:</para>
 
 	<screen>&prompt.root; <userinput>service ctld reload</userinput></screen>
-      </sect3>
 
       <sect3>
 	<title>Authentication</title>
@@ -5849,7 +5862,7 @@ target iqn.2012-06.com.example:target0 {
     </sect2>
 
     <sect2 xml:id="network-iscsi-initiator">
-      <title><acronym>iSCSI</acronym> Initiator</title>
+      <title>Configuring an <acronym>iSCSI</acronym> Initiator</title>
 
       <note>
 	<para>The current <acronym>iSCSI</acronym> initiator is