my previous attempt to fix the renaming of the inet(3) pages was wrong;

this fixes those by referencing the correct page, and cleans up the netintro/
inet entries;

all this on the advice (and ok) of guenther!

diff --git a/sbin/mountd/exports.5 b/sbin/mountd/exports.5
index 53aaee7..4cc9087 100644 (file)
--- a/sbin/mountd/exports.5
+++ b/sbin/mountd/exports.5
@@ -1,4 +1,4 @@
-.\"    $OpenBSD: exports.5,v 1.20 2014/05/08 13:08:43 jmc Exp $
+.\"    $OpenBSD: exports.5,v 1.21 2014/05/09 06:37:38 jmc Exp $
 .\"    $NetBSD: exports.5,v 1.9 1996/02/18 11:57:50 fvdl Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)exports.5  8.3 (Berkeley) 3/29/95
 .\"
-.Dd $Mdocdate: May 8 2014 $
+.Dd $Mdocdate: May 9 2014 $
 .Dt EXPORTS 5
 .Os
 .Sh NAME
@@ -187,7 +187,7 @@ and optionally
 .Sm on
 If the mask is not specified, it will default to the mask for that network
 class (A, B or C; see
-.Xr inet_net 3 ) .
+.Xr inet_addr 3 ) .
 .Pp
 For example:
 .Bd -literal -offset indent

diff --git a/share/man/man4/inet.4 b/share/man/man4/inet.4
index 9d84ea2..2b555e4 100644 (file)
--- a/share/man/man4/inet.4
+++ b/share/man/man4/inet.4
@@ -1,4 +1,4 @@
-.\"    $OpenBSD: inet.4,v 1.15 2014/01/21 03:15:46 schwarze Exp $
+.\"    $OpenBSD: inet.4,v 1.16 2014/05/09 06:37:38 jmc Exp $
 .\"    $NetBSD: inet.4,v 1.3 1994/11/30 16:22:18 jtc Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)inet.4     8.1 (Berkeley) 6/5/93
 .\"
-.Dd $Mdocdate: January 21 2014 $
+.Dd $Mdocdate: May 9 2014 $
 .Dt INET 4
 .Os
 .Sh NAME
@@ -156,6 +156,8 @@ Get interface network mask.
 .Sh SEE ALSO
 .Xr ioctl 2 ,
 .Xr socket 2 ,
+.Xr inet_net 3 ,
+.Xr inet_ntop 3 ,
 .Xr icmp 4 ,
 .Xr ip 4 ,
 .Xr netintro 4 ,

diff --git a/share/man/man4/netintro.4 b/share/man/man4/netintro.4
index 8618283..08113e3 100644 (file)
--- a/share/man/man4/netintro.4
+++ b/share/man/man4/netintro.4
@@ -1,4 +1,4 @@
-.\"    $OpenBSD: netintro.4,v 1.43 2014/05/08 13:08:43 jmc Exp $
+.\"    $OpenBSD: netintro.4,v 1.44 2014/05/09 06:37:38 jmc Exp $
 .\"    $NetBSD: netintro.4,v 1.4 1995/10/19 08:03:40 jtc Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)netintro.4 8.2 (Berkeley) 11/30/93
 .\"
-.Dd $Mdocdate: May 8 2014 $
+.Dd $Mdocdate: May 9 2014 $
 .Dt NETINTRO 4
 .Os
 .Sh NAME
@@ -503,7 +503,6 @@ from the group
 .Xr netstat 1 ,
 .Xr ioctl 2 ,
 .Xr socket 2 ,
-.Xr inet_net 3 ,
 .Xr arp 4 ,
 .Xr bluetooth 4 ,
 .Xr bridge 4 ,

diff --git a/share/man/man5/hosts.5 b/share/man/man5/hosts.5
index bee0707..6654f00 100644 (file)
--- a/share/man/man5/hosts.5
+++ b/share/man/man5/hosts.5
@@ -1,4 +1,4 @@
-.\"    $OpenBSD: hosts.5,v 1.20 2014/05/08 13:08:43 jmc Exp $
+.\"    $OpenBSD: hosts.5,v 1.21 2014/05/09 06:37:38 jmc Exp $
 .\"    $NetBSD: hosts.5,v 1.4 1994/11/30 19:31:20 jtc Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)hosts.5    8.2 (Berkeley) 12/11/93
 .\"
-.Dd $Mdocdate: May 8 2014 $
+.Dd $Mdocdate: May 9 2014 $
 .Dt HOSTS 5
 .Os
 .Sh NAME
@@ -77,7 +77,7 @@ Internet addresses are specified using either
 dot notation (IPv4)
 or colon separated notation (IPv6).
 Further information on network addressing is contained in
-.Xr inet_net 3 .
+.Xr inet_addr 3 .
 Host names may contain any printable character other than a field delimiter,
 newline, or comment character.
 .Sh FILES
@@ -88,7 +88,7 @@ newline, or comment character.
 .Xr getaddrinfo 3 ,
 .Xr gethostbyname 3 ,
 .Xr getnameinfo 3 ,
-.Xr inet_net 3 ,
+.Xr inet_addr 3 ,
 .Xr resolv.conf 5 ,
 .Xr ifconfig 8 ,
 .Xr named 8

diff --git a/share/man/man5/networks.5 b/share/man/man5/networks.5
index 60bda2d..c2155d8 100644 (file)
--- a/share/man/man5/networks.5
+++ b/share/man/man5/networks.5
@@ -1,4 +1,4 @@
-.\"    $OpenBSD: networks.5,v 1.17 2014/05/08 13:08:43 jmc Exp $
+.\"    $OpenBSD: networks.5,v 1.18 2014/05/09 06:37:38 jmc Exp $
 .\"    $NetBSD: networks.5,v 1.9 1999/03/17 20:19:47 garbled Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)networks.5 8.1 (Berkeley) 6/5/93
 .\"
-.Dd $Mdocdate: May 8 2014 $
+.Dd $Mdocdate: May 9 2014 $
 .Dt NETWORKS 5
 .Os
 .Sh NAME
@@ -70,9 +70,8 @@ the line are not interpreted by routines which search the file.
 Network number may be specified in the conventional
 .Ql \&.
 (dot) notation using the
-.Xr inet_network 3
-routine from the IP address manipulation library,
-.Xr inet_net 3 .
+.Xr inet_addr 3
+routine from the IP address manipulation library.
 Network names may contain
 .Qq a
 through

diff --git a/usr.bin/telnet/telnet.1 b/usr.bin/telnet/telnet.1
index f2e6625..6903ad7 100644 (file)
--- a/usr.bin/telnet/telnet.1
+++ b/usr.bin/telnet/telnet.1
@@ -1,4 +1,4 @@
-.\"    $OpenBSD: telnet.1,v 1.48 2014/05/08 13:08:43 jmc Exp $
+.\"    $OpenBSD: telnet.1,v 1.49 2014/05/09 06:37:38 jmc Exp $
 .\"    $NetBSD: telnet.1,v 1.5 1996/02/28 21:04:12 thorpej Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"    from: @(#)telnet.1      8.4 (Berkeley) 2/3/94
 .\"
-.Dd $Mdocdate: May 8 2014 $
+.Dd $Mdocdate: May 9 2014 $
 .Dt TELNET 1
 .Os
 .Sh NAME
@@ -580,7 +580,7 @@ will attempt to contact a TELNET server at the default port.
 The host specification may be either a host name (see
 .Xr hosts 5 )
 or an Internet address specified in the ``dot notation'' (see
-.Xr inet_net 3 ) .
+.Xr inet_ntop 3 ) .
 The
 .Fl l
 option may be used to specify the user name

diff --git a/usr.sbin/arp/arp.8 b/usr.sbin/arp/arp.8
index a35be9a..26b1c3c 100644 (file)
--- a/usr.sbin/arp/arp.8
+++ b/usr.sbin/arp/arp.8
@@ -1,4 +1,4 @@
-.\"    $OpenBSD: arp.8,v 1.32 2014/05/08 13:08:43 jmc Exp $
+.\"    $OpenBSD: arp.8,v 1.33 2014/05/09 06:37:38 jmc Exp $
 .\"    $NetBSD: arp.8,v 1.7 1995/03/01 11:50:59 chopps Exp $
 .\"
 .\" Copyright (c) 1985, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"    from: @(#)arp.8 8.1 (Berkeley) 6/6/93
 .\"
-.Dd $Mdocdate: May 8 2014 $
+.Dd $Mdocdate: May 9 2014 $
 .Dt ARP 8
 .Os
 .Sh NAME
@@ -194,7 +194,7 @@ for IP addresses 204.1.2.3 and 204.1.2.4:
 # arp -s 204.1.2.4 00:90:27:bb:cc:dd pub
 .Ed
 .Sh SEE ALSO
-.Xr inet_net 3 ,
+.Xr inet_addr 3 ,
 .Xr arp 4 ,
 .Xr ethers 5 ,
 .Xr ifconfig 8 ,