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 AAA9C11F81 for ; Mon, 28 Apr 2014 12:43:12 +0000 (UTC) Received: (qmail 57598 invoked by uid 500); 28 Apr 2014 12:42:33 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 56033 invoked by uid 500); 28 Apr 2014 12:41:50 -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 55256 invoked by uid 99); 28 Apr 2014 12:41:38 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Apr 2014 12:41:38 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E09949959F9; Mon, 28 Apr 2014 12:41:35 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dch@apache.org To: commits@couchdb.apache.org Date: Mon, 28 Apr 2014 12:42:18 -0000 Message-Id: <8ff20834246746b59a6ad31554ecf9fe@git.apache.org> In-Reply-To: <8eb79567b3b740e8a9c3ed07ee666767@git.apache.org> References: <8eb79567b3b740e8a9c3ed07ee666767@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [45/50] couchdb commit: updated refs/heads/2200-feature-support-erlang-17.0 to c81eb6d fix documentation for replicator intro Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/7599552b Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/7599552b Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/7599552b Branch: refs/heads/2200-feature-support-erlang-17.0 Commit: 7599552b668707885e18f73b39e578c1571a69d5 Parents: abf2b64 Author: Andy Wenk Authored: Thu Apr 24 22:25:22 2014 +0200 Committer: Andy Wenk Committed: Thu Apr 24 22:25:22 2014 +0200 ---------------------------------------------------------------------- share/doc/src/replication/intro.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/7599552b/share/doc/src/replication/intro.rst ---------------------------------------------------------------------- diff --git a/share/doc/src/replication/intro.rst b/share/doc/src/replication/intro.rst index ff002db..68690bf 100644 --- a/share/doc/src/replication/intro.rst +++ b/share/doc/src/replication/intro.rst @@ -29,8 +29,8 @@ databases are also deleted on the destination database (if they even existed). Triggering Replication ---------------------- -Replication is controlled through documents in the :ref:`replicator`, where -each document describes one replication process (see +Replication is controlled through documents in the :ref:`_replicator ` +database, where each document describes one replication process (see :ref:`replication-settings`). A replication is triggered by storing a replication document in the replicator