You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by va...@apache.org on 2019/12/31 05:00:04 UTC

[couchdb-documentation] branch master updated: clarify replication (#466)

This is an automated email from the ASF dual-hosted git repository.

vatamane pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-documentation.git


The following commit(s) were added to refs/heads/master by this push:
     new 41d1be5  clarify replication (#466)
41d1be5 is described below

commit 41d1be50c725d1e1132662ba885f7ce392fa5e42
Author: Lyn Headley <la...@gmail.com>
AuthorDate: Mon Dec 30 23:59:58 2019 -0500

    clarify replication (#466)
---
 src/replication/index.rst | 12 ++++++------
 src/replication/intro.rst | 10 +++++-----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/replication/index.rst b/src/replication/index.rst
index 6f79958..d0c64a8 100644
--- a/src/replication/index.rst
+++ b/src/replication/index.rst
@@ -16,16 +16,16 @@
 Replication
 ===========
 
-The replication is an incremental one way process involving two databases
+Replication is an incremental one way process involving two databases
 (a source and a destination).
 
-The aim of the replication is that at the end of the process, all active
-documents on the source database are also in the destination database and all
-documents that were deleted in the source databases are also deleted (if exists)
-on the destination database.
+The aim of replication is that at the end of the process, all active
+documents in the source database are also in the destination database
+and all documents that were deleted in the source database are also
+deleted in the destination database (if they even existed).
 
 The replication process only copies the last revision of a document, so all
-previous revisions that were only on the source database are not copied to the
+previous revisions that were only in the source database are not copied to the
 destination database.
 
 .. toctree::
diff --git a/src/replication/intro.rst b/src/replication/intro.rst
index 8bc4afa..f5cda1a 100644
--- a/src/replication/intro.rst
+++ b/src/replication/intro.rst
@@ -21,16 +21,16 @@ database. This enables users to distribute data across several nodes or
 data centers, but also to move data more closely to clients.
 
 Replication involves a source and a destination database, which can be on the
-same or on different CouchDB instances. The aim of the replication is that at
-the end of the process, all active documents on the source database are also in
+same or on different CouchDB instances. The aim of replication is that at
+the end of the process, all active documents in the source database are also in
 the destination database and all documents that were deleted in the source
-databases are also deleted on the destination database (if they even existed).
+database are also deleted in the destination database (if they even existed).
 
-Transient and Persistant Replication
+Transient and Persistent Replication
 ====================================
 
 There are two different ways to set up a replication. The first one that was
-introduced into CouchDB leads do a replication that could be called `transient`.
+introduced into CouchDB leads to a replication that could be called `transient`.
 Transient means that there are no documents backing up the replication. So after a
 restart of the CouchDB server the replication will disapear. Later, the
 :ref:`_replicator <replicator>` database was introduced, which keeps documents