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 C40B810C7F for ; Tue, 1 Apr 2014 17:43:06 +0000 (UTC) Received: (qmail 63839 invoked by uid 500); 1 Apr 2014 17:42:30 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 63097 invoked by uid 500); 1 Apr 2014 17:42:07 -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 62114 invoked by uid 99); 1 Apr 2014 17:41:43 -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:43 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 8E03C9240C0; Tue, 1 Apr 2014 17:41:43 +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:41:53 -0000 Message-Id: In-Reply-To: <3cf0cb21133d4c18b22d7e4745e70cb6@git.apache.org> References: <3cf0cb21133d4c18b22d7e4745e70cb6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [11/50] [abbrv] couchdb commit: updated refs/heads/1.6.x to d2ac597 some minor documentatiom fixes Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/f0cdb701 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/f0cdb701 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/f0cdb701 Branch: refs/heads/1.6.x Commit: f0cdb701d268870a4157d76286269ed6fe4f0ead Parents: fb59cca Author: Andy Wenk Authored: Fri Mar 21 00:22:06 2014 +0100 Committer: Andy Wenk Committed: Fri Mar 21 00:22:06 2014 +0100 ---------------------------------------------------------------------- share/doc/src/intro/overview.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/f0cdb701/share/doc/src/intro/overview.rst ---------------------------------------------------------------------- diff --git a/share/doc/src/intro/overview.rst b/share/doc/src/intro/overview.rst index 4e3b72c..7804cf9 100644 --- a/share/doc/src/intro/overview.rst +++ b/share/doc/src/intro/overview.rst @@ -261,9 +261,9 @@ updates, ensuring security and data validation in a shared, distributed system. Distributed Updates and Replication =================================== -CouchDB is a peer-based distributed database system, it allows for users and -servers to access and update the same shared data while disconnected and then -bi-directionally replicate those changes later. +CouchDB is a peer-based distributed database system. It allows users and servers +to access and update the same shared data while disconnected. Those changes can +then be replicated bi-directionally later. The CouchDB document storage, view and security models are designed to work together to make true bi-directional replication efficient and reliable.