Merge "doc: Modernise parameter names and documentation for 'replica' DBs"

author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>

Tue, 13 Nov 2018 21:39:14 +0000 (21:39 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Tue, 13 Nov 2018 21:39:14 +0000 (21:39 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 13 Nov 2018 21:39:14 +0000 (21:39 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Tue, 13 Nov 2018 21:39:14 +0000 (21:39 +0000)
diff --cc includes/OutputPage.php
Simple merge
diff --cc includes/Title.php
Simple merge
diff --cc includes/user/User.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Tue, 13 Nov 2018 21:39:14 +0000 (21:39 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Tue, 13 Nov 2018 21:39:14 +0000 (21:39 +0000)
		1	2
includes/OutputPage.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/Title.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/user/User.php	patch \|	diff1 \|	diff2 \|	blob \| history