Merge branch 'release/2.6.1' into develop

zendframework · Oct 16, 2019 · 3a8e851 · 3a8e851
2 parents 58fa33e + e23496f
commit 3a8e851
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -24,7 +24,7 @@ All notable changes to this project will be documented in this file, in reverse
 
 - Nothing.
 
-## 2.6.1 - TBD
+## 2.6.1 - 2019-10-16
 
 ### Added
 

diff --git a/LICENSE.md b/LICENSE.md
@@ -1,4 +1,4 @@
-Copyright (c) 2005-2018, Zend Technologies USA, Inc.
+Copyright (c) 2005-2019, Zend Technologies USA, Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

diff --git a/README.md b/README.md
@@ -13,5 +13,20 @@ usage to exceed the limit you specify, some managed objects are copied to cache
 storage outside of memory. In this way, the total memory used by managed objects
 does not exceed the limit you need to enforce.
 
-- File issues at https://github.com/zendframework/zend-memory/issues
-- Documentation is at https://docs.zendframework.com/zend-memory/
+## Installation
+
+Run the following to install this library:
+
+```bash
+$ composer require zendframework/zend-memory
+```
+
+## Documentation
+
+Browse the documentation online at https://docs.zendframework.com/zend-memory/
+
+## Support
+
+* [Issues](https://github.com/zendframework/zend-memory/issues/)
+* [Chat](https://zendframework-slack.herokuapp.com/)
+* [Forum](https://discourse.zendframework.com/)
diff --git a/docs/book/index.html b/docs/book/index.html
diff --git a/mkdocs.yml b/mkdocs.yml
@@ -1,12 +1,11 @@
 docs_dir: docs/book
 site_dir: docs/html
-pages:
-    - index.md
-    - Intro: intro.md
+nav:
+    - Home: index.md
+    - Introduction: intro.md
     - Reference:
         - "Memory Manager": memory-manager.md
         - "Memory Objects": memory-objects.md
 site_name: zend-memory
-site_description: zend-memory
+site_description: "Manage data in an environment with limited memory"
 repo_url: 'https://github.com/zendframework/zend-memory'
-copyright: 'Copyright (c) 2005-2018 <a href="https://www.zend.com/">Zend Technologies USA Inc.</a>'