Merge branch 'release/3.1.2'

zendframework · Oct 16, 2019 · 43b08ce · 43b08ce
2 parents 11d8d6b + 8ad861a
commit 43b08ce
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 18 deletions.
diff --git a/CHANGELOG.md b/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-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
@@ -5,5 +5,20 @@
 
 zend-xml2json provides functionality for converting XML structures to JSON.
 
-- File issues at https://github.com/zendframework/zend-xml2json/issues
-- Documentation is at https://docs.zendframework.com/zend-xml2json/
+## Installation
+
+Run the following to install this library:
+
+```bash
+$ composer require zendframework/zend-xml2json
+```
+
+## Documentation
+
+Browse the documentation online at https://docs.zendframework.com/zend-xml2json/
+
+## Support
+
+* [Issues](https://github.com/zendframework/zend-xml2json/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,9 +1,8 @@
 docs_dir: docs/book
 site_dir: docs/html
-pages:
-    - index.md
+nav:
+    - Home: index.md
     - Usage: usage.md
 site_name: zend-xml2json
-site_description: Zend\Xml2Json
+site_description: "Convert XML documents to JSON"
 repo_url: 'https://github.com/zendframework/zend-xml2json'
-copyright: 'Copyright (c) 2005-2018 <a href="https://www.zend.com/">Zend Technologies USA Inc.</a>'