From 2a2fd264d20e2c3c5d8af18d656df1de5b65575f Mon Sep 17 00:00:00 2001
From: Marijn van der Zee <marijn@serraict.com>
Date: Mon, 19 Dec 2011 16:08:40 +0100
Subject: [PATCH] Add note on user changes to user settings during container
 lifetime

---
 doc/reference/src/objects.xml | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/doc/reference/src/objects.xml b/doc/reference/src/objects.xml
index 637068d7..959dbdee 100644
--- a/doc/reference/src/objects.xml
+++ b/doc/reference/src/objects.xml
@@ -5057,9 +5057,23 @@ cfg.PostProcessObjectFactory(factory);</programlisting></para>
               <imageobject>
                 <imagedata fileref="images/applicationsettings.png"></imagedata>
               </imageobject>
-            </mediaobject>Then you can use <literal>${peggy_name}</literal>
-          and <literal>${peter_age}</literal> as variables in your object
-          definitions.</para>
+            </mediaobject>Then you can use <literal>${peggy_name}</literal>,
+          <literal>${peggy_age}</literal>,
+          <literal>&amp;{peter_name}</literal> and
+          <literal>${peter_age}</literal> as variables in your object
+          definitions. They will be retrieved using the appropriate
+          scope.<note>
+              <para>Changes to user settings during the lifetime of your
+              application context will <emphasis>not</emphasis> be be visible
+              to the <literal>ConfigSectionVariableSource</literal>. Although
+              variables based on user settings will be resolved using user
+              scope, variables will <emphasis>only be resolved when the
+              <literal>VariablePlaceholderConfigurer</literal> is
+              initialized</emphasis>: that is when the context is created. Any
+              object (including lazy-loaded singletons and non-singletons) you
+              retrieve from the context will have the variable values injected
+              as they were when the context was loaded.</para>
+            </note></para>
         </sect4>
 
         <sect4>