summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-06-29 16:12:15 -0400
committerNick Mathewson <nickm@torproject.org>2016-06-29 16:12:15 -0400
commit560e976e4b3e330301704075bc6f9e1d5ccaa386 (patch)
tree83cf4bcb6d7edecbbe4caa3df7e2748a4ba3fa94 /doc
parent2fb177e8c98d1062a63d811b1bc4be35ff38f19f (diff)
parent135800f75ce2b7d299b921acd9dbc5012b8787e0 (diff)
downloadtor-560e976e4b3e330301704075bc6f9e1d5ccaa386.tar.gz
tor-560e976e4b3e330301704075bc6f9e1d5ccaa386.zip
Merge remote-tracking branch 'weasel/bug19505'
Diffstat (limited to 'doc')
-rw-r--r--doc/tor-gencert.1.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/tor-gencert.1.txt b/doc/tor-gencert.1.txt
index aa61ec3ec6..6bba548b87 100644
--- a/doc/tor-gencert.1.txt
+++ b/doc/tor-gencert.1.txt
@@ -68,7 +68,7 @@ OPTIONS
Number of months that the certificate should be valid. Default: 12.
**--passphrase-fd** __FILEDES__::
- Filedescriptor to read the file descriptor from. Ends at the first NUL or
+ Filedescriptor to read the passphrase from. Ends at the first NUL or
newline. Default: read from the terminal.
**-a** __address__:__port__::