Improve config-dir docs a bit

diff --git a/pdns/recursordist/docs/settings.rst b/pdns/recursordist/docs/settings.rst
index 89c14d3d46cec9c559b352f676da1e3aa9948c92..ba9e877f1ba4417b381b198dbaaa7f8977782d4c 100644 (file)
--- a/pdns/recursordist/docs/settings.rst
+++ b/pdns/recursordist/docs/settings.rst
@@ -367,8 +367,9 @@ Time to wait for data from TCP clients.
 
 - YAML setting: :ref:`setting-yaml-recursor.config_dir`
 
-Location of configuration directory (``recursor.conf``).
+Location of configuration directory (where ``recursor.conf`` or ``recursor.yml`` is stored).
 Usually ``/etc/powerdns``, but this depends on ``SYSCONFDIR`` during compile-time.
+Use default or set on command line.
 
 .. _setting-config-name:
 

diff --git a/pdns/recursordist/docs/yamlsettings.rst b/pdns/recursordist/docs/yamlsettings.rst
index 5e9baea4398cfd428aff1d151f2eb3da5fa9735d..cec4d93b08fbcadfe3092fb956d7ade2e1c54018 100644 (file)
--- a/pdns/recursordist/docs/yamlsettings.rst
+++ b/pdns/recursordist/docs/yamlsettings.rst
@@ -2034,8 +2034,9 @@ Either do not ``chroot`` on these systems or set the 'Type' of this service to '
 
 - Old style setting: :ref:`setting-config-dir`
 
-Location of configuration directory (``recursor.conf``).
+Location of configuration directory (where ``recursor.conf`` or ``recursor.yml`` is stored).
 Usually ``/etc/powerdns``, but this depends on ``SYSCONFDIR`` during compile-time.
+Use default or set on command line.
 
 .. _setting-yaml-recursor.config_name:
 

diff --git a/pdns/recursordist/settings/table.py b/pdns/recursordist/settings/table.py
index 02dd1ab928980a217618d5044155b1836be1900b..6178aac50f6b5cba576242eec44d9e7c2ce9f61d 100644 (file)
--- a/pdns/recursordist/settings/table.py
+++ b/pdns/recursordist/settings/table.py
@@ -380,10 +380,11 @@ EMPTY?  '''
         'section' : 'recursor',
         'type' : LType.String,
         'default' : 'SYSCONFDIR',
-        'help' : 'Location of configuration directory (recursor.conf)',
+        'help' : 'Location of configuration directory (recursor.conf or recursor.yml)',
         'doc' : '''
-Location of configuration directory (``recursor.conf``).
+Location of configuration directory (where ``recursor.conf`` or ``recursor.yml`` is stored).
 Usually ``/etc/powerdns``, but this depends on ``SYSCONFDIR`` during compile-time.
+Use default or set on command line.
  ''',
     },
     {