summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2005-09-14 02:46:16 +0000
committerRoger Dingledine <arma@torproject.org>2005-09-14 02:46:16 +0000
commitec9ef0da3b2613866583ac378b06e8191b23b834 (patch)
treeb893cf78657949beb06c5dc0ce9a94c90711ed50
parent7c6679d8dc260f6fb6f183c83b0d058b3ba0852c (diff)
downloadtor-ec9ef0da3b2613866583ac378b06e8191b23b834.tar.gz
tor-ec9ef0da3b2613866583ac378b06e8191b23b834.zip
document the new functionality that crept in:
RESETCONF exitpolicy=foo is equivalent to SETCONF exitpolicy=foo unless foo is a linelist with a non-null default (we don't have any of those currently), in which it appends to the default rather than replacing. svn:r5047
-rw-r--r--doc/control-spec.txt8
1 files changed, 5 insertions, 3 deletions
diff --git a/doc/control-spec.txt b/doc/control-spec.txt
index 151b614fd5..0fd970d991 100644
--- a/doc/control-spec.txt
+++ b/doc/control-spec.txt
@@ -128,10 +128,12 @@ $Id$
3.2. RESETCONF
- Remove all settings for a given configuration option entirely, and go
- back to its default value. The syntax is:
+ Remove all settings for a given configuration option entirely, assign
+ its default value (if any), and then assign the String provided.
+ Typically the String is left empty, to simply set an option back to
+ its default. The syntax is:
- "RESETCONF" 1*(SP keyword) CRLF
+ "RESETCONF" 1*(SP keyword ["=" String]) CRLF
Otherwise it behaves like SETCONF above.