svn commit: r943604 - in /websites/staging/felix/trunk/content: ./ documentation/subprojects/apache-felix-dependency-manager/reference/components.html

[bu...@apache.org]

Author: buildbot
Date: Fri Mar 13 00:06:00 2015
New Revision: 943604

Log:
Staging update by buildbot for felix

Modified:
    websites/staging/felix/trunk/content/   (props changed)
    websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/components.html

Propchange: websites/staging/felix/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Mar 13 00:06:00 2015
@@ -1 +1 @@
-1666336
+1666338

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/components.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/components.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/components.html Fri Mar 13 00:06:00 2015
@@ -105,14 +105,13 @@ DependencyManager object) and the requir
 tracked. The component remains in the current state until all required dependencies are
 available.</li>
 <li><em>Instantiated and waiting for required</em> state: All required dependencies declared
-in the Activator are available. The Component has been instantiated, has been injected 
-with all required dependencies, including optional dependencies on class fields (autoconfig).
+in the Activator are available. The Component has been instantiated with required dependencies injected,
 and has been invoked in the <em>init</em> callback. Now, if some extra required dependencies have
 been dynamically added in the <em>init</em> callback, then the component remains in the
 current state until all extra required dependencies become available.</li>
-<li><em>Tracking optional</em>: All Required dependencies are available (including the ones
-that have been dynamically declared from the init component callback). The component has 
-been invoked in the <em>start</em> callback and the optional dependencies (with callbacks) are 
+<li><em>Tracking optional</em>: All Required dependencies are injected (including the ones
+you dynamically added from the <em>init</em> method), the component <em>start</em> callback
+is called, the component service is registered in the OSGi registry, and finally the optional dependencies (with callbacks) are 
 then tracked.</li>
 </ul>
 <h2 id="what-happens-during-component-instantiation">What happens during component instantiation ?</h2>
@@ -307,7 +306,7 @@ the depenencies defined in the Activator
 
 <p>You can refer to this <a href="https://svn.apache.org/repos/asf/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/compositefactory/">sample code</a>, which is part of the source distribution.</p>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1666336 by pderop on Thu, 12 Mar 2015 23:44:41 +0000
+        Rev. 1666338 by pderop on Fri, 13 Mar 2015 00:05:47 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Felix, Felix, Apache, the Apache feather logo, and the Apache Felix project