aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-08-19 19:58:51 -0400
committerNick Mathewson <nickm@torproject.org>2016-08-19 19:58:51 -0400
commit507f07de098a14d54dfc2a2fdc603b49d563ef01 (patch)
tree3e2f6b5ea4b0cf69768d668d8481f65528d8a457 /doc
parent5aad921e3a02cd96158cc54d309d072ed21b3aba (diff)
parentf5dcab8072e4f8471cc0d4d8a28c79272467fb92 (diff)
downloadtor-507f07de098a14d54dfc2a2fdc603b49d563ef01.tar.gz
tor-507f07de098a14d54dfc2a2fdc603b49d563ef01.zip
Merge remote-tracking branch 'public/deprecation_v2'
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index db376b1159..055073656b 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -84,6 +84,10 @@ COMMAND-LINE OPTIONS
[[opt-list-torrc-options]] **--list-torrc-options**::
List all valid options.
+[[opt-list-deprecated-options]] **--list-deprecated-options**::
+ List all valid options that are scheduled to become obsolete in a
+ future version. (This is a warning, not a promise.)
+
[[opt-version]] **--version**::
Display Tor version and exit.