summaryrefslogtreecommitdiffstats
path: root/share/man/man5
diff options
context:
space:
mode:
authorjmc <jmc@openbsd.org>2013-07-14 19:44:38 +0000
committerjmc <jmc@openbsd.org>2013-07-14 19:44:38 +0000
commit26a5db8a7ebce64bfcf86e74714f8207284ac13c (patch)
tree67874cb582ca5339c199771f63ccd2b9e20d57fb /share/man/man5
parentIPL_VM is "mpsafe" now as well. (diff)
downloadwireguard-openbsd-26a5db8a7ebce64bfcf86e74714f8207284ac13c.tar.xz
wireguard-openbsd-26a5db8a7ebce64bfcf86e74714f8207284ac13c.zip
merge the relevant bits of dhcp(8) into dhclient(8) and dhcpd(8),
removing traces of dhcp(8)... i'm about to remove that file, since it's essentially useless. holding off for a little, in case my commit is greeted with howls. help/ok krw
Diffstat (limited to 'share/man/man5')
-rw-r--r--share/man/man5/hostname.if.56
-rw-r--r--share/man/man5/resolv.conf.56
2 files changed, 6 insertions, 6 deletions
diff --git a/share/man/man5/hostname.if.5 b/share/man/man5/hostname.if.5
index 161769ad4fd..be1185da85d 100644
--- a/share/man/man5/hostname.if.5
+++ b/share/man/man5/hostname.if.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: hostname.if.5,v 1.60 2013/01/18 21:48:43 jmc Exp $
+.\" $OpenBSD: hostname.if.5,v 1.61 2013/07/14 19:44:39 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: January 18 2013 $
+.Dd $Mdocdate: July 14 2013 $
.Dt HOSTNAME.IF 5
.Os
.Sh NAME
@@ -300,7 +300,7 @@ Interface-specific configuration files.
.El
.Sh SEE ALSO
.Xr hosts 5 ,
-.Xr dhcp 8 ,
+.Xr dhclient 8 ,
.Xr ifconfig 8 ,
.Xr lmccontrol 8 ,
.Xr netstart 8 ,
diff --git a/share/man/man5/resolv.conf.5 b/share/man/man5/resolv.conf.5
index 6eef0e0a935..1ea47b900c2 100644
--- a/share/man/man5/resolv.conf.5
+++ b/share/man/man5/resolv.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: resolv.conf.5,v 1.43 2012/12/15 16:04:13 jmc Exp $
+.\" $OpenBSD: resolv.conf.5,v 1.44 2013/07/14 19:44:39 jmc Exp $
.\" $NetBSD: resolv.conf.5,v 1.7 1996/03/06 18:22:16 scottr Exp $
.\"
.\" Copyright (c) 1986, 1991 The Regents of the University of California.
@@ -30,7 +30,7 @@
.\"
.\" @(#)resolver.5 5.12 (Berkeley) 5/10/91
.\"
-.Dd $Mdocdate: December 15 2012 $
+.Dd $Mdocdate: July 14 2013 $
.Dt RESOLV.CONF 5
.Os
.Sh NAME
@@ -347,7 +347,7 @@ file.
.Xr resolver 3 ,
.Xr hosts 5 ,
.Xr hostname 7 ,
-.Xr dhcp 8 ,
+.Xr dhclient 8 ,
.Xr named 8
.Sh HISTORY
The