Re: couchdb commit: updated refs/heads/1.6.x to 46f7b4e

[Jan Lehnardt <ja...@apache.org>]

Heya Robert,

as far as I can see, this commit is missing in the 1.x.x branch,
can you merge/cherry-pick it over?

Thanks! :)
Jan
--

> On 05 May 2015, at 16:04, rnewson@apache.org wrote:
> 
> Repository: couchdb
> Updated Branches:
>  refs/heads/1.6.x 61d33cb64 -> 46f7b4e7e
> 
> 
> s/afrikan/afrikaans/g
> 
> 
> Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
> Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/46f7b4e7
> Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/46f7b4e7
> Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/46f7b4e7
> 
> Branch: refs/heads/1.6.x
> Commit: 46f7b4e7e1e34f427b333fd97ddb02e475848607
> Parents: 61d33cb
> Author: Robert Newson <rn...@apache.org>
> Authored: Tue May 5 15:03:44 2015 +0100
> Committer: Robert Newson <rn...@apache.org>
> Committed: Tue May 5 15:03:47 2015 +0100
> 
> ----------------------------------------------------------------------
> share/doc/src/couchapp/views/intro.rst | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
> ----------------------------------------------------------------------
> 
> 
> http://git-wip-us.apache.org/repos/asf/couchdb/blob/46f7b4e7/share/doc/src/couchapp/views/intro.rst
> ----------------------------------------------------------------------
> diff --git a/share/doc/src/couchapp/views/intro.rst b/share/doc/src/couchapp/views/intro.rst
> index 5e1dab4..dbaf414 100644
> --- a/share/doc/src/couchapp/views/intro.rst
> +++ b/share/doc/src/couchapp/views/intro.rst
> @@ -470,8 +470,8 @@ Consider the map result are:
> 
> .. code-block:: javascript
> 
> -  "afrikan", 1
> -  "afrikan", 1
> +  "afrikaans", 1
> +  "afrikaans", 1
>   "chinese", 1
>   "chinese", 1
>   "chinese", 1
> @@ -560,8 +560,8 @@ want to get a list of all the unique labels in our view:
> 
> .. code-block:: javascript
> 
> -  "abc", "afrikan"
> -  "cef", "afrikan"
> +  "abc", "afrikaans"
> +  "cef", "afrikaans"
>   "fhi", "chinese"
>   "hkl", "chinese"
>   "ino", "chinese"
> 

-- 
Professional Support for Apache CouchDB:
http://www.neighbourhood.ie/couchdb-support/