Merge pull request #9715 from pieterlexis/4.1-docs

author Pieter Lexis <pieter.lexis@powerdns.com>

Fri, 18 Dec 2020 15:34:00 +0000 (16:34 +0100)

committer GitHub <noreply@github.com>

Fri, 18 Dec 2020 15:34:00 +0000 (16:34 +0100)
author Pieter Lexis <pieter.lexis@powerdns.com>
Fri, 18 Dec 2020 15:34:00 +0000 (16:34 +0100)
committer GitHub <noreply@github.com>
Fri, 18 Dec 2020 15:34:00 +0000 (16:34 +0100)
diff --cc docs/appendices/compiling.rst
Simple merge
diff --cc docs/settings.rst
Simple merge
author	Pieter Lexis <pieter.lexis@powerdns.com>
	Fri, 18 Dec 2020 15:34:00 +0000 (16:34 +0100)
committer	GitHub <noreply@github.com>
	Fri, 18 Dec 2020 15:34:00 +0000 (16:34 +0100)
		1	2
docs/appendices/compiling.rst	patch \|	diff1 \|	diff2 \|	blob \| history
docs/settings.rst	patch \|	diff1 \|	diff2 \|	blob \| history