Skip to content

Commit

Permalink
doc: bumped version to 0.16.
Browse files Browse the repository at this point in the history
  • Loading branch information
agentzh committed Jun 22, 2015
1 parent d6efa00 commit 4f6f78f
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 16 deletions.
17 changes: 9 additions & 8 deletions README.markdown
Expand Up @@ -61,7 +61,7 @@ Table of Contents
Version
=======

This document describes ngx_memc [v0.15](http://github.com/openresty/memc-nginx-module/tags) released on 8 July 2014.
This document describes ngx_memc [v0.16](http://github.com/openresty/memc-nginx-module/tags) released on 22 June 2015.

Synopsis
========
Expand Down Expand Up @@ -187,7 +187,7 @@ When used in conjunction with [lua-nginx-module](http://github.com/openresty/lua
Keep-alive connections to memcached servers
-------------------------------------------

You need the (now standard) [HttpUpstreamKeepaliveModule](http://wiki.nginx.org/HttpUpstreamKeepaliveModule) together with this module for keep-alive TCP connections to your backend memcached servers.
You need [HttpUpstreamKeepaliveModule](http://wiki.nginx.org/HttpUpstreamKeepaliveModule) together with this module for keep-alive TCP connections to your backend memcached servers.

Here's a sample configuration:

Expand Down Expand Up @@ -603,13 +603,13 @@ You're recommended to install this module (as well as the Nginx core and many ot
Alternatively, you can compile this module into the standard Nginx source distribution by hand:

Grab the nginx source code from [nginx.org](http://nginx.org/), for example,
the version 1.7.2 (see [nginx compatibility](#compatibility)), and then build the source with this module:
the version 1.7.10 (see [nginx compatibility](#compatibility)), and then build the source with this module:

```bash

wget 'http://nginx.org/download/nginx-1.7.2.tar.gz'
tar -xzvf nginx-1.7.2.tar.gz
cd nginx-1.7.2/
wget 'http://nginx.org/download/nginx-1.7.10.tar.gz'
tar -xzvf nginx-1.7.10.tar.gz
cd nginx-1.7.10/

# Here we assume you would install you nginx under /opt/nginx/.
./configure --prefix=/opt/nginx \
Expand Down Expand Up @@ -641,7 +641,8 @@ Compatibility

The following versions of Nginx should work with this module:

* **1.7.x** (last tested: 1.7.2)
* **1.7.x** (last tested: 1.7.10)
* **1.6.x**
* **1.5.x** (last tested: 1.5.12)
* **1.4.x** (last tested: 1.4.4)
* **1.2.x** (last tested: 1.2.9)
Expand Down Expand Up @@ -758,7 +759,7 @@ Copyright & License

The code base is borrowed directly from the standard [memcached module](http://nginx.org/en/docs/http/ngx_http_memcached_module.html) in the Nginx core. This part of code is copyrighted by Igor Sysoev and Nginx Inc.

Copyright (c) 2009-2013, Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, CloudFlare Inc.
Copyright (c) 2009-2015, Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, CloudFlare Inc.

This module is licensed under the terms of the BSD license.

Expand Down
17 changes: 9 additions & 8 deletions doc/HttpMemcModule.wiki
Expand Up @@ -6,7 +6,7 @@

= Version =

This document describes ngx_memc [http://github.com/openresty/memc-nginx-module/tags v0.15] released on 8 July 2014.
This document describes ngx_memc [http://github.com/openresty/memc-nginx-module/tags v0.16] released on 22 June 2015.

= Synopsis =

Expand Down Expand Up @@ -121,7 +121,7 @@ When used in conjunction with [[HttpLuaModule]], it is recommended to use the [h

== Keep-alive connections to memcached servers ==

You need the (now standard) [[HttpUpstreamKeepaliveModule]] together with this module for keep-alive TCP connections to your backend memcached servers.
You need [[HttpUpstreamKeepaliveModule]] together with this module for keep-alive TCP connections to your backend memcached servers.

Here's a sample configuration:

Expand Down Expand Up @@ -449,12 +449,12 @@ You're recommended to install this module (as well as the Nginx core and many ot
Alternatively, you can compile this module into the standard Nginx source distribution by hand:

Grab the nginx source code from [http://nginx.org/ nginx.org], for example,
the version 1.7.2 (see [[#Compatibility|nginx compatibility]]), and then build the source with this module:
the version 1.7.10 (see [[#Compatibility|nginx compatibility]]), and then build the source with this module:

<geshi lang="bash">
wget 'http://nginx.org/download/nginx-1.7.2.tar.gz'
tar -xzvf nginx-1.7.2.tar.gz
cd nginx-1.7.2/
wget 'http://nginx.org/download/nginx-1.7.10.tar.gz'
tar -xzvf nginx-1.7.10.tar.gz
cd nginx-1.7.10/

# Here we assume you would install you nginx under /opt/nginx/.
./configure --prefix=/opt/nginx \
Expand All @@ -479,7 +479,8 @@ regenerate the parser's C file, i.e., [http://github.com/openresty/memc-nginx-mo

The following versions of Nginx should work with this module:

* '''1.7.x''' (last tested: 1.7.2)
* '''1.7.x''' (last tested: 1.7.10)
* '''1.6.x'''
* '''1.5.x''' (last tested: 1.5.12)
* '''1.4.x''' (last tested: 1.4.4)
* '''1.2.x''' (last tested: 1.2.9)
Expand Down Expand Up @@ -562,7 +563,7 @@ This wiki page is also maintained by the author himself, and everybody is encour

The code base is borrowed directly from the standard [[HttpMemcachedModule|memcached module]] in the Nginx core. This part of code is copyrighted by Igor Sysoev and Nginx Inc.

Copyright (c) 2009-2013, Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, CloudFlare Inc.
Copyright (c) 2009-2015, Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, CloudFlare Inc.

This module is licensed under the terms of the BSD license.

Expand Down

0 comments on commit 4f6f78f

Please sign in to comment.