server/admin.c: Remove spurious `ping' in usage message.

[tripe] / peerdb / peers.in.5.in

diff --git a/peerdb/peers.in.5.in b/peerdb/peers.in.5.in
index 4e6d5cadd765bcb1f7154f69a7dc10ff9299d8e1..c128a4ed31d9df771af40db0cbc010120737f43e 100644 (file)
--- a/peerdb/peers.in.5.in
+++ b/peerdb/peers.in.5.in
@@ -97,9 +97,19 @@ consist of zero or more of the following characters:
 looks up the
 .IR host 's
 IPv4 address(es);
 looks up the
 .IR host 's
 IPv4 address(es);

+.RB ` 6 '
+looks up the
+.IR host 's
+IPv6 address(es);
+and

 .RB ` * '
 returns all of the found addresses, separated by spaces, rather than
 .RB ` * '
 returns all of the found addresses, separated by spaces, rather than

-just the first one.
+just the first one.  If neither address family is requested, then
+.RB ` 46 '
+is assumed.  IPv6 address lookup of names, rather than address literals,
+depends on the external
+.BR adnshost (1)
+program; if it is not present then only IPv4 lookups will be performed.

 .PP
 There is a simple concept of
 .I inheritance
 .PP
 There is a simple concept of
 .I inheritance


@@ -184,6 +194,12 @@ Don't initiate immediate key exchange.  Used by
 Shell command for closing down connection to this peer.  Used by
 .BR connect (8).
 .TP
 Shell command for closing down connection to this peer.  Used by
 .BR connect (8).
 .TP

+.B ephemeral
+Mark the peer as ephemeral: see
+.BR tripe-admin (5)
+for what this means.  Used by
+.BR connect (8).
+.TP

 .B every
 Interval for checking that the peer is still alive and well.  Used by
 .BR connect (8).
 .B every
 Interval for checking that the peer is still alive and well.  Used by
 .BR connect (8).


@@ -216,6 +232,10 @@ Interval for sending keepalive pings.  Used by
 Key tag to use to authenticate the peer.  Used by
 .BR connect (8).
 .TP
 Key tag to use to authenticate the peer.  Used by
 .BR connect (8).
 .TP

+.B knock
+Knock string to send when establishing a dynamic connection.  Used by
+.BR connect (8).
+.TP

 .B mobile
 Peer's IP address is highly volatile.  Used by
 .BR connect (8).
 .B mobile
 Peer's IP address is highly volatile.  Used by
 .BR connect (8).


@@ -306,7 +326,7 @@ Firstly, if there is a key
 .B auto
 in the section (or in its parent, etc.), and the value is
 .BR y ,
 .B auto
 in the section (or in its parent, etc.), and the value is
 .BR y ,

-.BR yes .
+.BR yes ,

 .BR t ,
 .BR true ,
 .BR 1 ,
 .BR t ,
 .BR true ,
 .BR 1 ,