Various nips and tucks.

diff --git a/doc/tripe.8 b/doc/tripe.8
index 9697e0a61d3fd401c554eccff43a8290f4298ea3..caacbe79d744107c8979dc33decd03d5aa777fe2 100644 (file)
--- a/doc/tripe.8
+++ b/doc/tripe.8
@@ -61,9 +61,9 @@ tripe \- a simple VPN daemon
 The
 .B tripe
 program is a server which can provide strong IP-level encryption and
 The
 .B tripe
 program is a server which can provide strong IP-level encryption and

-authentication between two co-operating hosts.  The program and its
-protocol are deliberately very simple, to make analysing them easy and
-to help build trust rapidly in the system.
+authentication between co-operating hosts.  The program and its protocol
+are deliberately very simple, to make analysing them easy and to help
+build trust rapidly in the system.

 .SS "Overview"
 The
 .B tripe
 .SS "Overview"
 The
 .B tripe


@@ -91,17 +91,20 @@ interactively or by simple scripts.
 If not given any command-line arguments,
 .B tripe
 will initialize by following these steps:
 If not given any command-line arguments,
 .B tripe
 will initialize by following these steps:

-.hP \*o
-It changes directory to
-.BR /var/lib/tripe .
-.hP \*o
+.hP 1.
+It sets the directory named by the
+.B TRIPEDIR
+environment variable (or
+.B /var/lib/tripe
+if the variable is unset) as the current directory.
+.hP 2.

 It acquires a UDP socket with an arbitrary kernel-selected port number.
 It will use this socket to send and receive all communications with its
 peer servers.  The port chosen may be discovered by means of the
 .B PORT
 admin command (see
 .BR tripe\-admin (5)).
 It acquires a UDP socket with an arbitrary kernel-selected port number.
 It will use this socket to send and receive all communications with its
 peer servers.  The port chosen may be discovered by means of the
 .B PORT
 admin command (see
 .BR tripe\-admin (5)).

-.hP \*o
+.hP 3.

 It loads the private key with the tag or type name
 .B tripe\-dh
 from the Catacomb-format file
 It loads the private key with the tag or type name
 .B tripe\-dh
 from the Catacomb-format file


@@ -114,7 +117,7 @@ ready for extracting the public keys of peers as they're introduced.
 They are maintained using the program
 .BR key (1)
 provided with the Catacomb distribution.)
 They are maintained using the program
 .BR key (1)
 provided with the Catacomb distribution.)

-.hP \*o
+.hP 4.

 It creates and listens to the Unix-domain socket
 .BR tripesock .
 .PP
 It creates and listens to the Unix-domain socket
 .BR tripesock .
 .PP

diff --git a/doc/tripectl.1 b/doc/tripectl.1
index 1168a03c1526fa13c566ea73d1441976eb111677..e24a018c2c9e574a3758a7680f2c03f84885c76d 100644 (file)
--- a/doc/tripectl.1
+++ b/doc/tripectl.1
@@ -51,8 +51,9 @@ Options:
 .SH DESCRIPTION
 The
 .B tripectl
 .SH DESCRIPTION
 The
 .B tripectl

-is a simple client which can be used, either interactively or from a
-script, to send commands to and read status information from a running
+program is a simple client which can be used, either interactively or
+from a script, to send commands to and read status information from a
+running

 .BR tripe (8)
 server.  It can also be used to start
 .BR tripe (8),
 .BR tripe (8)
 server.  It can also be used to start
 .BR tripe (8),