Merge branch 'hotfix/257' into develop

Forward-port #257

Author: weierophinney

CHANGELOG.md

@@ -141,7 +141,7 @@ All notable changes to this project will be documented in this file, in reverse
   `Zend\ServiceManager\AbstractFactory\ConfigAbstractFactory`, which enables a
   configuration-based approach to providing class dependencies when all
   dependencies are services known to the `ServiceManager`. Please see
-  [the documentation](doc/book/config-abstract-factory.md) for details.
+  [the documentation](docs/book/config-abstract-factory.md) for details.
 - [#154](https://github.com/zendframework/zend-servicemanager/pull/154) adds
   `Zend\ServiceManager\Tool\ConfigDumper`, which will introspect a given class
   to determine dependencies, and then create configuration for

README.md

@@ -13,7 +13,7 @@ retrieving other objects.
 
 - File issues at https://github.com/zendframework/zend-servicemanager/issues
 - [Online documentation](https://docs.zendframework.com/zend-servicemanager)
-- [Documentation source files](doc/book/)
+- [Documentation source files](docs/book/)
 
 ## Benchmarks