Merge branch 'hotfix/broker-cleanup'

joncave · Jul 6, 2012 · 4fe4e7b · 4fe4e7b
2 parents 5da884f + 7d5bed1
commit 4fe4e7b
Show file tree

Hide file tree

Showing 18 changed files with 2 additions and 2,501 deletions.
diff --git a/documentation/manual/en/manual.xml.in b/documentation/manual/en/manual.xml.in
@@ -1067,12 +1067,6 @@
                 </xi:fallback>
             </xi:include>
 
-            <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="module_specs/Zend_Loader-Broker.xml" parse="xml">
-                <xi:fallback>
-                    <xi:include href="../en/module_specs/Zend_Loader-Broker.xml" parse="xml"/>
-                </xi:fallback>
-            </xi:include>
-
             <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="module_specs/Zend_Loader-PluginClassLocator.xml" parse="xml">
                 <xi:fallback>
                     <xi:include href="../en/module_specs/Zend_Loader-PluginClassLocator.xml" parse="xml"/>
@@ -1091,12 +1085,6 @@
                 </xi:fallback>
             </xi:include>
 
-            <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="module_specs/Zend_Loader-PluginSpecBroker.xml" parse="xml">
-                <xi:fallback>
-                    <xi:include href="../en/module_specs/Zend_Loader-PluginSpecBroker.xml" parse="xml"/>
-                </xi:fallback>
-            </xi:include>
-
             <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="module_specs/Zend_Loader-StandardAutoloader.xml" parse="xml">
                 <xi:fallback>
                     <xi:include href="../en/module_specs/Zend_Loader-StandardAutoloader.xml" parse="xml"/>
@@ -1115,18 +1103,11 @@
                 </xi:fallback>
             </xi:include>
 
-            <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="module_specs/Zend_Loader-PluginBroker.xml" parse="xml">
-                <xi:fallback>
-                    <xi:include href="../en/module_specs/Zend_Loader-PluginBroker.xml" parse="xml"/>
-                </xi:fallback>
-            </xi:include>
-
             <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="module_specs/Zend_Loader-PrefixPathMapper.xml" parse="xml">
                 <xi:fallback>
                     <xi:include href="../en/module_specs/Zend_Loader-PrefixPathMapper.xml" parse="xml"/>
                 </xi:fallback>
             </xi:include>
-
         </chapter>
 
         <!--<chapter xml:id="zend.log"><title>Zend_Log</title>-->

diff --git a/documentation/manual/en/module_specs/Zend_Loader-Broker.xml b/documentation/manual/en/module_specs/Zend_Loader-Broker.xml