From: Remi Gacogne <rgacogne@users.noreply.github.com>
Date: Tue, 9 Apr 2019 07:56:15 +0000 (+0200)
Subject: Merge branch 'master' into dnsdist-reload-all-certs
X-Git-Tag: dnsdist-1.4.0-alpha1~6^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F7676%2Fhead;p=thirdparty%2Fpdns.git

Merge branch 'master' into dnsdist-reload-all-certs
---

4c9e4e334956d3565996eb6f421fd8f327902130
diff --cc pdns/dnsdistdist/docs/reference/config.rst
index 6a366f1982,ef1f68b4b1..2e0355283d
--- a/pdns/dnsdistdist/docs/reference/config.rst
+++ b/pdns/dnsdistdist/docs/reference/config.rst
@@@ -42,12 -42,14 +42,20 @@@ Global configuratio
  
    :param str path: The directory to load configuration files from. Each file must end in ``.conf``.
  
 +.. function:: reloadAllCertificates()
 +
 +  .. versionadded:: 1.4.0
 +
 +  Reload all DNSCrypt and TLS certificates, along with their associated keys.
 +
+ .. function:: setSyslogFacility(facility)
+ 
+   .. versionadded:: 1.4.0
+ 
+   Set the syslog logging facility to ``facility``.
+ 
+   :param int facility: The new facility as a numeric value. Defaults to LOG_DAEMON.
+ 
  Listen Sockets
  ~~~~~~~~~~~~~~