Skip to content
This repository was archived by the owner on Jan 31, 2020. It is now read-only.

Commit 43b08ce

Browse files
committed
Merge branch 'release/3.1.2'
2 parents 11d8d6b + 8ad861a commit 43b08ce

File tree

5 files changed

+22
-18
lines changed

5 files changed

+22
-18
lines changed

CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
All notable changes to this project will be documented in this file, in reverse chronological order by release.
44

5-
## 3.1.2 - TBD
5+
## 3.1.2 - 2019-10-16
66

77
### Added
88

LICENSE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2005-2018, Zend Technologies USA, Inc.
1+
Copyright (c) 2005-2019, Zend Technologies USA, Inc.
22
All rights reserved.
33

44
Redistribution and use in source and binary forms, with or without modification,

README.md

+17-2
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,20 @@
55

66
zend-xml2json provides functionality for converting XML structures to JSON.
77

8-
- File issues at https://github.com/zendframework/zend-xml2json/issues
9-
- Documentation is at https://docs.zendframework.com/zend-xml2json/
8+
## Installation
9+
10+
Run the following to install this library:
11+
12+
```bash
13+
$ composer require zendframework/zend-xml2json
14+
```
15+
16+
## Documentation
17+
18+
Browse the documentation online at https://docs.zendframework.com/zend-xml2json/
19+
20+
## Support
21+
22+
* [Issues](https://github.com/zendframework/zend-xml2json/issues/)
23+
* [Chat](https://zendframework-slack.herokuapp.com/)
24+
* [Forum](https://discourse.zendframework.com/)

docs/book/index.html

-10
This file was deleted.

mkdocs.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
docs_dir: docs/book
22
site_dir: docs/html
3-
pages:
4-
- index.md
3+
nav:
4+
- Home: index.md
55
- Usage: usage.md
66
site_name: zend-xml2json
7-
site_description: Zend\Xml2Json
7+
site_description: "Convert XML documents to JSON"
88
repo_url: 'https://github.com/zendframework/zend-xml2json'
9-
copyright: 'Copyright (c) 2005-2018 <a href="https://www.zend.com/">Zend Technologies USA Inc.</a>'

0 commit comments

Comments
 (0)