Module Name: src
Committed By: wiz
Date: Sun Mar 6 17:39:06 UTC 2011
Modified Files:
src/share/man/man4: wscons.4 wskbd.4 wsmux.4 wss.4
Log Message:
New sentence, new line.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/share/man/man4/wscons.4
cvs rdiff -u -r1.13 -r1.14 src/share/man/man4/wskbd.4
cvs rdiff -u -r1.11 -r1.12 src/share/man/man4/wsmux.4
cvs rdiff -u -r1.19 -r1.20 src/share/man/man4/wss.4
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man4/wscons.4
diff -u src/share/man/man4/wscons.4:1.28 src/share/man/man4/wscons.4:1.29
--- src/share/man/man4/wscons.4:1.28 Wed Apr 30 13:10:55 2008
+++ src/share/man/man4/wscons.4 Sun Mar 6 17:39:05 2011
@@ -1,4 +1,4 @@
-.\" $NetBSD: wscons.4,v 1.28 2008/04/30 13:10:55 martin Exp $
+.\" $NetBSD: wscons.4,v 1.29 2011/03/06 17:39:05 wiz Exp $
.\"
.\" Copyright (c) 1999, 2004 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -85,7 +85,8 @@
.Xr termcap 5 .
Instead a
.Dq terminal emulation
-is assigned to each virtual screen when the screen is created. (See
+is assigned to each virtual screen when the screen is created.
+(See
.Xr wsconscfg 8 . )
Different terminal emulations can be active at the same time on one display.
The following choices are available:
@@ -93,15 +94,18 @@
.It dumb
This minimal terminal support is available unless the kernel option
.Cd options WSEMUL_NO_DUMB
-was specified at build time. No control sequences are supported besides
-the ASCII control characters. The cursor is not addressable. Only ASCII
+was specified at build time.
+No control sequences are supported besides the ASCII control characters.
+The cursor is not addressable.
+Only ASCII
keyboard codes will be delivered, cursor and functions keys do not work.
.It sun
The
.Dq sun
console emulation is available if
.Cd options WSEMUL_SUN
-was specified at kernel build time. It supports the control sequences of
+was specified at kernel build time.
+It supports the control sequences of
.Tn SUN
machine consoles and delivers its keyboard codes for function and
keypad keys in use.
@@ -115,7 +119,8 @@
.Tn DEC VT220
and
.Tn DEC VT320
-models. The features of the original
+models.
+The features of the original
.Tn VT100
which are not or not completely implemented are:
.Bl -bullet
@@ -139,7 +144,8 @@
subtle differences.
.It
The actual rendering quality depends on the underlying graphics hardware
-driver. Characters might be missing in the available fonts and be
+driver.
+Characters might be missing in the available fonts and be
substituted by more or less fitting replacements.
.Pp
Depending on the keyboard used, not all function keys might be available.
@@ -168,9 +174,9 @@
The
.Va WSEMUL_DEFAULT
kernel option is used to select one of the described terminal options
-as the default choice. The default takes effect at kernel startup, i.e.
-for the operating system console or additional screens allocated
-through the
+as the default choice.
+The default takes effect at kernel startup, i.e. for the operating
+system console or additional screens allocated through the
.Va WSDISPLAY_DEFAULTSCREENS
option (see
.Xr wsdisplay 4 ) ,
@@ -182,7 +188,8 @@
console driver functions which were written specifically for other
console drivers to run on
.Nx
-systems. The options are in particular:
+systems.
+The options are in particular:
.Bl -tag -width xxxxxxxx
.It Cd WSDISPLAY_COMPAT_USL
Support the protocol for switches between multiple virtual screens on
@@ -199,7 +206,8 @@
Emulates enough of the
.Fx
.Dq syscons
-driver to make X servers work. Useful with
+driver to make X servers work.
+Useful with
.Fx
binary emulation.
.El
@@ -225,7 +233,8 @@
.Dq WS_DEFAULT_FG
and
.Dq WS_DEFAULT_BG
-set the foreground / background used on color displays. The
+set the foreground / background used on color displays.
+The
.Dq WSCOL_XXX
arguments are colors as defined in
.Pa src/sys/dev/wscons/wsdisplayvar.h .
@@ -258,8 +267,8 @@
The virtual screen switching protocol enabled by
.Dq WSDISPLAY_COMPAT_USL
uses a somewhat complex handshake protocol to pass control to user programs
-such as X servers controlling a virtual screen. In order
-to prevent a non-responsive
+such as X servers controlling a virtual screen.
+In order to prevent a non-responsive
application from locking the whole console system,
a screen switch will be rolled
back after a 5 second timeout if the application does not respond.
Index: src/share/man/man4/wskbd.4
diff -u src/share/man/man4/wskbd.4:1.13 src/share/man/man4/wskbd.4:1.14
--- src/share/man/man4/wskbd.4:1.13 Mon Mar 9 19:24:28 2009
+++ src/share/man/man4/wskbd.4 Sun Mar 6 17:39:05 2011
@@ -1,4 +1,4 @@
-.\" $NetBSD: wskbd.4,v 1.13 2009/03/09 19:24:28 joerg Exp $
+.\" $NetBSD: wskbd.4,v 1.14 2011/03/06 17:39:05 wiz Exp $
.\"
.\" Copyright (c) 1999
.\" Matthias Drochner. All rights reserved.
@@ -52,7 +52,8 @@
.Nm
driver handles common tasks for keyboards within the
.Xr wscons 4
-framework. It is attached to the hardware specific keyboard drivers and
+framework.
+It is attached to the hardware specific keyboard drivers and
provides their connection to
.Dq wsdisplay
devices and a character device interface.
@@ -66,7 +67,8 @@
.It
Handling of
.Dq compose
-sequences. Characters commonly not present as separate key on keyboards
+sequences.
+Characters commonly not present as separate key on keyboards
can be generated after either a special
.Dq compose
key is pressed or a
@@ -93,10 +95,11 @@
The
.Nm
driver provides a number of ioctl functions to control key maps
-and other parameters. These functions are accessible though the
-associated
+and other parameters.
+These functions are accessible though the associated
.Dq wsdisplay
-device as well. A complete list is in
+device as well.
+A complete list is in
.Pa /usr/include/dev/wscons/wsconsio.h .
The
.Xr wsconsctl 8
@@ -105,10 +108,11 @@
The
.Em console
locator in the configuration line refers to the device's use as input
-part of the operating system console. A device specification containing
-a positive value here will only match if the device is in use as system
-console. (The console device selection in early system startup is not
-influenced.) This way, the console device can be connected to a known
+part of the operating system console.
+A device specification containing a positive value here will only
+match if the device is in use as system console.
+(The console device selection in early system startup is not influenced.)
+This way, the console device can be connected to a known
wskbd device instance.
.Sh FILES
.Bl -item
Index: src/share/man/man4/wsmux.4
diff -u src/share/man/man4/wsmux.4:1.11 src/share/man/man4/wsmux.4:1.12
--- src/share/man/man4/wsmux.4:1.11 Wed Apr 30 13:10:55 2008
+++ src/share/man/man4/wsmux.4 Sun Mar 6 17:39:05 2011
@@ -1,4 +1,4 @@
-.\" $NetBSD: wsmux.4,v 1.11 2008/04/30 13:10:55 martin Exp $
+.\" $NetBSD: wsmux.4,v 1.12 2011/03/06 17:39:05 wiz Exp $
.\"
.\" Copyright (c) 1999 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -43,18 +43,21 @@
input devices to have their events multiplexed into one stream.
.Pp
The typical usage for this device is to have two multiplexors, one
-for mouse events and one for keyboard events. All
+for mouse events and one for keyboard events.
+All
.Xr wsmouse 4
devices should direct their events to the mouse mux (normally 0)
and all keyboard devices, except the console, should direct their
-events to the keyboard mux (normally 1). A device will
-send its events to the mux indicated by the
+events to the keyboard mux (normally 1).
+A device will send its events to the mux indicated by the
.Va mux
-locator. If none is given the device will not use a multiplexor.
+locator.
+If none is given the device will not use a multiplexor.
The keyboard multiplexor should be connected to the display, using
the
.Xr wsconscfg 8
-command. It will then receive all keystrokes from all keyboards
+command.
+It will then receive all keystrokes from all keyboards
and, furthermore, keyboards can be dynamically attached and detached without
further user interaction.
In a similar way, the window system will open the mouse multiplexor
@@ -79,7 +82,8 @@
there is a control device
.Pa /dev/wsmuxctlN .
The control device has a minor number 128 greater than the regular
-mux device. It can be used to control the mux even when it is open,
+mux device.
+It can be used to control the mux even when it is open,
e.g., by
.Xr wsmuxctl 8 .
.Bl -item
Index: src/share/man/man4/wss.4
diff -u src/share/man/man4/wss.4:1.19 src/share/man/man4/wss.4:1.20
--- src/share/man/man4/wss.4:1.19 Wed Jun 22 04:30:08 2005
+++ src/share/man/man4/wss.4 Sun Mar 6 17:39:05 2011
@@ -1,4 +1,4 @@
-.\" $NetBSD: wss.4,v 1.19 2005/06/22 04:30:08 kent Exp $
+.\" $NetBSD: wss.4,v 1.20 2011/03/06 17:39:05 wiz Exp $
.\"
.\" Copyright (c) 1995 Michael Long.
.\" All rights reserved.
@@ -53,11 +53,13 @@
.Pp
The device
.Cm flags
-must have bit 0 (value 1) set to enable the MAD16 support. This is to
+must have bit 0 (value 1) set to enable the MAD16 support.
+This is to
avoid potential conflicts with other devices when probing the MAD16
because it requires use of extra I/O ports not in the base port range.
Chips needing this flag include the OPTi 82C928, 82C929, 82C831, and
-the OAK OTI-601D. Setting bit 1 (value 2) in
+the OAK OTI-601D.
+Setting bit 1 (value 2) in
.Cm flags
disables the joystick port on MAD16 hardware.
.Sh SEE ALSO
