Merge pull request zendframework#1079

Mike Willbanks · Mike Willbanks · commit 82f6b364c67b · 2013-10-14T12:06:05.000-07:00
diff --git a/docs/languages/en/modules/zend.cache.storage.adapter.rst b/docs/languages/en/modules/zend.cache.storage.adapter.rst
@@ -985,8 +985,6 @@ The ZendServerShm Adapter
 Examples
 --------
 
-.. _zend.cache.storage.adapter.examples.basic:
-
 .. rubric:: Basic usage
 
 .. code-block:: php
@@ -1010,8 +1008,6 @@ Examples
        $cache->setItem($key, $result);
    }
 
-.. _zend.cache.storage.adapter.examples.basic:
-
 .. rubric:: Get multiple rows from db
 
 .. code-block:: php
diff --git a/docs/languages/en/modules/zend.code.generator.reference.rst b/docs/languages/en/modules/zend.code.generator.reference.rst
@@ -8,62 +8,55 @@ Zend\Code\Generator Reference
 Abstract Classes and Interfaces
 -------------------------------
 
-.. _zend.code.generator.reference.abstracts.abstract:
+.. _zend.code.generator.reference.interface.generator:
 
-Zend\Code\Generator\AbstractGenerator
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Zend\Code\Generator\GeneratorInterface
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-The base class from which all CodeGenerator classes inherit provides the minimal functionality necessary. It's
+The base interface from which all CodeGenerator classes implement provides the minimal functionality necessary. It's
 *API* is as follows:
 
 .. code-block:: php
    :linenos:
 
-   abstract class Zend\Code\Generator\AbstractGenerator
+   interface Zend\Code\Generator\GeneratorInterface
    {
-       final public function __construct(Array $options = array())
-       public function setOptions(Array $options)
-       public function setSourceContent($sourceContent)
-       public function getSourceContent()
-       protected function _init()
-       protected function _prepare()
-       abstract public function generate();
-       final public function __toString()
+       public function generate();
    }
 
-The constructor first calls ``_init()`` (which is left empty for the concrete extending class to implement), then
-passes the ``$options`` parameter to ``setOptions()``, and finally calls ``_prepare()`` (again, to be implemented
-by an extending class).
-
-Like most classes in Zend Framework, ``setOptions()`` compares an option key to existing setters in the class, and
-passes the value on to that method if found.
-
-``__toString()`` is marked as final, and proxies to ``generate()``.
-
-``setSourceContent()`` and ``getSourceContent()`` are intended to either set the default content for the code being
-generated, or to replace said content once all generation tasks are complete.
-
 .. _zend.code.generator.reference.abstracts.abstract:
 
 Zend\Code\Generator\AbstractGenerator
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-``Zend\Code\Generator\AbstractGenerator`` extends ``Zend\Code\Generator\AbstractGenerator``, and adds some properties for tracking
+``Zend\Code\Generator\AbstractGenerator`` implements ``Zend\Code\Generator\GeneratorInterface``, and adds some properties for tracking
 whether content has changed as well as the amount of indentation that should appear before generated content. Its
 *API* is as follows:
 
 .. code-block:: php
    :linenos:
 
    abstract class Zend\Code\Generator\AbstractGenerator
-       extends Zend\Code\Generator\AbstractGenerator
+       implements Zend\Code\Generator\GeneratorInterface
    {
+       public function __construct(Array|Traversable $options = array())
+       public function setOptions(Array $options)
+       public function setSourceContent($sourceContent)
+       public function getSourceContent()
        public function setSourceDirty($isSourceDirty = true)
        public function isSourceDirty()
        public function setIndentation($indentation)
        public function getIndentation()
    }
 
+The constructor passes the ``$options`` parameter to ``setOptions()``.
+
+Like most classes in Zend Framework, ``setOptions()`` compares an option key to existing setters in the class, and
+passes the value on to that method if found.
+
+``setSourceContent()`` and ``getSourceContent()`` are intended to either set the default content for the code being
+generated, or to replace said content once all generation tasks are complete.
+
 .. _zend.code.generator.reference.abstracts.member-abstract:
 
 Zend\Code\Generator\AbstractMemberGenerator
diff --git a/docs/languages/en/modules/zend.filter.file.rename-upload.rst b/docs/languages/en/modules/zend.filter.file.rename-upload.rst
@@ -6,7 +6,7 @@ RenameUpload
 ``Zend\Filter\File\RenameUpload`` can be used to rename or move an uploaded file
 to a new path.
 
-.. _zend.filter.file.rename.options:
+.. _zend.filter.file.rename-upload.options:
 
 .. rubric:: Supported Options
 
@@ -47,7 +47,7 @@ The following set of options are supported:
 When filtering HTML5 file uploads with the ``multiple`` attribute set, all files will
 be filtered with the same option settings.
 
-.. _zend.filter.file.rename.usage:
+.. _zend.filter.file.rename-upload.usage:
 
 .. rubric:: Usage Examples
 
diff --git a/docs/languages/en/modules/zend.form.view.helper.form-file-upload-progress.rst b/docs/languages/en/modules/zend.form.view.helper.form-file-upload-progress.rst
@@ -20,7 +20,7 @@ See the `PECL uploadprogress extension`_ for more information.
 
 ``FormFileUploadProgress`` extends from :ref:`Zend\\Form\\View\\Helper\\FormInput <zend.form.view.helper.form-input>`.
 
-.. _zend.form.view.helper.form-file-session-progress.usage:
+.. _zend.form.view.helper.form-file-upload-progress.usage:
 
 Basic usage:
 
diff --git a/docs/languages/en/modules/zend.i18n.filter.number.parse.rst b/docs/languages/en/modules/zend.i18n.filter.number.parse.rst
@@ -6,7 +6,7 @@ NumberParse
 The ``NumberParse`` filter can be used to parse a number from a string. It acts as a
 wrapper for the ``NumberFormatter`` class within the Internationalization extension (Intl).
 
-.. _zend.i18n.filter.number-format.options:
+.. _zend.i18n.filter.number-parse.options:
 
 .. rubric:: Supported Options for NumberParse Filter
 
@@ -29,7 +29,7 @@ The following options are supported for ``NumberParse``:
 
   Methods for getting/setting the parse type are also available: ``getType()`` and ``setType()``
 
-.. _zend.i18n.filter.number-format.usage:
+.. _zend.i18n.filter.number-parse.usage:
 
 .. rubric:: NumberParse Filter Usage
 
diff --git a/docs/languages/en/modules/zend.uri.rst b/docs/languages/en/modules/zend.uri.rst
@@ -136,9 +136,6 @@ example, the scheme of ``http://johndoe@example.com/my/path?query#token`` is 'ht
 The ``getScheme()`` instance method returns only the scheme part of the *URI* 
 object.
 
-.. _zend.uri.instance-methods.geturi:
-
-
 .. _zend.uri.instance-methods.getuserinfo:
 
 Getting the Userinfo of the URI
diff --git a/docs/languages/en/modules/zend.view.helpers.flash-messenger.rst b/docs/languages/en/modules/zend.view.helpers.flash-messenger.rst
@@ -64,7 +64,7 @@ The output of this example, using the default ``HTML`` rendering settings, would
        <li>You, the developer, are AWESOME!</li>
    </ul>
 
-.. _zend.view.helpers.initial.flashmessenger.css-layout:
+.. _zend.view.helpers.initial.flashmessenger.html-layout:
 
 HTML Layout
 -----------
