[tor-commits] [tor/master] Improve our documentation for the NT Service command line options

[nickm at torproject.org]

commit dc60b5d6a725955847082a24ff0b65d183e60c18
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Apr 11 13:10:35 2012 -0400

    Improve our documentation for the NT Service command line options
    
    We explain the --options option, document --nt-service as an
    internal-use-only thing (which it is), fix a URL, and generally
    improve the prose.
---
 changes/bug3964 |    4 ++++
 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 0000000..34cad50
--- /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 e73377b..ff46472 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.