aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2020-06-25 10:00:28 -0400
committerNick Mathewson <nickm@torproject.org>2020-06-25 10:01:40 -0400
commit62e1d983cf362d6769e763e8b50ab8a51bdc84d4 (patch)
treeac235fa96b028445cfb2556a2f03d8ebec7ef6f9 /doc
parentc370b4a049bd99e45b2dcfd4b0824901234f8b17 (diff)
downloadtor-62e1d983cf362d6769e763e8b50ab8a51bdc84d4.tar.gz
tor-62e1d983cf362d6769e763e8b50ab8a51bdc84d4.zip
Deprecate the "--dump-config non-builtin" option
When it works, "non-builtin" doesn't do anything different from "short". (When it doesn't work, it gives an assertion failure.) Closes ticket #33398.
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt7
1 files changed, 3 insertions, 4 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 15d5775e2c..a7b3a67879 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -97,11 +97,10 @@ The following options in this section are only recognized on the
[[opt-verify-config]] **`--verify-config`**::
Verify whether the configuration file is valid.
-[[opt-dump-config]] **`--dump-config`** **`short`**|**`full`**|**`non-builtin`**::
- Write a complete list of Tor's configured options to standard output.
+[[opt-dump-config]] **`--dump-config`** **`short`**|**`full`**::
+ Write a list of Tor's configured options to standard output.
When the `short` flag is selected, only write the options that
- are different from their default values. When `non-builtin` is selected,
- write options that are not zero or the empty string.
+ are different from their default values
When `full` is selected, write every option.
[[opt-serviceinstall]] **`--service install`** [**`--options`** __command-line options__]::