couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gar...@apache.org
Subject [12/47] couchdb commit: updated refs/heads/Update-Sidebar-Ui to c173e52
Date Mon, 19 May 2014 16:17:30 GMT
minor documentation fixes


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/d25fce62
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/d25fce62
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/d25fce62

Branch: refs/heads/Update-Sidebar-Ui
Commit: d25fce62f74af57fdcfc9e05b8774b5d7e8b7d79
Parents: 8b5e4ba
Author: Andy Wenk <andywenk@apache.org>
Authored: Fri Apr 25 15:41:39 2014 +0200
Committer: Andy Wenk <andywenk@apache.org>
Committed: Fri Apr 25 15:41:39 2014 +0200

----------------------------------------------------------------------
 share/doc/src/replication/intro.rst | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/d25fce62/share/doc/src/replication/intro.rst
----------------------------------------------------------------------
diff --git a/share/doc/src/replication/intro.rst b/share/doc/src/replication/intro.rst
index 68690bf..2d09617 100644
--- a/share/doc/src/replication/intro.rst
+++ b/share/doc/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`.


Mime
View raw message