From 128f1c2add661d06b7b500ddd1ba86f9b39ef29d Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Sun, 4 Nov 2018 17:03:58 +0000
Subject: [PATCH] Merge r7518 from trunk

git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.3.x@7770 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 fcst/Kconfig                         | 16 +++++++++++++---
 iscsi-scst/kernel/Kconfig            |  7 ++++---
 iscsi-scst/kernel/isert-scst/Kconfig |  4 +++-
 scst_local/in-tree/Kconfig           |  2 +-
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/fcst/Kconfig b/fcst/Kconfig
index 4c8890ad4..9c8d21e9c 100644
--- a/fcst/Kconfig
+++ b/fcst/Kconfig
@@ -1,5 +1,15 @@
 config FCST
-	tristate "SCST target module for Fibre Channel using libfc"
+	tristate "SCST FCoE target module"
 	depends on LIBFC && SCST
-	---help---
-	  Supports using libfc HBAs as target adapters with SCST
+	help
+	  The fcst kernel module implements an SCST target driver for the FCoE
+	  protocol. FCoE or Fibre Channel over Ethernet is a protocol that
+	  allows to communicate fibre channel frames over an Ethernet
+	  network. Since the FCoE protocol requires a lossless Ethernet
+	  network, special network adapters and switches are required.
+	  Ethernet network adapters that support FCoE are called Converged
+	  Network Adapters (CNA). The standard that makes lossless Ethernet
+	  communication possible is called DCB or Data Center Bridging. Since
+	  FCoE frames are a kind of Ethernet frames, communication between
+	  FCoE clients and servers is limited to a single Ethernet broadcast
+	  domain.
diff --git a/iscsi-scst/kernel/Kconfig b/iscsi-scst/kernel/Kconfig
index 9b973ea25..c7651bcad 100644
--- a/iscsi-scst/kernel/Kconfig
+++ b/iscsi-scst/kernel/Kconfig
@@ -3,9 +3,10 @@ config SCST_ISCSI
 	depends on SCST && INET && LIBCRC32C
 	default SCST
 	help
-	  ISCSI target driver for SCST framework. The iSCSI protocol has been
-	  defined in RFC 3720. To use it you should download from
-	  http://scst.sourceforge.net the user space part of it.
+	  ISCSI target driver for SCST. The iSCSI protocol has been defined in
+	  RFC 3720. To use this target driver you will not only have to enable
+	  this kernel module but you will also have to download the
+	  corresponding user space daemon from http://scst.sourceforge.net.
 
 config SCST_ISCSI_DEBUG_DIGEST_FAILURES
 	bool "Simulate iSCSI digest failures"
diff --git a/iscsi-scst/kernel/isert-scst/Kconfig b/iscsi-scst/kernel/isert-scst/Kconfig
index 1cbc3e477..c5b325b94 100644
--- a/iscsi-scst/kernel/isert-scst/Kconfig
+++ b/iscsi-scst/kernel/isert-scst/Kconfig
@@ -3,7 +3,9 @@ config SCST_ISER
 	depends on SCST && SCST_ISCSI && INFINIBAND
 	default SCST
 	help
-	  ISER target driver for SCST framework. The iSCSI iSER extension
+	  ISER target driver for SCST framework. iSER is a protocol that
+	  extends iSCSI to use Remote Direct Memory Access (RDMA). RDMA over
+	  InfiniBand, iWARP and RoCE are supported. The iSCSI iSER extension
 	  has been defined in RFC 5046.
 
 	  If unsure, say "N".
diff --git a/scst_local/in-tree/Kconfig b/scst_local/in-tree/Kconfig
index da40460cf..da6b9d492 100644
--- a/scst_local/in-tree/Kconfig
+++ b/scst_local/in-tree/Kconfig
@@ -1,7 +1,7 @@
 config SCST_LOCAL
 	tristate "SCST Local driver"
 	depends on SCST && !HIGHMEM4G && !HIGHMEM64G
-	---help---
+	help
 	  This module provides a LLD SCSI driver that connects to
 	  the SCST target mode subsystem in a loop-back manner.
 	  It allows you to test target-mode device-handlers locally.