xorgproto: Branch 'master'
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Sat Aug 8 17:35:47 UTC 2020
COPYING-x11proto | 2 +-
README.md | 6 +++---
dri2proto.txt | 4 ++--
fixesproto.txt | 2 +-
include/GL/glxint.h | 2 +-
include/GL/internal/glcore.h | 2 +-
include/X11/HPkeysym.h | 2 +-
include/X11/ap_keysym.h | 2 +-
include/X11/extensions/Printstr.h | 8 ++++----
include/X11/extensions/XKB.h | 2 +-
include/X11/extensions/syncconst.h | 2 +-
include/X11/extensions/syncstr.h | 2 +-
include/X11/extensions/windowswm.h | 2 +-
include/X11/fonts/FS.h | 2 +-
man/Xprint.man | 6 +++---
man/Xprint.sgml | 6 +++---
presentproto.txt | 2 +-
randrproto.txt | 2 +-
specs/XI2proto.txt | 28 ++++++++++++++--------------
specs/XIproto.txt | 10 +++++-----
specs/kbproto/appD.xml | 6 +++---
specs/recordproto/record.xml | 2 +-
specs/scrnsaverproto/saver.xml | 10 +++++-----
specs/xextproto/appgrp.xml | 6 +++---
specs/xextproto/dbe.xml | 2 +-
specs/xextproto/dpms.xml | 4 ++--
specs/xextproto/evi.xml | 2 +-
specs/xextproto/security.xml | 8 ++++----
specs/xextproto/shm.xml | 2 +-
specs/xextproto/tog-cup.xml | 6 +++---
specs/xproto/glossary.xml | 2 +-
specs/xproto/keysyms.xml | 2 +-
specs/xproto/sect1-9.xml | 2 +-
xv-protocol-v2.txt | 2 +-
34 files changed, 75 insertions(+), 75 deletions(-)
New commits:
commit 09602b2130b3710bcca4d2707132bd47d4a832ef
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date: Sat Aug 8 10:32:28 2020 -0700
Fix spelling/wording issues
Found by using:
codespell --builtin clear,rare,usage,informal,code,names
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
diff --git a/COPYING-x11proto b/COPYING-x11proto
index 32cb88f..03c3582 100644
--- a/COPYING-x11proto
+++ b/COPYING-x11proto
@@ -80,7 +80,7 @@ Consortium not be used in advertising or publicity pertaining to
distribution of the software without written prior permission.
HEWLETT-PACKARD MAKES NO WARRANTY OF ANY KIND WITH REGARD
-TO THIS SOFWARE, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+TO THIS SOFTWARE, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE. Hewlett-Packard shall not be liable for errors
contained herein or direct, indirect, special, incidental or
diff --git a/README.md b/README.md
index 4237f7f..a5af6b6 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ X Window System Unified Protocol
This package provides the headers and specification documents defining
the core protocol and (many) extensions for the X Window System. The
-extensions are those common among servers descended from X.Org 6.7. It
+extensions are those common among servers descended from X11R7. It
also includes a number of headers that aren't purely protocol related,
but are depended upon by many other X Window System packages to provide
common definitions and porting layer.
@@ -15,14 +15,14 @@ protocol description suitable for code generation or use in new
projects, please refer to the XCB project:
https://xcb.freedesktop.org/
- https://cgit.freedesktop.org/xcb/proto
+ https://gitlab.freedesktop.org/xorg/proto/xcbproto
All questions regarding this software should be directed at the
Xorg mailing list:
https://lists.x.org/mailman/listinfo/xorg
-The master development code repository can be found at:
+The primary development code repository can be found at:
https://gitlab.freedesktop.org/xorg/proto/xorgproto
diff --git a/dri2proto.txt b/dri2proto.txt
index f896777..0e58171 100644
--- a/dri2proto.txt
+++ b/dri2proto.txt
@@ -190,7 +190,7 @@ DRI2BUFFER { attachment: CARD32
cpp: CARD32
flags: CARD32 }
- The DRI2BUFFER describes an auxillary rendering buffer
+ The DRI2BUFFER describes an auxiliary rendering buffer
associated with an X drawable. 'attachment' describes the
attachment point for the buffer, 'name' is the name of the
underlying kernel buffer,
@@ -561,7 +561,7 @@ naturally some interactions with other extensions.
11.1 GLX
-The GL auxilary buffers map directly to the DRI2 buffers... eh
+The GL auxiliary buffers map directly to the DRI2 buffers... eh
11.2 DBE
diff --git a/fixesproto.txt b/fixesproto.txt
index 1161946..ff083bc 100644
--- a/fixesproto.txt
+++ b/fixesproto.txt
@@ -190,7 +190,7 @@ SelectCursorInput
Servers supporting the X Input Extension Version 2.0 or higher only
notify the clients of cursor change events for the ClientPointer, not
of any other master pointer (see Section 4.4. in the XI2 protocol
- specificiation).
+ specification).
GetCursorImage
diff --git a/include/GL/glxint.h b/include/GL/glxint.h
index 44c9e9e..87ae6b6 100644
--- a/include/GL/glxint.h
+++ b/include/GL/glxint.h
@@ -118,7 +118,7 @@ struct __GLXFBConfigRec {
GLuint multiSampleSize; /* Number of samples per pixel (0 if no ms) */
- GLuint nMultiSampleBuffers; /* Number of availble ms buffers */
+ GLuint nMultiSampleBuffers; /* Number of available ms buffers */
GLint maxAuxBuffers;
/* frame buffer level */
diff --git a/include/GL/internal/glcore.h b/include/GL/internal/glcore.h
index 3879727..edcb014 100644
--- a/include/GL/internal/glcore.h
+++ b/include/GL/internal/glcore.h
@@ -60,7 +60,7 @@ typedef struct __GLcontextRec __GLcontext;
* context to the application.
*
* Instances of this structure are shared by the driver and the loader. To
- * maintain binary compatability, new fields \b must be added only to the
+ * maintain binary compatibility, new fields \b must be added only to the
* end of the structure.
*
* \sa _gl_context_modes_create
diff --git a/include/X11/HPkeysym.h b/include/X11/HPkeysym.h
index 4a0655a..d41ed38 100644
--- a/include/X11/HPkeysym.h
+++ b/include/X11/HPkeysym.h
@@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
HEWLETT-PACKARD MAKES NO WARRANTY OF ANY KIND WITH REGARD
-TO THIS SOFWARE, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+TO THIS SOFTWARE, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE. Hewlett-Packard shall not be liable for errors
contained herein or direct, indirect, special, incidental or
diff --git a/include/X11/ap_keysym.h b/include/X11/ap_keysym.h
index 76cbde2..601f1e5 100644
--- a/include/X11/ap_keysym.h
+++ b/include/X11/ap_keysym.h
@@ -13,7 +13,7 @@ Consortium not be used in advertising or publicity pertaining to
distribution of the software without written prior permission.
HEWLETT-PACKARD MAKES NO WARRANTY OF ANY KIND WITH REGARD
-TO THIS SOFWARE, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+TO THIS SOFTWARE, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE. Hewlett-Packard shall not be liable for errors
contained herein or direct, indirect, special, incidental or
diff --git a/include/X11/extensions/Printstr.h b/include/X11/extensions/Printstr.h
index 7c3e8ad..c11fc06 100644
--- a/include/X11/extensions/Printstr.h
+++ b/include/X11/extensions/Printstr.h
@@ -569,10 +569,10 @@ typedef struct {
CARD32 length;
CARD16 width; /* total pixel width */
CARD16 height; /* total pixel height */
- CARD16 rx; /* reproducable x pixel offset */
- CARD16 ry; /* reproducable y pixel offset */
- CARD16 rwidth; /* reproducable x pixel width */
- CARD16 rheight; /* reproducable y pixel width */
+ CARD16 rx; /* reproducible x pixel offset */
+ CARD16 ry; /* reproducible y pixel offset */
+ CARD16 rwidth; /* reproducible x pixel width */
+ CARD16 rheight; /* reproducible y pixel width */
CARD32 pad1;
CARD32 pad2;
CARD32 pad3;
diff --git a/include/X11/extensions/XKB.h b/include/X11/extensions/XKB.h
index 7e702eb..5d3f870 100644
--- a/include/X11/extensions/XKB.h
+++ b/include/X11/extensions/XKB.h
@@ -141,7 +141,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
/*
* Miscellaneous event details:
- * - event detail masks for assorted events that don't reall
+ * - event detail masks for assorted events that don't really
* have any details.
*/
#define XkbAllStateEventsMask XkbAllStateComponentsMask
diff --git a/include/X11/extensions/syncconst.h b/include/X11/extensions/syncconst.h
index 3acc387..0479816 100644
--- a/include/X11/extensions/syncconst.h
+++ b/include/X11/extensions/syncconst.h
@@ -121,7 +121,7 @@ PERFORMANCE OF THIS SOFTWARE.
#define _XSyncMinValue(pv) ((pv)->hi = 0x80000000, (pv)->lo = 0)
/*
- * These are the publically usable macros. If you want the function version
+ * These are the publicly usable macros. If you want the function version
* of one of these, just #undef the macro to uncover the function.
* (This is the same convention that the ANSI C library uses.)
*/
diff --git a/include/X11/extensions/syncstr.h b/include/X11/extensions/syncstr.h
index 4e8db1b..43cdcba 100644
--- a/include/X11/extensions/syncstr.h
+++ b/include/X11/extensions/syncstr.h
@@ -100,7 +100,7 @@ typedef struct _SyncTrigger {
SyncCounter *pCounter;
CARD64 wait_value; /* wait value */
unsigned int value_type; /* Absolute or Relative */
- unsigned int test_type; /* transition or Comparision type */
+ unsigned int test_type; /* transition or Comparison type */
CARD64 test_value; /* trigger event threshold value */
Bool (*CheckTrigger)(
struct _SyncTrigger * /*pTrigger*/,
diff --git a/include/X11/extensions/windowswm.h b/include/X11/extensions/windowswm.h
index 2c3379f..9938900 100644
--- a/include/X11/extensions/windowswm.h
+++ b/include/X11/extensions/windowswm.h
@@ -143,7 +143,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
typedef struct {
int type; /* of event */
unsigned long serial; /* # of last request processed by server */
- Bool send_event; /* true if this came frome a SendEvent request */
+ Bool send_event; /* true if this came from a SendEvent request */
Display *display; /* Display the event was read from */
Window window; /* window of event */
Time time; /* server timestamp when event happened */
diff --git a/include/X11/fonts/FS.h b/include/X11/fonts/FS.h
index 2ea6cd7..fa4ff80 100644
--- a/include/X11/fonts/FS.h
+++ b/include/X11/fonts/FS.h
@@ -59,7 +59,7 @@ in this Software without prior written authorization from The Open Group.
#define FS_PROTOCOL_MINOR 0
#ifndef X_PROTOCOL
-/* protocol familes */
+/* protocol families */
#define FamilyInternet 0
#define FamilyDECnet 1
#define FamilyChaos 2
diff --git a/man/Xprint.man b/man/Xprint.man
index 3b254e4..6f96654 100644
--- a/man/Xprint.man
+++ b/man/Xprint.man
@@ -3,7 +3,7 @@
.SH NAME
Xprint \- The "X print service" - a portable, network-transparent printing system based on the X11 protocol
.SH SYNOPSIS
-Xprint is a very flexible, extensible, scaleable, client/server
+Xprint is a very flexible, extensible, scalable, client/server
print system based on ISO 10175 (and some other specs) and the X11
rendering protocol.
Using Xprint an application can search, query and use devices like
@@ -210,7 +210,7 @@ The most significant factors in which execution model to choose will be
driven by:
.TP 0.2i
\(bu
-how many printers will be accessable through the printer
+how many printers will be accessible through the printer
subsystem on any given machine. A system administrator may
choose to cluster printers on a few given machines, or
scatter them across an organization and possibly make
@@ -257,7 +257,7 @@ this model becomes very natural.
Startup would likely be done at session login or by
launching actions or processes manually once the user
-logs in. Note: Deamons like "dtpdmd" must be started after Xprt.
+logs in. Note: Daemons like "dtpdmd" must be started after Xprt.
.PP
.PP
Starting of the processes is straight forward. In strict order (example is for manually starting the X print server for CDEnext usage):
diff --git a/man/Xprint.sgml b/man/Xprint.sgml
index 96af582..f83a2c4 100644
--- a/man/Xprint.sgml
+++ b/man/Xprint.sgml
@@ -23,7 +23,7 @@ HTML generation can be done like this:
<refpurpose>The "X print service" - a portable, network-transparent printing system based on the X11 protocol</refpurpose>
</refnamediv>
<refsynopsisdiv>
- <para>Xprint is a very flexible, extensible, scaleable, client/server
+ <para>Xprint is a very flexible, extensible, scalable, client/server
print system based on ISO 10175 (and some other specs) and the X11
rendering protocol.
Using Xprint an application can search, query and use devices like
@@ -316,7 +316,7 @@ HTML generation can be done like this:
<itemizedlist>
<listitem>
<para>
- how many printers will be accessable through the printer
+ how many printers will be accessible through the printer
subsystem on any given machine. A system administrator may
choose to cluster printers on a few given machines, or
scatter them across an organization and possibly make
@@ -380,7 +380,7 @@ HTML generation can be done like this:
<para>
Startup would likely be done at session login or by
launching actions or processes manually once the user
- logs in. Note: Deamons like "dtpdmd" must be started after Xprt.
+ logs in. Note: Daemons like "dtpdmd" must be started after Xprt.
</para>
</listitem>
</itemizedlist>
diff --git a/presentproto.txt b/presentproto.txt
index 6221047..4a8e043 100644
--- a/presentproto.txt
+++ b/presentproto.txt
@@ -201,7 +201,7 @@ The name of this extension is "Present"
the client as soon as the PresentIdleNotify event has been
received. Note that if PresentCapabilityFence is set for the
associated CRTC, then clients should use fences to improve
- overall systme performance. If PresentCapabilityFence is not
+ overall system performance. If PresentCapabilityFence is not
set, then using fences offers no benefit, but also no cost.
If 'target-msc' is greater than the current msc for 'window',
diff --git a/randrproto.txt b/randrproto.txt
index 88f06cc..a26cb61 100644
--- a/randrproto.txt
+++ b/randrproto.txt
@@ -1973,7 +1973,7 @@ factors, such as re-cabling a monitor, etc.
This event is generated whenever a lease has been created or
destroyed and is sent to requesting clients. 'timestamp'
- indicates when the change happend. 'window' is the window
+ indicates when the change happened. 'window' is the window
selecting for this event.
❧❧❧❧❧❧❧❧❧❧❧
diff --git a/specs/XI2proto.txt b/specs/XI2proto.txt
index 440b0d0..9ba0201 100644
--- a/specs/XI2proto.txt
+++ b/specs/XI2proto.txt
@@ -198,7 +198,7 @@ the screen. A master keyboard is represented by a keyboard focus.
Each master pointer is paired with the respective master keyboard and vice
versa, and this pairing is constant for the lifetime of both input devices.
Clients can use this pairing behaviour to implement input paradigms that
-require pointer and keyboard interation (e.g. SHIFT + Click).
+require pointer and keyboard integration (e.g. SHIFT + Click).
[[hierarchy-slave]]
Slave devices
@@ -265,7 +265,7 @@ is chosen to provide the data for this request.
This ClientPointer may be explicitly assigned to a client with the
SetClientPointer call. If no ClientPointer is set when a client issues an
ambiguous request, the server choses one device as the ClientPointer. The
-method of chosing a ClientPointer from the available master pointers is
+method of choosing a ClientPointer from the available master pointers is
implementation-specific.
If the master pointer currently set as ClientPointer for one or more clients is
@@ -391,7 +391,7 @@ touch events as they occur on the device. If and when the client
becomes the owner of a touch sequence, a TouchOwnership event is sent to the
client. If the client is the initial owner of the sequence, the TouchBegin is
immediately followed by the TouchOwnership event. Otherwise, TouchUpdate events
-may preceed a TouchOwnership event. A client is not guaranteed to become the
+may precede a TouchOwnership event. A client is not guaranteed to become the
owner of any given touch sequence.
The server delivers touch events to all clients that have selected for
@@ -1399,7 +1399,7 @@ XIGrabDevice
This request actively grabs control of the specified input device. Further
input events from this device are reported only to the grabbing client.
-This request overides any previous active grab by this client for this
+This request overrides any previous active grab by this client for this
device. This request does not affect the processing of XI 2.2
touch events.
@@ -1802,7 +1802,7 @@ with mode XIPassiveGrabNotify are generated as if the pointer or focus
were to suddenly warp from its current position to some position in
the grab window. These events are sent to the grabbing client only
and only if the grab event mask has selected for it. If such a passive
-grab deactivates, addional LeaveNotify events with mode
+grab deactivates, additional LeaveNotify events with mode
XIPassiveUngrabNotify are generated and sent to the grabbing client
before the grab deactivates.
@@ -1902,7 +1902,7 @@ The type is uninterpreted by the server. The format specifies whether
the data should be viewed as a list of 8-bit, 16-bit, or 32-bit
quantities so that the server can correctly byte-swap as necessary.
-If the mode is Replace, the previous propert y value is discarded. If
+If the mode is Replace, the previous property value is discarded. If
the mode is Prepend or Append, then the type and format must match the
existing property value (or a Match error results). If the property is
undefined, it is treated as defined with the correct type and format
@@ -2149,20 +2149,20 @@ HierarchyEvent
flags: SETofHIERARCHYMASK}
flags
- Set of the changes that have occured, causing this event.
+ Set of the changes that have occurred, causing this event.
num_info
The number of device info structs following the request.
info:
The current hierarchy information.
An XIHierarchyEvent is sent whenever the device hierarchy been
-changed. The flags specify all types of hierarchy modifiations that have
-occured.
+changed. The flags specify all types of hierarchy modifications that have
+occurred.
For all devices, info details the hierarchy information after the
-modification of the hierarchy has occured. For each device specified with
+modification of the hierarchy has occurred. For each device specified with
deviceid:
-- if type is MasterPointer or MasterKeyboard, attachment decribes the
+- if type is MasterPointer or MasterKeyboard, attachment describes the
pairing of this device.
- if type is SlavePointer or SlaveKeyboard, attachment describes the
master device this device is attached to.
@@ -2285,7 +2285,7 @@ XI 2.2: The event type may also be TouchBegin, TouchUpdate, or TouchEnd.
sourceid
The source device that originally generated the event.
mods
- XKB modifier state before the event occured.
+ XKB modifier state before the event occurred.
group
XKB group state before the event.
buttons
@@ -2393,7 +2393,7 @@ when the device is grabbed by another client.
eventtype
- The type of event that occured on the device.
+ The type of event that occurred on the device.
detail
The button number, keycode or touch ID¹.
sourceid
@@ -2491,7 +2491,7 @@ zero if the device is a floating slave device.
window, then focus is True. Otherwise, focus is False. This field is
unspecified for focus in/out events.
mods
- XKB modifier state before the event occured.
+ XKB modifier state before the event occurred.
group
XKB group state before the event.
buttons_len
diff --git a/specs/XIproto.txt b/specs/XIproto.txt
index 1095a26..61ef41b 100644
--- a/specs/XIproto.txt
+++ b/specs/XIproto.txt
@@ -474,7 +474,7 @@ VALUATORCLASS is as follows:
axes
The axes field contains a pointer to an AXISINFO
- struture.
+ structure.
The information returned for each axis reported by the
device is:
@@ -630,7 +630,7 @@ by first_valuator and num_valuators are set. If the number of
valuators supported by the device is less than the expression
first_valuator + num_valuators, a Value error will result.
-If the request succeeds, Success is returned. If the specifed
+If the request succeeds, Success is returned. If the specified
device is grabbed by some other client, the request will fail
and a status of AlreadyGrabbed will be returned.
@@ -698,7 +698,7 @@ where
Errors: Length, Device, Match, Value
-ChangeDeviceControl changes the specifed device control
+ChangeDeviceControl changes the specified device control
according to the values specified in the DeviceControl
structure. The device control must be supported by the target
server and device or an error will result.
@@ -969,7 +969,7 @@ keycodes. Client programs may be running that depend on those
characteristics. For example, a client program could allocate
an array based on the number of buttons on the pointer device,
and then use the button numbers received in button events as
-indicies into that array. Changing the core devices could cause
+indices into that array. Changing the core devices could cause
such client programs to behave improperly or abnormally
terminate.
@@ -2546,7 +2546,7 @@ DeviceEnabled, the device is enabled and will generate events.
If the field is DeviceDisabled or DeviceRemoved, the given
device is disabled and stops sending events or was removed from
the server, respectively. If the field is DeviceUnrecoverable,
-an IO-error has occured on the device and the device is
+an IO-error has occurred on the device and the device is
forcibly disabled and removed by the server. If devchange is
DeviceControlChanged, control specifies the type of control
that has been changed.
diff --git a/specs/kbproto/appD.xml b/specs/kbproto/appD.xml
index 23aed05..147373b 100644
--- a/specs/kbproto/appD.xml
+++ b/specs/kbproto/appD.xml
@@ -26,7 +26,7 @@ v LISTofITEMs NAME
<para>
The MASK-EXPRESSION is an expression using C-style boolean operators and fields
of the request which specifies the bitmask used to determine whether or not a
-mem ber of the LISTofITEMs is present. If present, TYPE specifies the
+member of the LISTofITEMs is present. If present, TYPE specifies the
interpretation of the resulting bitmask and the values are listed using the
symbolic names of the members of the set. If TYPE is blank, the values are
numeric constants.
@@ -692,10 +692,10 @@ class, or feedback
1 KEYCODE new key
1 SETofKEYMASK mask
1 SETofKEYMASK real modifiers
-1 SETofKB_VMODSHIGH virtual modfiiers mask high
+1 SETofKB_VMODSHIGH virtual modifiers mask high
1 SETofKB_VMODSLOW virtual modifiers mask low
1 SETofKB_VMODSHIGH virtual modifiers high
-1 SETofKB_VMODSLOW virtual modfiers low
+1 SETofKB_VMODSLOW virtual modifiers low
</literallayout>
<literallayout class='monospaced'>1 18 type
diff --git a/specs/recordproto/record.xml b/specs/recordproto/record.xml
index 842a5d6..6b15895 100644
--- a/specs/recordproto/record.xml
+++ b/specs/recordproto/record.xml
@@ -177,7 +177,7 @@ experiments done under the auspices of the X Consortium xtest working
group. Although this was a group effort, the author remains
responsible for any errors or omissions.
Two years ago, Robert Chesler of Absol-puter, Kieron Drake of UniSoft
-Ltd., Marc Evans of Synergytics and Ken Miller of Digitial shared the
+Ltd., Marc Evans of Synergytics and Ken Miller of Digital shared the
vision of a standard extension for recording and were all instrumental
in the early protocol development. During the last two years, Bob
Scheifler of the X Consortium and Jim Fulton of NCD continuously
diff --git a/specs/scrnsaverproto/saver.xml b/specs/scrnsaverproto/saver.xml
index 2374218..b19f0f9 100644
--- a/specs/scrnsaverproto/saver.xml
+++ b/specs/scrnsaverproto/saver.xml
@@ -103,7 +103,7 @@ deactivates. At this time, the window is unmapped and is not accessible to any
client requests.
</para>
<para>
-The server's default mechanism is refered to as the <emphasis remap='I'>internal</emphasis> screen
+The server's default mechanism is referred to as the <emphasis remap='I'>internal</emphasis> screen
saver. An <emphasis remap='I'>external</emphasis>
screen saver client requires a means of determining the window
id for the screen saver window and setting the attributes (e.g. size,
@@ -126,7 +126,7 @@ Second, a screen saver program must control the actual RGB values sent to the
display tube to ensure that the values change periodically to avoid phosphor
burn in. Thus, the client must have a known colormap installed whenever the
screen saver window is displayed. To prevent screen flashing, the visual type
-of the screen saver window should also be controlable.
+of the screen saver window should also be controllable.
</para>
<para>
Third, some implementations may wish to destroy the screen saver window when
@@ -145,7 +145,7 @@ The Screen Saver extension is as follows:
<sect1 id="Types">
<title>Types</title>
<para>
-In adition to the comon types described in the core protocol, the following
+In addition to the common types described in the core protocol, the following
type is used in the request and event definitions in subsequent sections.
</para>
@@ -233,7 +233,7 @@ any of its siblings in the stacking order. XXX - TranslateCoords?
</para>
<para>
The <emphasis remap='I'>state</emphasis> field specifies whether or not the screen saver is currently
-active and how the <emphasis remap='I'>til-or-since</emphasis> value should be interpretted:
+active and how the <emphasis remap='I'>til-or-since</emphasis> value should be interpreted:
</para>
<informaltable frame="none">
@@ -826,7 +826,7 @@ The format of the events generated is:
typedef struct {
int type; /* of event */
unsigned long serial; /* # of last request processed by server */
- Bool send_event; /* true if this came frome a SendEvent request */
+ Bool send_event; /* true if this came from a SendEvent request */
Display *display; /* Display the event was read from */
Window window; /* screen saver window */
Window root; /* root window of event screen */
diff --git a/specs/xextproto/appgrp.xml b/specs/xextproto/appgrp.xml
index 0f91e16..5e27a63 100644
--- a/specs/xextproto/appgrp.xml
+++ b/specs/xextproto/appgrp.xml
@@ -233,7 +233,7 @@ If single_screen is set to True default_root specifies which screen will be retu
<para>
-If single_screen is set to True the root_visual and default_colormap attributes may be used to over-ride the default values that are returned in the connection setup information returned to new programs in the Application Group. If None is specified for root_visual or default_colormap then the normal default values for the screen (possibly spedified by default_root) are used, otherwise the specified values are used. If root_visual and/or default_colormap are specified they must be valid, i.e. root_visual must be a visual type available on the screen, and the colormap, if specified, must be a valid colormap for the visual that is used.
+If single_screen is set to True the root_visual and default_colormap attributes may be used to over-ride the default values that are returned in the connection setup information returned to new programs in the Application Group. If None is specified for root_visual or default_colormap then the normal default values for the screen (possibly specified by default_root) are used, otherwise the specified values are used. If root_visual and/or default_colormap are specified they must be valid, i.e. root_visual must be a visual type available on the screen, and the colormap, if specified, must be a valid colormap for the visual that is used.
</para>
<para>
@@ -409,7 +409,7 @@ The Application Group Leader must not select SubstructuRedirect events on a root
<title>MapRequest</title>
<para>
-When a MapWindow request is received for a window whose override-redirect attribut is set to False and whose parent is the root window and the window belongs to an application that is in an application group and there is an application group leader for the group, then this event is delivered to the Application Group Leader with the parent field in the event set to the AppGroup ID. Otherwise the core protocol semantics apply.
+When a MapWindow request is received for a window whose override-redirect attribute is set to False and whose parent is the root window and the window belongs to an application that is in an application group and there is an application group leader for the group, then this event is delivered to the Application Group Leader with the parent field in the event set to the AppGroup ID. Otherwise the core protocol semantics apply.
</para>
</sect2>
@@ -417,7 +417,7 @@ When a MapWindow request is received for a window whose override-redirect attrib
<title>ConfigureRequest</title>
<para>
-When a ConfigureWindow request is received for a window whose override-redirect attribut is set to False and whose parent is the root window and the window belongs to an application that is in an application group and there is an application group leader for the group, then this event is delivered to the Application Group Leader with the parent field in the event set to the AppGroup ID. Otherwise the core protocol semantics apply.
+When a ConfigureWindow request is received for a window whose override-redirect attribute is set to False and whose parent is the root window and the window belongs to an application that is in an application group and there is an application group leader for the group, then this event is delivered to the Application Group Leader with the parent field in the event set to the AppGroup ID. Otherwise the core protocol semantics apply.
</para>
</sect2>
diff --git a/specs/xextproto/dbe.xml b/specs/xextproto/dbe.xml
index 5af90a6..7b09f5a 100644
--- a/specs/xextproto/dbe.xml
+++ b/specs/xextproto/dbe.xml
@@ -236,7 +236,7 @@ is cleared.
</itemizedlist>
<para>
The effect of passing a window to a request that accepts a DRAWABLE is
-unchanged by this extension. The window and front buffer are synonomous with
+unchanged by this extension. The window and front buffer are synonymous with
each other. This includes obeying the <function>GetImage</function> semantics
and the subwindow-mode semantics if a core graphics context is involved.
Regardless of whether the window was explicitly passed in a
diff --git a/specs/xextproto/dpms.xml b/specs/xextproto/dpms.xml
index 823344d..7edfe5c 100644
--- a/specs/xextproto/dpms.xml
+++ b/specs/xextproto/dpms.xml
@@ -108,7 +108,7 @@ to enforce this rule.
</para>
<para>
-Note however that a concious decision is made to decouple the timeouts
+Note however that a conscious decision is made to decouple the timeouts
associated with screen saver from the DPMS timeouts. While it might be
considered logical to require that the first non-zero DPMS timeout be
greater than or equal to the screen saver timeout, this is intentionally
@@ -273,7 +273,7 @@ final level of power savings is invoked. Off mode's physical and electrical
characteristics are implementation defined, but in DPMS compliant hardware,
is implemented by shutting off both horizontal and vertical sync signals,
resulting in the power-down of the monitor. Recovery time is implementation
-dependant, but frequently is similar to the power-up time of the monitor. A
+dependent, but frequently is similar to the power-up time of the monitor. A
value of zero indicates that this mode is disabled.
</para>
diff --git a/specs/xextproto/evi.xml b/specs/xextproto/evi.xml
index 7b661f6..e47feb1 100644
--- a/specs/xextproto/evi.xml
+++ b/specs/xextproto/evi.xml
@@ -46,7 +46,7 @@ OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-
INFRINGEMENT. IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER USEABILITIY, WHETHER IN AN ACTION OF
CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF, OR IN
-CONNNECTION WITH THE SOFTWARE OR THE USE OF OTHER DEALINGS IN
+CONNECTION WITH THE SOFTWARE OR THE USE OF OTHER DEALINGS IN
THE SOFTWARE.
</para>
diff --git a/specs/xextproto/security.xml b/specs/xextproto/security.xml
index 93073c5..35f3395 100644
--- a/specs/xextproto/security.xml
+++ b/specs/xextproto/security.xml
@@ -530,7 +530,7 @@ a root window destination.)
</para>
<orderedlist>
<listitem>
- <para>The propogate field of SendEvent is False.</para>
+ <para>The propagate field of SendEvent is False.</para>
</listitem>
<listitem>
<para>
@@ -838,7 +838,7 @@ forward client connections to servers that do not meet the criteria.
To use this authorization method, the client (or proxy) sends
"XC-QUERY-SECURITY-1" as the authorization-protocol-name in the initial
connection setup message. The authorization-protocol-data may be empty or
-may contain additional security criteria desribed below. If the success
+may contain additional security criteria described below. If the success
field of the server's reply is Authenticate, the server supports the
security extension, and the server meets all specified additional security
criteria. In this case, the client should resend the initial connection
@@ -1289,7 +1289,7 @@ name and name_length fields of auth_in should be initialized to the
authorization protocol name and its length in characters respectively.
If there is authorization data, the data and data_length fields of
auth_in should be initialized to the data and its length in characters
-respectivley. The library does not assume that name and data are
+respectively. The library does not assume that name and data are
null-terminated strings. The auth_in argument must be freed with
<xref linkend='XSecurityFreeXauth' xrefstyle='select: title'/>.
</para>
@@ -1380,7 +1380,7 @@ name that was passed in, and the data and data_length fields will be set to
the authorization data returned by the server. The caller should not assume
that name and data are null-terminated strings. If no authorization data was
returned by the server, the data and data_length fields will be set to NULL
-and zero repectively. The returned Xauth structure must be freed with
+and zero respectively. The returned Xauth structure must be freed with
<xref linkend='XSecurityFreeXauth' xrefstyle='select: title'/>; the caller should not use any other
means free the structure or any of its components. The auth_id_return
argument will be filled in with the non-zero authorization id of the created
diff --git a/specs/xextproto/shm.xml b/specs/xextproto/shm.xml
index f6ad347..8e04e7d 100644
--- a/specs/xextproto/shm.xml
+++ b/specs/xextproto/shm.xml
@@ -81,7 +81,7 @@ be able to use this extension, your system must provide the SYSV shared
memory primitives. There is not an mmap-based version of this extension.
To use shared memory on Sun systems, you must have built your kernel with
SYSV shared memory enabled -- which is not the default configuration.
-Additionally, the shared memeory maximum size will need to be increased on
+Additionally, the shared memory maximum size will need to be increased on
both Sun and Digital systems; the defaults are far too small for any useful
work.
</para>
diff --git a/specs/xextproto/tog-cup.xml b/specs/xextproto/tog-cup.xml
index a35ff8c..c59e768 100644
--- a/specs/xextproto/tog-cup.xml
+++ b/specs/xextproto/tog-cup.xml
@@ -49,7 +49,7 @@ OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-
INFRINGEMENT. IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF, OR IN
-CONNNECTION WITH THE SOFTWARE OR THE USE OF OTHER DEALINGS IN
+CONNECTION WITH THE SOFTWARE OR THE USE OF OTHER DEALINGS IN
THE SOFTWARE.
</para>
<para>
@@ -80,7 +80,7 @@ colormap flashing.
</para>
<para>
-To encourage colormap sharing and accomodate special colormap requirements
+To encourage colormap sharing and accommodate special colormap requirements
two new protocols are defined: the first provides a way to query the
server for a list of reserved colormap entries, and the second is a way
to initialize read-only (shareable) colormap entries at specific locations
@@ -555,7 +555,7 @@ proper location) in its private colormap using XCupStoreColors.
<para>
Applications which allocate many colors in a screen's default colormap, e.g.
a color-cube or a gray-ramp, should allocate them with XCupStoreColors. By
-using XCupStoreColors the colors will be allocated sharable (read-only) and
+using XCupStoreColors the colors will be allocated shareable (read-only) and
any other application which allocates the same color will share that color
cell.
</para>
diff --git a/specs/xproto/glossary.xml b/specs/xproto/glossary.xml
index 61233e3..eefd327 100644
--- a/specs/xproto/glossary.xml
+++ b/specs/xproto/glossary.xml
@@ -350,7 +350,7 @@ These events can be generated either asynchronously from devices
or as side effects of client requests.
Events are grouped into types.
The server never sends events to a client unless the
-client has specificially asked to be informed of that type of event.
+client has specifically asked to be informed of that type of event.
However, other clients can force events to be sent to other clients.
Events are typically reported relative to a window.
<!-- .KE -->
diff --git a/specs/xproto/keysyms.xml b/specs/xproto/keysyms.xml
index e2fa0d0..9999f8d 100644
--- a/specs/xproto/keysyms.xml
+++ b/specs/xproto/keysyms.xml
@@ -1181,7 +1181,7 @@ terminals.
<para>
The KEYSYM number range #x10000000 to #x1FFFFFFF is available for
-vendor-specific extentions. Among these, the range #x11000000 to
+vendor-specific extensions. Among these, the range #x11000000 to
#x1100FFFF is designated for keypad KEYSYMs.
</para>
</sect1>
diff --git a/specs/xproto/sect1-9.xml b/specs/xproto/sect1-9.xml
index f8e8b7c..c59def1 100644
--- a/specs/xproto/sect1-9.xml
+++ b/specs/xproto/sect1-9.xml
@@ -2,7 +2,7 @@
<preface id="acknowledgements">
<title>Acknowledgements</title>
<para>
-The primary contributers to the X11 protocol are:
+The primary contributors to the X11 protocol are:
</para>
<itemizedlist>
diff --git a/xv-protocol-v2.txt b/xv-protocol-v2.txt
index ab65195..d863185 100644
--- a/xv-protocol-v2.txt
+++ b/xv-protocol-v2.txt
@@ -551,7 +551,7 @@
motion video. If motion is False, the requested size is intended
for use with stills only.
- The retuned size is also chosen to maintain the requested aspect ratio
+ The returned size is also chosen to maintain the requested aspect ratio
if possible.
Errors: {Port}
More information about the xorg-commit
mailing list