summaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
authorAaron Campbell <aaron@cvs.openbsd.org>2000-09-17 00:53:36 +0000
committerAaron Campbell <aaron@cvs.openbsd.org>2000-09-17 00:53:36 +0000
commit45a9f9605dc5aef385efecc359c3912413799ea3 (patch)
tree4b40d446a4d84f9211510c1ee1aefd4b8cefbd53 /share
parent86446ba1cbca369fc066c32f7dd72c5ff456f079 (diff)
Zap some unwanted trailing whitespace.
Diffstat (limited to 'share')
-rw-r--r--share/man/man4/adv.44
-rw-r--r--share/man/man4/inet6.44
-rw-r--r--share/man/man4/tun.410
-rw-r--r--share/man/man4/urio.46
-rw-r--r--share/man/man4/vlan.412
-rw-r--r--share/man/man4/wscons.4107
-rw-r--r--share/man/man4/wsmux.42
7 files changed, 79 insertions, 66 deletions
diff --git a/share/man/man4/adv.4 b/share/man/man4/adv.4
index 4ca6fdb5ca3..4c212a58353 100644
--- a/share/man/man4/adv.4
+++ b/share/man/man4/adv.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: adv.4,v 1.6 2000/05/01 02:04:22 krw Exp $
+.\" $OpenBSD: adv.4,v 1.7 2000/09/17 00:53:35 aaron Exp $
.\"
.\" Copyright (c) 1998, Jason Downs. All rights reserved.
.\"
@@ -57,7 +57,7 @@ in this table:
.It ABP-970U
.It ABP-980
.It ABP-980U
-.El
+.El
.Pp
.Bl -enum -compact
.It
diff --git a/share/man/man4/inet6.4 b/share/man/man4/inet6.4
index 7d3427927f1..d76b98bbe2b 100644
--- a/share/man/man4/inet6.4
+++ b/share/man/man4/inet6.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: inet6.4,v 1.16 2000/06/15 14:24:12 itojun Exp $
+.\" $OpenBSD: inet6.4,v 1.17 2000/09/17 00:53:35 aaron Exp $
.\" $KAME: inet6.4,v 1.15 2000/06/15 14:21:50 itojun Exp $
.\"
.\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -278,7 +278,7 @@ message protocol is accessible from a raw socket.
.\" .Tn IP
.\" packets, whether locally-generated or forwarded, will not.
.Ss Interaction between IPv4/v6 sockets
-The behavior of
+The behavior of
.Dv AF_INET6
TCP/UDP socket is documented in RFC2553.
Basically, it says as follows:
diff --git a/share/man/man4/tun.4 b/share/man/man4/tun.4
index d641504f630..3b5a98d01de 100644
--- a/share/man/man4/tun.4
+++ b/share/man/man4/tun.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tun.4,v 1.14 2000/05/23 05:04:37 deraadt Exp $
+.\" $OpenBSD: tun.4,v 1.15 2000/09/17 00:53:35 aaron Exp $
.Dd March 10, 1996
.Dt TUN 4
.Os
@@ -137,14 +137,14 @@ on the pseudo-interface. Each
call supplies exactly one packet; the packet length is taken from the
amount of data provided to
.Fn write .
-The first u_int32_t must be the address family of the packet in network
+The first u_int32_t must be the address family of the packet in network
byte order, much as in packets returned by
.Fn read ;
the packet data always follows immediately.
A
-.Fn write
-with an invalid address family (eg. not specified or in the wrong byte
-order) will return
+.Fn write
+with an invalid address family (eg. not specified or in the wrong byte
+order) will return
.Er ENOSUPPORT .
A large number of
.Xr ioctl 2
diff --git a/share/man/man4/urio.4 b/share/man/man4/urio.4
index 36b6d8e8246..c1be88208fb 100644
--- a/share/man/man4/urio.4
+++ b/share/man/man4/urio.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: urio.4,v 1.4 2000/08/17 20:34:17 jakob Exp $
+.\" $OpenBSD: urio.4,v 1.5 2000/09/17 00:53:35 aaron Exp $
.\" $NetBSD: urio.4,v 1.1 2000/04/14 14:48:29 augustss Exp $
.\"
.\" Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -54,14 +54,14 @@ a user application for up and downloading music.
.Sh FILES
.Bl -tag -width Pa /dev/urio0 -compact
.It Pa /dev/urio0
-device node
+device node
.El
.Sh EXAMPLE
Using the Rio500 package the command
.Pp
.Dl rio_add_song 01_BlinkarBla.mp3
.Pp
-will download a song over the
+will download a song over the
.Nm USB
connection into your Rio500.
.Sh SEE ALSO
diff --git a/share/man/man4/vlan.4 b/share/man/man4/vlan.4
index dfbd4f43454..a25034a251e 100644
--- a/share/man/man4/vlan.4
+++ b/share/man/man4/vlan.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: vlan.4,v 1.6 2000/07/02 15:59:14 aaron Exp $
+.\" $OpenBSD: vlan.4,v 1.7 2000/09/17 00:53:35 aaron Exp $
.\"
.Dd January 9, 2000
.Dt VLAN 4
@@ -32,7 +32,7 @@ Frame headers which normally contain the destination host, source host, and
protocol, are altered with additional information.
After the source host,
a 32-bit 802.1Q header is included, with 16 bits for the ether type (0x8100), 3
-bits for the priority field (not used in this implementation), 1 bit for
+bits for the priority field (not used in this implementation), 1 bit for
the canonical field (always 0), and 12 bits for the vlan identifier.
Following the vlan header is the actual ether type for the frame and length
information.
@@ -48,13 +48,13 @@ line in the system config file.
interfaces support the following unique
.Xr ioctl 2 Ns s :
.Bl -tag -width aaa
-.It SIOCSETVLAN:
+.It SIOCSETVLAN:
Set the vlan tag and parent for a given vlan interface.
-.It SIOCGETVLAN:
+.It SIOCGETVLAN:
Get the vlan tag and parent for a given vlan interface.
.Pp
.El
-The operation mode can be given as
+The operation mode can be given as
.Bl -tag -width bbb
.It link0
The parent interface supports VLAN tagging/untagging in hardware,
@@ -88,7 +88,7 @@ Some Ethernet chips (notably the Intel 82558 and 82559) automatically
discard frames that are larger then 1514 bytes.
All Ethernet
chips sporting this sort of feature should allow for it to be turned off.
-Optimally, upon loading, the chip's driver would do this (The
+Optimally, upon loading, the chip's driver would do this (The
.Xr fxp 4
driver currently does for the Intel 82558/82559 chips.)
Refer to the hardware manual for your Ethernet chip to determine
diff --git a/share/man/man4/wscons.4 b/share/man/man4/wscons.4
index efa4734dfd9..2ee7e71b312 100644
--- a/share/man/man4/wscons.4
+++ b/share/man/man4/wscons.4
@@ -1,3 +1,4 @@
+.\" $OpenBSD: wscons.4,v 1.2 2000/09/17 00:53:35 aaron Exp $
.\" $NetBSD: wscons.4,v 1.11 2000/04/13 11:14:42 is Exp $
.\"
.\" Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -38,16 +39,16 @@
.Nm wscons
.Nd console access
.Sh SYNOPSIS
-.Cd options WSEMUL_SUN
-.Cd options WSEMUL_VT100
-.Cd options WSEMUL_NO_DUMB
-.Cd options \&"WSEMUL_DEFAULT=\e"xxx\e""
-.Cd options WS_KERNEL_FG=WSCOL_XXX
-.Cd options WS_KERNEL_BG=WSCOL_XXX
-.Cd options WSDISPLAY_COMPAT_PCVT
-.Cd options WSDISPLAY_COMPAT_SYSCONS
-.Cd options WSDISPLAY_COMPAT_USL
-.Cd options WSDISPLAY_COMPAT_RAWKBD
+.Cd option WSEMUL_SUN
+.Cd option WSEMUL_VT100
+.Cd option WSEMUL_NO_DUMB
+.Cd option \&"WSEMUL_DEFAULT=\e"xxx\e""
+.Cd option WS_KERNEL_FG=WSCOL_XXX
+.Cd option WS_KERNEL_BG=WSCOL_XXX
+.Cd option WSDISPLAY_COMPAT_PCVT
+.Cd option WSDISPLAY_COMPAT_SYSCONS
+.Cd option WSDISPLAY_COMPAT_USL
+.Cd option WSDISPLAY_COMPAT_RAWKBD
.Cd "wsdisplay* at ..."
.Cd "wskbd* at ... mux N"
@@ -58,64 +59,69 @@
.Sh DESCRIPTION
The
.Nm
-driver provides support for machine independent access to the console.
+driver provides support for machine-independent access to the console.
.Pp
.Nm
is made of a number of cooperating modules, in particular
.Bl -bullet
.It
-hardware support for display adapters, keyboards and mice, see
+Hardware support for display adapters, keyboards and mice; see
.Xr wsdisplay 4 ,
-.Xr wskbd 4 , and
-.Xr wsmouse 4
+.Xr wskbd 4 ,
+and
+.Xr wsmouse 4 .
.It
-input event multiplexor, see
-.Xr wsmux 4
+Input event multiplexor; see
+.Xr wsmux 4 .
.It
-terminal emulation modules (see below), and
+Terminal emulation modules (see below).
.It
-compatibility options to support control operations and other low-level
-behaviour of existing terminal drivers (see below)
+Compatibility options to support control operations and other low-level
+behaviour of existing terminal drivers (see below).
.El
-.Pp
-.Em Terminal emulations:
+.Ss Terminal emulations
.Nm
-does not define an own set of terminal control sequences and special keyboard
+does not define its own set of terminal control sequences and special keyboard
codes in terms of
.Xr termcap 5 .
-Instead a
+Instead, a
.Dq terminal emulation
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.
+.Pp
The following choices are available:
.Bl -tag -width xxxxxx
.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
-keyboard codes will be delivered, cursor and functions keys do not work.
+.Cd option 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 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
+.Cd option WSEMUL_SUN
+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 (as far as present on the actually used keyboard).
This emulation is sufficient for full-screen applications.
.It vt100
is available with the kernel compile option
-.Cd options WSEMUL_VT100 .
+.Cd option WSEMUL_VT100 .
It provides the most commonly used functions of
.Tn DEC VT100
terminals with some extensions introduced by the
.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
@@ -138,8 +144,9 @@ The
font is approximated by the ISO-latin-1 font, though there are
subtle differences.
.It
-The actual rendering quality depends on the underlying graphics hardware
-driver. Characters might be missing in the available fonts and be
+The actual rendering quality depends on the underlying graphics
+hardware 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,7 +175,8 @@ emulator.
The
.Va WSEMUL_DEFAULT
kernel option allows to select one of the described terminal options
-as default choice. The default gets into effect in kernel startup, i.e.
+as default choice.
+The default gets into effect in kernel startup, i.e.,
for the operating system console or additional screens allocated
through the
.Va WSDISPLAY_DEFAULTSCREENS
@@ -183,7 +191,8 @@ these options allow to run X servers or other programs using low-level
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
@@ -200,7 +209,8 @@ driver to make X servers work.
.It Cd WSDISPLAY_COMPAT_SYSCONS
Emulates enough of the i386 FreeBSD
.Dq syscons
-driver to make X servers work. Useful with FreeBSD binary emulation.
+driver to make X servers work.
+Useful with FreeBSD binary emulation.
.El
.Pp
Linux/i386 X servers do usually run if the first two options are
@@ -215,11 +225,11 @@ driver entry points, symlinks are a helpful measure.)
.Pp
.Em Other options:
.Bl -tag -width xxxxxxxx
-.It Cd options WS_KERNEL_FG=WSCOL_XXX ,
-.It Cd options WS_KERNEL_BG=WSCOL_XXX ,
-.It Cd options \&WS_KERNEL_COLATTR="(WSATTR_XXX | WSATTR_YYY)"
+.It Cd option WS_KERNEL_FG=WSCOL_XXX ,
+.It Cd option WS_KERNEL_BG=WSCOL_XXX ,
+.It Cd option \&WS_KERNEL_COLATTR="(WSATTR_XXX | WSATTR_YYY)"
and
-.It Cd options \&WS_KERNEL_MONOATTR="(WSATTR_XXX | WSATTR_YYY)"
+.It Cd option \&WS_KERNEL_MONOATTR="(WSATTR_XXX | WSATTR_YYY)"
allow to make console output originating from the kernel appear differently
than output from user level programs (via
.Pa /dev/console
@@ -230,7 +240,8 @@ device like
.Dq WS_KERNEL_FG
and
.Dq WS_KERNEL_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 /usr/include/wscons/wsdisplayvar.h .
@@ -239,19 +250,21 @@ and
.Dq WS_KERNEL_MONOATTR
are additional attribute flags used on color or monochrome displays,
respectively.
-The arguments are defined in the same header file. Whether the attributes
+The arguments are defined in the same header file.
+Whether the attributes
are supported or not depends on the actually used graphics adapter.
These options are ignored by the
.Dq dumb
terminal emulation.
-.It Cd options WSCOMPAT_USL_SYNCTIMEOUT=nnn
+.It Cd option WSCOMPAT_USL_SYNCTIMEOUT=nnn
The virtual screen switching protocol enabled by
.Dq WSDISPLAY_COMPAT_USL
uses a somewhat complex handshake protocol to pass control to user programs
-as X servers controlling a virtual screen. To avoid a non-responsive
-application to lock the whole console system a screen switch will be rolled
-back if the user application does not respond to a screen switch request
-within some time. This option allows to set this timeout (in seconds),
+as X servers controlling a virtual screen.
+To avoid a non-responsive application to lock the whole console system a
+screen switch will be rolled back if the user application does not respond
+to a screen switch request within some time.
+This option allows to set this timeout (in seconds),
the default value is 5 seconds.
.El
.Sh SEE ALSO
diff --git a/share/man/man4/wsmux.4 b/share/man/man4/wsmux.4
index 15e975a373a..4d703de7519 100644
--- a/share/man/man4/wsmux.4
+++ b/share/man/man4/wsmux.4
@@ -66,7 +66,7 @@ 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
-and receive all mouse events; mice can also be dynamically attached
+and receive all mouse events; mice can also be dynamically attached
and detached.
.Pp
It is also possible to inject events into a multiplexor from a