summaryrefslogtreecommitdiff
path: root/docs/ref
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2014-05-20 09:37:04 -0700
committerAlex Gaynor <alex.gaynor@gmail.com>2014-05-20 09:37:04 -0700
commit8a95b4fca793eeb8adceffe697b55214509019eb (patch)
tree9c8995407c0d38605e07796c59eb80450c280d8c /docs/ref
parent3bec38888f6f4ee9245b004fcb9fe15b35cef469 (diff)
parent73a57b06f9d8c963b9be2bdb83122a004a4a8b0b (diff)
Merge pull request #2692 from fcurella/patch-5
#22667 replaced occurrences of master/slave terminology with leader/follower
Diffstat (limited to 'docs/ref')
-rw-r--r--docs/ref/settings.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 597e39ab99..f82ced255b 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -649,10 +649,10 @@ Default: ``None``
The alias of the database that this database should mirror during
testing.
-This setting exists to allow for testing of master/slave
+This setting exists to allow for testing of leader/follower
configurations of multiple databases. See the documentation on
-:ref:`testing master/slave configurations
-<topics-testing-masterslave>` for details.
+:ref:`testing leader/follower configurations
+<topics-testing-leaderfollower>` for details.
.. setting:: TEST_NAME