switch references from sudo to doas;

ok deraadt

8 files changed, 34 insertions, 35 deletions

diff --git a/share/man/man5/bsd.port.mk.5 b/share/man/man5/bsd.port.mk.5
index 3157fab75df..9b5484adc23 100644
--- a/share/man/man5/bsd.port.mk.5
+++ b/share/man/man5/bsd.port.mk.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: bsd.port.mk.5,v 1.417 2015/07/04 15:07:54 espie Exp $
+.\" $OpenBSD: bsd.port.mk.5,v 1.418 2015/07/30 08:03:50 jmc Exp $
 .\"
 .\" Copyright (c) 2000-2008 Marc Espie
 .\"
@@ -24,7 +24,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 4 2015 $
+.Dd $Mdocdate: July 30 2015 $
 .Dt BSD.PORT.MK 5
 .Os
 .Sh NAME
@@ -2776,7 +2776,7 @@ a path.
 .It Ev SUDO
 User settings.
 If set to
-.Xr sudo 8
+.Xr doas 1
 in
 .Xr mk.conf 5 ,
 the ports tree will only invoke root's privileges for the parts that
diff --git a/share/man/man5/bsd.regress.mk.5 b/share/man/man5/bsd.regress.mk.5
index 9f191197f15..d32644256f0 100644
--- a/share/man/man5/bsd.regress.mk.5
+++ b/share/man/man5/bsd.regress.mk.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: bsd.regress.mk.5,v 1.7 2013/06/17 11:57:10 schwarze Exp $
+.\" $OpenBSD: bsd.regress.mk.5,v 1.8 2015/07/30 08:03:50 jmc Exp $
 .\"
 .\" Copyright (c) 2002 Anil Madhavapeddy
 .\" Copyright (c) 2000 Marc Espie
@@ -25,7 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: June 17 2013 $
+.Dd $Mdocdate: July 30 2015 $
 .Dt BSD.REGRESS.MK 5
 .Os
 .Sh NAME
@@ -96,8 +96,10 @@ for this Makefile.
 Defaults to
 .Ar run-regress-${PROG} .
 .It Ev SUDO
-Location of the sudo command, used to switch to root for certain
+Location of a command used to switch to root for certain
 test targets which require it.
+See
+.Xr doas 1 .
 .El
 .Sh SEE ALSO
 .Xr bsd.port.mk 5
diff --git a/share/man/man5/mk.conf.5 b/share/man/man5/mk.conf.5
index 84e29549a44..eddd52702cb 100644
--- a/share/man/man5/mk.conf.5
+++ b/share/man/man5/mk.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mk.conf.5,v 1.27 2015/07/27 17:28:39 sobrado Exp $
+.\"	$OpenBSD: mk.conf.5,v 1.28 2015/07/30 08:03:50 jmc Exp $
 .\"
 .\" Copyright (c) 2003 Jason McIntyre
 .\"
@@ -24,7 +24,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 27 2015 $
+.Dd $Mdocdate: July 30 2015 $
 .Dt MK.CONF 5
 .Os
 .Sh NAME
@@ -225,9 +225,9 @@ Command run by
 when doing certain operations requiring root privileges
 (e.g. the "make install" portion of "make build").
 If set to
-.Ev /usr/bin/sudo ,
+.Ev /usr/bin/doas ,
 this allows one to run "make build" as a user other than root
-(assuming sudo is set up for that user).
+(assuming doas is set up for that user).
 .It Ev SYS_INCLUDE
 Copy or symlink kernel include files into
 .Pa /usr/include .
diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7
index 9653eece431..b710592052b 100644
--- a/share/man/man7/hier.7
+++ b/share/man/man7/hier.7
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: hier.7,v 1.139 2015/07/25 12:29:41 jmc Exp $
+.\"	$OpenBSD: hier.7,v 1.140 2015/07/30 08:03:50 jmc Exp $
 .\"	$NetBSD: hier.7,v 1.7 1994/11/30 19:07:10 jtc Exp $
 .\"
 .\" Copyright (c) 1990, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"	@(#)hier.7	8.1 (Berkeley) 6/5/93
 .\"
-.Dd $Mdocdate: July 25 2015 $
+.Dd $Mdocdate: July 30 2015 $
 .Dt HIER 7
 .Os
 .Sh NAME
@@ -581,9 +581,6 @@ system since it was booted.
 .It utmp
 Database of current users (see
 .Xr utmp 5 ) .
-.It sudo/
-Timestamps for
-.Xr sudo 8 .
 .El
 .Pp
 .It spool/
diff --git a/share/man/man7/ports.7 b/share/man/man7/ports.7
index 8120622f84a..e1fbfd2af0d 100644
--- a/share/man/man7/ports.7
+++ b/share/man/man7/ports.7
@@ -23,10 +23,10 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: ports.7,v 1.101 2015/02/17 16:29:16 bentley Exp $
+.\" $OpenBSD: ports.7,v 1.102 2015/07/30 08:03:50 jmc Exp $
 .\" $FreeBSD: ports.7,v 1.7 1998/06/23 04:38:50 hoek Exp $
 .\"
-.Dd $Mdocdate: February 17 2015 $
+.Dd $Mdocdate: July 30 2015 $
 .Dt PORTS 7
 .Os
 .Sh NAME
@@ -56,7 +56,7 @@ automatically fetches the
 application source code, either from a local disk or via ftp, unpacks it
 on the local system, applies the patches, and compiles it.
 If all goes well, simply type
-.Ic sudo make install
+.Ic doas make install
 to install the application.
 .Pp
 For more information about using ports, see
diff --git a/share/man/man8/afterboot.8 b/share/man/man8/afterboot.8
index 3b81216b7f5..159960cc0bb 100644
--- a/share/man/man8/afterboot.8
+++ b/share/man/man8/afterboot.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: afterboot.8,v 1.146 2014/12/07 23:05:30 schwarze Exp $
+.\"	$OpenBSD: afterboot.8,v 1.147 2015/07/30 08:03:49 jmc Exp $
 .\"
 .\" Copyright (c) 1997 Marshall M. Midden
 .\" All rights reserved.
@@ -29,7 +29,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: December 7 2014 $
+.Dd $Mdocdate: July 30 2015 $
 .Dt AFTERBOOT 8
 .\" Originally created by Marshall M. Midden -- 1997-10-20, m4@umn.edu
 .Os
@@ -78,7 +78,7 @@ user, add said user to the
 group, then use the
 .Xr su 1
 and
-.Xr sudo 8
+.Xr doas 1
 commands when root privileges are required.
 .Pp
 The installation process provides an option to set up a user account.
@@ -109,13 +109,13 @@ Do not choose any word in any language.
 It is common for an intruder to use dictionary attacks.
 Type the following command to change it:
 .Pp
-.Dl $ /usr/bin/sudo /usr/bin/passwd root
+.Dl $ /usr/bin/doas /usr/bin/passwd root
 .Pp
 It is a good idea to always specify the full path name for the
 .Xr passwd 1 ,
 .Xr su 1
 and
-.Xr sudo 8
+.Xr doas 1
 commands as this inhibits the possibility of rogue files placed in your
 .Ev PATH
 being executed for most shells.
@@ -594,6 +594,7 @@ Information on building and modifying kernels
 is contained within
 .Xr config 8 .
 .Sh SEE ALSO
+.Xr doas 1 ,
 .Xr ksh 1 ,
 .Xr man 1 ,
 .Xr pkg_add 1 ,
@@ -604,7 +605,6 @@ is contained within
 .Xr dmesg 8 ,
 .Xr ifconfig 8 ,
 .Xr intro 8 ,
-.Xr sudo 8 ,
 .Xr sysctl 8
 .Sh HISTORY
 This document first appeared in
diff --git a/share/man/man8/release.8 b/share/man/man8/release.8
index 4ed8bfc0f0b..854c0c6457f 100644
--- a/share/man/man8/release.8
+++ b/share/man/man8/release.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: release.8,v 1.68 2014/04/06 12:15:26 millert Exp $
+.\"	$OpenBSD: release.8,v 1.69 2015/07/30 08:03:50 jmc Exp $
 .\"
 .\"	Copyright (c) 2000 Marco S. Hyman
 .\"
@@ -9,7 +9,7 @@
 .\"	LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
 .\"	FOR A PARTICULAR PURPOSE.
 .\"
-.Dd $Mdocdate: April 6 2014 $
+.Dd $Mdocdate: July 30 2015 $
 .Dt RELEASE 8
 .Os
 .Sh NAME
@@ -184,8 +184,8 @@ The steps are:
 Move all your existing object files out of the way and then remove
 them in the background:
 .Bd -literal -offset indent
-$ cd /usr/obj && mkdir -p .old && sudo mv * .old && \e
-	sudo rm -rf .old &
+$ cd /usr/obj && mkdir -p .old && doas mv * .old && \e
+	doas rm -rf .old &
 .Ed
 .Pp
 Re-build your obj directories:
@@ -194,11 +194,11 @@ Re-build your obj directories:
 .Pp
 Create directories that might be missing:
 .Pp
-.Dl $ cd /usr/src/etc && sudo DESTDIR=/ make distrib-dirs
+.Dl $ cd /usr/src/etc && doas DESTDIR=/ make distrib-dirs
 .Pp
 Begin the build:
 .Pp
-.Dl $ cd /usr/src && make SUDO=sudo build
+.Dl $ cd /usr/src && make SUDO=doas build
 .Pp
 Update
 .Pa /etc ,
@@ -342,9 +342,9 @@ This is described in
 .Xr ports 7 .
 .Sh SEE ALSO
 .Xr cvs 1 ,
+.Xr doas 1 ,
 .Xr pkg_add 1 ,
 .Xr ports 7 ,
-.Xr sudo 8 ,
 .Xr sysmerge 8
 .Sh HISTORY
 This document first appeared in
diff --git a/usr.bin/su/su.1 b/usr.bin/su/su.1
index 7c12e21c81f..f3ee12b2520 100644
--- a/usr.bin/su/su.1
+++ b/usr.bin/su/su.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: su.1,v 1.30 2014/04/24 14:14:08 jmc Exp $
+.\"	$OpenBSD: su.1,v 1.31 2015/07/30 08:03:49 jmc Exp $
 .\"
 .\" Copyright (c) 1988, 1990 The Regents of the University of California.
 .\" All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"	from: @(#)su.1	6.12 (Berkeley) 7/29/91
 .\"
-.Dd $Mdocdate: April 24 2014 $
+.Dd $Mdocdate: July 30 2015 $
 .Dt SU 1
 .Os
 .Sh NAME
@@ -258,13 +258,13 @@ Same as above, but use S/Key for authentication:
 .Pp
 .Dl $ su -a skey -l foo
 .Sh SEE ALSO
+.Xr doas 1 ,
 .Xr login 1 ,
 .Xr setusercontext 3 ,
 .Xr group 5 ,
 .Xr login.conf 5 ,
 .Xr passwd 5 ,
-.Xr environ 7 ,
-.Xr sudo 8
+.Xr environ 7
 .Sh HISTORY
 A
 .Nm