summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorajacoutot <ajacoutot@openbsd.org>2013-09-23 06:19:39 +0000
committerajacoutot <ajacoutot@openbsd.org>2013-09-23 06:19:39 +0000
commitf4757fc1291a4674347e099c3c82f6f07acf26f4 (patch)
treeda83eb138b41c6a4746c5ee4bd9ac32f9426e7ac
parent- change m8820x_cmmu_set_reg() and m8820x_cmmu_set_cmd() to perform (diff)
downloadwireguard-openbsd-f4757fc1291a4674347e099c3c82f6f07acf26f4.tar.xz
wireguard-openbsd-f4757fc1291a4674347e099c3c82f6f07acf26f4.zip
cd0a -> cd0c for consistency with the FAQ.
discussed with and ok miod@
-rw-r--r--sbin/mount/mount.86
-rw-r--r--share/man/man5/fstab.56
-rw-r--r--share/man/man8/compat_linux.86
-rw-r--r--usr.bin/sudo/sudoers.mdoc.in4
4 files changed, 11 insertions, 11 deletions
diff --git a/sbin/mount/mount.8 b/sbin/mount/mount.8
index b58381fd9ee..a998ef7990d 100644
--- a/sbin/mount/mount.8
+++ b/sbin/mount/mount.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mount.8,v 1.70 2012/08/23 14:43:04 jmc Exp $
+.\" $OpenBSD: mount.8,v 1.71 2013/09/23 06:19:39 ajacoutot Exp $
.\" $NetBSD: mount.8,v 1.11 1995/07/12 06:23:21 cgd Exp $
.\"
.\" Copyright (c) 1980, 1989, 1991, 1993
@@ -30,7 +30,7 @@
.\"
.\" @(#)mount.8 8.7 (Berkeley) 3/27/94
.\"
-.Dd $Mdocdate: August 23 2012 $
+.Dd $Mdocdate: September 23 2013 $
.Dt MOUNT 8
.Os
.Sh NAME
@@ -355,7 +355,7 @@ file system table
Mount a CD-ROM on node
.Pa /mnt/cdrom :
.Pp
-.Dl # mount -t cd9660 -r /dev/cd0a /mnt/cdrom
+.Dl # mount -t cd9660 -r /dev/cd0c /mnt/cdrom
.Pp
Mount an MS-DOS USB stick with DUID 3eb7f9da875cb9ee on node
.Pa /mnt/key :
diff --git a/share/man/man5/fstab.5 b/share/man/man5/fstab.5
index b07135d7f5a..afb8184664a 100644
--- a/share/man/man5/fstab.5
+++ b/share/man/man5/fstab.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: fstab.5,v 1.45 2011/04/17 20:17:12 krw Exp $
+.\" $OpenBSD: fstab.5,v 1.46 2013/09/23 06:19:39 ajacoutot Exp $
.\" $NetBSD: fstab.5,v 1.5.2.1 1995/11/16 20:11:11 pk Exp $
.\"
.\" Copyright (c) 1980, 1989, 1991, 1993
@@ -30,7 +30,7 @@
.\"
.\" @(#)fstab.5 8.1 (Berkeley) 6/5/93
.\"
-.Dd $Mdocdate: April 17 2011 $
+.Dd $Mdocdate: September 23 2013 $
.Dt FSTAB 5
.Os
.Sh NAME
@@ -286,7 +286,7 @@ swap /tmp mfs rw,nodev,nosuid,-s=153600 0 0
/dev/sd0h /usr/local ffs rw,nodev 1 2
/dev/sd0i /home ffs rw,nodev,nosuid 1 2
/dev/sd0j /usr/src ffs rw,nodev,nosuid,softdep 1 2
-/dev/cd0a /cdrom cd9660 ro,noauto 0 0
+/dev/cd0c /cdrom cd9660 ro,noauto 0 0
5b27c2761a9b0b06.i /mnt/key msdos rw,noauto 0 0
server:/export/ports /usr/ports nfs rw,nodev,nosuid,soft,intr 0 0
.Ed
diff --git a/share/man/man8/compat_linux.8 b/share/man/man8/compat_linux.8
index c8a1eaea636..bf6a799a73f 100644
--- a/share/man/man8/compat_linux.8
+++ b/share/man/man8/compat_linux.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: compat_linux.8,v 1.40 2009/10/22 09:22:46 sobrado Exp $
+.\" $OpenBSD: compat_linux.8,v 1.41 2013/09/23 06:19:39 ajacoutot Exp $
.\" $NetBSD: compat_linux.8,v 1.2 1995/10/16 20:17:59 fvdl Exp $
.\"
.\" Copyright (c) 1995 Frank van der Linden
@@ -30,7 +30,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: October 22 2009 $
+.Dd $Mdocdate: September 23 2013 $
.Dt COMPAT_LINUX 8
.Os
.Sh NAME
@@ -383,7 +383,7 @@ Only the DSP device is emulated, the following link should be created:
.Ss Other links Linux binaries may require
CD-ROM support requires a link to the CD-ROM device, similar to:
.Pp
-.D1 /emul/linux/dev/cdrom -> /dev/cd0a (first CD-ROM)
+.D1 /emul/linux/dev/cdrom -> /dev/cd0c (first CD-ROM)
.Ss File systems
Many Linux binaries expect
.Pa /proc
diff --git a/usr.bin/sudo/sudoers.mdoc.in b/usr.bin/sudo/sudoers.mdoc.in
index 5d4d6a1ccc9..d9c98a6a8d0 100644
--- a/usr.bin/sudo/sudoers.mdoc.in
+++ b/usr.bin/sudo/sudoers.mdoc.in
@@ -19,7 +19,7 @@
.\" Agency (DARPA) and Air Force Research Laboratory, Air Force
.\" Materiel Command, USAF, under agreement number F39502-99-1-0512.
.\"
-.Dd $Mdocdate: August 17 2012 $
+.Dd $Mdocdate: September 23 2013 $
.Dt SUDOERS @mansectform@
.Os
.Sh NAME
@@ -2554,7 +2554,7 @@ web pages) or simply
to www.
.Bd -literal
ALL CDROM = NOPASSWD: /sbin/umount /CDROM,\e
- /sbin/mount -o nosuid\,nodev /dev/cd0a /CDROM
+ /sbin/mount -o nosuid\,nodev /dev/cd0c /CDROM
.Ed
.Pp
Any user may mount or unmount a CD-ROM on the machines in the CDROM