aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ObsoleteFiles.inc4
-rw-r--r--share/man/man5/forward.51
-rw-r--r--share/man/man7/Makefile1
-rw-r--r--share/man/man7/hostname.71
-rw-r--r--share/man/man7/mailaddr.7158
-rw-r--r--usr.bin/mail/mail.17
6 files changed, 3 insertions, 169 deletions
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 94c685458f9a..1fc74bf3e530 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -38,6 +38,8 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20171110: Removal of mailaddr man page
+OLD_FILES+=usr/share/man/man7/mailaddr.7.gz
# 20171108: badsect(8) removal
OLD_FILES+=sbin/badsect
OLD_FILES+=rescue/badsect
@@ -71,7 +73,7 @@ OLD_FILES+=usr/lib/libcap_random.a
OLD_FILES+=usr/lib/libcap_random_p.a
OLD_FILES+=usr/lib/libcap_sysctl.a
OLD_FILES+=usr/lib/libcap_sysctl_p.a
-# 20171031: Removal of obsolete man files
+# 20171031: Removal of adding_user man page
OLD_FILES+=usr/share/man/man7/adding_user.7.gz
# 20171031: Disconnected libpathconv tests
OLD_DIRS+=usr/tests/lib/libpathconv
diff --git a/share/man/man5/forward.5 b/share/man/man5/forward.5
index 2234ff359091..78fa61b02577 100644
--- a/share/man/man5/forward.5
+++ b/share/man/man5/forward.5
@@ -93,5 +93,4 @@ The user's forwarding instructions.
.El
.Sh SEE ALSO
.Xr aliases 5 ,
-.Xr mailaddr 7 ,
.Xr sendmail 8
diff --git a/share/man/man7/Makefile b/share/man/man7/Makefile
index cc4826242341..c6d03fd60082 100644
--- a/share/man/man7/Makefile
+++ b/share/man/man7/Makefile
@@ -22,7 +22,6 @@ MAN= arch.7 \
hostname.7 \
intro.7 \
maclabel.7 \
- mailaddr.7 \
operator.7 \
ports.7 \
release.7 \
diff --git a/share/man/man7/hostname.7 b/share/man/man7/hostname.7
index 2068b55b4f68..083968f0edc1 100644
--- a/share/man/man7/hostname.7
+++ b/share/man/man7/hostname.7
@@ -82,7 +82,6 @@ by a system-wide configuration file (see
.Sh SEE ALSO
.Xr gethostbyname 3 ,
.Xr resolver 5 ,
-.Xr mailaddr 7
.Sh HISTORY
.Nm Hostname
appeared in
diff --git a/share/man/man7/mailaddr.7 b/share/man/man7/mailaddr.7
deleted file mode 100644
index 5956f3417f53..000000000000
--- a/share/man/man7/mailaddr.7
+++ /dev/null
@@ -1,158 +0,0 @@
-.\" 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
-.\" $FreeBSD$
-.\"
-.Dd June 16, 1993
-.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 ``calder.berkeley.edu'' could send to ``eric@CS''
-without adding the ``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 ``host!user'' form before being sent
-on for compatibility with older UUCP hosts.
-.Ss Case Distinctions.
-Domain names (i.e., anything after the ``@'' 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 ``route-addrs.''
-These use the syntax:
-.Pp
-.Dl <@hosta,@hostb:user@hostc>
-.Pp
-This specifies that the message should be sent to hosta, from there to hostb,
-and finally to hostc.
-This path is forced even if there is a more efficient
-path to 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 ``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 ``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 ``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 ``user@host.CSNET'' or ``user@host.BITNET'' respectively.
-.Sh SEE ALSO
-.Xr mail 1 ,
-.Xr sendmail 8
-.Rs
-.%A Crocker, D. H.
-.%T Standard for the Format of Arpa Internet Text Messages
-.%O RFC822
-.Re
-.Sh HISTORY
-.Nm Mailaddr
-appeared in
-.Bx 4.2 .
-.Sh BUGS
-The RFC822 group syntax (``group:user1,user2,user3;'') is not supported
-except in the special case of ``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.
diff --git a/usr.bin/mail/mail.1 b/usr.bin/mail/mail.1
index 54966d9fa9fe..b2f03bd4a908 100644
--- a/usr.bin/mail/mail.1
+++ b/usr.bin/mail/mail.1
@@ -327,9 +327,6 @@ but any reply returned to the machine will have the system wide
alias expanded as all mail goes through
.Xr sendmail 8 .
.Ss "Network Mail (ARPA, UUCP, Berknet)"
-See
-.Xr mailaddr 7
-for a description of network addresses.
.Pp
The
.Nm
@@ -1245,11 +1242,7 @@ if it exists.
.Xr newaliases 1 ,
.Xr vacation 1 ,
.Xr aliases 5 ,
-.Xr mailaddr 7 ,
.Xr sendmail 8
-.Rs
-.%T "The Mail Reference Manual"
-.Re
.Sh HISTORY
A
.Nm