Added module class map cache option sample (zendframework/zf2#2086)
update: default locator getting about JsonStrategy.
->get('Zend\View\Strategy\JsonStrategy') is out of date.
Update docs/languages/en/modules/zend.mvc.services.rst

not sure if view_helpers is intended, but controller_plugins was duplicate thus wrong
remove incorrect comment about ServiceLisetnerFactory
Update docs/languages/en/modules/zend.navigation.pages.common.rst

Fix class name
Fix usage example of HeadLink helper
Adding Zend\Feed to the ToC
Update docs/languages/en/modules/zend.form.elements.rst

Somebody asked for Select element documentation on this page http://framework.zend.com/manual/2.0/en/modules/zend.form.elements.html so I gave my shot at it.

Since my fork is currently in 'conflict' state I can not create a pull request for zend.form.element.select.rst myself but here is the text:

.. _zend.form.element.select:

Select Element
^^^^^^^^^^^^^^

``Zend\Form\Element\Select`` is meant to be paired with the ``Zend/Form/View/Helper/FormSelect`` for HTML inputs with type select. This element adds an InArray validator to validate if the selected value is one of the available values originally provided by the select element.
Use ``$select->setAttribute('multiple', 'multiple');`` to allow multiple selections. To select one option by default use ``$select->setValue('bar');``

.. _zend.form.element.select.usage:

Basic Usage
"""""""""""

.. code-block:: php
   :linenos:

   use Zend\Form\Element;
   use Zend\Form\Form;

   $select = new Element\Select('select');
   $select
       ->setLabel('A select')
       ->setValueOptions(array(
           'foo' => 'Foo',
           'bar' => 'Bar',
           'baz' => 'Baz',
       ));

   $form = new Form('my-form');
   $form->add($select);

.. _zend.form.element.select.methods:

Public Methods
""""""""""""""

The following methods are in addition to the inherited :ref:`methods of Zend\\Form\\Element <zend.form.element.methods>` .

.. function:: setValueOptions(array $options)
   :noindex:

   Set the available select options. Accepts key/value pair array of values and labels.

   :rtype: Select

.. function:: getValueOptions()
   :noindex:

   Return all current select options as key/value pair array. Empty options do not get included.

   :rtype: array

.. function:: setEmptyOption(string $emptyOption)
   :noindex:

   Set empty select option with given text and no value. If set to null, no option will be added.

   :rtype: Select

.. function:: getEmptyOption()
   :noindex:

   Return the label text for the empty select option.

   :rtype: string|null

.. function:: getInputSpecification()
   :noindex:

   Returns a input filter specification, which includes a ``Zend\Validator\InArray`` to validate if the selected value is one of the available values originally provided by the select element.
   :rtype: array
Improve the Feed intro doc
Improve/fix the Feed importing section
Improve/fix section about finding feed links
Improve/fix the section about consuming RSS feeds.
Add prev/next links for Zend\Feed
Improve/fix the section about consuming Atom feeds
Update docs/languages/en/modules/zend.mail.smtp.options.rst

Example of how to use TLS or SSL transport.
Fix/improve docs for Reader
These are better explained in zend.feed.reader section
Merge branch 'hotfix/todo-fix' into develop
Merge branch 'hotfix/todo-form' into develop
Fix/improve section about consuming single atom entries