No more phones(5), /etc/phones, or dial up bits in remote.

3 files changed, 4 insertions, 174 deletions

diff --git a/share/man/man5/Makefile b/share/man/man5/Makefile
index 98b5dd44896..f6bdd3c4700 100644
--- a/share/man/man5/Makefile
+++ b/share/man/man5/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.42 2009/11/22 22:01:55 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.43 2010/06/29 17:17:53 nicm Exp $
 #	$NetBSD: Makefile,v 1.14 1995/05/11 23:13:15 cgd Exp $
 
 # missing: dump.5 plot.5
@@ -8,7 +8,7 @@ MAN=	a.out.5 acct.5 bsd.port.mk.5 bsd.regress.mk.5 changelist.5 core.5 \
 	forward.5 fs.5 fstab.5 genassym.cf.5 group.5 hostname.if.5 \
 	hosts.equiv.5 hosts.5 intro.5 link.5 login.conf.5 mixerctl.conf.5 \
 	mk.conf.5 moduli.5 motd.5 myname.5 netgroup.5 networks.5 passwd.5 \
-	pf.conf.5 pf.os.5 phones.5 port-modules.5 printcap.5 protocols.5 \
+	pf.conf.5 pf.os.5 port-modules.5 printcap.5 protocols.5 \
 	remote.5 resolv.conf.5 rpc.5 services.5 shells.5 stab.5 spamd.conf.5 \
 	sysctl.conf.5 utmp.5 wsconsctl.conf.5
 	
diff --git a/share/man/man5/phones.5 b/share/man/man5/phones.5
deleted file mode 100644
index f036f616a6b..00000000000
--- a/share/man/man5/phones.5
+++ /dev/null
@@ -1,116 +0,0 @@
-.\"	$OpenBSD: phones.5,v 1.11 2007/05/31 19:19:58 jmc Exp $
-.\"	$NetBSD: phones.5,v 1.3 1994/11/30 19:31:25 jtc Exp $
-.\"
-.\" Copyright (c) 1983, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     @(#)phones.5	8.1 (Berkeley) 6/5/93
-.\"
-.Dd $Mdocdate: May 31 2007 $
-.Dt PHONES 5
-.Os
-.Sh NAME
-.Nm phones
-.Nd remote host phone number file
-.Sh DESCRIPTION
-.Nm
-files are used by
-.Xr tip 1
-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>
-.Pp
-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.
-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
-.Xr tip 1
-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.
-.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 ,
-.Xr remote 5
-.Sh HISTORY
-The
-.Nm
-file appeared in
-.Bx 4.2 .
diff --git a/share/man/man5/remote.5 b/share/man/man5/remote.5
index 6d40b33ffd9..69df4454347 100644
--- a/share/man/man5/remote.5
+++ b/share/man/man5/remote.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: remote.5,v 1.21 2009/10/22 09:22:46 sobrado Exp $
+.\"	$OpenBSD: remote.5,v 1.22 2010/06/29 17:17:53 nicm Exp $
 .\"	$NetBSD: remote.5,v 1.4 1997/04/20 00:05:27 mellon Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)remote.5	8.1 (Berkeley) 6/5/93
 .\"
-.Dd $Mdocdate: October 22 2009 $
+.Dd $Mdocdate: June 29 2010 $
 .Dt REMOTE 5
 .Os
 .Sh NAME
@@ -100,9 +100,6 @@ for example,
 .Dq xa#99 .
 A boolean capability is specified by simply listing the capability.
 .Bl -tag -width indent
-.It Sy \&at
-(str)
-Auto call unit type.
 .It Sy \&be
 (bool)
 Initialize the
@@ -123,12 +120,6 @@ The default baud rate is 300 baud.
 An initial connection message to be sent to the remote host.
 For example, if a host is reached through port selector, this
 might be set to the appropriate sequence required to switch to the host.
-.It Sy \&cu
-(str)
-Call unit if making a phone call.
-Default is the same as the
-.Sy dv
-field.
 .It Sy \&dc
 (bool)
 This host is directly connected, and
@@ -138,9 +129,6 @@ carrier detect drops.
 .It Sy \&di
 (str)
 Disconnect message sent to the host when a disconnect is requested by the user.
-.It Sy \&du
-(bool)
-This host is on a dial-up line.
 .It Sy \&dv
 (str)
 .Tn UNIX
@@ -274,38 +262,6 @@ or
 .Dq one
 (always set bit 8 to 1).
 The default is no parity.
-.It Sy \&pn
-(str)
-Telephone number(s) for this host.
-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.
@@ -382,15 +338,6 @@ to
 .Sy on ,
 so that verbose mode will be turned on.
 .El
-.Pp
-Here is a short example showing the use of the capability continuation
-feature:
-.Bd -literal -offset indent
-UNIX-1200:\e
-:dv=/dev/cau0:el=^D^U^C^S^Q^O@:du:at=ventel:ie=#$%:oe=^D:br#1200:
-arpavax|ax:\e
-:pn=7654321%:tc=UNIX-1200
-.Ed
 .Sh FILES
 .Bl -tag -width /etc/remote -compact
 .It Pa /etc/remote
@@ -398,7 +345,6 @@ Global database.
 .El
 .Sh SEE ALSO
 .Xr tip 1 ,
-.Xr phones 5
 .Sh HISTORY
 The
 .Nm