summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/libcurses/curses.priv.h4
-rw-r--r--libexec/telnetd/telnetd.82
-rw-r--r--share/man/man4/man4.alpha/tga.44
-rw-r--r--share/man/man7/ports.74
-rw-r--r--usr.sbin/wsmoused/wsmoused.88
-rw-r--r--usr.sbin/wsmoused/wsmoused.c4
6 files changed, 13 insertions, 13 deletions
diff --git a/lib/libcurses/curses.priv.h b/lib/libcurses/curses.priv.h
index fd4f605ab45..989a5158751 100644
--- a/lib/libcurses/curses.priv.h
+++ b/lib/libcurses/curses.priv.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: curses.priv.h,v 1.31 2001/01/22 18:01:34 millert Exp $ */
+/* $OpenBSD: curses.priv.h,v 1.32 2003/04/13 11:20:47 jmc Exp $ */
/****************************************************************************
* Copyright (c) 1998,1999,2000 Free Software Foundation, Inc. *
@@ -824,7 +824,7 @@ extern NCURSES_EXPORT_VAR(SCREEN *) SP;
/*
* We don't want to use the lines or columns capabilities internally,
* because if the application is running multiple screens under
- * X windows, it's quite possible they could all have type xterm
+ * the X Window System, it's quite possible they could all have type xterm
* but have different sizes! So...
*/
#define screen_lines SP->_lines
diff --git a/libexec/telnetd/telnetd.8 b/libexec/telnetd/telnetd.8
index 14980bc054b..e17fc8275ef 100644
--- a/libexec/telnetd/telnetd.8
+++ b/libexec/telnetd/telnetd.8
@@ -420,7 +420,7 @@ about the speed of the serial line to which
the client is attached.
.It "DO XDISPLOC"
Indicates a desire to be able to request the name
-of the X windows display that is associated with
+of the X11 display that is associated with
the telnet client.
.It "DO NEW-ENVIRON"
Indicates a desire to be able to request environment
diff --git a/share/man/man4/man4.alpha/tga.4 b/share/man/man4/man4.alpha/tga.4
index 60518ea25b4..c04f59b43b9 100644
--- a/share/man/man4/man4.alpha/tga.4
+++ b/share/man/man4/man4.alpha/tga.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tga.4,v 1.4 2003/03/07 09:34:59 jmc Exp $
+.\" $OpenBSD: tga.4,v 1.5 2003/04/13 11:20:47 jmc Exp $
.\"
.\" Copyright (c) 2001 Nathan L. Binkert
.\" All rights reserved.
@@ -68,7 +68,7 @@ There are also some that use jumpers.
The settings for D, E, and F are for 1600x1200 on some cards, but
there are no guarantees.
.Pp
-N.B.: The resolution selected is the resolution used in X windows.
+N.B.: The resolution selected is the resolution used in the X Window System.
.Pp
There are also a couple of extra jumpers on some cards.
One of these jumpers often selects the card to be the primary display.
diff --git a/share/man/man7/ports.7 b/share/man/man7/ports.7
index 188079cc686..396e20d666b 100644
--- a/share/man/man7/ports.7
+++ b/share/man/man7/ports.7
@@ -23,7 +23,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $OpenBSD: ports.7,v 1.31 2003/03/16 16:36:47 avsm Exp $
+.\" $OpenBSD: ports.7,v 1.32 2003/04/13 11:20:47 jmc Exp $
.\" $FreeBSD: ports.7,v 1.7 1998/06/23 04:38:50 hoek Exp $
.\"
.Dd January 25, 1998
@@ -355,7 +355,7 @@ Specifying a flavor that does not exist is an error.
Additionally, some ports impose some further restrictions on flavor
combinations, when such combinations do not make sense.
.Pp
-Lots of ports can be built without X Windows requirement and accordingly
+Lots of ports can be built without X11 requirement and accordingly
have a
.Ic no_x11
flavor.
diff --git a/usr.sbin/wsmoused/wsmoused.8 b/usr.sbin/wsmoused/wsmoused.8
index 6144b9301e1..fdb9465eb9a 100644
--- a/usr.sbin/wsmoused/wsmoused.8
+++ b/usr.sbin/wsmoused/wsmoused.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: wsmoused.8,v 1.8 2003/02/26 21:04:53 jmc Exp $
+.\" $OpenBSD: wsmoused.8,v 1.9 2003/04/13 11:20:47 jmc Exp $
.\"
.\" Copyright (c) 2001 Jean-Baptiste Marchand
.\" All rights reserved.
@@ -168,14 +168,14 @@ Hitachi tablet protocol.
.El
.Nm
-will happily coexist with X-Window, provided that the mouse device is
-supported by
+will happily coexist with the X Window System, provided that the mouse
+device is supported by
.Xr wsmouse 4 .
Serial mice do not have a
.Xr wsmouse 4
compatible driver, so
.Nm
-has to be killed before starting X-Window.
+has to be killed before starting the X Window System.
.Sh SEE ALSO
.Xr wscons 4 ,
.Xr wsmouse 4
diff --git a/usr.sbin/wsmoused/wsmoused.c b/usr.sbin/wsmoused/wsmoused.c
index bb9ee107253..453c6bc24c3 100644
--- a/usr.sbin/wsmoused/wsmoused.c
+++ b/usr.sbin/wsmoused/wsmoused.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsmoused.c,v 1.13 2002/05/30 19:09:05 deraadt Exp $ */
+/* $OpenBSD: wsmoused.c,v 1.14 2003/04/13 11:20:47 jmc Exp $ */
/*
* Copyright (c) 2001 Jean-Baptiste Marchand, Julien Montagne and Jerome Verdon
@@ -420,7 +420,7 @@ wsmoused(void)
event.value = 0;
}
else
- /* X-Window won't start using wsmoused(8) with a serial mouse */
+ /* X11 won't start using wsmoused(8) with a serial mouse */
event.value = 0;
/* notify kernel to start wsmoused */