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

Commit 00a733e

Browse files
committed
Merge branch 'release/2.6.1'
2 parents 40f2b56 + e23496f commit 00a733e

File tree

5 files changed

+23
-21
lines changed

5 files changed

+23
-21
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
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-
## 2.6.1 - TBD
5+
## 2.6.1 - 2019-10-16
66

77
### Added
88

LICENSE.md

Lines changed: 1 addition & 1 deletion
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

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,20 @@ usage to exceed the limit you specify, some managed objects are copied to cache
1313
storage outside of memory. In this way, the total memory used by managed objects
1414
does not exceed the limit you need to enforce.
1515

16-
- File issues at https://github.com/zendframework/zend-memory/issues
17-
- Documentation is at https://docs.zendframework.com/zend-memory/
16+
## Installation
17+
18+
Run the following to install this library:
19+
20+
```bash
21+
$ composer require zendframework/zend-memory
22+
```
23+
24+
## Documentation
25+
26+
Browse the documentation online at https://docs.zendframework.com/zend-memory/
27+
28+
## Support
29+
30+
* [Issues](https://github.com/zendframework/zend-memory/issues/)
31+
* [Chat](https://zendframework-slack.herokuapp.com/)
32+
* [Forum](https://discourse.zendframework.com/)

docs/book/index.html

Lines changed: 0 additions & 12 deletions
This file was deleted.

mkdocs.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
docs_dir: docs/book
22
site_dir: docs/html
3-
pages:
4-
- index.md
5-
- Intro: intro.md
3+
nav:
4+
- Home: index.md
5+
- Introduction: intro.md
66
- Reference:
77
- "Memory Manager": memory-manager.md
88
- "Memory Objects": memory-objects.md
99
site_name: zend-memory
10-
site_description: zend-memory
10+
site_description: "Manage data in an environment with limited memory"
1111
repo_url: 'https://github.com/zendframework/zend-memory'
12-
copyright: 'Copyright (c) 2005-2018 <a href="https://www.zend.com/">Zend Technologies USA Inc.</a>'

0 commit comments

Comments
 (0)