Merge branch 'release/3.1.2'

Author: michalbundyra

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 3.1.2 - TBD
+## 3.1.2 - 2019-10-09
 
 ### Added
 

LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2005-2017, 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,

README.md

@@ -7,5 +7,21 @@
 decoding JSON to native PHP. For more information on JSON, visit the JSON
 [project site](http://www.json.org/).
 
-- File issues at https://github.com/zendframework/zend-json/issues
-- Documentation is at https://docs.zendframework.com/zend-json/
+
+## Installation
+
+Run the following to install this library:
+
+```bash
+$ composer require zendframework/zend-json
+```
+
+## Documentation
+
+Browse the documentation online at https://docs.zendframework.com/zend-json/
+
+## Support
+
+* [Issues](https://github.com/zendframework/zend-json/issues/)
+* [Chat](https://zendframework-slack.herokuapp.com/)
+* [Forum](https://discourse.zendframework.com/)

composer.json

@@ -12,7 +12,7 @@
         "issues": "https://github.com/zendframework/zend-json/issues",
         "source": "https://github.com/zendframework/zend-json",
         "rss": "https://github.com/zendframework/zend-json/releases.atom",
-        "slack": "https://zendframework-slack.herokuapp.com",
+        "chat": "https://zendframework-slack.herokuapp.com",
         "forum": "https://discourse.zendframework.com/c/questions/components"
     },
     "require": {

docs/CONTRIBUTING.md

@@ -7,7 +7,7 @@ read/subscribe to the following resources:
 
  - [Coding Standards](https://github.com/zendframework/zend-coding-standard)
  - [Forums](https://discourse.zendframework.com/c/contributors)
- - [Slack](https://zendframework-slack.herokuapp.com)
+ - [Chat](https://zendframework-slack.herokuapp.com)
  - [Code of Conduct](CODE_OF_CONDUCT.md)
 
 If you are working on new features or refactoring

docs/ISSUE_TEMPLATE.md

@@ -1,5 +1,5 @@
  - [ ] I was not able to find an [open](https://github.com/zendframework/zend-json/issues?q=is%3Aopen) or [closed](https://github.com/zendframework/zend-json/issues?q=is%3Aclosed) issue matching what I'm seeing.
- - [ ] This is not a question. (Questions should be asked on [slack](https://zendframework.slack.com/) ([Signup for Slack here](https://zendframework-slack.herokuapp.com/)) or our [forums](https://discourse.zendframework.com/).)
+ - [ ] This is not a question. (Questions should be asked on [chat](https://zendframework.slack.com/) ([Signup here](https://zendframework-slack.herokuapp.com/)) or our [forums](https://discourse.zendframework.com/).)
 
 Provide a narrative description of what you are trying to accomplish.
 

docs/SUPPORT.md

@@ -3,13 +3,13 @@
 Zend Framework offers three support channels:
 
 - For real-time questions, use our
-  [Slack](https://zendframework-slack.herokuapp.com)
+  [chat](https://zendframework-slack.herokuapp.com)
 - For detailed questions (e.g., those requiring examples) use our
   [forums](https://discourse.zendframework.com/c/questions/components)
 - To report issues, use this repository's
   [issue tracker](https://github.com/zendframework/zend-json/issues/new)
 
-**DO NOT** use the issue tracker to ask questions; use Slack or the forums for
+**DO NOT** use the issue tracker to ask questions; use chat or the forums for
 that. Questions posed to the issue tracker will be closed.
 
 When reporting an issue, please include the following details:

docs/book/index.html

@@ -1,14 +1,13 @@
 docs_dir: docs/book
 site_dir: docs/html
-pages:
-    - index.md
-    - Intro: intro.md
+nav:
+    - Home: index.md
+    - Introduction: intro.md
     - Reference:
       - "Basic Usage": basics.md
       - "Advanced Usage": advanced.md
     - Migration:
       - "From v2 to v3": migration/v2-to-v3.md
 site_name: zend-json
-site_description: Zend\Json
+site_description: "De/Serialize JSON in PHP, including JavaScript expressions"
 repo_url: 'https://github.com/zendframework/zend-json'
-copyright: 'Copyright (c) 2005-2017 <a href="http://www.zend.com/">Zend Technologies USA Inc.</a>'