sync

4 files changed, 24 insertions, 34 deletions

diff --git a/etc/etc.amd64/MAKEDEV b/etc/etc.amd64/MAKEDEV
index a9de7c8a010..2154be0cd3e 100644
--- a/etc/etc.amd64/MAKEDEV
+++ b/etc/etc.amd64/MAKEDEV
@@ -3,7 +3,7 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.amd64/MAKEDEV.md,v 1.7 2004/05/30 08:17:18 grange Exp 
+#	OpenBSD: etc.amd64/MAKEDEV.md,v 1.8 2004/08/09 19:57:23 otto Exp 
 #	OpenBSD: MAKEDEV.common,v 1.10 2004/06/03 18:36:59 grange Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.72 2004/02/16 18:58:53 miod Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.12 2004/02/20 19:13:01 miod Exp 
@@ -46,8 +46,6 @@
 # Terminal ports:
 #	tty[0-7][0-9a-f]	NS16x50 serial ports
 #	ttyc*	Cyclades serial ports
-# Call units:
-#	tun*	Network tunnel driver
 # Pseudo terminals:
 #	ptm	pty master device
 #	pty*	Set of 62 master pseudo terminals
@@ -94,6 +92,7 @@
 #	speaker	PC speaker
 #	ss*	SCSI scanners
 #	systrace*	System call tracing device
+#	tun*	Network tunnel driver
 #	tuner*	Tuner devices
 #	uk*	SCSI unknown devices
 #	wdt0	Watchdog timer
@@ -271,6 +270,10 @@ tuner*)
 	M tuner$U c 49 $(($(($U*2))+16)) 644
 	;;
 
+tun*)
+	M tun$U c 40 $U 600
+	;;
+
 systrace)
 	M systrace c 78 0 644
 	;;
@@ -490,10 +493,6 @@ ptm)
 	M ptm c 81 0 666
 	;;
 
-tun*)
-	M tun$U c 40 $U 600
-	;;
-
 tty[0-7][0-9a-f])
 	U=${i#tty*}
 	o=$(h2d $U)
diff --git a/etc/etc.i386/MAKEDEV b/etc/etc.i386/MAKEDEV
index 8f7927b1181..6ceaaf8c662 100644
--- a/etc/etc.i386/MAKEDEV
+++ b/etc/etc.i386/MAKEDEV
@@ -3,7 +3,7 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.i386/MAKEDEV.md,v 1.25 2004/06/03 18:36:59 grange Exp 
+#	OpenBSD: etc.i386/MAKEDEV.md,v 1.26 2004/08/09 19:57:23 otto Exp 
 #	OpenBSD: MAKEDEV.common,v 1.10 2004/06/03 18:36:59 grange Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.72 2004/02/16 18:58:53 miod Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.12 2004/02/20 19:13:01 miod Exp 
@@ -46,8 +46,6 @@
 # Terminal ports:
 #	tty[0-7][0-9a-f]	NS16x50 serial ports
 #	ttyc*	Cyclades serial ports
-# Call units:
-#	tun*	Network tunnel driver
 # Pseudo terminals:
 #	ptm	pty master device
 #	pty*	Set of 62 master pseudo terminals
@@ -95,6 +93,7 @@
 #	speaker	PC speaker
 #	ss*	SCSI scanners
 #	systrace*	System call tracing device
+#	tun*	Network tunnel driver
 #	tuner*	Tuner devices
 #	uk*	SCSI unknown devices
 #	wdt0	Watchdog timer
@@ -272,6 +271,10 @@ tuner*)
 	M tuner$U c 49 $(($(($U*2))+16)) 644
 	;;
 
+tun*)
+	M tun$U c 40 $U 600
+	;;
+
 systrace)
 	M systrace c 78 0 644
 	;;
@@ -495,10 +498,6 @@ ptm)
 	M ptm c 81 0 666
 	;;
 
-tun*)
-	M tun$U c 40 $U 600
-	;;
-
 tty[0-7][0-9a-f])
 	U=${i#tty*}
 	o=$(h2d $U)
diff --git a/share/man/man8/man8.amd64/MAKEDEV.8 b/share/man/man8/man8.amd64/MAKEDEV.8
index 1eca24a2827..0f07f55c3a7 100644
--- a/share/man/man8/man8.amd64/MAKEDEV.8
+++ b/share/man/man8/man8.amd64/MAKEDEV.8
@@ -1,9 +1,9 @@
-.\" $OpenBSD: MAKEDEV.8,v 1.8 2004/06/03 18:40:17 grange Exp $
+.\" $OpenBSD: MAKEDEV.8,v 1.9 2004/08/09 19:58:27 otto Exp $
 .\"
 .\" THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 .\" generated from:
 .\"
-.\"	OpenBSD: etc.amd64/MAKEDEV.md,v 1.7 2004/05/30 08:17:18 grange Exp 
+.\"	OpenBSD: etc.amd64/MAKEDEV.md,v 1.8 2004/08/09 19:57:23 otto Exp 
 .\"	OpenBSD: MAKEDEV.common,v 1.10 2004/06/03 18:36:59 grange Exp 
 .\"	OpenBSD: MAKEDEV.man,v 1.3 2004/03/12 18:12:12 miod Exp 
 .\"	OpenBSD: MAKEDEV.mansub,v 1.2 2004/02/20 19:13:01 miod Exp 
@@ -23,7 +23,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd June  3, 2004
+.Dd August  9, 2004
 .Dt MAKEDEV 8 amd64
 .Os
 .Sh NAME
@@ -130,13 +130,6 @@ Cyclades serial ports, see
 .Xr cy 4 .
 .El
 .Pp
-.Sy Call units
-.Bl -tag -width tenletters -compact
-.It Ar tun*
-Network tunnel driver, see
-.Xr tun 4 .
-.El
-.Pp
 .Sy Pseudo terminals
 .Bl -tag -width tenletters -compact
 .It Ar ptm
@@ -279,6 +272,9 @@ SCSI scanners, see
 .It Ar systrace*
 System call tracing device, see
 .Xr systrace 4 .
+.It Ar tun*
+Network tunnel driver, see
+.Xr tun 4 .
 .It Ar tuner*
 Tuner devices, see
 .Xr tuner 4 .
diff --git a/share/man/man8/man8.i386/MAKEDEV.8 b/share/man/man8/man8.i386/MAKEDEV.8
index e3251a68dbf..926573eb8b4 100644
--- a/share/man/man8/man8.i386/MAKEDEV.8
+++ b/share/man/man8/man8.i386/MAKEDEV.8
@@ -1,9 +1,9 @@
-.\" $OpenBSD: MAKEDEV.8,v 1.33 2004/06/03 18:40:17 grange Exp $
+.\" $OpenBSD: MAKEDEV.8,v 1.34 2004/08/09 19:58:27 otto Exp $
 .\"
 .\" THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 .\" generated from:
 .\"
-.\"	OpenBSD: etc.i386/MAKEDEV.md,v 1.25 2004/06/03 18:36:59 grange Exp 
+.\"	OpenBSD: etc.i386/MAKEDEV.md,v 1.26 2004/08/09 19:57:23 otto Exp 
 .\"	OpenBSD: MAKEDEV.common,v 1.10 2004/06/03 18:36:59 grange Exp 
 .\"	OpenBSD: MAKEDEV.man,v 1.3 2004/03/12 18:12:12 miod Exp 
 .\"	OpenBSD: MAKEDEV.mansub,v 1.2 2004/02/20 19:13:01 miod Exp 
@@ -23,7 +23,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd June  3, 2004
+.Dd August  9, 2004
 .Dt MAKEDEV 8 i386
 .Os
 .Sh NAME
@@ -130,13 +130,6 @@ Cyclades serial ports, see
 .Xr cy 4 .
 .El
 .Pp
-.Sy Call units
-.Bl -tag -width tenletters -compact
-.It Ar tun*
-Network tunnel driver, see
-.Xr tun 4 .
-.El
-.Pp
 .Sy Pseudo terminals
 .Bl -tag -width tenletters -compact
 .It Ar ptm
@@ -282,6 +275,9 @@ SCSI scanners, see
 .It Ar systrace*
 System call tracing device, see
 .Xr systrace 4 .
+.It Ar tun*
+Network tunnel driver, see
+.Xr tun 4 .
 .It Ar tuner*
 Tuner devices, see
 .Xr tuner 4 .