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

[weld-commits at lists.jboss.org]

Author: gavin.king at jboss.com
Date: 2009-11-12 18:51:49 -0500 (Thu, 12 Nov 2009)
New Revision: 5006

Modified:
   doc/trunk/reference/en-US/scopescontexts.xml
Log:
some revisions

Modified: doc/trunk/reference/en-US/scopescontexts.xml
===================================================================
--- doc/trunk/reference/en-US/scopescontexts.xml	2009-11-12 23:46:52 UTC (rev 5005)
+++ doc/trunk/reference/en-US/scopescontexts.xml	2009-11-12 23:51:49 UTC (rev 5006)
@@ -102,7 +102,7 @@
       </itemizedlist>
 
       <note>
-         <para>A CDI extension can support the conversation scope for other frameworks as well.</para>
+         <para>A CDI extension can implement support for the conversation scope in other web frameworks.</para>
       </note>
 
       <para>The request and application scopes are also active:</para>
@@ -132,6 +132,11 @@
          If the application tries to invoke a bean with a scope that does not have an active context, a
          <literal>ContextNotActiveException</literal> is thrown by the container at runtime.
       </para>
+      
+      <para>
+         Managed beans with scope <literal>@SessionScoped</literal> or <literal>@ConversationScoped</literal> must be
+         serializable, since the container passivates the HTTP session from time to time.
+      </para>
 
       <para>
          Three of the four built-in scopes should be extremely familiar to every Java EE developer, so let's not waste
@@ -294,7 +299,7 @@
       
       <para>
          In addition to the four built-in scopes, CDI also supports two <emphasis>pseudo-scopes</emphasis>. The first 
-         is the <literal>singleton pseudo-scope</literal>, which we specify using the annotation <literal>@Singleton</literal>.
+         is the <emphasis>singleton pseudo-scope</emphasis>, which we specify using the annotation <literal>@Singleton</literal>.
       </para>
       
       <note>
@@ -341,7 +346,7 @@
          </listitem>
       </itemizedlist>
       
-      <para>A third, better solution is to instead use <literal>@ApplicationScoped</literal>, allowing the container to
+      <para>A fourth, better solution is to instead use <literal>@ApplicationScoped</literal>, allowing the container to
       proxy the bean, and take care of serialization problems automatically.</para>
    
    </section>