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 3771F11E29 for ; Thu, 10 Jul 2014 09:47:05 +0000 (UTC) Received: (qmail 3440 invoked by uid 500); 10 Jul 2014 09:47:01 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 3340 invoked by uid 500); 10 Jul 2014 09:47:01 -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 2236 invoked by uid 99); 10 Jul 2014 09:47:01 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Jul 2014 09:47:01 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 47A3D9AA9CF; Thu, 10 Jul 2014 09:47:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rnewson@apache.org To: commits@couchdb.apache.org Date: Thu, 10 Jul 2014 09:47:36 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [37/50] documentation commit: updated refs/heads/import-master to fe7f7bf minor documentation fixes Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/61a24600 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/61a24600 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/61a24600 Branch: refs/heads/import-master Commit: 61a24600e15edb39fc25e3e2ea67cea95bceefea Parents: 8577708 Author: Andy Wenk Authored: Fri Apr 25 15:41:39 2014 +0200 Committer: Andy Wenk Committed: Fri Apr 25 15:41:39 2014 +0200 ---------------------------------------------------------------------- src/replication/intro.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/61a24600/src/replication/intro.rst ---------------------------------------------------------------------- diff --git a/src/replication/intro.rst b/src/replication/intro.rst index 68690bf..2d09617 100644 --- a/src/replication/intro.rst +++ b/src/replication/intro.rst @@ -67,10 +67,10 @@ Master - Master replication --------------------------- One replication task will only transfer changes in one direction. To achieve -master-master replication it is possible to set up two replication tasks in -different directions. When a change is replication from database A to B by the -first task, the second will discover that the new change on B already exists in -A and will wait for further changes. +master-master replication, it is possible to set up two replication tasks in +opposite direction. When a change is replicated from database A to B by the +first task, the second task from B to A will discover that the new change on +B already exists in A and will wait for further changes. Controlling which Documents to Replicate @@ -79,7 +79,7 @@ Controlling which Documents to Replicate There are two ways for controlling which documents are replicated, and which are skipped. *Local* documents are never replicated (see :ref:`api/local`). -Additionally, :ref:`filterfun` can be used in a replication documents (see +Additionally, :ref:`filterfun` can be used in a replication (see :ref:`replication-settings`). The replication task will then evaluate the filter function for each document in the changes feed. The document will only be replicated if the filter returns `true`.