aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-05-16 11:33:52 -0400
committerNick Mathewson <nickm@torproject.org>2012-05-16 11:33:52 -0400
commit82ce43a70676013eb4b694465a826b9d469905aa (patch)
tree5edc658d514a26d3b5df0e0928a880b28902f818 /doc
parent2cdd631f5ca93e8bed5ad741881d4b332a81ebc3 (diff)
parentdc60b5d6a725955847082a24ff0b65d183e60c18 (diff)
downloadtor-82ce43a70676013eb4b694465a826b9d469905aa.tar
tor-82ce43a70676013eb4b694465a826b9d469905aa.tar.gz
Merge remote-tracking branch 'public/bug3964'
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt12
1 files changed, 9 insertions, 3 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 3dbaa3ab5..16bfd23bb 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -45,10 +45,16 @@ OPTIONS
**--verify-config**::
Verify the configuration file is valid.
+**--service install** [**--options** __command-line options__]::
+ Install an instance of Tor as a Windows service, with the provided
+ command-line options. Current instructions can be found at
+ https://trac.torproject.org/projects/tor/wiki/doc/TorFAQ#HowdoIrunmyTorrelayasanNTservice
+
+**--service** **remove**|**start**|**stop**::
+ Remove, start, or stop a configured Tor Windows service.
+
**--nt-service**::
- **--service [install|remove|start|stop]** Manage the Tor Windows
- NT/2000/XP service. Current instructions can be found at
- https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService
+ Used internally to implement a Windows service.
**--list-torrc-options**::
List all valid options.