Merge pull request #8995 from kpfleming/local-port-docs

author Peter van Dijk <peter.van.dijk@powerdns.com>

Fri, 5 Jun 2020 08:34:28 +0000 (10:34 +0200)

committer GitHub <noreply@github.com>

Fri, 5 Jun 2020 08:34:28 +0000 (10:34 +0200)
author Peter van Dijk <peter.van.dijk@powerdns.com>
Fri, 5 Jun 2020 08:34:28 +0000 (10:34 +0200)
committer GitHub <noreply@github.com>
Fri, 5 Jun 2020 08:34:28 +0000 (10:34 +0200)
diff --cc docs/settings.rst
Simple merge
diff --cc pdns/recursordist/docs/settings.rst
Simple merge
author	Peter van Dijk <peter.van.dijk@powerdns.com>
	Fri, 5 Jun 2020 08:34:28 +0000 (10:34 +0200)
committer	GitHub <noreply@github.com>
	Fri, 5 Jun 2020 08:34:28 +0000 (10:34 +0200)
		1	2
docs/settings.rst	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/recursordist/docs/settings.rst	patch \|	diff1 \|	diff2 \|	blob \| history