Merge remote-tracking branch 'public/bug3964'

This commit is contained in:
Nick Mathewson
2012-05-16 11:33:52 -04:00
2 changed files with 13 additions and 3 deletions
+4
View File
@@ -0,0 +1,4 @@
o Documentation fixes:
- Improve the manual's documentation for the NT Service command-line
options. Addresses bug 3964.
+9 -3
View File
@@ -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.