Merge branch 'develop' of https://github.com/zendframework/zf2-documentation into develop
Merge branch 'develop' of https://github.com/zendframework/zf2-documentation into develop
Merge branch 'develop' of https://github.com/zendframework/zf2-documentation into develop
Merge branch 'develop' of https://github.com/zendframework/zf2-documentation into develop
Fixed text
Merge branch 'hotfix/#788' into develop

Close #788
Merge branch 'hotfix/789' into develop

Forward port #789
Merge pull request #801 from brian978/fix/en/zend.navigation.view.helpers

Minor text fix en/modules/zend.navigation.view.helpers.rst
Merge branch 'develop' of https://github.com/zendframework/zf2-documentation into develop
Merge branch 'master' into develop
Merge branch 'master' into develop
Adding delegator factories documentation
Breaking code block
Minor refinements, line numbers
Addressing typical @Ocramius grammar errors, adding config example
Merge branch 'master' into develop
Added docs for new option 'default_template_suffix'
Added docs for new option 'literal'
Merge branch 'develop' of https://github.com/zendframework/zf2-documentation into develop
Merge pull request #831 from wryck7/feature-zf2.2

Docs for new options added