[weld-commits] Weld SVN: r4947 - doc/trunk/reference/en-US.

[weld-commits at lists.jboss.org]

Author: gavin.king at jboss.com
Date: 2009-11-10 02:50:26 -0500 (Tue, 10 Nov 2009)
New Revision: 4947

Modified:
   doc/trunk/reference/en-US/intro.xml
   doc/trunk/reference/en-US/master.xml
   doc/trunk/reference/en-US/part2.xml
Log:
more reorg

Modified: doc/trunk/reference/en-US/intro.xml
===================================================================
--- doc/trunk/reference/en-US/intro.xml	2009-11-10 07:35:33 UTC (rev 4946)
+++ doc/trunk/reference/en-US/intro.xml	2009-11-10 07:50:26 UTC (rev 4947)
@@ -455,7 +455,7 @@
          <para>
             That's not quite the end of the story. CDI also defines a simple <emphasis>resolution rule</emphasis> that helps 
             the container decide what to do if there is more than one bean that satisfies a particular contract. We'll get 
-            into the details in <xref linkend="alternatives"/>.
+            into the details in <xref linkend="injection"/>.
          </para>
          
          <!--
@@ -578,10 +578,9 @@
             deployment descriptor <literal>META-INF/beans.xml</literal> of the jar or Java EE module that uses 
             it. Different modules can specify that they use different alternatives.
          </para>
-
+         
          <para>
-            Details on how to enable alternative beans, and how you can use them to specialize (override) beans 
-            and producer methods is covered in <xref linkend="3"/>.
+            We cover alternatives in more detail in <xref linkend="alternatives"/>.
          </para>
          
       </section>

Modified: doc/trunk/reference/en-US/master.xml
===================================================================
--- doc/trunk/reference/en-US/master.xml	2009-11-10 07:35:33 UTC (rev 4946)
+++ doc/trunk/reference/en-US/master.xml	2009-11-10 07:50:26 UTC (rev 4947)
@@ -41,7 +41,6 @@
       <xi:include href="example.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
       <xi:include href="injection.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
       <xi:include href="scopescontexts.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-      <xi:include href="producermethods.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
       <!-- TODO <xi:include href="producerfields.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
      
    </part>
@@ -61,6 +60,7 @@
       
       <xi:include href="part2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 
+      <xi:include href="producermethods.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
       <xi:include href="interceptors.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
       <xi:include href="decorators.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
       <xi:include href="events.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />

Modified: doc/trunk/reference/en-US/part2.xml
===================================================================
--- doc/trunk/reference/en-US/part2.xml	2009-11-10 07:35:33 UTC (rev 4946)
+++ doc/trunk/reference/en-US/part2.xml	2009-11-10 07:50:26 UTC (rev 4947)
@@ -59,7 +59,7 @@
       </listitem>
    </itemizedlist>
 
-   <para>Let's explore interceptors first.</para>
+   <para>Let's explore producer methods first.</para>
 
 <!--
 vim:et:ts=3:sw=3:tw=120