From 91eca4309e0d2a03f63cebe86ba401411ec2591d Mon Sep 17 00:00:00 2001
From: Vladislav Bolkhovitin <vst@vlnb.net>
Date: Tue, 16 Jun 2015 01:28:06 +0000
Subject: [PATCH] Web updates

git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@6316 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 www/handler_fileio_tgt.html |  5 +-
 www/scst_admin.html         |  5 +-
 www/target_emulex.html      |  7 ++-
 www/target_fcoe.html        |  5 +-
 www/target_ibmvscsi.html    |  5 +-
 www/target_iscsi.html       | 66 ++++---------------------
 www/target_iser.html        | 96 -------------------------------------
 www/target_local.html       |  5 +-
 www/target_lsi.html         |  5 +-
 www/target_mvsas.html       |  5 +-
 www/target_old.html         |  5 +-
 www/target_qla2x00t.html    |  5 +-
 www/target_srp.html         |  5 +-
 www/targets.html            |  9 ++--
 14 files changed, 37 insertions(+), 191 deletions(-)
 delete mode 100644 www/target_iser.html

diff --git a/www/handler_fileio_tgt.html b/www/handler_fileio_tgt.html
index e6321f956..6998f2fba 100644
--- a/www/handler_fileio_tgt.html
+++ b/www/handler_fileio_tgt.html
@@ -36,12 +36,11 @@
 			<div id="sidebar">
 				<h1>Target Drivers</h1>
 				<ul class="sidemenu">
-					<li><a href="target_iscsi.html">ISCSI-SCST</a></li>
-					<li><a href="target_iser.html">iSER</a></li>
+					<li><a href="target_iscsi.html">ISCSI-SCST with iSER</a></li>
 					<li><a href="target_qla2x00t.html">QLogic FC qla2x00t</a></li>
 					<li><a href="target_srp.html">SCSI RDMA Protocol (SRP)</a></li>
 					<li><a href="target_mvsas.html">Marvell SAS adapters</a></li>
-					<li><a href="target_emulex.html">Emulex FC/FCoE adapters</a></li>
+					<li><a href="target_emulex.html">Emulex FC/FCoE</a></li>
 					<li><a href="target_lsi.html">LSI/MPT adapters</a></li>
 					<li><a href="target_fcoe.html">FCoE Target</a></li>
 					<li><a href="target_local.html">Local Target Driver</a></li>
diff --git a/www/scst_admin.html b/www/scst_admin.html
index 4b6d3117d..cd5b3f193 100644
--- a/www/scst_admin.html
+++ b/www/scst_admin.html
@@ -36,12 +36,11 @@
 			<div id="sidebar">
 				<h1>Target Drivers</h1>
 				<ul class="sidemenu">
-					<li><a href="target_iscsi.html">ISCSI-SCST</a></li>
-					<li><a href="target_iser.html">iSER</a></li>
+					<li><a href="target_iscsi.html">ISCSI-SCST with iSER</a></li>
 					<li><a href="target_qla2x00t.html">QLogic FC qla2x00t</a></li>
 					<li><a href="target_srp.html">SCSI RDMA Protocol (SRP)</a></li>
 					<li><a href="target_mvsas.html">Marvell SAS adapters</a></li>
-					<li><a href="target_emulex.html">Emulex FC/FCoE adapters</a></li>
+					<li><a href="target_emulex.html">Emulex FC/FCoE</a></li>
 					<li><a href="target_lsi.html">LSI/MPT adapters</a></li>
 					<li><a href="target_fcoe.html">FCoE Target</a></li>
 					<li><a href="target_local.html">Local Target Driver</a></li>
diff --git a/www/target_emulex.html b/www/target_emulex.html
index ca9210d5e..42b6962cb 100644
--- a/www/target_emulex.html
+++ b/www/target_emulex.html
@@ -36,12 +36,11 @@
 			<div id="sidebar">
 				<h1>Target Drivers</h1>
 				<ul class="sidemenu">
-					<li><a href="target_iscsi.html">ISCSI-SCST</a></li>
-					<li><a href="target_iser.html">iSER</a></li>
+					<li><a href="target_iscsi.html">ISCSI-SCST with iSER</a></li>
 					<li><a href="target_qla2x00t.html">QLogic FC qla2x00t</a></li>
 					<li><a href="target_srp.html">SCSI RDMA Protocol (SRP)</a></li>
 					<li><a href="target_mvsas.html">Marvell SAS adapters</a></li>
-					<li><a href="target_emulex.html">Emulex FC/FCoE adapters</a></li>
+					<li><a href="target_emulex.html">Emulex FC/FCoE</a></li>
 					<li><a href="target_lsi.html">LSI/MPT adapters</a></li>
 					<li><a href="target_fcoe.html">FCoE Target</a></li>
 					<li><a href="target_local.html">Local Target Driver</a></li>
@@ -56,7 +55,7 @@
 			</div>		
 	
 	  		<div id="main"> 
-				<h1>Target driver for Emulex FC/FCoE adapters</h1>
+				<h1>Target driver for Emulex FC/FCoE</h1>
 				<p><img src="images/LPe16002.jpg" width="100" height="120" class="float-left" alt="SCST Emulex">
 
 				<p>The Emulex OneCore Storage FC/FCoE driver (ocs_fc_scst) is developed and maintained by Emulex. It is available on the emulex.com download page under <a href="http://www.emulex.com/downloads/emulex/onecore-storage-drivers/driver-and-firmware-downloads" class="readmore">OneCore Storage Drivers</a>.
diff --git a/www/target_fcoe.html b/www/target_fcoe.html
index 51c2afd47..eafc69c19 100644
--- a/www/target_fcoe.html
+++ b/www/target_fcoe.html
@@ -36,12 +36,11 @@
 			<div id="sidebar">
 				<h1>Target Drivers</h1>
 				<ul class="sidemenu">
-					<li><a href="target_iscsi.html">ISCSI-SCST</a></li>
-					<li><a href="target_iser.html">iSER</a></li>
+					<li><a href="target_iscsi.html">ISCSI-SCST with iSER</a></li>
 					<li><a href="target_qla2x00t.html">QLogic FC qla2x00t</a></li>
 					<li><a href="target_srp.html">SCSI RDMA Protocol (SRP)</a></li>
 					<li><a href="target_mvsas.html">Marvell SAS adapters</a></li>
-					<li><a href="target_emulex.html">Emulex FC/FCoE adapters</a></li>
+					<li><a href="target_emulex.html">Emulex FC/FCoE</a></li>
 					<li><a href="target_lsi.html">LSI/MPT adapters</a></li>
 					<li><a href="target_fcoe.html">FCoE Target</a></li>
 					<li><a href="target_local.html">Local Target Driver</a></li>
diff --git a/www/target_ibmvscsi.html b/www/target_ibmvscsi.html
index f9abc7446..40245cf70 100644
--- a/www/target_ibmvscsi.html
+++ b/www/target_ibmvscsi.html
@@ -36,12 +36,11 @@
 			<div id="sidebar">
 				<h1>Target Drivers</h1>
 				<ul class="sidemenu">
-					<li><a href="target_iscsi.html">ISCSI-SCST</a></li>
-					<li><a href="target_iser.html">iSER</a></li>
+					<li><a href="target_iscsi.html">ISCSI-SCST with iSER</a></li>
 					<li><a href="target_qla2x00t.html">QLogic FC qla2x00t</a></li>
 					<li><a href="target_srp.html">SCSI RDMA Protocol (SRP)</a></li>
 					<li><a href="target_mvsas.html">Marvell SAS adapters</a></li>
-					<li><a href="target_emulex.html">Emulex FC/FCoE adapters</a></li>
+					<li><a href="target_emulex.html">Emulex FC/FCoE</a></li>
 					<li><a href="target_lsi.html">LSI/MPT adapters</a></li>
 					<li><a href="target_fcoe.html">FCoE Target</a></li>
 					<li><a href="target_local.html">Local Target Driver</a></li>
diff --git a/www/target_iscsi.html b/www/target_iscsi.html
index bf58b0183..6f824cdd7 100644
--- a/www/target_iscsi.html
+++ b/www/target_iscsi.html
@@ -36,12 +36,11 @@
 			<div id="sidebar">
 				<h1>Target Drivers</h1>
 				<ul class="sidemenu">
-					<li><a href="target_iscsi.html">ISCSI-SCST</a></li>
-					<li><a href="target_iser.html">iSER</a></li>
+					<li><a href="target_iscsi.html">ISCSI-SCST with iSER</a></li>
 					<li><a href="target_qla2x00t.html">QLogic FC qla2x00t</a></li>
 					<li><a href="target_srp.html">SCSI RDMA Protocol (SRP)</a></li>
 					<li><a href="target_mvsas.html">Marvell SAS adapters</a></li>
-					<li><a href="target_emulex.html">Emulex FC/FCoE adapters</a></li>
+					<li><a href="target_emulex.html">Emulex FC/FCoE</a></li>
 					<li><a href="target_lsi.html">LSI/MPT adapters</a></li>
 					<li><a href="target_fcoe.html">FCoE Target</a></li>
 					<li><a href="target_local.html">Local Target Driver</a></li>
@@ -56,58 +55,13 @@
 			</div>		
 			
 			<div id="main">
-				<h1>ISCSI target driver iSCSI-SCST</h1>
-				<p>ISCSI-SCST is an iSCSI target driver for SCST. It is a deeply reworked fork of
-				<a href="http://iscsitarget.sourceforge.net/">IET</a> with a lot of fixes and improvements. Reasons of the fork were:</p>
+				<h1>ISCSI target driver iSCSI-SCST with iSER support</h1>
+				<p>ISCSI-SCST is an iSCSI target driver for SCST. It was originated from
+				<a href="http://iscsitarget.sourceforge.net/">IET</a>, but then became a deep rework of it with a lot of fixes and improvements in all areas of
+				performance, stability and functionality.</p>
 
-				<ul>
-					<li><span>To be able to use full power of SCST core.</span></li>
-					<li><span>To fix all the problems, corner cases issues and iSCSI standard violations which IET has.</span></li>
-				</ul>
-
-				<p>IET in many corner cases has a lot of problems, like ignoring errors processing, as it is for memory allocations,
-				crashing itself with BUG() macro, as it is for malformed packets from initiators, possible data
-				corruptions, because of, for instance, unsafe task management or sessions reinstatement implementations, etc.
-				There was no way to fix all them without a fork, because it needed a deep code redesign to fix all internal architecture
-				and implementation issues which IET has. As the result of this effort nearly all (>90% overall and almost 100%
-				of the fast path core) of the IET kernel code and 20-25% of the user space code were rewritten.</p>
-				
-				<p>You can find comparison of iSCSI-SCST with IET and other iSCSI targets on the
-				<a href="comparison.html">Comparison</a> page. Some highlights:
-				</p>
-
-				<ul>
-					<li><span>Improved performance. In some cases improvement >100%. Especially it is noticeable
-					with several initiators accessing the same device.</span></li>
-				
-					<li><span>Pass-through mode with one to many relationship, when multiple initiators can connect to
-					exported local SCSI devices. For instance, in this mode you can safely export your parallel
-					SCSI tape or tape library, or VTL on your iSCSI net and multiple initiators can share it without risk of
-					data loss because of the shared usage.</span></li>
-
-					<li><span>Automatic PnP-like reconfiguration, when initiators instantly see any configuration changes on the
-					target, like addition of new LUNs or a LUN resize. No restart or anything like that is needed.</span></li>
-
-					<li><span>Safe implementation of many management and errors recovery facilities as well as better handling of various
-					corner cases, which means better errors recovery stability without putting user data at risk.</span></li>
-
-					<li><span>Advanced devices visibility management, when different initiators can see different set of
-					devices from the same target.</span></li>
-
-					<li><span>O_DIRECT, i.e. "BLOCKIO on files", mode, which has all advantages 
-					of BLOCKIO, but also supports files on file systems. Sometimes, in the appropriate cases, 
-					this mode can make performance difference in 100% or even more.</span></li>
-
-					<li><span>4KB blocks eliminate abysmal write performance issues caused by misaligned partitions. 
-					</span></li>
-
-					<li><span>Virtual CD/DVD-ROMs.</span></li>	
-
-					<li><span>Ability to create target devices emulators in the user space.</span></li>
-
-					<li><span>Ability to create multi-transport SCSI targets, which can export (possibly, the same) 
-					devices over multiple transports.</span></li>
-				</ul>
+				<p>The latest improvement was addition of iSER support,
+				thanks a lot to Yan Burman and Mellanox Technologies!</p>
 
 				<p>If you are an IET user before installation carefully read README files of both iSCSI-SCST and 
 				the SCST core. You can also use a migration tool developed by Scalable Informatics Inc., which will
@@ -124,12 +78,12 @@
 				<a href="http://scalecomputing.com/products">Scale&rsquo;s Intelligent Clustered Storage</a> technology developed by
 				<a href="http://scalecomputing.com">Scale Computing</a> as well as VMware and Microsoft certification as part of
 				storage arrays developed by <a href="http://www.open-e.com/">Open-E, Inc</a> and
-				<a href="http://www.starboardstorage.com">Starboard Storage</a>.</p>
+				Starboard Storage.</p>
 				
 				<p class="post-footer align-right">					
 					<a href="iscsi-scst-howto.txt" class="readmore">HOWTO</a>
+					<a href="http://community.mellanox.com/docs/DOC-1479" class="readmore">iSER HOWTO</a>
 					<a href="SCST_Gentoo_HOWTO.txt" class="readmore">Gentoo HOWTO</a>
-					<a href="http://alpinelinux.org/wiki/High_performance_SCST_iSCSI_Target_on_Linux_software_Raid" class="readmore">Alpine Linux HOWTO</a>
 					<a href="downloads.html" class="readmore">Download</a>				
 					<a href="http://sourceforge.net/p/scst/svn/HEAD/tree/" class="readmore">SCST SVN Repository</a>
 				</p>
diff --git a/www/target_iser.html b/www/target_iser.html
deleted file mode 100644
index 67bf344a9..000000000
--- a/www/target_iser.html
+++ /dev/null
@@ -1,96 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta name="Keywords" content="iSER, iSCSI target, iSCSI-SCST">
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta name="author" content="Daniel Fernandes">
-<meta name="Robots" content="index,follow">
-<link rel="stylesheet" href="images/Orange.css" type="text/css">	
-<title>iSER Target Driver</title>
-</head>
-
-<body>
-<!-- wrap starts here -->
-<div id="wrap"> 
-	<div id="header">	
-		<div class="logoimg"></div><h1 id="logo"><span class="orange"></span></h1>
-		<h2 id=slogan>Generic SCSI Target Subsystem for Linux</h2>
-	</div>		
-		
-	<div id="menu">
-		<ul>
-			<li><a href="http://scst.sourceforge.net">Home</a></li>
-			<li><a href="http://www.sourceforge.net/projects/scst">Main</a></li>
-			<li><a href="http://sourceforge.net/news/?group_id=110471">News</a></li>
-			<li id="current"><a href="targets.html">Drivers</a></li>
-			<li><a href="downloads.html">Downloads</a></li>
-			<li><a href="contributing.html">Contributing</a></li>
-			<li><a href="comparison.html">Comparison</a></li>		
-			<li><a href="users.html">Users</a></li>
-			<li><a href="solutions.html">Solutions</a></li>
-		</ul>
-	</div>
-	
-	<!-- content-wrap starts here -->	
-	<div id="content-wrap">
-			<div id="sidebar">
-				<h1>Target Drivers</h1>
-				<ul class="sidemenu">
-					<li><a href="target_iscsi.html">ISCSI-SCST</a></li>
-					<li><a href="target_iser.html">iSER</a></li>
-					<li><a href="target_qla2x00t.html">QLogic FC qla2x00t</a></li>
-					<li><a href="target_srp.html">SCSI RDMA Protocol (SRP)</a></li>
-					<li><a href="target_mvsas.html">Marvell SAS adapters</a></li>
-					<li><a href="target_emulex.html">Emulex FC/FCoE adapters</a></li>
-					<li><a href="target_lsi.html">LSI/MPT adapters</a></li>
-					<li><a href="target_fcoe.html">FCoE Target</a></li>
-					<li><a href="target_local.html">Local Target Driver</a></li>
-					<li><a href="target_ibmvscsi.html">IBM pSeries Virtual SCSI</a></li>
-					<li><a href="target_old.html">Old Unsupported</a></li>
-				</ul>
-				<h1>User utilities</h1>
-				<ul class="sidemenu">
-					<li><a href="scst_admin.html">SCST Admin Utility</a></li>
-					<li><a href="handler_fileio_tgt.html">FILEIO_TGT handler</a></li>
-				</ul>
-			</div>		
-			
-			<div id="main">
-				<h1>iSCSI Extensions for RDMA (iSER) driver for iSCSI-SCST</h1>
-				<p>ISER extension for ISCSI-SCST has been developed by Yan Burman and Mellanox Technologies (thank you!).</p>
-				
-				<p>Current version is 3.0.1. You can find the latest development version in the SCST SVN in iser branch. See the download page how to setup
-				access to it.</p>
-
-				<p>3.0.x-iser branch in the SCST SVN is the stable post-3.0 release iSER
-				branch with the latest stable fixes in the iSER driver as well as other SCST components merged from the 3.0.x branch.</p>
-
-				<br><br><br>
-				<p class="post-footer align-right">					
-					<a href="http://community.mellanox.com/docs/DOC-1479" class="readmore">HOWTO</a>
-					<a href="http://sourceforge.net/p/scst/svn/HEAD/tree/" class="readmore">SCST SVN Repository</a>
-				</p>
-				<table border=0><tr><td height="300px">&nbsp;</td></tr></table>								
-	  		</div> 
-	</div>
-</div>		
-<!-- footer starts here -->		
-<div id="footer">
-	<p>&copy; Copyright 2004 - 2015<b><font class="names"> Vladislav Bolkhovitin/SCST Ltd &amp others.</font></b>&nbsp;&nbsp;
-	Design by: <b><font class="names">Daniel Fernandes</font></b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</p>
-</div>	
-<!-- footer ends here -->
-<!-- Piwik -->
-<script type="text/javascript">
-var pkBaseURL = (("https:" == document.location.protocol) ? "https://apps.sourceforge.net/piwik/scst/" : "http://apps.sourceforge.net/piwik/scst/");
-document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
-</script><script type="text/javascript">
-piwik_action_name = '';
-piwik_idsite = 1;
-piwik_url = pkBaseURL + "piwik.php";
-piwik_log(piwik_action_name, piwik_idsite, piwik_url);
-</script>
-<object><noscript><p><img src="http://apps.sourceforge.net/piwik/scst/piwik.php?idsite=1" alt="piwik"></p></noscript></object>
-<!-- End Piwik Tag -->
-</body>
-</html>
diff --git a/www/target_local.html b/www/target_local.html
index 570c8158e..02dc6ec2a 100644
--- a/www/target_local.html
+++ b/www/target_local.html
@@ -36,12 +36,11 @@
 			<div id="sidebar">
 				<h1>Target Drivers</h1>
 				<ul class="sidemenu">
-					<li><a href="target_iscsi.html">ISCSI-SCST</a></li>
-					<li><a href="target_iser.html">iSER</a></li>
+					<li><a href="target_iscsi.html">ISCSI-SCST with iSER</a></li>
 					<li><a href="target_qla2x00t.html">QLogic FC qla2x00t</a></li>
 					<li><a href="target_srp.html">SCSI RDMA Protocol (SRP)</a></li>
 					<li><a href="target_mvsas.html">Marvell SAS adapters</a></li>
-					<li><a href="target_emulex.html">Emulex FC/FCoE adapters</a></li>
+					<li><a href="target_emulex.html">Emulex FC/FCoE</a></li>
 					<li><a href="target_lsi.html">LSI/MPT adapters</a></li>
 					<li><a href="target_fcoe.html">FCoE Target</a></li>
 					<li><a href="target_local.html">Local Target Driver</a></li>
diff --git a/www/target_lsi.html b/www/target_lsi.html
index b96496b0b..109949910 100644
--- a/www/target_lsi.html
+++ b/www/target_lsi.html
@@ -36,12 +36,11 @@
 			<div id="sidebar">
 				<h1>Target Drivers</h1>
 				<ul class="sidemenu">
-					<li><a href="target_iscsi.html">ISCSI-SCST</a></li>
-					<li><a href="target_iser.html">iSER</a></li>
+					<li><a href="target_iscsi.html">ISCSI-SCST with iSER</a></li>
 					<li><a href="target_qla2x00t.html">QLogic FC qla2x00t</a></li>
 					<li><a href="target_srp.html">SCSI RDMA Protocol (SRP)</a></li>
 					<li><a href="target_mvsas.html">Marvell SAS adapters</a></li>
-					<li><a href="target_emulex.html">Emulex FC/FCoE adapters</a></li>
+					<li><a href="target_emulex.html">Emulex FC/FCoE</a></li>
 					<li><a href="target_lsi.html">LSI/MPT adapters</a></li>
 					<li><a href="target_fcoe.html">FCoE Target</a></li>
 					<li><a href="target_local.html">Local Target Driver</a></li>
diff --git a/www/target_mvsas.html b/www/target_mvsas.html
index 2e3984aaa..7cbda1e02 100644
--- a/www/target_mvsas.html
+++ b/www/target_mvsas.html
@@ -36,12 +36,11 @@
 			<div id="sidebar">
 				<h1>Target Drivers</h1>
 				<ul class="sidemenu">
-					<li><a href="target_iscsi.html">ISCSI-SCST</a></li>
-					<li><a href="target_iser.html">iSER</a></li>
+					<li><a href="target_iscsi.html">ISCSI-SCST with iSER</a></li>
 					<li><a href="target_qla2x00t.html">QLogic FC qla2x00t</a></li>
 					<li><a href="target_srp.html">SCSI RDMA Protocol (SRP)</a></li>
 					<li><a href="target_mvsas.html">Marvell SAS adapters</a></li>
-					<li><a href="target_emulex.html">Emulex FC/FCoE adapters</a></li>
+					<li><a href="target_emulex.html">Emulex FC/FCoE</a></li>
 					<li><a href="target_lsi.html">LSI/MPT adapters</a></li>
 					<li><a href="target_fcoe.html">FCoE Target</a></li>
 					<li><a href="target_local.html">Local Target Driver</a></li>
diff --git a/www/target_old.html b/www/target_old.html
index bae199446..eae42915c 100644
--- a/www/target_old.html
+++ b/www/target_old.html
@@ -36,12 +36,11 @@
 			<div id="sidebar">
 				<h1>Target Drivers</h1>
 				<ul class="sidemenu">
-					<li><a href="target_iscsi.html">ISCSI-SCST</a></li>
-					<li><a href="target_iser.html">iSER</a></li>
+					<li><a href="target_iscsi.html">ISCSI-SCST with iSER</a></li>
 					<li><a href="target_qla2x00t.html">QLogic FC qla2x00t</a></li>
 					<li><a href="target_srp.html">SCSI RDMA Protocol (SRP)</a></li>
 					<li><a href="target_mvsas.html">Marvell SAS adapters</a></li>
-					<li><a href="target_emulex.html">Emulex FC/FCoE adapters</a></li>
+					<li><a href="target_emulex.html">Emulex FC/FCoE</a></li>
 					<li><a href="target_lsi.html">LSI/MPT adapters</a></li>
 					<li><a href="target_fcoe.html">FCoE Target</a></li>
 					<li><a href="target_local.html">Local Target Driver</a></li>
diff --git a/www/target_qla2x00t.html b/www/target_qla2x00t.html
index 493a55b29..ad867be1c 100644
--- a/www/target_qla2x00t.html
+++ b/www/target_qla2x00t.html
@@ -36,12 +36,11 @@
 			<div id="sidebar">
 				<h1>Target Drivers</h1>
 				<ul class="sidemenu">
-					<li><a href="target_iscsi.html">ISCSI-SCST</a></li>
-					<li><a href="target_iser.html">iSER</a></li>
+					<li><a href="target_iscsi.html">ISCSI-SCST with iSER</a></li>
 					<li><a href="target_qla2x00t.html">QLogic FC qla2x00t</a></li>
 					<li><a href="target_srp.html">SCSI RDMA Protocol (SRP)</a></li>
 					<li><a href="target_mvsas.html">Marvell SAS adapters</a></li>
-					<li><a href="target_emulex.html">Emulex FC/FCoE adapters</a></li>
+					<li><a href="target_emulex.html">Emulex FC/FCoE</a></li>
 					<li><a href="target_lsi.html">LSI/MPT adapters</a></li>
 					<li><a href="target_fcoe.html">FCoE Target</a></li>
 					<li><a href="target_local.html">Local Target Driver</a></li>
diff --git a/www/target_srp.html b/www/target_srp.html
index ed6e8e4e8..f16421c6a 100644
--- a/www/target_srp.html
+++ b/www/target_srp.html
@@ -36,12 +36,11 @@
 			<div id="sidebar">
 				<h1>Target Drivers</h1>
 				<ul class="sidemenu">
-					<li><a href="target_iscsi.html">ISCSI-SCST</a></li>
-					<li><a href="target_iser.html">iSER</a></li>
+					<li><a href="target_iscsi.html">ISCSI-SCST with iSER</a></li>
 					<li><a href="target_qla2x00t.html">QLogic FC qla2x00t</a></li>
 					<li><a href="target_srp.html">SCSI RDMA Protocol (SRP)</a></li>
 					<li><a href="target_mvsas.html">Marvell SAS adapters</a></li>
-					<li><a href="target_emulex.html">Emulex FC/FCoE adapters</a></li>
+					<li><a href="target_emulex.html">Emulex FC/FCoE</a></li>
 					<li><a href="target_lsi.html">LSI/MPT adapters</a></li>
 					<li><a href="target_fcoe.html">FCoE Target</a></li>
 					<li><a href="target_local.html">Local Target Driver</a></li>
diff --git a/www/targets.html b/www/targets.html
index 412ae3c4f..9cc85e27f 100644
--- a/www/targets.html
+++ b/www/targets.html
@@ -36,12 +36,11 @@
 			<div id="sidebar">
 				<h1>Target Drivers</h1>
 				<ul class="sidemenu">
-					<li><a href="target_iscsi.html">ISCSI-SCST</a></li>
-					<li><a href="target_iser.html">iSER</a></li>
+					<li><a href="target_iscsi.html">ISCSI-SCST with iSER</a></li>
 					<li><a href="target_qla2x00t.html">QLogic FC qla2x00t</a></li>
 					<li><a href="target_srp.html">SCSI RDMA Protocol (SRP)</a></li>
 					<li><a href="target_mvsas.html">Marvell SAS adapters</a></li>
-					<li><a href="target_emulex.html">Emulex FC/FCoE adapters</a></li>
+					<li><a href="target_emulex.html">Emulex FC/FCoE</a></li>
 					<li><a href="target_lsi.html">LSI/MPT adapters</a></li>
 					<li><a href="target_fcoe.html">FCoE Target</a></li>
 					<li><a href="target_local.html">Local Target Driver</a></li>
@@ -60,11 +59,11 @@
 				
 				<p>SCST has target drivers for:</p>
 					<ul>
-						<li><span>iSCSI</span></li>
+						<li><span>iSCSI with iSER</span></li>
 						<li><span>Fibre Channel QLogic qla2xxx series</span></li>
 						<li><span>Infiniband SCSI RDMA Protocol (SRP)</span></li>
 						<li><span>Marvell SAS adapters</span></li>
-						<li><span>Emulex FC/FCoE adapters</span></li>
+						<li><span>Emulex FC/FCoE</span></li>
 						<li><span>LSI/MPT adapters (parallel SCSI, including Wide Ultra320, SAS, Fibre Channel)</span></li>
 						<li><span>FCoE</span></li>
 						<li><span>Local access</span></li>