Fixup example files, man pages and phones parsing.

Make '/etc/remote' a working example, with some lengthy comments that
might help people trying to use it.

Remove untruths and beef up documentation for tip(1), remote(5) and
phones(5). In particular remove last reference to the 'cu' tip
interface since we use the 'cu' that comes with uucp, improve
documentation on phone numbers and flesh out documentation on
acu/modems supported. Document PHONES and REMOTE environment
variables.

Cleanup parsing of /etc/phones (so our example can be used) and ignore
lines with empty phone numbers instead of aborting the scan of the
file. This makes /etc/phones parsing consistant with ':pn:' capability
parsing. Don't try to dial empty phone numbers in either case.

ok millert@

5 files changed, 412 insertions, 273 deletions

diff --git a/etc/remote b/etc/remote
index e1ca7244fd7..9143bfa719d 100644
--- a/etc/remote
+++ b/etc/remote
@@ -1,32 +1,75 @@
-#	$OpenBSD: remote,v 1.4 1997/09/03 21:26:19 deraadt Exp $
-#	@(#)remote	5.2 (Berkeley) 6/30/90
-#
-# remote -- remote host description file
-# see tip(1), remote(5)
-#
-# dv	device to use for the tty
-# el	EOL marks (default is NULL)
-# du	make a call flag (dial up)
-# pn	phone numbers (@ =>'s search phones file; possibly taken from
-#	PHONES environment variable)
-# at	ACU type
-# ie	input EOF marks (default is NULL)
-# oe	output EOF string (default is NULL)
-# cu	call unit (default is dv)
-# br	baud rate (defaults to 300)
-# fs	frame size (default is BUFSIZ) -- used in buffering writes on
-#	receive operations
-# tc	to continue a capability
+#	from: @(#)remote	8.1 (Berkeley) 6/10/93
+#
+# remote -- remote host description database
+# see tip(1), cgetcap(3), phones(5), remote(5)
+#
+# Capabilities used in examples:
+#
+#   at	ACU type
+#   br	baud rate (defaults to 300)
+#   dc	direct connect
+#   du	make a call flag (dial up)
+#   dv	device to use for the tty
+#   el	EOL marks (default is NULL)
+#   ie	input EOF marks (default is NULL)
+#   oe	output EOF string (default is NULL)
+#   pa	parity
+#   pn	phone #, '\@' means use the phones(5) file
+#   tc	include the named system description
+#
+# Most OpenBSD architectures use /dev/tty00, /dev/cua00, etc.
+# for the 'standard' serial ports. Some architectures use
+# /dev/ttya, /dev/cuaa, etc. The samples provide descriptions
+# for the first serial port in each style.
+#
+# A few architectures such as the Alpha, HPPA, or mvme88k either
+# don't provide a serial port by default or have more complex
+# naming conventions.
+#
+# In all cases make sure you are using the appropriate device
+# name for the port you wish to access.
+#
+# System names can be anything, the samples use the device name
+# for simplicity.
+#
+# NOTE:
+#       a) Multiple :tc=XXX: capabilities are allowed, so that
+#          various general pieces can be assembled into one
+#          system description.
+#       b) Only the first capability with the same name is 
+#          used. So capabilitites included a with :tc=XXX: can
+#          be overridden by assigning them a value before 
+#          including them. e.g. ":oe=^Z:" in doshost below.
+#
+# See cgetcap(3) for details on capability databases.
+# --------------------------------------------------------------
+
+# General definitions used in :tc=XXX: capabilities below
+#
+direct:\
+	:dc:
+
+dialup:\
+        :du:at=hayes:pn=\@:
+
+doshost:\
+	:oe=^Z:tc=unixhost:
+
+unixhost:\
+	:pa=none:br#9600:el=^U^C^R^O^D^S^Q:ie=%$:oe=^D:
+
+# Sample directly connected lines. Directly connected lines are
+# most commonly used for serial consoles.
+#
+tty00|For Amiga,i386,mac68k,mvmeppc,powerpc,vax,hp300:\
+	:dv=/dev/tty00:tc=direct:tc=unixhost:
 
-# UNIX system definitions
-unix19200|19200 Baud dial-out to another UNIX system:\
-	:el=^U^C^R^O^D^S^Q:ie=%$:oe=^D:tc=dial1200:
-unix1200|1200 Baud dial-out to another UNIX system:\
-	:el=^U^C^R^O^D^S^Q:ie=%$:oe=^D:tc=dial1200:
-unix300|300 Baud dial-out to another UNIX system:\
-	:el=^U^C^R^O^D^S^Q:ie=%$:oe=^D:tc=dial300:
+ttya|For sun3,sparc,mvme68k:\
+	:dv=/dev/ttya:tc=direct:tc=unixhost:
 
-# General dialer definitions used below
+# Sample dial out lines.
 #
-dialout:\
-        :dv=/dev/tty00:br#19200:cu=/dev/cua00:at=hayes:du:
+cua00|For Amiga,i386,mac68k,mvmeppc,powerpc,vax,hp300:\
+	:dv=/dev/cua00:tc=dialup:tc=unixhost:
+cuaa|For sun3,sparc,mvme68k:\
+	:dv=/dev/cuaa:tc=dialup:tc=unixhost:
diff --git a/share/man/man5/phones.5 b/share/man/man5/phones.5
index 3d95b21f986..e4c19c0cf47 100644
--- a/share/man/man5/phones.5
+++ b/share/man/man5/phones.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: phones.5,v 1.6 2000/10/26 00:37:05 aaron Exp $
+.\"	$OpenBSD: phones.5,v 1.7 2001/08/11 00:05:53 krw Exp $
 .\"	$NetBSD: phones.5,v 1.3 1994/11/30 19:31:25 jtc Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -39,47 +39,77 @@
 .Os
 .Sh NAME
 .Nm phones
-.Nd remote host phone number database
+.Nd remote host phone number file
 .Sh DESCRIPTION
-The
-.Pa /etc/phones
-file contains the system-wide private phone numbers for the
+.Nm
+files are used by
 .Xr tip 1
-program.
-This file is normally unreadable, and so may contain privileged information.
+to find phone numbers not included in the
+.Xr remote 5
+database(s) being used.
+.Pp
+The default file is
+.Pa /etc/phones ,
+which is used unless the
+.Ev PHONES
+environment variable has been set.
+.Pa /etc/phones
+is world readable by default, and should
+.Em not
+contain privileged information.
+.Pp
 The format of the file is a series of lines of the form:
 .Pp
-.D1 Li <system-name>[\ \et]*<phone-number>
+.D1 Li <system name>[\ \et]*<phone number>
 .Pp
-The system name is one of those defined in the
-.Xr remote 5
-file and the phone number is constructed from any sequence of
-characters terminated only by
+The system name must start at the first character on the line.
+The phone number is any sequence of characters terminated by a
 .Ql \&,
 or the end of the line.
-The
-.Ql =
-and
-.Ql *
-characters are indicators to the auto call units to pause and wait for
-a second dial tone (when going through an exchange).
-The
-.Ql =
-is required by the
-.Tn DF02-AC
-and the
-.Ql *
-is required by the
-.Tn BIZCOMP
-1030.
+Thus the phone number field can contain arbitrary dialing strings, not
+just phone numbers.
+.Pp
+Certain auto-call units or modems can use
+.Ql \&,
+in their dialing strings.
+For these units (currently Hayes, Courier and Telebit)
+.Xr tip 1
+will translate a
+.Ql \&=
+in the phone number to a
+.Ql \&,
+when actually dialing the number.
+.Pp
+If the auto-call unit is a Racal-Vadic 831,
+.Xr tip 1
+will translate a
+.Ql \&_
+in the phone number to a
+.Ql \&= .
 .Pp
-Only one phone number per line is permitted.
-However, if more than one line in the file contains the same system name,
 .Xr tip 1
-will attempt to dial each one in turn, until it establishes a connection.
+ignores all lines with a system name other than the one being
+looked up.
+Comments can be inserted into the file by making the first character
+on a line something not used to start any system name in the
+.Xr remote 5
+database(s) being used, such as 
+.Ql # .
+.Pp
+Only one phone number per line is permitted.
+To associate more than one phone number with a system name you must
+create multiple lines that have the same system name.
+.Xr tip 1 
+will try each number in sequence until it makes a connection or
+reaches the end of the file.
+.Pp
 .Sh FILES
 .Bl -tag -width /etc/phones -compact
 .It Pa /etc/phones
+The default
+.Nm
+file for
+.Xr tip 1 .
 .El
 .Sh SEE ALSO
 .Xr tip 1 ,
diff --git a/share/man/man5/remote.5 b/share/man/man5/remote.5
index 560fc942b29..088d81b77a3 100644
--- a/share/man/man5/remote.5
+++ b/share/man/man5/remote.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: remote.5,v 1.10 2001/08/02 20:37:35 hugh Exp $
+.\"	$OpenBSD: remote.5,v 1.11 2001/08/11 00:05:53 krw Exp $
 .\"	$NetBSD: remote.5,v 1.4 1997/04/20 00:05:27 mellon Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -48,8 +48,7 @@ and their attributes are stored in an
 file which is structured somewhat like the
 .Xr termcap 5
 file.
-Each line in the file provides a description for a single
-.Xr system .
+Each line in the file provides a description for a single remote host.
 Fields are separated by a colon
 .Pq Sq \&: .
 Lines ending with a
@@ -70,25 +69,29 @@ indicates a following numeric value.
 .Pp
 Entries named
 .Dq tip\&*
-and
-.Dq cu\&*
+.\"and
+.\".Dq cu\&*
 are used as default entries by
-.Xr tip ,
-and the
-.Xr cu
-interface to
-.Xr tip ,
+.Xr tip 1
+.\"and the
+.\".Xr cu 1
+.\"interface to
+.\".Xr tip 1 ,
 as follows.
 When
-.Xr tip
-is invoked with only a phone number, it looks for an entry of the form
-.Dq tip300 ,
-where 300 is the baud rate with which the connection is to be made.
-When the
-.Xr cu
-interface is used, entries of the form
-.Dq cu300
-are used.
+.Xr tip 1
+is invoked with only a baud rate, it looks for an entry of the form
+.Dq tip<baud rate> .
+E.g.
+.Ic tip -300
+will cause
+.Xr tip 1
+to look for the system tip300.
+.\"When the
+.\".Xr cu 1
+.\"interface is used, entries of the form
+.\".Dq cu300
+.\"are used.
 .Sh CAPABILITIES
 Capabilities are either strings (str), numbers (num), or boolean flags (bool).
 A string capability is specified by
@@ -107,7 +110,7 @@ Auto call unit type.
 .It Sy \&be
 (bool)
 Initialize the
-.Xr tip
+.Xr tip 1
 variable
 .Dq beautify
 to
@@ -133,7 +136,7 @@ field.
 .It Sy \&dc
 (bool)
 This host is directly connected, and
-.Xr tip
+.Xr tip 1
 should not expect carrier detect to be high, nor should it exit if
 carrier detect drops.
 .It Sy \&di
@@ -153,13 +156,13 @@ one user at a time has access to the port.
 .It Sy \&ec
 (bool)
 Initialize the
-.Xr tip
+.Xr tip 1
 variable
 .Dq echocheck
 to
 .Sy on ,
 so that
-.Xr tip
+.Xr tip 1
 will synchronize with the remote host during file
 transfer by waiting for the last character transmitted to echo.
 .It Sy \&el
@@ -169,14 +172,14 @@ The default is
 .Dv NULL .
 .Dq ~
 escapes are only recognized by
-.Xr tip
+.Xr tip 1
 after one of the characters in
 .Sy el ,
 or after a carriage-return.
 .It Sy \&es
 (str)
 The escape character for
-.Xr tip .
+.Xr tip 1 .
 The default is
 .Dq ~ .
 .It Sy \&et
@@ -213,7 +216,7 @@ The default is
 .It Sy \&nb
 (bool)
 Initialize the
-.Xr tip
+.Xr tip 1
 variable
 .Dq beautify
 to
@@ -222,7 +225,7 @@ so that non-printable characters will not be discarded when scripting.
 .It Sy \&nt
 (bool)
 Initialize the
-.Xr tip
+.Xr tip 1
 variable
 .Dq tandem
 to
@@ -232,7 +235,7 @@ from the remote host.
 .It Sy \&nv
 (bool)
 Initialize the
-.Xr tip
+.Xr tip 1
 variable
 .Dq verbose
 to
@@ -244,7 +247,7 @@ Output end-of-file string.
 The default is
 .Dv NULL .
 When
-.Xr tip
+.Xr tip 1
 is transferring a file, this string is sent at end-of-file.
 .It Sy \&pa
 (str)
@@ -262,14 +265,35 @@ The default is no parity.
 .It Sy \&pn
 (str)
 Telephone number(s) for this host.
-If the telephone number field contains a
-.Ql @
-(at sign),
-.Xr tip
-searches the file
-.Pa /etc/phones
-file for a list of telephone numbers (see
-.Xr phones 5 ) .
+Either a list of arbitrary dialing strings separated by
+commas, or a
+.Ql @ .
+An at sign,
+.Ql @ ,
+tells
+.Xr tip 1
+to search the
+.Xr phones 5
+database for the list of telephone numbers.
+.Pp
+For modems or auto-call units that use a
+.Ql \&,
+in their dialing strings (hayes, courier, t3000)
+.Xr tip 1
+will convert any
+.Ql \&=
+in the string to a 
+.Ql \&,
+when dialing.
+For modems or auto-call units that use a
+.Ql \&=
+in their dial strings, (v831),
+.Xr tip 1
+will convert any
+.Ql \&_
+to a
+.Ql \&=
+when dialing.
 .It Sy \&pr
 (str)
 Character that indicates end-of-line on the remote host.
@@ -278,7 +302,7 @@ The default value is
 .It Sy \&ra
 (bool)
 Initialize the
-.Xr tip
+.Xr tip 1
 variable
 .Dq raise
 to
@@ -299,7 +323,7 @@ The default value is
 .It Sy \&rw
 (str)
 Initialize the
-.Xr tip
+.Xr tip 1
 variable
 .Dq rawftp
 to
@@ -308,7 +332,7 @@ so that all characters will be sent as is during file transfers.
 .It Sy \&sc
 (bool)
 Initialize the
-.Xr tip
+.Xr tip 1
 variable
 .Dq script
 to
@@ -317,7 +341,7 @@ so that everything transmitted by the remote host will be recorded.
 .It Sy \&ta
 (bool)
 Initialize the
-.Xr tip
+.Xr tip 1
 variable
 .Dq tandem
 to
@@ -327,7 +351,7 @@ from the remote host.
 .It Sy \&tb
 (bool)
 Initialize the 
-.Xr tip 
+.Xr tip 1 
 variable 
 .Dq tabexpand
 to
@@ -340,7 +364,7 @@ This is used primarily to share common capability information.
 .It Sy \&vb
 (bool)
 Initialize the
-.Xr tip
+.Xr tip 1
 variable
 .Dq verbose
 to
@@ -359,6 +383,7 @@ arpavax|ax:\e
 .Sh FILES
 .Bl -tag -width /etc/remote -compact
 .It Pa /etc/remote
+Global database.
 .El
 .Sh SEE ALSO
 .Xr tip 1 ,
diff --git a/usr.bin/tip/acu.c b/usr.bin/tip/acu.c
index a6acf8dfc79..9fb3fb21036 100644
--- a/usr.bin/tip/acu.c
+++ b/usr.bin/tip/acu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: acu.c,v 1.5 2000/04/20 06:19:33 deraadt Exp $	*/
+/*	$OpenBSD: acu.c,v 1.6 2001/08/11 00:05:53 krw Exp $	*/
 /*	$NetBSD: acu.c,v 1.4 1996/12/29 10:34:03 cgd Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)acu.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: acu.c,v 1.5 2000/04/20 06:19:33 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: acu.c,v 1.6 2001/08/11 00:05:53 krw Exp $";
 #endif /* not lint */
 
 #include "tip.h"
@@ -102,20 +102,19 @@ connect()
 		return ("unknown ACU type");
 	if (*cp != '@') {
 		while (*cp) {
-			for (phnum = cp; *cp && *cp != ','; cp++)
-				;
-			if (*cp)
+			phnum = cp;
+			cp = strpbrk(cp, ",");
+			if (*cp != '\0')
 				*cp++ = '\0';
-			
-			if ((conflag = (*acu->acu_dialer)(phnum, CU))) {
-				if (CM != NOSTR)
-					parwrite(FD, CM, size(CM));
-				logent(value(HOST), phnum, acu->acu_name,
-					"call completed");
-				return (NOSTR);
-			} else
-				logent(value(HOST), phnum, acu->acu_name,
-					"call failed");
+
+			if (strlen(phnum) == 0)
+				continue;
+
+			conflag = (*acu->acu_dialer)(phnum, CU);
+			if (conflag)
+				break;
+
+			logent(value(HOST), phnum, acu->acu_name, "call failed");
 			tried++;
 		}
 	} else {
@@ -124,45 +123,41 @@ connect()
 			return ("can't open phone number file");
 		}
 		while (fgets(string, sizeof(string), fd) != NOSTR) {
-			for (cp = string; !any(*cp, " \t\n"); cp++)
-				;
-			if (*cp == '\n') {
-				fclose(fd);
-				return ("unrecognizable host name");
-			}
-			*cp++ = '\0';
-			if (strcmp(string, value(HOST)))
-				continue;
-			while (any(*cp, " \t"))
-				cp++;
-			if (*cp == '\n') {
-				fclose(fd);
-				return ("missing phone number");
-			}
-			for (phnum = cp; *cp && *cp != ',' && *cp != '\n'; cp++)
-				;
-			if (*cp)
+			cp = &string[strcspn(string, " \t\n")];
+			if (*cp != '\0')
 				*cp++ = '\0';
+
+			if (strcmp(string, value(HOST)) != 0)
+				continue;
+
+			cp += strspn(cp, " \t\n");
+			phnum = cp;
+			*(cp + strcspn(cp, ",\n")) = '\0';
+
+			if (strlen(phnum) == 0)
+				continue;
+
+			conflag = (*acu->acu_dialer)(phnum, CU);
+			if (conflag)
+				break;
 			
-			if ((conflag = (*acu->acu_dialer)(phnum, CU))) {
-				fclose(fd);
-				if (CM != NOSTR)
-					parwrite(FD, CM, size(CM));
-				logent(value(HOST), phnum, acu->acu_name,
-					"call completed");
-				return (NOSTR);
-			} else
-				logent(value(HOST), phnum, acu->acu_name,
-					"call failed");
+			logent(value(HOST), phnum, acu->acu_name, "call failed");
 			tried++;
 		}
 		fclose(fd);
 	}
-	if (!tried)
+	if (conflag) {
+		if (CM != NOSTR)
+			parwrite(FD, CM, size(CM));
+		logent(value(HOST), phnum, acu->acu_name, "call completed");
+		return (NOSTR);
+	} else if (!tried) {
 		logent(value(HOST), "", acu->acu_name, "missing phone number");
-	else
+		return ("missing phone number");
+	} else {
 		(*acu->acu_abort)();
-	return (tried ? "call failed" : "missing phone number");
+		return ("call failed");
+	}
 }
 
 void
diff --git a/usr.bin/tip/tip.1 b/usr.bin/tip/tip.1
index 91798ca533b..088e3feee5a 100644
--- a/usr.bin/tip/tip.1
+++ b/usr.bin/tip/tip.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tip.1,v 1.13 2001/07/31 09:18:21 hugh Exp $
+.\"	$OpenBSD: tip.1,v 1.14 2001/08/11 00:05:53 krw Exp $
 .\"	$NetBSD: tip.1,v 1.7 1994/12/08 09:31:05 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
@@ -44,12 +44,8 @@
 .Sh SYNOPSIS
 .Nm tip
 .Op Fl nv
-.Fl Ns Ns Ar speed
-.Ar system\-name
-.Nm tip
-.Op Fl nv
-.Fl Ns Ns Ar speed
-.Ar phone\-number
+.Op Fl Ar speed
+.Op Ar system\-name
 .\" .Nm cu
 .\" .Ar phone\-number
 .\" .Op Fl t
@@ -61,11 +57,10 @@
 .Nm
 .\" and
 .\" .Nm cu
-establishes a full-duplex connection to another machine,
-giving the appearance of being logged in directly on the
-remote CPU.
-It goes without saying that you must have a login
-on the machine (or equivalent) to which you wish to connect.
+establishes a full-duplex connection to another machine, giving the
+appearance of being logged in directly on the remote CPU.
+It goes without saying that you must have a login on the machine (or
+equivalent) to which you wish to connect.
 .\" The preferred interface is
 .\" .Nm tip .
 .\" The
@@ -78,30 +73,57 @@ on the machine (or equivalent) to which you wish to connect.
 .\" .Nm tip .
 .Pp
 The options are as follows:
-.Bl -tag -width Ds
+.Bl -tag -offset indent -width 4n
 .It Fl v
 Set verbose mode.
 .It Fl n
 No escape (disable tilde).
 .El
 .Pp
+If
+.Ar speed
+is specified it will override any baudrate specified in the system
+description being used.
+.Pp
+If neither
+.Ar speed
+nor
+.Ar system-name
+are specified,
+.Ar system-name
+will be set to the value of the
+.Ev HOST
+environment variable.
+.Pp
+If
+.Ar speed
+is specified but
+.Ar system-name
+is not,
+.Ar system-name
+will be set to a value of 'tip' with
+.Ar speed
+appended.
+e.g.
+.Ic tip -1200
+will set
+.Ar system-name
+to 'tip1200'.
+.Pp
 Typed characters are normally transmitted directly to the remote
 machine (which does the echoing as well).
 A tilde
 .Pq Ql ~
-appearing
-as the first character of a line is an escape signal; the following
-are recognized:
-.Bl -tag -width flag
+appearing as the first character of a line is an escape signal; the
+following are recognized:
+.Bl -tag -offset indent -width Fl
 .It Ic \&~^D No or Ic \&~ .
-Drop the connection and exit
-(you may still be logged in on the
-remote machine).
+Drop the connection and exit (you may still be logged in on the remote
+machine).
 .It Ic \&~c Op Ar name
 Change directory to
 .Ar name
-(no argument
-implies change to your home directory).
+(no argument implies change to your home directory).
 .It Ic \&~!
 Escape to a shell (exiting the shell will return you to
 .Nm tip Ns ).
@@ -112,8 +134,8 @@ prompts for the name of a local file to transmit.
 .It Ic \&~<
 Copy file from remote to local.
 .Nm
-prompts first for the name of the file to be sent, then for
-a command to be executed on the remote machine.
+prompts first for the name of the file to be sent, then for a command
+to be executed on the remote machine.
 .It Ic \&~p Ar from Op Ar to
 Send a file to a remote
 .Ux
@@ -143,12 +165,10 @@ Take a file from a remote
 host.
 As in the put command the
 .Dq to
-file
-defaults to the
+file defaults to the
 .Dq from
 file name if it isn't specified.
-The remote host
-executes the command string
+The remote host executes the command string
 .Dq cat 'from';echo ^A
 to send the file to
 .Nm tip .
@@ -169,26 +189,23 @@ system is processed by the shell.
 .It Ic \&~C
 Fork a child process on the local system to perform special protocols
 such as \s-1XMODEM\s+1.
-The child program will be run with the following
-somewhat unusual arrangement of file descriptors:
-.nf
-.in +1i
+The child program will be run with the following somewhat unusual
+arrangement of file descriptors:
+.Bd -literal -offset indent
 0 <-> local tty in
 1 <-> local tty out
 2 <-> local tty out
 3 <-> remote tty in
 4 <-> remote tty out
-.in -1i
-.fi
+.Ed
 .It Ic \&~#
 Send a
 .Dv BREAK
 to the remote system.
-For systems which don't support the
-necessary
+For systems which don't support the necessary
 .Fn ioctl
-call the break is simulated by a sequence of line speed changes
-and DEL characters.
+call the break is simulated by a sequence of line speed changes and
+DEL characters.
 .It Ic \&~s
 Set a variable (see the discussion below).
 .It Ic \&~^Z
@@ -200,8 +217,7 @@ Stop only the
 .Dq local side
 of
 .Nm
-(only available with job control);
-the
+(only available with job control); the
 .Dq remote side
 of
 .Nm tip ,
@@ -210,43 +226,66 @@ the side that displays output from the remote host, is left running.
 Get a summary of the tilde escapes.
 .El
 .Pp
+To find the system description and thus the operating characteristics
+of
+.Ar system-name ,
 .Nm
-uses the file
-.Pa /etc/remote
-to find how to reach a particular
-system and to find out how it should operate while talking
-to the system;
-refer to
+searches for a system description with a name identical to
+.Ar system-name .
+The search order is
+.Bl -enum -offset indent
+.It
+If the environment variable
+.Ev REMOTE
+does not start with a
+.Ql \&/
+it is assumed to be a system description, and is considered first.
+.It
+If the environment variable
+.Ev REMOTE
+begins with a
+.Ql \&/
+it is assumed to be a path to a
 .Xr remote 5
-for a full description.
-Each system has a default baud rate with which to
-establish a connection.
-If this value is not suitable, the baud rate
-to be used may be specified on the command line, e.g.,
+database, and the specified database is searched.
+.It 
+The default
+.Xr remote 5
+database,
+.Pa /etc/remote ,
+is searched.
+.El
+.Pp
+See
+.Xr remote 5
+for full documentation on system descriptions.
+.Pp
+The
+.Ar ba
+capability is used in system descriptions to specify the baud rate
+with which to establish a connection.
+If the value specified is not suitable, the baud rate to be used may
+be given on the command line, e.g.,
 .Ql "tip -300 mds" .
 .Pp
 When
 .Nm
-establishes a connection it sends out a
-connection message to the remote system; the default value, if any,
-is defined in
-.Pa /etc/remote
-(see
-.Xr remote 5 ) .
+establishes a connection it sends out the connection message
+specified in the
+.Ar cm
+capability of the system description being used.
 .Pp
 When
 .Nm
-prompts for an argument (e.g., during setup of
-a file transfer) the line typed may be edited with the standard
-erase and kill characters.
-A null line in response to a prompt,
-or an interrupt, will abort the dialogue and return you to the
-remote machine.
+prompts for an argument (e.g., during setup of a file transfer) the
+line typed may be edited with the standard erase and kill characters.
+A null line in response to a prompt, or an interrupt, will abort the
+dialogue and return you to the remote machine.
 .Pp
 .Nm
-guards against multiple users connecting to a remote system
-by opening modems and terminal lines with exclusive access,
-and by honoring the locking protocol used by
+guards against multiple users connecting to a remote system by opening
+modems and terminal lines with exclusive access, and by honoring the
+locking protocol used by
 .Xr uucico 8 .
 .Pp
 During file transfers
@@ -260,8 +299,8 @@ commands, the
 .Dq eofread
 and
 .Dq eofwrite
-variables are used to recognize end-of-file when reading, and
-specify end-of-file when writing (see below).
+variables are used to recognize end-of-file when reading, and specify
+end-of-file when writing (see below).
 File transfers normally depend on tandem mode for flow control.
 If the remote system does not support tandem mode,
 .Dq echocheck
@@ -272,23 +311,29 @@ transmitted character.
 .Pp
 When
 .Nm
-must dial a phone number to connect to a system it will print
-various messages indicating its actions.
+must dial a phone number to connect to a system it will print various
+messages indicating its actions.
 .Nm
-supports the
-.Tn DEC DN Ns -11
-and
-Racal-Vadic 831 auto-call-units;
-the
-.Tn DEC DF Ns \&02
-and
-.Tn DF Ns \&03 ,
-Ventel 212+, Racal-Vadic 3451, and
-Bizcomp 1031 and 1032 integral call unit/modems.
+supports a variety of auto-call units and modems with the
+.Ar at
+capability in system descriptions.
+.Pp
+Support for Ventel 212+	(ventel), Hayes AT-style (hayes),
+USRobotics Courier (courier), Telebit T3000 (t3000) and
+Racal-Vadic 831 (vadic) units is enabled by default.
+.Pp
+Support for Bizcomp 1031[fw] (biz31[fw]), Bizcomp 1022[fw]
+(biz22[fw]), DEC DF0[23]-AC (df0[23]), DEC DN-11 (dn11) and
+Racal-Vadic 3451 (v3451) units can be added by recompiling
+.Xr tip 1
+with the appropriate defines.
+.Pp
+Note that if support for both the Racal-Vadic 831 and 3451 is enabled
+they are referred to as the v831 and v3451 respectively.
+If only one of the two is supported, it is referred to as vadic.
 .Ss VARIABLES
 .Nm
-maintains a set of variables
-which control its operation.
+maintains a set of variables which control its operation.
 Some of these variables are read-only to normal users (root is allowed
 to change anything of interest).
 Variables may be displayed and set through the
@@ -302,8 +347,8 @@ Supplying
 .Dq all
 as an argument to the set command displays all variables readable by
 the user.
-Alternatively, the user may request display of a particular
-variable by attaching a
+Alternatively, the user may request display of a particular variable
+by attaching a
 .Ql ?
 to the end.
 For example,
@@ -311,17 +356,16 @@ For example,
 displays the current escape character.
 .Pp
 Variables are numeric, string, character, or boolean values.
-Boolean
-variables are set merely by specifying their name; they may be reset
-by prepending a
+Boolean variables are set merely by specifying their name; they may be
+reset by prepending a
 .Ql !
 to the name.
 Other variable types are set by concatenating an
 .Ql =
 and the value.
 The entire assignment must not have any blanks in it.
-A single set command may be used to interrogate
-as well as set a number of variables.
+A single set command may be used to interrogate as well as set a
+number of variables.
 Variables may be initialized at run time by placing set commands
 (without the
 .Ql ~s
@@ -334,20 +378,20 @@ option causes
 .Nm
 to display the sets as they are made.
 Certain common variables have abbreviations.
-The following is a list of common variables,
-their abbreviations, and their default values:
+The following is a list of common variables, their abbreviations, and
+their default values:
 .Bl -tag -width Ar
 .It Ar beautify
-(bool) Discard unprintable characters when a session is being scripted;
-abbreviated
+(bool) Discard unprintable characters when a session is being
+scripted; abbreviated
 .Ar be .
 .It Ar baudrate
 (num) The baud rate at which the connection was established;
 abbreviated
 .Ar ba .
 .It Ar dialtimeout
-(num) When dialing a phone number, the time (in seconds)
-to wait for a connection to be established; abbreviated
+(num) When dialing a phone number, the time (in seconds) to wait for a
+connection to be established; abbreviated
 .Ar dial .
 .It Ar echocheck
 (bool) Synchronize with the remote host during file transfer by
@@ -374,8 +418,8 @@ will recognize escape characters only after an end-of-line.
 default value is
 .Ql ~ .
 .It Ar exceptions
-(str) The set of characters which should not be discarded
-due to the beautification switch; abbreviated
+(str) The set of characters which should not be discarded due to the
+beautification switch; abbreviated
 .Ar ex ;
 default value is
 .Dq \et\en\ef\eb .
@@ -399,8 +443,8 @@ host; abbreviated
 default value is
 .Ql \en .
 This value is used to synchronize during data transfers.
-The count of lines transferred during a file transfer
-command is based on receipt of this character.
+The count of lines transferred during a file transfer command is based
+on receipt of this character.
 .It Ar raise
 (bool) Upper case mapping mode; abbreviated
 .Ar ra ;
@@ -432,15 +476,15 @@ When
 is
 .Li true ,
 .Nm
-will record everything transmitted by the remote machine in
-the script record file specified in
+will record everything transmitted by the remote machine in the script
+record file specified in
 .Ar record .
 If the
 .Ar beautify
 switch is on, only printable
 .Tn ASCII
-characters will be included in
-the script file (those characters between 040 and 0177).
+characters will be included in the script file (those characters
+between 040 and 0177).
 The variable
 .Ar exceptions
 is used to indicate characters which are an exception to the normal
@@ -458,41 +502,43 @@ default is
 .Ar true .
 When verbose mode is enabled,
 .Nm
-prints messages while dialing, shows the current number
-of lines transferred during a file transfer operations,
-and more.
+prints messages while dialing, shows the current number of lines
+transferred during a file transfer operations, and more.
 .El
 .Sh ENVIRONMENT
 .Bl -tag -width Fl
 .It Ev SHELL
-(str) The name of the shell to use for the
+The name of the shell to use for the
 .Ic ~!
 command; default value is
-.Dq /bin/sh ,
-or taken from the environment.
+.Dq /bin/sh .
 .It Ev HOME
-(str) The home directory to use for the
+The home directory to use for the
 .Ic ~c
-command; default value is taken from the environment.
+command.
 .It Ev HOST
-Check for a default host if none specified.
+The default value for
+.Ar system-name
+if none is specified via the command line.
+.It Ev REMOTE
+A system description, or an absolute path to a
+.Xr remote 5
+system description database.
+.It Ev PHONES
+A path to a
+.Xr phones 5
+database.
 .El
-.Pp
-The variables
-.Ev ${REMOTE}
-and
-.Ev ${PHONES}
-are also exported.
 .Sh FILES
-.Bl -tag -width /var/spool/lock/LCK..* -compact
+.Bl -tag -width "/var/spool/lock/LCK..*" -compact
 .It Pa /etc/remote
-global system descriptions
+global
+.Xr remote 5
+database
 .It Pa /etc/phones
-global phone number database
-.It ${REMOTE}
-private system descriptions
-.It ${PHONES}
-private phone numbers
+default
+.Xr phones 5
+file
 .It Pa ~/.tiprc
 initialization file
 .It Pa tip.record