Merge branch 'versions/3.0.0'

3.0.0 readiness

Author: weierophinney

CHANGELOG.md

@@ -2,7 +2,11 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## v3.0.0 - TBD
+## v3.0.0 - 2016-01-11
+
+First stable release of version 3 of zend-servicemanager.
+
+Documentation is now available at http://zend-servicemanager.rtfd.org
 
 ### Added
 

README.md

@@ -11,9 +11,9 @@ The Service Locator design pattern is implemented by the `Zend\ServiceManager`
 component. The Service Locator is a service/object locator, tasked with
 retrieving other objects.
 
-
 - File issues at https://github.com/zendframework/zend-servicemanager/issues
-- Documentation is at http://framework.zend.com/manual/current/en/index.html#zend-servicemanager
+- [Online documentation](https://zend-servicemanager.rtfd.org)
+- [Documentation source files](doc/)
 
 ## Benchmarks
 

composer.json

@@ -30,8 +30,8 @@
     "prefer-stable": true,
     "extra": {
         "branch-alias": {
-            "dev-master": "2.7-dev",
-            "dev-develop": "3.0-dev"
+            "dev-master": "3.0-dev",
+            "dev-develop": "3.1-dev"
         }
     },
     "autoload-dev": {