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

[bu...@apache.org]

Author: buildbot
Date: Fri Mar 13 07:59:45 2015
New Revision: 943636

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 07:59:45 2015
@@ -1 +1 @@
-1666340
+1666366

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 07:59:45 2015
@@ -246,8 +246,8 @@ that is internally implemented using thr
 <p>Out of the box, there already is support for lazy instantiation, meaning that the dependency manager can create component instances for you when their required dependencies are resolved. However, sometimes creating a single instance using a default constructor is not enough. In those cases, you can tell the dependency manager to delegate the creation process to a factory.</p>
 <p>Interestingly, you can also mix the usage of a Factory object and a Composition of objects returned by the Factory.
 The following is the same example as in the previous section (Composition), but using a Factory approach in order to instantiate a composition of objects: 
-The "ProviderFactory" is first injected with a Configuration that can be possibly be used to create
-and configure all the other objects that are part of the composition; each object will also injected with
+The "ProviderFactory" is first injected with a Configuration that can possibly be used to create
+and configure all the other objects that are part of the composition; each object will also be injected with
 the dependencies defined in the Activator.</p>
 <div class="codehilite"><pre><span class="kd">public</span> <span class="kd">class</span> <span class="nc">ProviderFactory</span> <span class="o">{</span>
     <span class="kd">private</span> <span class="n">ProviderParticipant1</span> <span class="n">m_participant1</span><span class="o">;</span>
@@ -311,7 +311,7 @@ are part of a composition and need depen
 
 <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. 1666340 by pderop on Fri, 13 Mar 2015 00:21:19 +0000
+        Rev. 1666366 by pderop on Fri, 13 Mar 2015 07:59:18 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Felix, Felix, Apache, the Apache feather logo, and the Apache Felix project