diff --git a/doc/reference/src/messaging.xml b/doc/reference/src/messaging.xml
index 3fd13468..f3e3e5d7 100644
--- a/doc/reference/src/messaging.xml
+++ b/doc/reference/src/messaging.xml
@@ -218,7 +218,7 @@
       even with the option of using WCF, many people prefer to sit 'closer to
       the metal' when using messaging middleware, to access specific features
       and functionality not available in WCF, or simply because they are more
-      comfortable with that programming model. </para>
+      comfortable with that programming model.</para>
 
       <para>A WCF binding for Apache NMS is being developed as a separate
       project under the <link
@@ -275,19 +275,7 @@
       working with the provider's messaging API. It is used by the client
       application as a factory to create connections to the messaging server
       and encapsulates various configuration parameters, many of which are
-      vendor specific such as SSL configuration options.<note>
-          <para>The TIBCO EMS ConnectionFactory is not interface based and its
-          methods are not virtual so no additional functionality that may
-          otherwise be part of a ConnectionFactory 'Wrappers' (to be discussed
-          later) are provided.</para>
-        </note></para>
-
-      <section>
-        <title>Caching EMS Resources</title>
-
-        <para>The class
-        Spring.Messaging.Nms.Connections.CachingConnectionFactory</para>
-      </section>
+      vendor specific such as SSL configuration options.</para>
     </section>
 
     <section>
@@ -302,9 +290,7 @@
       <para>Between the ConnectionFactory and the Send operation there are
       three intermediate objects that are created and destroyed. To optimise
       the resource usage and increase performance two implementations of
-      IConnectionFactory are provided. Note that the TIBCO EMS implementation
-      is not based on interfaces and an alternative strategy was selected for
-      the time being. See the last section in this manual for details.</para>
+      IConnectionFactory are provided.</para>
 
       <section>
         <title>SingleConnectionFactory</title>
@@ -837,13 +823,14 @@ public delegate object ProducerDelegate(ISession session, IMessageProducer produ
 
       <para>Other vendors may provide a delegate based version of this
       callback or even both a delegate and interface options. Apache ActiveMQ
-      supports only the use of delegates for message reception callbacks. As a
+      supports the use of delegates for message reception callbacks. As a
       programming convenience in <literal>Spring.Messaging.Nms.Core</literal>
       is an interface <literal>IMessageListener</literal> that can be used
       with NMS.</para>
 
-      <para>Below is a simple implementation of the IMessageListener interface
-      that processing a message.</para>
+      <para>Below is a simple implementation of the
+      <literal>IMessageListener</literal> interface that processes a
+      message.</para>
 
       <programlisting language="csharp">using Spring.Messaging.Nms.Core;
 using Apache.NMS;
@@ -1403,47 +1390,4 @@ namespace MyApp
       </table>
     </section>
   </section>
-
-  <section>
-    <title>TIBCO EMS Specific Details</title>
-
-    <para>This section covers functionality and behavior that is different
-    than described previously and is specific to TIBCO EMS.</para>
-
-    <section>
-      <title>Resource Management</title>
-
-      <para>Caching of messaging resources is usually done by a wrapping the
-      'raw provider' provider implementation with an implementation that will
-      cache messaging resources. The resources that are candidates for caching
-      are the Connection, Session, and MessageProducer. The JMS specification
-      requires that the Connection be thread safe. The Session and
-      MessageProducer are not required to be thread safe but they are in
-      TIBCO's implementation. The most important resource to cache is the EMS
-      Connection since the flow of events in the message template class
-      (EmsTemplate) is to create/close a connection on each operation and this
-      is an expensive operation.</para>
-
-      <para>Spring provides a convenience class, SingleConnectionFactory, in
-      which the same Connection is returned on calls to CreateConnection() and
-      all calls to .Close() on the returned Connection are ignored. Since
-      TIBCO's Connection class does not have an interface nor virtual methods
-      this strategy is not possible. An alternative strategy used is to
-      'hard-code' the caching of these resources within EmsTemplate and
-      SimpleMessageContainer. This functionality is controlled by the property
-      <property>CacheJmsResources</property> and is set to true by default,
-      resulting in caching of Connection, Session, and MessageProducer. When
-      using the TIBCO EMS binding for the NMS APIs you do not need to set this
-      property and can instead use one of the wrapper implementations in
-      Spring based on the NMS API that performs caching of messaging
-      resources.</para>
-    </section>
-
-    <section>
-      <title>Queue browsing in EmsTemplate</title>
-
-      <para>The following queue browsing operations are available on
-      EmsTemplate</para>
-    </section>
-  </section>
 </chapter>
diff --git a/doc/reference/src/orm.xml b/doc/reference/src/orm.xml
index cbad46ef..d7e2240d 100644
--- a/doc/reference/src/orm.xml
+++ b/doc/reference/src/orm.xml
@@ -529,7 +529,7 @@
       <literal>Session</literal>, as its lifecycle is managed by the
       transaction). Asking for the</para>
 
-      <programlisting language="csharp">public class HibernateProductDao extends HibernateDaoSupport implements ProductDao {
+      <programlisting language="csharp">public class HibernateProductDao : HibernateDaoSupport, IProductDao {
 
         public Customer SaveOrUpdate(Customer customer)
         {