diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-05-16 11:33:52 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-05-16 11:33:52 -0400 |
| commit | 82ce43a70676013eb4b694465a826b9d469905aa (patch) | |
| tree | 5edc658d514a26d3b5df0e0928a880b28902f818 | |
| parent | 2cdd631f5ca93e8bed5ad741881d4b332a81ebc3 (diff) | |
| parent | dc60b5d6a725955847082a24ff0b65d183e60c18 (diff) | |
| download | tor-82ce43a70676013eb4b694465a826b9d469905aa.tar tor-82ce43a70676013eb4b694465a826b9d469905aa.tar.gz | |
Merge remote-tracking branch 'public/bug3964'
| -rw-r--r-- | changes/bug3964 | 4 | ||||
| -rw-r--r-- | doc/tor.1.txt | 12 |
2 files changed, 13 insertions, 3 deletions
diff --git a/changes/bug3964 b/changes/bug3964 new file mode 100644 index 000000000..34cad50af --- /dev/null +++ b/changes/bug3964 @@ -0,0 +1,4 @@ + o Documentation fixes: + - Improve the manual's documentation for the NT Service command-line + options. Addresses bug 3964. + 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. |