ceph · trociny · Oct 20, 2017 · Oct 11, 2017
diff --git a/doc/rbd/index.rst b/doc/rbd/index.rst
@@ -45,7 +45,7 @@ devices simultaneously.
 	Kernel Modules <rbd-ko>
 	Snapshots<rbd-snapshot>
 	Mirroring <rbd-mirroring>
-	iSCSI Gateway <iscsi-overview>
+	LIO iSCSI Gateway <iscsi-overview>
 	QEMU <qemu-rbd>
 	libvirt <libvirt>
 	Cache Settings <rbd-config-ref/>

diff --git a/doc/rbd/iscsi-initiator-esx.rst b/doc/rbd/iscsi-initiator-esx.rst
@@ -1,10 +1,10 @@
-----------------------------------
-The iSCSI Initiator for VMware ESX
-----------------------------------
+------------------------------
+iSCSI Initiator for VMware ESX
+------------------------------
 
 **Prerequisite:**
 
--  VMware ESX 6.0 or later
+-  VMware ESX 6.5 or later
 
 **iSCSI Discovery and Multipath Device Setup:**
 
@@ -14,14 +14,14 @@ The iSCSI Initiator for VMware ESX
 #. In the General tab click the "Advanced" button and in the "Advanced Settings"
    set RecoveryTimeout to 25.
 
-#. If CHAP was setup on the iSCSI gateway, in the General tab click the "CHAP…"
+#. If CHAP was setup on the iSCSI gateway, in the General tab click the "CHAP..."
    button. If CHAP is not being used, skip to step 4.
 
 #. On the CHAP Credentials windows, select “Do not use CHAP unless required by target”,
    and enter the "Name" and "Secret" values used on the initial setup for the iSCSI
    gateway, then click on the "OK" button.
 
-#. On the Dynamic Discovery tab, click the "Add…" button, and enter the IP address
+#. On the Dynamic Discovery tab, click the "Add..." button, and enter the IP address
    and port of one of the iSCSI target portals. Click on the "OK" button.
 
 #. Close the iSCSI Initiator Properties window. A prompt will ask to rescan the

diff --git a/doc/rbd/iscsi-initiator-rhel.rst → doc/rbd/iscsi-initiator-linux.rst b/doc/rbd/iscsi-initiator-rhel.rst → doc/rbd/iscsi-initiator-linux.rst
@@ -1,14 +1,12 @@
-------------------------------------------------
-The iSCSI Initiator for Red Hat Enterprise Linux
-------------------------------------------------
+-------------------------
+iSCSI Initiator for Linux
+-------------------------
 
 **Prerequisite:**
 
--  Package ``iscsi-initiator-utils-6.2.0.873-35`` or newer must be
-   installed
+-  Package ``iscsi-initiator-utils``
 
--  Package ``device-mapper-multipath-0.4.9-99`` or newer must be
-   installed
+-  Package ``device-mapper-multipath``
 
 **Installing:**
 
@@ -22,7 +20,7 @@ Install the iSCSI initiator and multipath tools:
 **Configuring:**
 
 #. Create the default ``/etc/multipath.conf`` file and enable the
-   ``multiapthd`` service:
+   ``multipathd`` service:
 
    ::
 
@@ -42,7 +40,7 @@ Install the iSCSI initiator and multipath tools:
                        path_checker           tur
                        prio                   alua
                        prio_args              exclusive_pref_bit
-                       fast_oi_fail_tmo       25
+                       fast_io_fail_tmo       25
                        no_path_retry          queue
                }
        }

diff --git a/doc/rbd/iscsi-initiator-win.rst b/doc/rbd/iscsi-initiator-win.rst
@@ -1,6 +1,6 @@
------------------------------------------
-The iSCSI Initiator for Microsoft Windows
------------------------------------------
+-------------------------------------
+iSCSI Initiator for Microsoft Windows
+-------------------------------------
 
 **Prerequisite:**
 

diff --git a/doc/rbd/iscsi-initiators.rst b/doc/rbd/iscsi-initiators.rst
@@ -2,9 +2,16 @@
 Configuring the iSCSI Initiators
 --------------------------------
 
+- `iSCSI Initiator for Linux <../iscsi-initiator-linux>`_
+
+- `iSCSI Initiator for Microsoft Windows <../iscsi-initiator-win>`_
+
+- `iSCSI Initiator for VMware ESX <../iscsi-initiator-esx>`_
+
 .. toctree::
   :maxdepth: 1
+  :hidden:
 
-  The iSCSI Initiator for Red Hat Enterprise Linux <iscsi-initiator-rhel>
-  The iSCSI Initiator for Microsoft Windows <iscsi-initiator-win>
-  The iSCSI Initiator for VMware ESX <iscsi-initiator-esx>
+  Linux <iscsi-initiator-linux>
+  Microsoft Windows <iscsi-initiator-win>
+  VMware ESX <iscsi-initiator-esx>
diff --git a/doc/rbd/iscsi-monitoring.rst b/doc/rbd/iscsi-monitoring.rst
@@ -66,24 +66,6 @@ selects the LIO collector automatically.
 
 **Example ``gwtop`` Outputs**
 
-For kernel RBD-based devices:
-
-::
-
-    gwtop  2/2 Gateways   CPU% MIN:  4 MAX:  5    Network Total In:    2M  Out:    3M   10:20:09
-    Capacity:   8G    Disks:   8   IOPS:  500   Clients:  1   Ceph: HEALTH_OK          OSDs:   3
-    Pool.Image     Src  Device   Size     r/s     w/s    rMB/s     wMB/s    await  r_await  w_await  Client
-    iscsi.t1703          rbd0    500M       0       0     0.00      0.00     0.00     0.00     0.00
-    iscsi.testme1        rbd5    500M       0       0     0.00      0.00     0.00     0.00     0.00
-    iscsi.testme2        rbd2    500M       0       0     0.00      0.00     0.00     0.00     0.00
-    iscsi.testme3        rbd3    500M       0       0     0.00      0.00     0.00     0.00     0.00
-    iscsi.testme5        rbd1    500M       0       0     0.00      0.00     0.00     0.00     0.00
-    rbd.myhost_1    T    rbd4      4G     500       0     1.95      0.00     2.37     2.37     0.00  rh460p(CON)
-    rbd.test_2           rbd6      1G       0       0     0.00      0.00     0.00     0.00     0.00
-    rbd.testme           rbd7    500M       0       0     0.00      0.00     0.00     0.00     0.00
-
-For user backed storage (TCMU) devices:
-
 ::
 
     gwtop  2/2 Gateways   CPU% MIN:  4 MAX:  5    Network Total In:    2M  Out:    3M   10:20:00

diff --git a/doc/rbd/iscsi-overview.rst b/doc/rbd/iscsi-overview.rst
@@ -46,5 +46,5 @@ Network (SAN).
 
   Requirements <iscsi-requirements>
   Configuring the iSCSI Target <iscsi-targets>
-  Configuring the iSCSI Initiator <iscsi-initiators>
+  Configuring the iSCSI Initiators <iscsi-initiators>
   Monitoring the iSCSI Gateways <iscsi-monitoring>