Update documentation to reflect changes

diff --git a/docs/manpages/pdns_control.1.md b/docs/manpages/pdns_control.1.md
index 1a9803c11c828dc27b8eb447c2a04a18467b02fc..a785fcfbfe582749c8879fc098fc9ab950a97901 100644 (file)
--- a/docs/manpages/pdns_control.1.md
+++ b/docs/manpages/pdns_control.1.md
@@ -107,6 +107,9 @@ status
 :    Show usage statistics. This only works if the server is running in guardian
      mode.
 
+token-login *MODULE* *SLOT* *PIN*
+:    Log on to a PKCS#11 slot.
+
 uptime
 :    Show the uptime of the running server.
 

diff --git a/docs/markdown/authoritative/dnssec.md b/docs/markdown/authoritative/dnssec.md
index edd967d5fbeaad61a8cd9c5d3a4798baa797a3c4..cffa434cd0d0e6bb74ab8ddda2973deede39814c 100644 (file)
--- a/docs/markdown/authoritative/dnssec.md
+++ b/docs/markdown/authoritative/dnssec.md
@@ -315,6 +315,9 @@ For further details, please see [the `pdnssec`](#pdnssec) documentation.
 **Note**: This feature is experimental, and not ready for production. Use at your own risk!
 To enable it, compile PowerDNS Authoritative Server using --enable-experimental-pkcs11 flag on configure. This requires you to have p11-kit libraries and headers.
 
+You can also log on to the tokens after starting server, in this case you need to edit your PKCS#11 cryptokey record and remove PIN or set it empty. PIN is required
+for assigning keys to zone.
+
 Instructions on how to setup SoftHSM to work with the feature after compilation on ubuntu/debian (tested with Ubuntu 12 and 14).
 -   apt-get install softhsm p11-kit opensc
 -   create directory /etc/pkcs11/modules

diff --git a/docs/markdown/authoritative/internals.md b/docs/markdown/authoritative/internals.md
index a97b5b9871aa68be9e0a33ccef644d54a6b72b1f..708b85f8841ba7230f4310c1c9454b9611dde98a 100644 (file)
--- a/docs/markdown/authoritative/internals.md
+++ b/docs/markdown/authoritative/internals.md
@@ -56,6 +56,9 @@ Retrieve a slave domain from its master. Done nearly immediately.
 ## `set VARIABLE VALUE`
 Set a configuration parameter. Currently only the 'query-logging' parameter can be set.
 
+## `token-login MODULE SLOT PIN`
+Logs on to a PKCS#11 slot. You only need to login once per slot, even if you have multiple keys on single slot.
+
 ## `uptime`
 Reports the uptime of the daemon in human readable form.