Merge pmsi(4) into pms(4). From Alexandr Shadchin on tech@.

5 files changed, 14 insertions, 23 deletions

diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index e5c69e10a5c..2bff7da34dc 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.515 2010/09/23 14:35:13 yuo Exp $
+#	$OpenBSD: Makefile,v 1.516 2010/09/26 20:39:08 miod Exp $
 
 MAN=	aac.4 ac97.4 acphy.4 \
 	acpi.4 acpiac.4 acpiasus.4 acpibat.4 acpibtn.4 acpicpu.4 acpidock.4 \
@@ -79,7 +79,6 @@ MLINKS+=isa.4 isadma.4
 MLINKS+=isapnp.4 pnp.4
 MLINKS+=netintro.4 networking.4
 MLINKS+=pcmcia.4 pcic.4
-MLINKS+=pms.4 pmsi.4
 MLINKS+=pty.4 ptm.4
 MLINKS+=random.4 arandom.4
 MLINKS+=random.4 srandom.4 random.4 urandom.4
diff --git a/share/man/man4/man4.i386/lms.4 b/share/man/man4/man4.i386/lms.4
index 6d197d3af72..e3fdd59b3ca 100644
--- a/share/man/man4/man4.i386/lms.4
+++ b/share/man/man4/man4.i386/lms.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: lms.4,v 1.10 2007/05/31 19:19:55 jmc Exp $
+.\"	$OpenBSD: lms.4,v 1.11 2010/09/26 20:39:08 miod Exp $
 .\" $NetBSD: lms.4,v 1.13 2000/07/05 16:13:48 msaitoh Exp $
 .\"
 .\" Copyright (c) 1993 Christopher G. Demetriou
@@ -33,7 +33,7 @@
 .\"
 .\" <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: September 26 2010 $
 .Dt LMS 4 i386
 .Os
 .Sh NAME
@@ -53,6 +53,5 @@ devices.
 .Xr isa 4 ,
 .Xr mms 4 ,
 .Xr pms 4 ,
-.Xr pmsi 4 ,
 .Xr ums 4 ,
 .Xr wsmouse 4
diff --git a/share/man/man4/man4.i386/mms.4 b/share/man/man4/man4.i386/mms.4
index bed1af30511..5389a9963bf 100644
--- a/share/man/man4/man4.i386/mms.4
+++ b/share/man/man4/man4.i386/mms.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mms.4,v 1.9 2007/05/31 19:19:55 jmc Exp $
+.\"	$OpenBSD: mms.4,v 1.10 2010/09/26 20:39:08 miod Exp $
 .\" $NetBSD: mms.4,v 1.13 2000/07/05 16:13:49 msaitoh Exp $
 .\"
 .\" Copyright (c) 1993 Christopher G. Demetriou
@@ -33,7 +33,7 @@
 .\"
 .\" <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: September 26 2010 $
 .Dt MMS 4 i386
 .Os
 .Sh NAME
@@ -53,6 +53,5 @@ devices.
 .Xr isa 4 ,
 .Xr lms 4 ,
 .Xr pms 4 ,
-.Xr pmsi 4 ,
 .Xr ums 4 ,
 .Xr wsmouse 4
diff --git a/share/man/man4/pckbc.4 b/share/man/man4/pckbc.4
index bea6e25f168..92e77007d48 100644
--- a/share/man/man4/pckbc.4
+++ b/share/man/man4/pckbc.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pckbc.4,v 1.17 2010/07/22 07:41:59 jmc Exp $
+.\" $OpenBSD: pckbc.4,v 1.18 2010/09/26 20:39:08 miod Exp $
 .\" $NetBSD: pckbc.4,v 1.2 2000/06/16 06:42:31 augustss Exp $
 .\"
 .\" Copyright (c) 1999
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 22 2010 $
+.Dd $Mdocdate: September 26 2010 $
 .Dt PCKBC 4
 .Os
 .Sh NAME
@@ -36,7 +36,6 @@
 .Cd "pckbc* at ebus?                     " Pq "sparc64"
 .Cd "pckbd* at pckbc?"
 .Cd "pms*   at pckbc?"
-.Cd "pmsi*  at pckbc?"
 .Sh DESCRIPTION
 The
 .Nm
@@ -69,5 +68,4 @@ device flags to 1.
 .Xr isa 4 ,
 .Xr pckbd 4 ,
 .Xr pms 4 ,
-.Xr pmsi 4 ,
 .Xr boot_config 8
diff --git a/share/man/man4/pms.4 b/share/man/man4/pms.4
index d7c80239566..ba92566e06b 100644
--- a/share/man/man4/pms.4
+++ b/share/man/man4/pms.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pms.4,v 1.11 2007/10/19 06:29:36 jmc Exp $
+.\" $OpenBSD: pms.4,v 1.12 2010/09/26 20:39:08 miod Exp $
 .\" $NetBSD: pms.4,v 1.4 2000/07/05 15:45:34 msaitoh Exp $
 .\"
 .\" Copyright (c) 1993 Christopher G. Demetriou
@@ -33,20 +33,17 @@
 .\"
 .\" <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
 .\"
-.Dd $Mdocdate: October 19 2007 $
+.Dd $Mdocdate: September 26 2010 $
 .Dt PMS 4
 .Os
 .Sh NAME
-.Nm pms ,
-.Nm pmsi
+.Nm pms
 .Nd PS/2 auxiliary port mouse driver
 .Sh SYNOPSIS
 .Cd "pms* at pckbc?"
 .Cd "pms* at gsckbc?" Pq "hppa"
 .Cd "pms* at mkbc?" Pq "sgi"
-.Cd "pmsi* at pckbc?"
 .Cd "wsmouse* at pms? mux 0"
-.Cd "wsmouse* at pmsi? mux 0"
 .Sh DESCRIPTION
 The
 .Nm pms
@@ -60,12 +57,11 @@ the PS/2 input port controller found on hppa machines, or
 .Xr pckbc 4 ,
 the standard PC keyboard controller found on most other machines.
 .Dq pms
-is a generic driver which supports 2 coordinate axes and 3 buttons.
-The
-.Dq pmsi
-variant provides specific support for wheel mice of the
+is a generic driver which supports mice using common variants of the PS/2
+protocol, including wheel mice of the
 .Dq IntelliMouse
-breed; wheel movements are mapped to a third (z-) axis.
+breed.
+Wheel movements are mapped to a third (z-) axis.
 Mouse related data are accessed by
 .Xr wsmouse 4
 devices.