4 files changed, 6 insertions, 195 deletions
diff --git a/share/man/man7/Makefile b/share/man/man7/Makefile
index b5484ee03a0..f295d97fa4d 100644
--- a/share/man/man7/Makefile
+++ b/share/man/man7/Makefile
@@ -1,10 +1,10 @@
-#	$OpenBSD: Makefile,v 1.25 2017/05/28 19:44:52 benno Exp $
+#	$OpenBSD: Makefile,v 1.26 2017/05/29 12:13:50 tedu Exp $
 #	$NetBSD: Makefile,v 1.6 1994/12/22 10:50:05 cgd Exp $
 
 # missing: term.7
 
 MAN=	airport.7 ascii.7 eqn.7 environ.7 glob.7 hier.7 hostname.7 intro.7 \
-	library-specs.7 mailaddr.7 \
+	library-specs.7 \
 	man.7 mandoc_char.7 mdoc.7 mirroring-ports.7 \
 	operator.7 packages.7 packages-specs.7 pkgpath.7 ports.7 roff.7 \
 	script.7 securelevel.7 tbl.7
diff --git a/share/man/man7/hostname.7 b/share/man/man7/hostname.7
index 8ee32f2647e..8cacb7f4d72 100644
--- a/share/man/man7/hostname.7
+++ b/share/man/man7/hostname.7
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: hostname.7,v 1.9 2014/08/23 07:25:54 jmc Exp $
+.\"	$OpenBSD: hostname.7,v 1.10 2017/05/29 12:13:50 tedu Exp $
 .\"	$NetBSD: hostname.7,v 1.4 1994/11/30 19:07:14 jtc Exp $
 .\"
 .\" Copyright (c) 1987, 1990, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)hostname.7	8.2 (Berkeley) 12/30/93
 .\"
-.Dd $Mdocdate: August 23 2014 $
+.Dd $Mdocdate: May 29 2017 $
 .Dt HOSTNAME 7
 .Os
 .Sh NAME
@@ -84,7 +84,6 @@ by a system-wide configuration file (see
 .Sh SEE ALSO
 .Xr gethostbyname 3 ,
 .Xr resolv.conf 5 ,
-.Xr mailaddr 7 ,
 .Xr nsd 8 ,
 .Xr unbound 8
 .Sh HISTORY
diff --git a/share/man/man7/intro.7 b/share/man/man7/intro.7
index 8f52e3f402d..812fe35a3e7 100644
--- a/share/man/man7/intro.7
+++ b/share/man/man7/intro.7
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: intro.7,v 1.18 2017/05/01 06:39:25 mpi Exp $
+.\"	$OpenBSD: intro.7,v 1.19 2017/05/29 12:13:50 tedu Exp $
 .\"	$NetBSD: intro.7,v 1.3 1994/11/30 19:07:15 jtc Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)intro.7	8.1 (Berkeley) 6/5/93
 .\"
-.Dd $Mdocdate: May 1 2017 $
+.Dd $Mdocdate: May 29 2017 $
 .Dt INTRO 7
 .Os
 .Sh NAME
@@ -55,8 +55,6 @@ File system hierarchy.
 Hostname resolution rules.
 .It Xr library-specs 7
 Shared library name specifications.
-.It Xr mailaddr 7
-Mail addressing description.
 .It Xr man 7
 Man language reference.
 .It Xr mandoc_char 7
diff --git a/share/man/man7/mailaddr.7 b/share/man/man7/mailaddr.7
deleted file mode 100644
index 134c579e695..00000000000
--- a/share/man/man7/mailaddr.7
+++ /dev/null
@@ -1,186 +0,0 @@
-.\"	$OpenBSD: mailaddr.7,v 1.16 2014/09/16 21:11:56 jmc Exp $
-.\"	$NetBSD: mailaddr.7,v 1.3 1994/11/30 19:07:17 jtc Exp $
-.\"
-.\" Copyright (c) 1983, 1987, 1990, 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.
-.\"
-.\"     @(#)mailaddr.7	8.1 (Berkeley) 6/16/93
-.\"
-.Dd $Mdocdate: September 16 2014 $
-.Dt MAILADDR 7
-.Os
-.Sh NAME
-.Nm mailaddr
-.Nd mail addressing description
-.Sh DESCRIPTION
-Mail addresses are based on the Internet protocol listed at the end of this
-manual page.
-These addresses are in the general format
-.Pp
-.Dl user@domain
-.Pp
-where a domain is a hierarchical dot separated list of subdomains.
-For example, a valid address is:
-.Pp
-.Dl eric@CS.Berkeley.EDU
-.Pp
-Unlike some other forms of addressing, domains do not imply any routing.
-Thus, although this address is specified as an Internet address, it might
-travel by an alternate route if that were more convenient or efficient.
-For example, at Berkeley, the associated message would probably go directly
-to CS over the Ethernet rather than going via the Berkeley Internet
-gateway.
-.Ss Abbreviation
-Under certain circumstances it may not be necessary to type the entire
-domain name.
-In general, anything following the first dot may be omitted
-if it is the same as the domain from which you are sending the message.
-For example, a user on
-.Dq calder.berkeley.edu
-could send to
-.Dq eric@CS
-without adding the
-.Dq berkeley.edu
-since it is the same on both sending
-and receiving hosts.
-.Ss Compatibility
-Certain old address formats are converted to the new format to provide
-compatibility with the previous mail system.
-In particular,
-.Pp
-.Dl user@host
-.Pp
-and
-.Dl user@host.domain
-.Pp
-are allowed;
-.Pp
-.Dl host.domain!user
-.Pp
-is converted to
-.Pp
-.Dl user@host.domain
-.Pp
-and
-.Pp
-.Dl host!user
-.Pp
-is converted to
-.Pp
-.Dl user@host.UUCP
-.Pp
-This is normally converted back to the
-.Dq host!user
-form before being sent
-on for compatibility with older UUCP hosts.
-.Ss Case distinctions
-Domain names (i.e., anything after the
-.Dq @
-sign) may be given in any mixture
-of upper and lower case with the exception of UUCP hostnames.
-Most hosts
-accept any combination of case in user names, with the notable exception of
-MULTICS sites.
-.Ss Route-addrs
-Under some circumstances it may be necessary to route a message through
-several hosts to get it to the final destination.
-Normally this routing
-is done automatically, but sometimes it is desirable to route the message
-manually.
-Addresses which show these relays are termed
-.Dq route-addrs .
-These use the syntax:
-.Pp
-.Dl <@hosta,@hostb:user@hostc>
-.Pp
-This specifies that the message should be sent to
-.Dq hosta ,
-from there to
-.Dq hostb ,
-and finally to
-.Dq hostc .
-This path is forced even if there is a more efficient
-path to
-.Dq hostc .
-.Pp
-Route-addrs occur frequently on return addresses, since these are generally
-augmented by the software at each host.
-It is generally possible to ignore all but the
-.Dq user@hostc
-part of the address to determine the actual sender.
-.Pp
-[Note: The route-addr syntax is officially deprecated
-in RFC 1123 and should not be used.]
-.Pp
-Many sites also support the
-.Dq percent hack
-for simplistic routing:
-.Pp
-.Dl user%hostc%hostb@hosta
-.Pp
-is routed as indicated in the previous example.
-.Ss Postmaster
-Every site is required to have a user or user alias designated
-.Dq postmaster
-to which problems with the mail system may be addressed.
-.Ss Other networks
-Some other networks can be reached by giving the name of the network as the
-last component of the domain.
-.Em This is not a standard feature
-and may
-not be supported at all sites.
-For example, messages to CSNET or BITNET sites can often be sent to
-.Dq user@host.CSNET
-or
-.Dq user@host.BITNET ,
-respectively.
-.Sh SEE ALSO
-.Xr mail 1 ,
-.Xr smtpd 8
-.Sh STANDARDS
-.Rs
-.%A P. Resnick
-.%D 2008
-.%R RFC 5322
-.%T Internet Message Format
-.Re
-.Sh HISTORY
-.Nm
-appeared in
-.Bx 4.2 .
-.Sh BUGS
-The RFC 5322 group syntax
-.Pq Dq group:user1,user2,user3;
-is not supported
-except in the special case of
-.Dq group:;
-because of a conflict with old
-berknet-style addresses.
-.Pp
-Route-Address syntax is grotty.
-.Pp
-UUCP- and Internet-style addresses do not coexist politely.