From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Wed, 24 Jun 2015 20:24:16 +0000 (+0200)
Subject: docs: A little more on how to enable the API
X-Git-Tag: dnsdist-1.0.0-alpha1~248^2~77^2~7^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38e44a87a81601a75fc75bca091fa2f29ad823a6;p=thirdparty%2Fpdns.git

docs: A little more on how to enable the API
---

diff --git a/docs/markdown/authoritative/settings.md b/docs/markdown/authoritative/settings.md
index d01099f1ac..dff03e2583 100644
--- a/docs/markdown/authoritative/settings.md
+++ b/docs/markdown/authoritative/settings.md
@@ -268,6 +268,12 @@ doubles query load. **Do not combine with DNSSEC!**
 
 Enable/Disable DNS update (RFC2136) support.
 
+## `experimental-json-interface`
+* Boolean
+* Default: no
+
+Enable/disable the [JSON API](../httpapi/README.md).
+
 ## `forward-dnsupdates`
 * Boolean
 * Default: no
diff --git a/docs/markdown/httpapi/api_spec.md b/docs/markdown/httpapi/api_spec.md
index b964a73d68..9a8022752f 100644
--- a/docs/markdown/httpapi/api_spec.md
+++ b/docs/markdown/httpapi/api_spec.md
@@ -59,8 +59,9 @@ Action/Execute methods return a JSON body of this format:
 Authentication
 --------------
 
-The PowerDNS daemons accept a static API Key, which has to be sent in the
-`X-API-Key` header.
+The PowerDNS daemons accept a static API Key, configured with the
+[`experimental-api-key`]('../authoritative/settings.md#experimental-api-key')
+option, which has to be sent in the `X-API-Key` header.
 
 Note: Authoritative Server 3.4.0 and Recursor 3.6.0 and 3.6.1 use HTTP
 Basic Authentication instead.