From: Pieter Lexis Date: Fri, 3 Nov 2017 15:19:00 +0000 (+0100) Subject: Fix some changelog warnings X-Git-Tag: auth-4.1.0~13^2~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=690bd03e298db2737bb229d05dce235365095c03;p=thirdparty%2Fpdns.git Fix some changelog warnings --- diff --git a/docs/changelog/4.1.rst b/docs/changelog/4.1.rst index 67676d5b54..b9f1862d90 100644 --- a/docs/changelog/4.1.rst +++ b/docs/changelog/4.1.rst @@ -137,7 +137,7 @@ Changelogs for 4.1.x :tags: Improvements :pullreq: 5842 - Add :ref:`log-timestamp` option. This option can be used to disable + Add :ref:`setting-log-timestamp` option. This option can be used to disable printing timestamps to stdout, this is useful when using systemd-journald or another supervisor that timestamps stdout by itself. As the logs will not have 2 timestamps. diff --git a/docs/conf.py b/docs/conf.py index 05f67d598c..4655bd4705 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -61,7 +61,7 @@ author = 'PowerDNS.COM BV' # The short X.Y version. version = '4.1' # The full version, including alpha/beta/rc tags. -release = '4.1.0-alpha0' +#release = '4.1.0-alpha0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/docs/dnsupdate.rst b/docs/dnsupdate.rst index 62e967821a..3d212acb2c 100644 --- a/docs/dnsupdate.rst +++ b/docs/dnsupdate.rst @@ -92,6 +92,8 @@ Per zone settings For permissions, a number of per zone settings are available via the :doc:`domain metadata ``. +.. _metadata-allow-dnsupdate-from: + ALLOW-DNSUPDATE-FROM ~~~~~~~~~~~~~~~~~~~~ @@ -109,6 +111,8 @@ allowed per row, but multiple rows can be added. An example: This will allow 198.51.100.0/8 and 203.0.113.2/32 to send DNS update messages for the example.org domain. +.. _metadata-tsig-allow-dnsupdate: + TSIG-ALLOW-DNSUPDATE ~~~~~~~~~~~~~~~~~~~~ @@ -143,6 +147,8 @@ update. The TSIG is an alternative means of securing updates, instead of using t ``ALLOW-DNSUPDATE-FROM`` setting. If a TSIG key is set, and if ``ALLOW-DNSUPDATE-FROM`` is set, the IP(-range) of the updater still needs to be allowed via ``ALLOW-DNSUPDATE-FROM``. +.. _metadata-forward-dnsupdate: + FORWARD-DNSUPDATE ~~~~~~~~~~~~~~~~~ @@ -161,6 +167,8 @@ option :ref:`setting-forward-dnsupdate` is set to 'no', as that will disable it globally. Using the domainmetadata setting than allows you to enable it per domain. +.. _metadata-notify-dnsupdate: + NOTIFY-DNSUPDATE ~~~~~~~~~~~~~~~~ diff --git a/docs/domainmetadata.rst b/docs/domainmetadata.rst index 879be84335..d18c5ccf07 100644 --- a/docs/domainmetadata.rst +++ b/docs/domainmetadata.rst @@ -50,7 +50,7 @@ records, add ``allow-axfr-ips=`` to ``pdns.conf``. API-RECTIFY ----------- -.. since:: 4.1.0 +.. versionadded:: 4.1.0 This metadata item controls whether or not a zone is fully rectified on changes to the contents of a zone made through the :doc:`API `.