Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7F0CA10C79 for ; Tue, 1 Apr 2014 17:43:06 +0000 (UTC) Received: (qmail 64080 invoked by uid 500); 1 Apr 2014 17:42:37 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 63794 invoked by uid 500); 1 Apr 2014 17:42:29 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 62169 invoked by uid 99); 1 Apr 2014 17:41:45 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Apr 2014 17:41:45 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 2BBEF924114; Tue, 1 Apr 2014 17:41:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: djc@apache.org To: commits@couchdb.apache.org Date: Tue, 01 Apr 2014 17:42:15 -0000 Message-Id: <9bc0ae1c34b548748c44b33f0e326cd0@git.apache.org> In-Reply-To: <3cf0cb21133d4c18b22d7e4745e70cb6@git.apache.org> References: <3cf0cb21133d4c18b22d7e4745e70cb6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [33/50] [abbrv] couchdb commit: updated refs/heads/1.6.x to d2ac597 clarified what a complex key is in view collation Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/1fb7cea2 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/1fb7cea2 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/1fb7cea2 Branch: refs/heads/1.6.x Commit: 1fb7cea25b60585b16bdd786cd3e2b299fa384df Parents: bea5c94 Author: BigBlueHat Authored: Tue Mar 25 16:45:50 2014 -0400 Committer: BigBlueHat Committed: Tue Mar 25 16:45:54 2014 -0400 ---------------------------------------------------------------------- share/doc/src/couchapp/views/collation.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/1fb7cea2/share/doc/src/couchapp/views/collation.rst ---------------------------------------------------------------------- diff --git a/share/doc/src/couchapp/views/collation.rst b/share/doc/src/couchapp/views/collation.rst index 9c2f5c7..9b11b15 100644 --- a/share/doc/src/couchapp/views/collation.rst +++ b/share/doc/src/couchapp/views/collation.rst @@ -32,8 +32,8 @@ property serves as the key, thus the result will be sorted by ``LastName``: } } -CouchDB allows arbitrary JSON structures to be used as keys. You can use complex -keys for fine-grained control over sorting and grouping. +CouchDB allows arbitrary JSON structures to be used as keys. You can use JSON +arrays as keys for fine-grained control over sorting and grouping. Examples ========