[seam-commits] Seam SVN: r13425 - modules/xml/trunk/docs/src/main/docbook/en-US.

[seam-commits at lists.jboss.org]

Author: swd847
Date: 2010-07-18 00:28:50 -0400 (Sun, 18 Jul 2010)
New Revision: 13425

Modified:
   modules/xml/trunk/docs/src/main/docbook/en-US/xml-general.xml
   modules/xml/trunk/docs/src/main/docbook/en-US/xml-introduction.xml
Log:
missed some references to <override> in the docs



Modified: modules/xml/trunk/docs/src/main/docbook/en-US/xml-general.xml
===================================================================
--- modules/xml/trunk/docs/src/main/docbook/en-US/xml-general.xml	2010-07-18 04:26:36 UTC (rev 13424)
+++ modules/xml/trunk/docs/src/main/docbook/en-US/xml-general.xml	2010-07-18 04:28:50 UTC (rev 13425)
@@ -142,7 +142,7 @@
         <itemizedlist>
             <listitem><para><literal>Beans</literal></para></listitem>
             <listitem><para><literal>modifies</literal></para></listitem>
-            <listitem><para><literal>overrides</literal></para></listitem>
+            <listitem><para><literal>replaces</literal></para></listitem>
             <listitem><para><literal>parameters</literal></para></listitem>
             <listitem><para><literal>value</literal></para></listitem>
             <listitem><para><literal>key</literal></para></listitem>
@@ -193,9 +193,9 @@
         <title>Overriding and extending beans</title>
         <para>By configuring a bean via XML creates a new bean, however there 
           may be cases where you want to modify an existing bean rather than
-          adding a new one. The <literal>&lt;s:overrides&gt;</literal> and 
+          adding a new one. The <literal>&lt;s:replaces&gt;</literal> and 
           <literal>&lt;s:modifies&gt;</literal> tags allow you to do this.</para>
-          <para>The <literal>&lt;s:overrides&gt;</literal> tag prevents the existing bean from being 
+          <para>The <literal>&lt;s:replaces&gt;</literal> tag prevents the existing bean from being 
           installed, and registers a new one with the given configuration. The 
           <literal>&lt;s:modifies&gt;</literal> tag does the same, except that it merges
           the annotations on the bean with the annotations defined in XML. This has the

Modified: modules/xml/trunk/docs/src/main/docbook/en-US/xml-introduction.xml
===================================================================
--- modules/xml/trunk/docs/src/main/docbook/en-US/xml-introduction.xml	2010-07-18 04:26:36 UTC (rev 13424)
+++ modules/xml/trunk/docs/src/main/docbook/en-US/xml-introduction.xml	2010-07-18 04:28:50 UTC (rev 13425)
@@ -76,7 +76,7 @@
                    <area id="filename" coords="11"/>
                    <area id="datasource-qualifier" coords="13"/>
                    <area id="filename-short" coords="17"/>
-                   <area id="overrides" coords="18"/>
+                   <area id="replaces" coords="18"/>
                    <area id="inject" coords="20"/>
                    <area id="datasource-type" coords="21"/>
        </areaspec>
@@ -131,12 +131,12 @@
                             <callout arearefs="filename-short">
                                 <para>This is the shorthand syntax for setting a field value.</para>
                             </callout>
-                            <callout arearefs="overrides">
-                                <para>Beans installed using <literal>&lt;s:overrides&gt;</literal> do not read annotations from the existing class. In addition if a bean is installed with 
-                                <literal>&lt;s:overrides&gt;</literal> it prevents the original class being installed as a bean.</para>
+                            <callout arearefs="replaces">
+                                <para>Beans installed using <literal>&lt;s:replaces&gt;</literal> do not read annotations from the existing class. In addition if a bean is installed with 
+                                <literal>&lt;s:replaces&gt;</literal> it prevents the original class being installed as a bean.</para>
                             </callout>
                             <callout arearefs="inject">
-                                <para>The <literal>&lt;s:Inject&gt;</literal> element is needed this bean was installed with <literal>&lt;s:overrides&gt;</literal>, so annotations are not read
+                                <para>The <literal>&lt;s:Inject&gt;</literal> element is needed this bean was installed with <literal>&lt;s:replaces&gt;</literal>, so annotations are not read
                                 from the class definition.</para>
                             </callout>
                             <callout arearefs="datasource-type">