From: Mark Wooding Date: Mon, 1 Jan 2007 12:52:09 +0000 (+0000) Subject: doc: Various small cleanups to tripe-admin.5. X-Git-Tag: 1.0.0pre8~94^2~2 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/commitdiff_plain/2acd7cd6994079a71ee67280913e162dd814ef31 doc: Various small cleanups to tripe-admin.5. * Duplicate the timespec description for PING. * Put BGDETACH in the summary of responses. * Tag EPING as a command to include in the summary. * Fix the description of the INET address family now that we have background commands. --- diff --git a/doc/tripe-admin.5.in b/doc/tripe-admin.5.in index 0d9e7b66..4a966aa0 100644 --- a/doc/tripe-admin.5.in +++ b/doc/tripe-admin.5.in @@ -164,14 +164,13 @@ An Internet socket, naming an IPv4 address and UDP port. On output, the address is always in numeric dotted-quad form, and the port is given as a plain number. On input, DNS hostnames and symbolic port names are permitted. Name resolution does not block the main server, but will -block the requesting client. This hopefully makes life simpler for -stupid clients. Complex clients which don't wish to be held up can open -extra connections or do the resolution themselves.) +block the requesting client, unless the command is run in the background. .PP If, on input, no recognised address family token is found, the following words are assumed to represent an .B INET -address. +address. Addresses output by the server always have an address family +token. .SS "Key-value output" Some commands (e.g., .B STATS @@ -267,7 +266,7 @@ or in a greeting message. .B "DAEMON" Causes the server to disassociate itself from its terminal and become a background task. This only works once. A warning is issued. -.TP +.SP .BI "EPING \fR[" options "\fR] " peer Sends an encrypted ping to the peer, and expects an encrypted response. This checks that the peer is running (and not being impersonated), and @@ -379,10 +378,16 @@ Run the command in the background, using the given .BI "\-timeout " time Wait for .I time -seconds before giving up on a response. The default is 5 seconds. (The -time format is the same as for the -.B "ADD \-keepalive" -option.) +seconds before giving up on a response. The default is 5 seconds. The +.I time +is expressed as a nonnegative integer followed optionally by +.BR d , +.BR h , +.BR m , +or +.BR s +for days, hours, minutes, or seconds respectively; if no suffix is +given, seconds are assumed. .\"-opts .RE .SP @@ -1096,6 +1101,7 @@ An administration client issued a warning. .SH "SUMMARY" .SS "Command responses" .nf +.BI "BGDETACH " tag .BI "BGFAIL " tag " " tokens \fR... .BI "BGINFO " tag " " tokens \fR... .BI "BGOK " tag