summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2005-05-27 07:36:54 +0000
committerRoger Dingledine <arma@torproject.org>2005-05-27 07:36:54 +0000
commit8d42236f0fc7794395c14b337e6a187db8cdd1ec (patch)
tree227a2e862b12a6bacde3442a5de602b1e9be4a31
parentbfc7838b9751130a9a6dd7dc625f34f6a5e7b9ee (diff)
downloadtor-8d42236f0fc7794395c14b337e6a187db8cdd1ec.tar.gz
tor-8d42236f0fc7794395c14b337e6a187db8cdd1ec.zip
correct the explanation for KeepalivePeriod
svn:r4302
-rw-r--r--doc/tor.1.in4
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/tor.1.in b/doc/tor.1.in
index 0b53f8deb1..5393b3a6d0 100644
--- a/doc/tor.1.in
+++ b/doc/tor.1.in
@@ -101,7 +101,9 @@ patch if you want it to support others.
.TP
\fBKeepalivePeriod \fR\fINUM\fP
To keep firewalls from expiring connections, send a padding keepalive
-cell on open connections every NUM seconds. (Default: 5 minutes)
+cell every NUM seconds on open connections that are in use. If the
+connection has no open circuits, it will instead be closed after NUM
+seconds of idleness. (Default: 5 minutes)
.TP
\fBLog \fR\fIminSeverity\fR[-\fImaxSeverity\fR] \fBstderr\fR|\fBstdout\fR|\fBsyslog\fR\fP
Send all messages between \fIminSeverity\fR and \fImaxSeverity\fR to