From: Marek Vavrusa <marek@vavrusa.com>
Date: Thu, 7 Apr 2016 16:43:45 +0000 (-0700)
Subject: doc: fixes, added `second` and `min` aliases
X-Git-Tag: v1.0.0~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5bf67488d67a86169e5536a48d61ad986d358c3f;p=thirdparty%2Fknot-resolver.git

doc: fixes, added `second` and `min` aliases
---

diff --git a/daemon/README.rst b/daemon/README.rst
index 39cd067ec..952d12ba6 100644
--- a/daemon/README.rst
+++ b/daemon/README.rst
@@ -510,7 +510,7 @@ Trust anchors and DNSSEC
 
    :return: int (default: 30 * day)
 
-   Modify RFC5011 hold-down timer to given value. Example: ``30 * second``
+   Modify RFC5011 hold-down timer to given value. Example: ``30 * sec``
 
 .. envvar:: trust_anchors.refresh_time = nil
 
@@ -518,11 +518,11 @@ Trust anchors and DNSSEC
 
    Modify RFC5011 refresh timer to given value (not set by default), this will force trust anchors
    to be updated every N seconds periodically instead of relying on RFC5011 logic and TTLs.
-   Example: ``10 * second``
+   Example: ``10 * sec``
 
 .. envvar:: trust_anchors.keep_removed = 0
 
-   :return: int (default: 1)
+   :return: int (default: 0)
 
    How many ``Removed`` keys should be held in history (and key file) before being purged.
    Note: all ``Removed`` keys will be purged from key file after restarting the process.
diff --git a/daemon/lua/sandbox.lua b/daemon/lua/sandbox.lua
index 933100313..320e93f7f 100644
--- a/daemon/lua/sandbox.lua
+++ b/daemon/lua/sandbox.lua
@@ -4,7 +4,9 @@ MB = 1024*kB
 GB = 1024*MB
 -- Time
 sec = 1000
+second = sec
 minute = 60 * sec
+min = minute
 hour = 60 * minute
 day = 24 * hour