summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2012-02-29 14:56:37 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2012-03-02 10:49:59 +1000
commit9a2e10213c996010124a3d58e71140f41202416c (patch)
tree8733176c7d235eb422b94402325f80d283570ae9
parent5e18f74e24a17d6a1f18339600a00f5591dc6a82 (diff)
specs: fix typos 'hierachy' → 'hierarchy'
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
-rw-r--r--specs/XI2proto.txt16
1 files changed, 8 insertions, 8 deletions
diff --git a/specs/XI2proto.txt b/specs/XI2proto.txt
index 21c7203..e438fd0 100644
--- a/specs/XI2proto.txt
+++ b/specs/XI2proto.txt
@@ -32,7 +32,7 @@ XI2 provides a number of enhancements over version 1.5, including:
- use of XGE and GenericEvents. GenericEvents are of flexible length with a
minimum length of 32 bytes.
- explicit device hierarchy of master and slave devices. See Section
-<<hierachy,The Master/Slave device hierarchy>>.
+<<hierarchy,The Master/Slave device hierarchy>>.
- use of multiple independent master devices (Multi-Poiner X or MPX).
- the ability for devices to change capabilities at runtime.
- raw device events
@@ -176,14 +176,14 @@ marked Preferred or more than one valuator is marked with Preferred for this
scroll direction, this should be considered a driver bug and the behaviour
is implementation-dependent.
-[[hierachy]]
+[[hierarchy]]
The Master/Slave device hierarchy
---------------------------------
XI2 introduces a device hierarchy split up into so-called Master Devices (MD)
and Slave Devices (SD).
-[[hierachy-master]]
+[[hierarchy-master]]
Master devices
~~~~~~~~~~~~~~
An MD is a virtual device created and managed by the server. MDs may send core
@@ -197,7 +197,7 @@ 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).
-[[hierachy-slave]]
+[[hierarchy-slave]]
Slave devices
~~~~~~~~~~~~~
An SD is usually a physical device configured in the server. SDs are not
@@ -217,7 +217,7 @@ If an event is generated by an SD
Both the sprite and the focus must be managed explicitly by the client
program.
-[[hierachy-dcce]]
+[[hierarchy-dcce]]
Event processing for attached slave devices
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1093,7 +1093,7 @@ or the device is removed, whichever comes earlier.
If deviceid does not specify a master pointer, a BadDevice error
is returned.
-[[requests-changehierachy]]
+[[requests-changehierarchy]]
┌───
XIChangeHierarchy
num_changes: CARD8
@@ -1130,7 +1130,7 @@ is returned.
deviceid: DEVICEID }
XIChangeHierarchy allows a client to modify the
-<<hierachy,Master/Slave device hierarchy>>.
+<<hierarchy,Master/Slave device hierarchy>>.
num_changes
The number of changes to apply to the current hierarchy.
@@ -1975,7 +1975,7 @@ All events have a set of common fields specified as EVENTHEADER.
Events introduced in version 2.0
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-[[events-hierachyevent]]
+[[events-hierarchyevent]]
┌───
HierarchyEvent:
EVENTHEADER