Merge branch 'hotfix/382' into develop

Close #382
zendframework · Oct 17, 2012 · 90aedc4 · 90aedc4
2 parents ee61738 + 8c1edc0
commit 90aedc4
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 1,620 deletions.
diff --git a/docs/languages/en/index.rst b/docs/languages/en/index.rst
@@ -81,6 +81,7 @@
    modules/zend.feed.reader
    modules/zend.feed.writer
    modules/zend.feed.pubsubhubbub
+   modules/zend.file.class-file-locator
    modules/zend.filter
    modules/zend.filter.set
    modules/zend.filter.filter-chains
@@ -358,6 +359,13 @@ Zend\\Feed
         * :doc:`modules/zend.feed.writer`
         * :doc:`modules/zend.feed.pubsubhubbub`
 
+.. _zend.file:
+
+Zend\\File
+^^^^^^^^^^^^
+
+        * :doc:`modules/zend.file.class-file-locator`
+
 .. _zend.filter:
 
 Zend\\Filter

diff --git a/docs/languages/en/modules/zend.file.class-file-locator.rst b/docs/languages/en/modules/zend.file.class-file-locator.rst
@@ -0,0 +1,27 @@
+.. _zend.file.class-file-locator:
+
+Zend\\File\\ClassFileLocator
+============================
+
+.. _zend.file.class-file-locator.intro:
+
+Overview
+--------
+
+TODO
+
+.. _zend.file.class-file-locator.options:
+
+Available Methods
+-----------------
+
+TODO
+
+.. _zend.file.class-file-locator.examples:
+
+Examples
+--------
+
+TODO
+
+
diff --git a/docs/languages/en/modules/zend.file.transfer.filters.rst b/docs/languages/en/modules/zend.file.transfer.filters.rst