From 668003f8a5c4f7aa72c87755c43f357e5d48cf30 Mon Sep 17 00:00:00 2001
From: markpollack <mark.pollack@springsource.com>
Date: Sun, 17 Aug 2008 01:36:59 +0000
Subject: [PATCH] SPRNET-1007 - remove extraneous 'bean' references.

---
 doc/reference/src/messaging.xml   | 5 ++---
 doc/reference/src/objects.xml     | 2 +-
 doc/reference/src/transaction.xml | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/doc/reference/src/messaging.xml b/doc/reference/src/messaging.xml
index a2b2d1d3..7be07f6b 100644
--- a/doc/reference/src/messaging.xml
+++ b/doc/reference/src/messaging.xml
@@ -1037,7 +1037,7 @@ namespace MyApp
     &lt;property name="MessageConverter"&gt;
         &lt;null/&gt;
     &lt;/property&gt;
-&lt;/bean&gt;</programlisting>
+&lt;/object&gt;</programlisting>
 
       <para>Please note that if the above 'MessageListener' receives a Message
       of a type other than ITextMessage, a
@@ -1129,8 +1129,7 @@ namespace MyApp
 &lt;/nms:listener-container&gt;</programlisting>
 
       <para>The example above is equivalent to creating two distinct listener
-      container bean definitions and two distinct MessageListenerAdapter bean
-      definitions as demonstrated in the section entitled <xref
+      container object definitions and two distinct MessageListenerAdapter object      definitions as demonstrated in the section entitled <xref
       linkend="message-listener-adapter" />. In addition to the attributes
       shown above, the listener element may contain several optional ones. The
       following table describes all available attributes:</para>
diff --git a/doc/reference/src/objects.xml b/doc/reference/src/objects.xml
index c88fda73..a7c7521f 100644
--- a/doc/reference/src/objects.xml
+++ b/doc/reference/src/objects.xml
@@ -4861,7 +4861,7 @@ cfg.PostProcessObjectFactory(factory);</programlisting></para>
       <classname>IObjectFactory</classname> capabilities in a lot more depth
       than the said feature matrix.)</para>
 
-      <table id="context-introduction-ctx-vs-beanfactory-feature-matrix"
+      <table id="context-introduction-ctx-vs-objectfactory-feature-matrix"
              pgwide="1">
         <title>Feature Matrix</title>
 
diff --git a/doc/reference/src/transaction.xml b/doc/reference/src/transaction.xml
index 498d4151..f4929688 100644
--- a/doc/reference/src/transaction.xml
+++ b/doc/reference/src/transaction.xml
@@ -458,7 +458,7 @@
     <programlisting>TransactionInterceptor.CurrentTransactionStatus.RollbackOnly = true;</programlisting>
 
     <sect2 id="tx-understandingimpl">
-      <title id="beannameautoproxycreator-for-transactions">Understanding
+      <title id="objectnameautoproxycreator-for-transactions">Understanding
       Spring's declarative transaction implementation</title>
 
       <para>The aim of this section is to dispel the mystique that is