sync with netbsd

diff --git a/share/man/man4/man4.atari/ms.4 b/share/man/man4/man4.atari/ms.4
index c35c764..7560006 100644 (file)
--- a/share/man/man4/man4.atari/ms.4
+++ b/share/man/man4/man4.atari/ms.4
@@ -1,4 +1,4 @@
-.\"    $NetBSD: ms.4,v 1.1 1995/10/19 06:50:44 leo Exp $
+.\"    $NetBSD: ms.4,v 1.2 1996/04/25 06:03:47 leo Exp $
 .\"
 .\" Copyright (c) 1995 Leo Weppelman
 .\" All rights reserved.
@@ -41,6 +41,28 @@ mouse interface
 .Sh SYNOPSIS
 .Cd "pseudo-device mouse 1"
 .Sh DESCRIPTION
+
+The Atari mouse driver supports both the original Atari mouse and the third
+party 3-button mouse that has its middle button connected to the up-switch
+of the second joystick port. To accomodate X11 users with a standard mouse,
+the driver is able to emulate the middle button. See the section on ioctls
+for more info.
+.Pp
+.Bl -tag
+.It Sy Supported ioctls
+.Bl -tag -width MIOCG3B_EMUL -compact
+.It MIOCS3B_EMUL
+This ioctl turns the middle button emulation on or off depending on its
+argument. The middle button event is triggered by simultaneously pressing
+the left and right buttons. The default emulation mode is on.
+.Pp
+Note that the emulation status is retained across multiple open/close calls.
+.It MIOCG3B_EMUL
+This ioctl allows you to get the actual status of the emulation mode.
+.El
+.El
+.Bl -tag
+.It Sy Interface description
 The Atari mouse interface works on a minimal emulation of Sun's Firm_event
 structures. The primary reason for this is easy interfacing with X11.
 
@@ -57,23 +79,20 @@ typedef struct Firm_event {
 .Pp
 The values of 'id' concerning the mouse:
 .Bd -literal
-#define MS_LEFT         0x7f20    /* left mouse button */
+#define MS_LEFT         0x7f20    /* left mouse button   */
 #define MS_MIDDLE       0x7f21    /* middle mouse button */
-#define MS_RIGHT        0x7f22    /* right mouse button */
-#define LOC_X_DELTA     0x7f80    /* mouse delta-X */
-#define LOC_Y_DELTA     0x7f81    /* mouse delta-Y */
+#define MS_RIGHT        0x7f22    /* right mouse button  */
+#define LOC_X_DELTA     0x7f80    /* mouse delta-X       */
+#define LOC_Y_DELTA     0x7f81    /* mouse delta-Y       */
 .Ed
 
 .Pp
 The values of 'value' concerning a button event:
 .Bd -literal
-#define VKEY_UP         0         /* a button went up */
+#define VKEY_UP         0         /* a button went up   */
 #define VKEY_DOWN       1         /* a button went down */
 .Ed
 
-The middle button event is generated by the driver on the Atari. It can
-be triggered by simultaneously pressing the left and right buttons.
-
 .Pp
 .Sh FILES
 .Bl -tag -width /dev/mouse0 -compact
@@ -82,5 +101,6 @@ The real mouse device
 .It Pa /dev/mouse
 The currently active mouse device
 .El
+.El
 .Sh BUGS
 The time interval that defines 'simultaneous' cannot be set.

diff --git a/share/man/man4/man4.sparc/le.4 b/share/man/man4/man4.sparc/le.4
index 677aef0..78aa51f 100644 (file)
--- a/share/man/man4/man4.sparc/le.4
+++ b/share/man/man4/man4.sparc/le.4
@@ -35,7 +35,7 @@
 .\"
 .\"    from: Header: le.4,v 1.2 92/10/13 05:31:33 leres Exp
 .\"    from: @(#)le.4  8.1 (Berkeley) 6/9/93
-.\"    $Id: le.4,v 1.1.1.1 1995/10/18 08:44:31 deraadt Exp $
+.\"    $Id: le.4,v 1.2 1996/05/02 01:24:31 deraadt Exp $
 .\"
 .Dd June 9, 1993
 .Dt LE 4 sparc
@@ -64,6 +64,30 @@ interface employs the address resolution protocol described in
 .Xr arp 4
 to dynamically map between Internet and Ethernet addresses on the local
 network.
+.Pp
+The sun4m interface has two types of connectors:
+.Pp
+.Bl -tag -width xxxxxxxxxxxxxxxxxxxx
+.It AUI/DIX
+Standard 15 pin connector
+.It 10BaseT
+UTP, also known as twisted pair
+.El
+.Pp
+The default port to use is selected at boot time; if there is link on the UTP
+port, then the UTP interface is selected, otherwise the active connector
+defaults to AUI. To choose an alternate port,
+use the following flag
+.Xr ifconfig 8
+or in your /etc/hostname.le? file.
+.Pp
+.Bl -tag -width xxxxxxxxxxxxxxxxxxxx
+.It link0
+Use the UTP port.
+.It -link0
+Use the AUI port.
+.El
+.Pp
 .Sh SEE ALSO
 .Xr intro 4 ,
 .Xr inet 4 ,

diff --git a/share/tmac/doc-syms b/share/tmac/doc-syms
index 347bce3..e717028 100644 (file)
--- a/share/tmac/doc-syms
+++ b/share/tmac/doc-syms
@@ -132,6 +132,7 @@
 .      if "\\$1"1.0"  \&\\*(tNNetBSD\\*(aa 1.0\\*(aa\\$2
 .      if "\\$1"1.0a"  \&\\*(tNNetBSD\\*(aa 1.0a\\*(aa\\$2
 .      if "\\$1"1.1"  \&\\*(tNNetBSD\\*(aa 1.1\\*(aa\\$2
+.      if "\\$1"1.2"  \&\\*(tNNetBSD\\*(aa 1.2\\*(aa\\$2
 .\}
 .if \\n(.$==1 \{\
 .      if "\\$1"0.8"  \&\\*(tNNetBSD\\*(aa 0.8\\*(aa
@@ -141,6 +142,7 @@
 .      if "\\$1"1.0"  \&\\*(tNNetBSD\\*(aa 1.0\\*(aa
 .      if "\\$1"1.0a"  \&\\*(tNNetBSD\\*(aa 1.0a\\*(aa
 .      if "\\$1"1.1"  \&\\*(tNNetBSD\\*(aa 1.1\\*(aa
+.      if "\\$1"1.2"  \&\\*(tNNetBSD\\*(aa 1.2\\*(aa
 .\}
 ..
 .\" Ns Ox macro - OpenBSD
@@ -321,6 +323,16 @@
 .                      as b1 (``\\*(tNXPG4\\*(aa'')
 .              \}
 .       \}
+.       if "\\*(A\\n(aP"-xpg4.2" \{\
+.              ie \\n(sT==1 \{\
+.                      ds b1 \&\\*(tNX/Open Portability Guide Issue 4.2\\*(aa\\*(sV
+.                      as b1 (``\\*(tNXPG4\\*(aa'')
+.              \}
+.              el \{\
+.                      ds b1 \&\\*(tNX/Open Portability Guide Issue 4.2\\*(aa\\*(sV
+.                      as b1 (``\\*(tNXPG4\\*(aa'')
+.              \}
+.       \}
 .      ie \\n(aC>\\n(aP \{\
 .              nr aP \\n(aP+1
 .              nR