spec: Add zone attributes to indexterm tags for more stable link ids

Use named id's instead of autogenerating idXXXXXX values that change
in different versions so that it's easier to have stable links.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

1 files changed, 272 insertions, 267 deletions

diff --git a/specs/sect1-9.xml b/specs/sect1-9.xml
index aaf5719..5976546 100644
--- a/specs/sect1-9.xml
+++ b/specs/sect1-9.xml
@@ -79,12 +79,12 @@ X Consortium, Inc.
 
   <section id="request_format">
     <title>Request Format</title>
-    <indexterm significance="preferred"><primary>Request</primary><secondary>format</secondary></indexterm>
+    <indexterm zone="request_format" significance="preferred"><primary>Request</primary><secondary>format</secondary></indexterm>
     <para>
-Every request contains an 8-bit <firstterm>major opcode</firstterm>
-<indexterm significance="preferred"><primary>Opcode</primary><secondary>major</secondary></indexterm>
-and a 16-bit <firstterm>length field</firstterm>
-<indexterm significance="preferred"><primary>Request</primary><secondary>length</secondary></indexterm>
+Every request contains an 8-bit <firstterm id="major_opcode">major opcode</firstterm>
+<indexterm zone="major_opcode" significance="preferred"><primary>Opcode</primary><secondary>major</secondary></indexterm>
+and a 16-bit <firstterm id="request_length">length field</firstterm>
+<indexterm zone="request_length" significance="preferred"><primary>Request</primary><secondary>length</secondary></indexterm>
 expressed in units of four bytes.
 Every request consists of four bytes of a header
 (containing the major opcode, the length field, and a data byte)
@@ -95,25 +95,26 @@ the request.
 If the specified length is smaller or larger than the required length,
 an error is generated.
 Unused bytes in a request are not required to be zero.
-Major opcodes 128 through 255 are reserved for extensions.
-<indexterm><primary>Extension</primary></indexterm>
+Major opcodes 128 through 255 are reserved for 
+<firstterm id="extension">extensions</firstterm>.
+<indexterm zone="extension"><primary>Extension</primary></indexterm>
 Extensions are intended to contain multiple requests,
-so extension requests typically have an additional <firstterm>minor
-opcode</firstterm> encoded
+so extension requests typically have an additional 
+<firstterm id="minor_opcode">minor opcode</firstterm> encoded
 in the second data byte in the request header.
-<indexterm significance="preferred"><primary>Opcode</primary><secondary>minor</secondary></indexterm>
+<indexterm zone="minor_opcode" significance="preferred"><primary>Opcode</primary><secondary>minor</secondary></indexterm>
 However, the placement and interpretation of this minor opcode and of all
 other fields in extension requests are not defined by the core protocol.
 Every request on a given connection is implicitly assigned a
-<firstterm>sequence number</firstterm>,
-<indexterm significance="preferred"><primary>Sequence number</primary></indexterm>
+<firstterm id="sequence_number">sequence number</firstterm>,
+<indexterm zone="sequence_number" significance="preferred"><primary>Sequence number</primary></indexterm>
 starting with one, that is used in replies, errors, and events.
     </para>
   </section>
 
   <section id="reply_format">
     <title>Reply Format</title>
-    <indexterm significance="preferred"><primary>Reply</primary><secondary>format</secondary></indexterm>
+    <indexterm zone="reply_format" significance="preferred"><primary>Reply</primary><secondary>format</secondary></indexterm>
     <para>
 Every <firstterm>reply</firstterm> contains a 32-bit length field
 expressed in units of four bytes.
@@ -127,13 +128,15 @@ of the corresponding request.
 
   <section id="error_format">
     <title>Error Format</title>
-    <indexterm significance="preferred"><primary>Error report</primary><secondary>format</secondary></indexterm>
+    <indexterm zone="error_format" significance="preferred"><primary>Error report</primary><secondary>format</secondary></indexterm>
     <para>
 Error reports are 32 bytes long.
 Every error includes an 8-bit error code.
+<phrase id="errors:extensions">
 Error codes 128 through 255 are reserved for extensions.
-<indexterm significance="preferred"><primary>Error Codes</primary><secondary>extensions</secondary></indexterm>
-<indexterm significance="preferred"><primary>Extension</primary><secondary>error codes</secondary></indexterm>
+</phrase>
+<indexterm zone="errors:extensions" significance="preferred"><primary>Error Codes</primary><secondary>extensions</secondary></indexterm>
+<indexterm zone="errors:extensions" significance="preferred"><primary>Extension</primary><secondary>error codes</secondary></indexterm>
 Every error also includes the major and minor opcodes of the failed request
 and the least significant 16 bits of the sequence number of the request.
 For the following errors (see <link linkend="errors">section 4</link>),
@@ -160,7 +163,7 @@ Unused bytes within an error are not guaranteed to be zero.
 
   <section id="event_format">
     <title>Event Format</title>
-    <indexterm significance="preferred"><primary>Event</primary><secondary>format</secondary></indexterm>
+    <indexterm zone="event_format" significance="preferred"><primary>Event</primary><secondary>format</secondary></indexterm>
     <para>
 <firstterm>Events</firstterm> are 32 bytes long.
 Unused bytes within an event are not guaranteed to be zero.
@@ -168,10 +171,12 @@ Every event contains an 8-bit type code.
 The most significant bit in this code is set if the event was generated from a
 <link linkend="requests:SendEvent"><emphasis role='bold'>SendEvent</emphasis></link>
 request.
+<phrase id="events:extensions">
 Event codes 64 through 127 are reserved for extensions, although the core
 protocol does not define a mechanism for selecting interest in such events.
-<indexterm significance="preferred"><primary>Event</primary><secondary>extension</secondary></indexterm>
-<indexterm significance="preferred"><primary>Extension</primary><secondary>event</secondary></indexterm>
+</phrase>
+<indexterm zone="events:extensions" significance="preferred"><primary>Event</primary><secondary>extension</secondary></indexterm>
+<indexterm zone="events:extensions" significance="preferred"><primary>Extension</primary><secondary>event</secondary></indexterm>
 Every core event (with the exception of
 <link linkend="events:KeymapNotify"><emphasis role='bold'>KeymapNotify</emphasis></link>)
 also contains the least significant 16 bits of the sequence number of the last
@@ -269,7 +274,7 @@ in the following format:
   </thead>
   <tbody>
     <row rowsep="0">
-      <entry>LISTofFOO<indexterm significance="preferred"><primary>Types</primary><secondary>LISTofFOO</secondary></indexterm></entry>
+      <entry id="types:LISTofFOO">LISTofFOO<indexterm zone="types:LISTofFOO" significance="preferred"><primary>Types</primary><secondary>LISTofFOO</secondary></indexterm></entry>
       <entry>
 
 A type name of the form LISTofFOO means a counted list of elements of type
@@ -282,7 +287,7 @@ zero-length lists are legal.
       </entry>
     </row>
     <row rowsep="0">
-      <entry><para>BITMASK<indexterm significance="preferred"><primary>Types</primary><secondary>BITMASK</secondary></indexterm></para><para>LISTofVALUE<indexterm significance="preferred"><primary>Types</primary><secondary>LISTofVALUE</secondary></indexterm></para></entry>
+      <entry><para id="types:BITMASK">BITMASK<indexterm zone="types:BITMASK" significance="preferred"><primary>Types</primary><secondary>BITMASK</secondary></indexterm></para><para id="types:LISTofVALUE">LISTofVALUE<indexterm zone="types:LISTofVALUE" significance="preferred"><primary>Types</primary><secondary>LISTofVALUE</secondary></indexterm></para></entry>
       <entry>
 <para>
 The types BITMASK and LISTofVALUE are somewhat special.
@@ -313,90 +318,90 @@ The values of the unused bytes do not matter.
       </entry>
     </row>
     <row rowsep="0">
-      <entry>OR<indexterm significance="preferred"><primary>Types</primary><secondary>OR</secondary></indexterm></entry>
+      <entry id="types:OR">OR<indexterm zone="types:OR" significance="preferred"><primary>Types</primary><secondary>OR</secondary></indexterm></entry>
       <entry>
 A type of the form "T1 or ... or Tn" means the union of the indicated types.
 A single-element type is given as the element without enclosing braces.
       </entry>
     </row>
     <row rowsep="0">
-      <entry>WINDOW<indexterm significance="preferred"><primary>Types</primary><secondary>WINDOW</secondary></indexterm></entry>
+      <entry id="types:WINDOW">WINDOW<indexterm zone="types:WINDOW" significance="preferred"><primary>Types</primary><secondary>WINDOW</secondary></indexterm></entry>
       <entry>32-bit value (top three bits guaranteed to be zero)</entry>
     </row>
     <row rowsep="0">
-      <entry>PIXMAP<indexterm significance="preferred"><primary>Types</primary><secondary>PIXMAP</secondary></indexterm></entry>
+      <entry id="types:PIXMAP">PIXMAP<indexterm zone="types:PIXMAP" significance="preferred"><primary>Types</primary><secondary>PIXMAP</secondary></indexterm></entry>
       <entry>32-bit value (top three bits guaranteed to be zero)</entry>
     </row>
     <row rowsep="0">
-      <entry>CURSOR<indexterm significance="preferred"><primary>Types</primary><secondary>CURSOR</secondary></indexterm></entry>
+      <entry id="types:CURSOR">CURSOR<indexterm zone="types:CURSOR" significance="preferred"><primary>Types</primary><secondary>CURSOR</secondary></indexterm></entry>
       <entry>32-bit value (top three bits guaranteed to be zero)</entry>
     </row>
     <row rowsep="0">
-      <entry>FONT<indexterm significance="preferred"><primary>Types</primary><secondary>FONT</secondary></indexterm></entry>
+      <entry id="types:FONT">FONT<indexterm zone="types:FONT" significance="preferred"><primary>Types</primary><secondary>FONT</secondary></indexterm></entry>
       <entry>32-bit value (top three bits guaranteed to be zero)</entry>
     </row>
     <row rowsep="0">
-      <entry>GCONTEXT<indexterm significance="preferred"><primary>Types</primary><secondary>GCONTEXT</secondary></indexterm></entry>
+      <entry id="types:GCONTEXT">GCONTEXT<indexterm zone="types:GCONTEXT" significance="preferred"><primary>Types</primary><secondary>GCONTEXT</secondary></indexterm></entry>
       <entry>32-bit value (top three bits guaranteed to be zero)</entry>
     </row>
     <row rowsep="0">
-      <entry>COLORMAP<indexterm significance="preferred"><primary>Types</primary><secondary>COLORMAP</secondary></indexterm></entry>
+      <entry id="types:COLORMAP">COLORMAP<indexterm zone="types:COLORMAP" significance="preferred"><primary>Types</primary><secondary>COLORMAP</secondary></indexterm></entry>
       <entry>32-bit value (top three bits guaranteed to be zero)</entry>
     </row>
     <row rowsep="0">
-      <entry>DRAWABLE<indexterm significance="preferred"><primary>Types</primary><secondary>DRAWABLE</secondary></indexterm></entry>
+      <entry id="types:DRAWABLE">DRAWABLE<indexterm zone="types:DRAWABLE" significance="preferred"><primary>Types</primary><secondary>DRAWABLE</secondary></indexterm></entry>
       <entry>WINDOW or PIXMAP</entry>
     </row>
     <row rowsep="0">
-      <entry>FONTABLE<indexterm significance="preferred"><primary>Types</primary><secondary>FONTABLE</secondary></indexterm></entry>
+      <entry id="types:FONTABLE">FONTABLE<indexterm zone="types:FONTABLE" significance="preferred"><primary>Types</primary><secondary>FONTABLE</secondary></indexterm></entry>
       <entry>FONT or GCONTEXT</entry>
     </row>
     <row rowsep="0">
-      <entry>ATOM<indexterm significance="preferred"><primary>Types</primary><secondary>ATOM</secondary></indexterm></entry>
+      <entry id="types:ATOM">ATOM<indexterm zone="types:ATOM" significance="preferred"><primary>Types</primary><secondary>ATOM</secondary></indexterm></entry>
       <entry>32-bit value (top three bits guaranteed to be zero)</entry>
     </row>
     <row rowsep="0">
-      <entry>VISUALID<indexterm significance="preferred"><primary>Types</primary><secondary>VISUALID</secondary></indexterm></entry>
+      <entry id="types:VISUALID">VISUALID<indexterm zone="types:VISUALID" significance="preferred"><primary>Types</primary><secondary>VISUALID</secondary></indexterm></entry>
       <entry>32-bit value (top three bits guaranteed to be zero)</entry>
     </row>
     <row rowsep="0">
-      <entry>VALUE<indexterm significance="preferred"><primary>Types</primary><secondary>VALUE</secondary></indexterm></entry>
+      <entry id="types:VALUE">VALUE<indexterm zone="types:VALUE" significance="preferred"><primary>Types</primary><secondary>VALUE</secondary></indexterm></entry>
       <entry>32-bit quantity (used only in LISTofVALUE)</entry>
     </row>
     <row rowsep="0">
-      <entry>BYTE<indexterm significance="preferred"><primary>Types</primary><secondary>BYTE</secondary></indexterm></entry>
+      <entry id="types:BYTE">BYTE<indexterm zone="types:BYTE" significance="preferred"><primary>Types</primary><secondary>BYTE</secondary></indexterm></entry>
       <entry>8-bit value</entry>
     </row>
     <row rowsep="0">
-      <entry>INT8<indexterm significance="preferred"><primary>Types</primary><secondary>INT8</secondary></indexterm></entry>
+      <entry id="types:INT8">INT8<indexterm zone="types:INT8" significance="preferred"><primary>Types</primary><secondary>INT8</secondary></indexterm></entry>
       <entry>8-bit signed integer</entry>
     </row>
     <row rowsep="0">
-      <entry>INT16<indexterm significance="preferred"><primary>Types</primary><secondary>INT16</secondary></indexterm></entry>
+      <entry id="types:INT16">INT16<indexterm zone="types:INT16" significance="preferred"><primary>Types</primary><secondary>INT16</secondary></indexterm></entry>
       <entry>16-bit signed integer</entry>
     </row>
     <row rowsep="0">
-      <entry>INT32<indexterm significance="preferred"><primary>Types</primary><secondary>INT32</secondary></indexterm></entry>
+      <entry id="types:INT32">INT32<indexterm zone="types:INT32" significance="preferred"><primary>Types</primary><secondary>INT32</secondary></indexterm></entry>
       <entry>32-bit signed integer</entry>
     </row>
     <row rowsep="0">
-      <entry>CARD8<indexterm significance="preferred"><primary>Types</primary><secondary>CARD8</secondary></indexterm></entry>
+      <entry id="types:CARD8">CARD8<indexterm zone="types:CARD8" significance="preferred"><primary>Types</primary><secondary>CARD8</secondary></indexterm></entry>
       <entry>8-bit unsigned integer</entry>
     </row>
     <row rowsep="0">
-      <entry>CARD16<indexterm significance="preferred"><primary>Types</primary><secondary>CARD16</secondary></indexterm></entry>
+      <entry id="types:CARD16">CARD16<indexterm zone="types:CARD16" significance="preferred"><primary>Types</primary><secondary>CARD16</secondary></indexterm></entry>
       <entry>16-bit unsigned integer</entry>
     </row>
     <row rowsep="0">
-      <entry>CARD32<indexterm significance="preferred"><primary>Types</primary><secondary>CARD32</secondary></indexterm></entry>
+      <entry id="types:CARD32">CARD32<indexterm zone="types:CARD32" significance="preferred"><primary>Types</primary><secondary>CARD32</secondary></indexterm></entry>
       <entry>32-bit unsigned integer</entry>
     </row>
     <row rowsep="0">
-      <entry>TIMESTAMP<indexterm significance="preferred"><primary>Types</primary><secondary>TIMESTAMP</secondary></indexterm></entry>
+      <entry id="types:TIMESTAMP">TIMESTAMP<indexterm zone="types:TIMESTAMP" significance="preferred"><primary>Types</primary><secondary>TIMESTAMP</secondary></indexterm></entry>
       <entry>CARD32</entry>
     </row>
     <row rowsep="0">
-      <entry>BITGRAVITY<indexterm significance="preferred"><primary>Types</primary><secondary>BITGRAVITY</secondary></indexterm></entry>
+      <entry id="types:BITGRAVITY">BITGRAVITY<indexterm zone="types:BITGRAVITY" significance="preferred"><primary>Types</primary><secondary>BITGRAVITY</secondary></indexterm></entry>
       <entry>
 { <emphasis role='bold'>Forget</emphasis>,
 <emphasis role='bold'>Static</emphasis>,
@@ -412,7 +417,7 @@ A single-element type is given as the element without enclosing braces.
       </entry>
     </row>
     <row rowsep="0">
-      <entry>WINGRAVITY<indexterm significance="preferred"><primary>Types</primary><secondary>WINGRAVITY</secondary></indexterm></entry>
+      <entry id="types:WINGRAVITY">WINGRAVITY<indexterm zone="types:WINGRAVITY" significance="preferred"><primary>Types</primary><secondary>WINGRAVITY</secondary></indexterm></entry>
       <entry>
 { <emphasis role='bold'>Unmap</emphasis>,
 <emphasis role='bold'>Static</emphasis>,
@@ -428,14 +433,14 @@ A single-element type is given as the element without enclosing braces.
       </entry>
     </row>
     <row rowsep="0">
-      <entry>BOOL<indexterm significance="preferred"><primary>Types</primary><secondary>BOOL</secondary></indexterm></entry>
+      <entry id="types:BOOL">BOOL<indexterm zone="types:BOOL" significance="preferred"><primary>Types</primary><secondary>BOOL</secondary></indexterm></entry>
       <entry>
 { <emphasis role='bold'>True</emphasis>,
 <emphasis role='bold'>False</emphasis> }
       </entry>
     </row>
     <row rowsep="0">
-      <entry>EVENT<indexterm significance="preferred"><primary>Types</primary><secondary>EVENT</secondary></indexterm></entry>
+      <entry id="types:EVENT">EVENT<indexterm zone="types:EVENT" significance="preferred"><primary>Types</primary><secondary>EVENT</secondary></indexterm></entry>
       <entry>
 { <emphasis role='bold'>KeyPress</emphasis>,
 <emphasis role='bold'>KeyRelease</emphasis>,
@@ -465,7 +470,7 @@ A single-element type is given as the element without enclosing braces.
       </entry>
     </row>
     <row rowsep="0">
-      <entry>POINTEREVENT<indexterm significance="preferred"><primary>Types</primary><secondary>POINTEREVENT</secondary></indexterm></entry>
+      <entry id="types:POINTEREVENT">POINTEREVENT<indexterm zone="types:POINTEREVENT" significance="preferred"><primary>Types</primary><secondary>POINTEREVENT</secondary></indexterm></entry>
       <entry>
 { <emphasis role='bold'>ButtonPress</emphasis>,
 <emphasis role='bold'>ButtonRelease</emphasis>,
@@ -483,7 +488,7 @@ A single-element type is given as the element without enclosing braces.
       </entry>
     </row>
     <row rowsep="0">
-      <entry>DEVICEEVENT<indexterm significance="preferred"><primary>Types</primary><secondary>DEVICEEVENT</secondary></indexterm></entry>
+      <entry id="types:DEVICEEVENT">DEVICEEVENT<indexterm zone="types:DEVICEEVENT" significance="preferred"><primary>Types</primary><secondary>DEVICEEVENT</secondary></indexterm></entry>
       <entry>
 { <emphasis role='bold'>KeyPress</emphasis>,
 <emphasis role='bold'>KeyRelease</emphasis>,
@@ -499,19 +504,19 @@ A single-element type is given as the element without enclosing braces.
       </entry>
     </row>
     <row rowsep="0">
-      <entry>KEYSYM<indexterm significance="preferred"><primary>Types</primary><secondary>KEYSYM</secondary></indexterm></entry>
+      <entry id="types:KEYSYM">KEYSYM<indexterm zone="types:KEYSYM" significance="preferred"><primary>Types</primary><secondary>KEYSYM</secondary></indexterm></entry>
       <entry>32-bit value (top three bits guaranteed to be zero)</entry>
     </row>
     <row rowsep="0">
-      <entry>KEYCODE<indexterm significance="preferred"><primary>Types</primary><secondary>KEYCODE</secondary></indexterm></entry>
+      <entry id="types:KEYCODE">KEYCODE<indexterm zone="types:KEYCODE" significance="preferred"><primary>Types</primary><secondary>KEYCODE</secondary></indexterm></entry>
       <entry>CARD8</entry>
     </row>
     <row rowsep="0">
-      <entry>BUTTON<indexterm significance="preferred"><primary>Types</primary><secondary>BUTTON</secondary></indexterm></entry>
+      <entry id="types:BUTTON">BUTTON<indexterm zone="types:BUTTON" significance="preferred"><primary>Types</primary><secondary>BUTTON</secondary></indexterm></entry>
       <entry>CARD8</entry>
     </row>
     <row rowsep="0">
-      <entry>KEYMASK<indexterm significance="preferred"><primary>Types</primary><secondary>KEYMASK</secondary></indexterm></entry>
+      <entry id="types:KEYMASK">KEYMASK<indexterm zone="types:KEYMASK" significance="preferred"><primary>Types</primary><secondary>KEYMASK</secondary></indexterm></entry>
       <entry>
 { <emphasis role='bold'>Shift</emphasis>,
 <emphasis role='bold'>Lock</emphasis>,
@@ -524,7 +529,7 @@ A single-element type is given as the element without enclosing braces.
       </entry>
     </row>
     <row rowsep="0">
-      <entry>BUTMASK<indexterm significance="preferred"><primary>Types</primary><secondary>BUTMASK</secondary></indexterm></entry>
+      <entry id="types:BUTMASK">BUTMASK<indexterm zone="types:BUTMASK" significance="preferred"><primary>Types</primary><secondary>BUTMASK</secondary></indexterm></entry>
       <entry>
 { <emphasis role='bold'>Button1</emphasis>,
 <emphasis role='bold'>Button2</emphasis>,
@@ -534,34 +539,34 @@ A single-element type is given as the element without enclosing braces.
       </entry>
     </row>
     <row rowsep="0">
-      <entry>KEYBUTMASK<indexterm significance="preferred"><primary>Types</primary><secondary>KEYBUTMASK</secondary></indexterm></entry>
+      <entry id="types:KEYBUTMASK">KEYBUTMASK<indexterm zone="types:KEYBUTMASK" significance="preferred"><primary>Types</primary><secondary>KEYBUTMASK</secondary></indexterm></entry>
       <entry>KEYMASK or BUTMASK</entry>
     </row>
     <row rowsep="0">
-      <entry>STRING8<indexterm significance="preferred"><primary>Types</primary><secondary>STRING8</secondary></indexterm></entry>
+      <entry id="types:STRING8">STRING8<indexterm zone="types:STRING8" significance="preferred"><primary>Types</primary><secondary>STRING8</secondary></indexterm></entry>
       <entry>LISTofCARD8</entry>
     </row>
     <row rowsep="0">
-      <entry>STRING16<indexterm significance="preferred"><primary>Types</primary><secondary>STRING16</secondary></indexterm></entry>
+      <entry id="types:STRING16">STRING16<indexterm zone="types:STRING16" significance="preferred"><primary>Types</primary><secondary>STRING16</secondary></indexterm></entry>
       <entry>LISTofCHAR2B</entry>
     </row>
     <row rowsep="0">
-      <entry>CHAR2B<indexterm significance="preferred"><primary>Types</primary><secondary>CHAR2B</secondary></indexterm></entry>
+      <entry id="types:CHAR2B">CHAR2B<indexterm zone="types:CHAR2B" significance="preferred"><primary>Types</primary><secondary>CHAR2B</secondary></indexterm></entry>
       <entry>[byte1, byte2: CARD8]</entry>
     </row>
     <row rowsep="0">
-      <entry>POINT<indexterm significance="preferred"><primary>Types</primary><secondary>POINT</secondary></indexterm></entry>
+      <entry id="types:POINT">POINT<indexterm zone="types:POINT" significance="preferred"><primary>Types</primary><secondary>POINT</secondary></indexterm></entry>
       <entry>[x, y: INT16]</entry>
     </row>
     <row rowsep="0">
-      <entry>RECTANGLE<indexterm significance="preferred"><primary>Types</primary><secondary>RECTANGLE</secondary></indexterm></entry>
+      <entry id="types:RECTANGLE">RECTANGLE<indexterm zone="types:RECTANGLE" significance="preferred"><primary>Types</primary><secondary>RECTANGLE</secondary></indexterm></entry>
       <entry>
 <para>[x, y: INT16,</para>
 <para>width, height: CARD16]</para>
       </entry>
     </row>
     <row rowsep="0">
-      <entry>ARC<indexterm significance="preferred"><primary>Types</primary><secondary>ARC</secondary></indexterm></entry>
+      <entry id="types:ARC">ARC<indexterm zone="types:ARC" significance="preferred"><primary>Types</primary><secondary>ARC</secondary></indexterm></entry>
       <entry>
 <para>[x, y: INT16,</para>
 <para>width, height: CARD16,</para>
@@ -569,7 +574,7 @@ A single-element type is given as the element without enclosing braces.
       </entry>
     </row>
     <row rowsep="0">
-      <entry>HOST<indexterm significance="preferred"><primary>Types</primary><secondary>HOST</secondary></indexterm></entry>
+      <entry id="types:HOST">HOST<indexterm zone="types:HOST" significance="preferred"><primary>Types</primary><secondary>HOST</secondary></indexterm></entry>
       <entry>
 <para>
 [family:
@@ -649,7 +654,7 @@ The following error codes result from various requests as follows:
   </thead>
   <tbody>
     <row rowsep="0">
-      <entry><emphasis role='bold'>Access</emphasis><indexterm significance="preferred"><primary>Error Codes</primary><secondary>Access</secondary></indexterm></entry>
+      <entry id="errors:Access"><emphasis role='bold'>Access</emphasis><indexterm zone="errors:Access" significance="preferred"><primary>Error Codes</primary><secondary>Access</secondary></indexterm></entry>
       <entry>
 An attempt is made to grab a key/button combination already grabbed by another
 client.
@@ -663,7 +668,7 @@ select at a time when another client has already selected it.
       </entry>
     </row>
     <row rowsep="0">
-      <entry><emphasis role='bold'>Alloc</emphasis><indexterm significance="preferred"><primary>Error Codes</primary><secondary>Alloc</secondary></indexterm></entry>
+      <entry id="errors:Alloc"><emphasis role='bold'>Alloc</emphasis><indexterm zone="errors:Alloc" significance="preferred"><primary>Error Codes</primary><secondary>Alloc</secondary></indexterm></entry>
       <entry>
 The server failed to allocate the requested resource.
 Note that the explicit listing of
@@ -680,32 +685,32 @@ or discard them.
       </entry>
     </row>
     <row rowsep="0">
-      <entry><emphasis role='bold'>Atom</emphasis><indexterm significance="preferred"><primary>Error Codes</primary><secondary>Atom</secondary></indexterm></entry>
+      <entry id="errors:Atom"><emphasis role='bold'>Atom</emphasis><indexterm zone="errors:Atom" significance="preferred"><primary>Error Codes</primary><secondary>Atom</secondary></indexterm></entry>
       <entry>
 A value for an ATOM argument does not name a defined ATOM.
       </entry>
     </row>
     <row rowsep="0">
-      <entry><emphasis role='bold'>Colormap</emphasis><indexterm significance="preferred"><primary>Error Codes</primary><secondary>Colormap</secondary></indexterm></entry>
+      <entry id="errors:Colormap"><emphasis role='bold'>Colormap</emphasis><indexterm zone="errors:Colormap" significance="preferred"><primary>Error Codes</primary><secondary>Colormap</secondary></indexterm></entry>
       <entry>
 A value for a COLORMAP argument does not name a defined COLORMAP.
       </entry>
     </row>
     <row rowsep="0">
-      <entry><emphasis role='bold'>Cursor</emphasis><indexterm significance="preferred"><primary>Error Codes</primary><secondary>Cursor</secondary></indexterm></entry>
+      <entry id="errors:Cursor"><emphasis role='bold'>Cursor</emphasis><indexterm zone="errors:Cursor" significance="preferred"><primary>Error Codes</primary><secondary>Cursor</secondary></indexterm></entry>
       <entry>
 A value for a CURSOR argument does not name a defined CURSOR.
       </entry>
     </row>
     <row rowsep="0">
-      <entry><emphasis role='bold'>Drawable</emphasis><indexterm significance="preferred"><primary>Error Codes</primary><secondary>Drawable</secondary></indexterm></entry>
+      <entry id="errors:Drawable"><emphasis role='bold'>Drawable</emphasis><indexterm zone="errors:Drawable" significance="preferred"><primary>Error Codes</primary><secondary>Drawable</secondary></indexterm></entry>
       <entry>
 A value for a DRAWABLE argument does not name a defined WINDOW
 or PIXMAP.
       </entry>
     </row>
     <row rowsep="0">
-      <entry><emphasis role='bold'>Font</emphasis><indexterm significance="preferred"><primary>Error Codes</primary><secondary>Font</secondary></indexterm></entry>
+      <entry id="errors:Font"><emphasis role='bold'>Font</emphasis><indexterm zone="errors:Font" significance="preferred"><primary>Error Codes</primary><secondary>Font</secondary></indexterm></entry>
       <entry>
 A value for a FONT argument does not name a defined FONT.
 A value for a FONTABLE argument does not name a defined FONT or a
@@ -713,20 +718,20 @@ defined GCONTEXT.
       </entry>
     </row>
     <row rowsep="0">
-      <entry><emphasis role='bold'>GContext</emphasis><indexterm significance="preferred"><primary>Error Codes</primary><secondary>GContext</secondary></indexterm></entry>
+      <entry id="errors:GContext"><emphasis role='bold'>GContext</emphasis><indexterm zone="errors:GContext" significance="preferred"><primary>Error Codes</primary><secondary>GContext</secondary></indexterm></entry>
       <entry>
 A value for a GCONTEXT argument does not name a defined GCONTEXT.
       </entry>
     </row>
     <row rowsep="0">
-      <entry><emphasis role='bold'>IDChoice</emphasis><indexterm significance="preferred"><primary>Error Codes</primary><secondary>IDChoice</secondary></indexterm></entry>
+      <entry id="errors:IDChoice"><emphasis role='bold'>IDChoice</emphasis><indexterm zone="errors:IDChoice" significance="preferred"><primary>Error Codes</primary><secondary>IDChoice</secondary></indexterm></entry>
       <entry>
 The value chosen for a resource identifier either is not included
 in the range assigned to the client or is already in use.
       </entry>
     </row>
     <row rowsep="0">
-      <entry><emphasis role='bold'>Implementation</emphasis><indexterm significance="preferred"><primary>Error Codes</primary><secondary>Implementation</secondary></indexterm></entry>
+      <entry id="errors:Implementation"><emphasis role='bold'>Implementation</emphasis><indexterm zone="errors:Implementation" significance="preferred"><primary>Error Codes</primary><secondary>Implementation</secondary></indexterm></entry>
       <entry>
 The server does not implement some aspect of the request.
 A server that generates this error for a core request is deficient.
@@ -736,7 +741,7 @@ and handle or discard them.
       </entry>
     </row>
     <row rowsep="0">
-      <entry><emphasis role='bold'>Length</emphasis><indexterm significance="preferred"><primary>Error Codes</primary><secondary>Length</secondary></indexterm></entry>
+      <entry id="errors:Length"><emphasis role='bold'>Length</emphasis><indexterm zone="errors:Length" significance="preferred"><primary>Error Codes</primary><secondary>Length</secondary></indexterm></entry>
       <entry>
 The length of a request is shorter or longer than that required
 to minimally contain the arguments.
@@ -745,7 +750,7 @@ server.
       </entry>
     </row>
     <row rowsep="0">
-      <entry><emphasis role='bold'>Match</emphasis><indexterm significance="preferred"><primary>Error Codes</primary><secondary>Match</secondary></indexterm></entry>
+      <entry id="errors:Match"><emphasis role='bold'>Match</emphasis><indexterm zone="errors:Match" significance="preferred"><primary>Error Codes</primary><secondary>Match</secondary></indexterm></entry>
       <entry>
 An
 <emphasis role='bold'>InputOnly</emphasis>
@@ -757,25 +762,25 @@ but it fails to match in some other way required by the request.
       </entry>
     </row>
     <row rowsep="0">
-      <entry><emphasis role='bold'>Name</emphasis><indexterm significance="preferred"><primary>Error Codes</primary><secondary>Name</secondary></indexterm></entry>
+      <entry id="errors:Name"><emphasis role='bold'>Name</emphasis><indexterm zone="errors:Name" significance="preferred"><primary>Error Codes</primary><secondary>Name</secondary></indexterm></entry>
       <entry>
 A font or color of the specified name does not exist.
       </entry>
     </row>
     <row rowsep="0">
-      <entry><emphasis role='bold'>Pixmap</emphasis><indexterm significance="preferred"><primary>Error Codes</primary><secondary>Pixmap</secondary></indexterm></entry>
+      <entry id="errors:Pixmap"><emphasis role='bold'>Pixmap</emphasis><indexterm zone="errors:Pixmap" significance="preferred"><primary>Error Codes</primary><secondary>Pixmap</secondary></indexterm></entry>
       <entry>
 A value for a PIXMAP argument does not name a defined PIXMAP.
       </entry>
     </row>
     <row rowsep="0">
-      <entry><emphasis role='bold'>Request</emphasis><indexterm significance="preferred"><primary>Error Codes</primary><secondary>Request</secondary></indexterm></entry>
+      <entry id="errors:Request"><emphasis role='bold'>Request</emphasis><indexterm zone="errors:Request" significance="preferred"><primary>Error Codes</primary><secondary>Request</secondary></indexterm></entry>
       <entry>
 The major or minor opcode does not specify a valid request.
       </entry>
     </row>
     <row rowsep="0">
-      <entry><emphasis role='bold'>Value</emphasis><indexterm significance="preferred"><primary>Error Codes</primary><secondary>Value</secondary></indexterm></entry>
+      <entry id="errors:Value"><emphasis role='bold'>Value</emphasis><indexterm zone="errors:Value" significance="preferred"><primary>Error Codes</primary><secondary>Value</secondary></indexterm></entry>
       <entry>
 Some numeric value falls outside the range of values accepted by the request.
 Unless a specific range is specified for an argument,
@@ -785,7 +790,7 @@ this error (due to the encoding).
       </entry>
     </row>
     <row rowsep="0">
-      <entry><emphasis role='bold'>Window</emphasis><indexterm significance="preferred"><primary>Error Codes</primary><secondary>Window</secondary></indexterm></entry>
+      <entry id="errors:Window"><emphasis role='bold'>Window</emphasis><indexterm zone="errors:Window" significance="preferred"><primary>Error Codes</primary><secondary>Window</secondary></indexterm></entry>
       <entry>
 A value for a WINDOW argument does not name a defined WINDOW.
       </entry>
@@ -818,9 +823,9 @@ or
 <!-- .XS -->
 <!-- (SN Keyboards -->
 <!-- .XE -->
-<para>
+<para id="keycode">
 A KEYCODE represents a physical (or logical) key.
-<indexterm><primary>Types</primary><secondary>KEYCODE</secondary></indexterm>
+<indexterm zone="keycode"><primary>Types</primary><secondary>KEYCODE</secondary></indexterm>
 Keycodes lie in the inclusive range [8,255].
 A keycode value carries no intrinsic information,
 although server implementors may attempt to encode geometry information
@@ -828,9 +833,9 @@ although server implementors may attempt to encode geometry information
 The mapping between keys and keycodes cannot be changed using the
 protocol.
 </para>
-<para>
+<para id="keysym">
 A KEYSYM is an encoding of a symbol on the cap of a key.
-<indexterm><primary>Types</primary><secondary>KEYSYM</secondary></indexterm>
+<indexterm zone="keysym"><primary>Types</primary><secondary>KEYSYM</secondary></indexterm>
 The set of defined KEYSYMs include the character sets Latin-1, Latin-2,
 Latin-3, Latin-4, Kana, Arabic, Cyrillic, Greek, Tech, Special, Publish, APL,
 Hebrew, Thai, and Korean as well as a set of symbols common on keyboards
@@ -882,10 +887,10 @@ element were the uppercase form
 of "<emphasis remap='I'>K</emphasis>".
 </para>
 
-<para>
+<para id="keysym_from_keypress">
 The standard rules for obtaining a KEYSYM from a
 <link linkend="events:KeyPress"><emphasis role='bold'>KeyPress</emphasis></link>
-<indexterm><primary>KeyPress</primary></indexterm>
+<indexterm zone="keysym_from_keypress"><primary>KeyPress</primary></indexterm>
 event make use of only the Group 1 and Group 2 KEYSYMs; no interpretation of
 other KEYSYMs in the list is defined.  The modifier state determines which
 group to use.  Switching between groups is controlled by the KEYSYM named
@@ -895,15 +900,15 @@ KEYCODE to any one of the modifiers
 through
 <emphasis role='bold'>Mod5</emphasis>.
 This modifier is
-<indexterm significance="preferred"><primary>modifier</primary><secondary>group</secondary></indexterm>
-called the "group modifier".  For any KEYCODE, Group 1 is used when the
+<indexterm zone="group_modifier" significance="preferred"><primary>modifier</primary><secondary>group</secondary></indexterm>
+called the "<firstterm id="group_modifier">group modifier</firstterm>".  For any KEYCODE, Group 1 is used when the
 group modifier is off, and Group 2 is used when the group modifier is on.
 </para>
 
-<para>
+<para id="modifier:lock">
 The
 <emphasis role='bold'>Lock</emphasis>
-<indexterm significance="preferred"><primary>modifier</primary><secondary>Lock</secondary></indexterm>
+<indexterm zone="modifier:lock" significance="preferred"><primary>modifier</primary><secondary>Lock</secondary></indexterm>
 modifier is interpreted as CapsLock when the KEYSYM named CAPS
 LOCK is attached to some KEYCODE and that KEYCODE is attached to the
 <emphasis role='bold'>Lock</emphasis>
@@ -919,7 +924,7 @@ modifier could be interpreted as both
 CapsLock and ShiftLock, the CapsLock interpretation is used.
 </para>
 
-<para>
+<para id="modifier:numlock">
 <!-- .LP -->
 The operation of "keypad" keys is controlled by the KEYSYM named NUM LOCK,
 by attaching that KEYSYM to some KEYCODE and attaching that KEYCODE to any
@@ -928,7 +933,7 @@ one of the modifiers
 through
 <emphasis role='bold'>Mod5</emphasis>.
 This modifier is called the
-<indexterm significance="preferred"><primary>modifier</primary><secondary>NumLock</secondary></indexterm>
+<indexterm zone="modifier:lock" significance="preferred"><primary>modifier</primary><secondary>NumLock</secondary></indexterm>
 "numlock modifier".  The standard KEYSYMs with the prefix KEYPAD in their
 name are called "keypad" KEYSYMs; these are KEYSYMS with numeric value in
 the hexadecimal range #xFF80 to #xFFBD inclusive.  In addition,
@@ -1012,9 +1017,9 @@ it is merely stored for reading and writing by clients.
 <!-- .XS -->
 <!-- (SN Pointers -->
 <!-- .XE -->
-<para>
+<para id="pointers:buttons">
 Buttons are always numbered starting with one.
-<indexterm><primary>Button</primary><secondary>number</secondary></indexterm>
+<indexterm zone="pointers:buttons"><primary>Button</primary><secondary>number</secondary></indexterm>
 </para>
 </chapter>
 
@@ -1025,8 +1030,8 @@ Buttons are always numbered starting with one.
 <!-- .XE -->
 <para>
 <!-- .LP -->
+<indexterm zone="predefined_atoms"><primary>Atom</primary><secondary>predefined</secondary></indexterm>
 Predefined atoms are not strictly necessary and may not be useful in all
-<indexterm><primary>Atom</primary><secondary>predefined</secondary></indexterm>
 environments, but they will eliminate many
 <link linkend="requests:InternAtom"><emphasis role='bold'>InternAtom</emphasis></link>
 requests in most applications.
@@ -1143,10 +1148,10 @@ the X protocol can be built on top of any reliable byte stream.
   <section id="connection_initiation">
     <title>Connection Initiation</title>
 
-    <para>
+    <para id="byte-order">
 The client must send an initial byte of data to identify the byte order to be
 employed.
-<indexterm><primary>Byte order</primary></indexterm>
+<indexterm zone="byte-order"><primary>Byte order</primary></indexterm>
 The value of the byte must be octal 102 or 154.
 The value 102 (ASCII uppercase B) means values are transmitted most significant
 byte first, and value 154 (ASCII lowercase l) means values are transmitted
@@ -1179,11 +1184,11 @@ authorization-protocol-data: STRING8
 The version numbers indicate what version of the protocol the client
 expects the server to implement.
     </para>
-    <para>
+    <para id="authorization">
 The authorization name indicates what authorization (and authentication)
 protocol the client
 expects the server to use, and the data is specific to that protocol.
-<indexterm significance="preferred"><primary>Authorization</primary></indexterm>
+<indexterm zone="authorization" significance="preferred"><primary>Authorization</primary></indexterm>
 Specification of valid authorization mechanisms is not part of the core
 X protocol.
 A server that does not implement the protocol the client expects
@@ -1459,12 +1464,12 @@ The vendor string gives some identification of the owner of the server
 implementation.
 The vendor controls the semantics of the release number.
     </para>
-    <para>
+    <para id="resource-id-mask">
 The resource-id-mask contains a single contiguous set of bits (at least 18).
 The client allocates resource IDs for types WINDOW, PIXMAP,
 CURSOR, FONT, GCONTEXT, and COLORMAP by choosing a value with only
 some subset of these bits set and ORing it with resource-id-base.
-<indexterm><primary>Resource</primary><secondary>ID</secondary></indexterm>
+<indexterm zone="resource-id-mask"><primary>Resource</primary><secondary>ID</secondary></indexterm>
 Only values constructed in this way can be used to name newly created
 resources over this connection.
 Resource IDs never have the top three bits set.
@@ -1487,9 +1492,9 @@ specified by the server.
 The byte order for images is given by image-byte-order and applies to each
 scanline unit in XY format (bitmap format) and to each pixel value in Z format.
     </para>
-    <para>
+    <para id="bitmap-format">
 A bitmap is represented in scanline order.
-<indexterm><primary>Bitmap</primary><secondary>format</secondary></indexterm>
+<indexterm zone="bitmap-format"><primary>Bitmap</primary><secondary>format</secondary></indexterm>
 Each scanline is padded to a multiple of bits as given by bitmap-scanline-pad.
 The pad bits are of arbitrary value.
 The scanline is quantized in multiples of bits as given by bitmap-scanline-unit.
@@ -1503,9 +1508,9 @@ each plane is represented as a bitmap, and the planes appear from
 most significant to least significant in bit order with no padding
 between planes.
     </para>
-    <para>
+    <para id="pixmap-formats">
 Pixmap-formats contains one entry for each depth value.
-<indexterm><primary>Pixmap</primary><secondary>format</secondary></indexterm>
+<indexterm zone="pixmap-formats"><primary>Pixmap</primary><secondary>format</secondary></indexterm>
 The entry describes the Z format used to represent images of that depth.
 An entry for a depth is included if any screen supports that depth,
 and all screens supporting that depth must support only that Z format for that
@@ -1541,10 +1546,10 @@ request makes such history available.
 The motion-buffer-size gives the approximate maximum number
 of elements in the history buffer.
     </para>
-    <para>
+    <para id="Maximum-request-length">
 Maximum-request-length specifies the maximum length of a request
 accepted by the server, in 4-byte units.
-<indexterm><primary>Request</primary><secondary>length</secondary></indexterm>
+<indexterm zone="Maximum-request-length"><primary>Request</primary><secondary>length</secondary></indexterm>
 That is, length is the maximum value that can appear in the length field of a
 request.
 Requests larger than this maximum generate a
@@ -1566,7 +1571,7 @@ Not all keycodes in this range are required to have corresponding keys.
 
   <section id="screen_information">
     <title>Screen Information</title>
-    <indexterm><primary>Screen</primary></indexterm>
+    <indexterm zone="screen_information"><primary>Screen</primary></indexterm>
 
     <para>
 The information that applies per screen is:
@@ -1737,7 +1742,7 @@ red-mask, green-mask, and blue-mask.
   <title>Requests</title>
   <section id="requests:CreateWindow">
     <title>CreateWindow</title>
-    <indexterm significance="preferred"><primary>CreateWindow</primary></indexterm>
+    <indexterm zone="requests:CreateWindow" significance="preferred"><primary>CreateWindow</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -2326,7 +2331,7 @@ The server might or might not make a copy of the pixmap.
   </section>
   <section id="requests:ChangeWindowAttributes">
     <title>ChangeWindowAttributes</title>
-    <indexterm significance="preferred"><primary>ChangeWindowAttributes</primary></indexterm>
+    <indexterm zone="requests:ChangeWindowAttributes" significance="preferred"><primary>ChangeWindowAttributes</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -2446,7 +2451,7 @@ a subset of the attributes may have been altered.
   </section>
   <section id="requests:GetWindowAttributes">
     <title>GetWindowAttributes</title>
-    <indexterm significance="preferred"><primary>GetWindowAttributes</primary></indexterm>
+    <indexterm zone="requests:GetWindowAttributes" significance="preferred"><primary>GetWindowAttributes</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -2570,7 +2575,7 @@ Your-event-mask is the event mask selected by the querying client.
   </section>
   <section id="requests:DestroyWindow">
     <title>DestroyWindow</title>
-    <indexterm significance="preferred"><primary>DestroyWindow</primary></indexterm>
+    <indexterm zone="requests:DestroyWindow" significance="preferred"><primary>DestroyWindow</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -2623,7 +2628,7 @@ this request has no effect.
   </section>
   <section id="requests:DestroySubwindows">
     <title>DestroySubwindows</title>
-    <indexterm significance="preferred"><primary>DestroySubwindows</primary></indexterm>
+    <indexterm zone="requests:DestroySubwindows" significance="preferred"><primary>DestroySubwindows</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -2657,7 +2662,7 @@ request on all children of the window, in bottom-to-top stacking order.
   </section>
   <section id="requests:ChangeSaveSet">
     <title>ChangeSaveSet</title>
-    <indexterm significance="preferred"><primary>ChangeSaveSet</primary></indexterm>
+    <indexterm zone="requests:ChangeSaveSet" significance="preferred"><primary>ChangeSaveSet</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -2708,7 +2713,7 @@ the server automatically removes them from the save-set.
   </section>
   <section id="requests:ReparentWindow">
     <title>ReparentWindow</title>
-    <indexterm significance="preferred"><primary>ReparentWindow</primary></indexterm>
+    <indexterm zone="requests:ReparentWindow" significance="preferred"><primary>ReparentWindow</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -2788,7 +2793,7 @@ background, and the new parent is not the same depth as the window.
   </section>
   <section id="requests:MapWindow">
     <title>MapWindow</title>
-    <indexterm significance="preferred"><primary>MapWindow</primary></indexterm>
+    <indexterm zone="requests:MapWindow" significance="preferred"><primary>MapWindow</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -2845,7 +2850,7 @@ Similar tiling and exposure take place for any newly viewable inferiors.
   </section>
   <section id="requests:MapSubwindows">
     <title>MapSubwindows</title>
-    <indexterm significance="preferred"><primary>MapSubwindows</primary></indexterm>
+    <indexterm zone="requests:MapSubwindows" significance="preferred"><primary>MapSubwindows</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -2880,7 +2885,7 @@ in top-to-bottom stacking order.
   </section>
   <section id="requests:UnmapWindow">
     <title>UnmapWindow</title>
-    <indexterm significance="preferred"><primary>UnmapWindow</primary></indexterm>
+    <indexterm zone="requests:UnmapWindow" significance="preferred"><primary>UnmapWindow</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -2916,7 +2921,7 @@ Normal exposure processing on formerly obscured windows is performed.
   </section>
   <section id="requests:UnmapSubwindows">
     <title>UnmapSubwindows</title>
-    <indexterm significance="preferred"><primary>UnmapSubwindows</primary></indexterm>
+    <indexterm zone="requests:UnmapSubwindows" significance="preferred"><primary>UnmapSubwindows</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -2951,7 +2956,7 @@ in bottom-to-top stacking order.
   </section>
   <section id="requests:ConfigureWindow">
     <title>ConfigureWindow</title>
-    <indexterm significance="preferred"><primary>ConfigureWindow</primary></indexterm>
+    <indexterm zone="requests:ConfigureWindow" significance="preferred"><primary>ConfigureWindow</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -3381,7 +3386,7 @@ Attempts to configure a root window have no effect.
   </section>
   <section id="requests:CirculateWindow">
     <title>CirculateWindow</title>
-    <indexterm significance="preferred"><primary>CirculateWindow</primary></indexterm>
+    <indexterm zone="requests:CirculateWindow" significance="preferred"><primary>CirculateWindow</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -3441,7 +3446,7 @@ Exposure processing is performed on formerly obscured windows.
   </section>
   <section id="requests:GetGeometry">
     <title>GetGeometry</title>
-    <indexterm significance="preferred"><primary>GetGeometry</primary></indexterm>
+    <indexterm zone="requests:GetGeometry" significance="preferred"><primary>GetGeometry</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -3511,7 +3516,7 @@ window as a drawable to this request.
   </section>
   <section id="requests:QueryTree">
     <title>QueryTree</title>
-    <indexterm significance="preferred"><primary>QueryTree</primary></indexterm>
+    <indexterm zone="requests:QueryTree" significance="preferred"><primary>QueryTree</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -3567,7 +3572,7 @@ The children are listed in bottom-to-top stacking order.
   </section>
   <section id="requests:InternAtom">
     <title>InternAtom</title>
-    <indexterm significance="preferred"><primary>InternAtom</primary></indexterm>
+    <indexterm zone="requests:InternAtom" significance="preferred"><primary>InternAtom</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -3627,7 +3632,7 @@ Atoms remain defined until server reset (see <link linkend="connection_close">se
   </section>
   <section id="requests:GetAtomName">
     <title>GetAtomName</title>
-    <indexterm significance="preferred"><primary>GetAtomName</primary></indexterm>
+    <indexterm zone="requests:GetAtomName" significance="preferred"><primary>GetAtomName</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -3671,7 +3676,7 @@ This request returns the name for the given atom.
   </section>
   <section id="requests:ChangeProperty">
     <title>ChangeProperty</title>
-    <indexterm significance="preferred"><primary>ChangeProperty</primary></indexterm>
+    <indexterm zone="requests:ChangeProperty" significance="preferred"><primary>ChangeProperty</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -3767,7 +3772,7 @@ The maximum size of a property is server-dependent and may vary dynamically.
   </section>
   <section id="requests:DeleteProperty">
     <title>DeleteProperty</title>
-    <indexterm significance="preferred"><primary>DeleteProperty</primary></indexterm>
+    <indexterm zone="requests:DeleteProperty" significance="preferred"><primary>DeleteProperty</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -3808,7 +3813,7 @@ event on the window unless the property does not exist.
   </section>
   <section id="requests:GetProperty">
     <title>GetProperty</title>
-    <indexterm significance="preferred"><primary>GetProperty</primary></indexterm>
+    <indexterm zone="requests:GetProperty" significance="preferred"><primary>GetProperty</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -3934,7 +3939,7 @@ event is generated on the window.
   </section>
   <section id="requests:RotateProperties">
     <title>RotateProperties</title>
-    <indexterm significance="preferred"><primary>RotateProperties</primary></indexterm>
+    <indexterm zone="requests:RotateProperties" significance="preferred"><primary>RotateProperties</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -4001,7 +4006,7 @@ error is generated, no properties are changed.
   </section>
   <section id="requests:ListProperties">
     <title>ListProperties</title>
-    <indexterm significance="preferred"><primary>ListProperties</primary></indexterm>
+    <indexterm zone="requests:ListProperties" significance="preferred"><primary>ListProperties</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -4045,7 +4050,7 @@ This request returns the atoms of properties currently defined on the window.
   </section>
   <section id="requests:SetSelectionOwner">
     <title>SetSelectionOwner</title>
-    <indexterm significance="preferred"><primary>SetSelectionOwner</primary></indexterm>
+    <indexterm zone="requests:SetSelectionOwner" significance="preferred"><primary>SetSelectionOwner</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -4133,7 +4138,7 @@ Selections are global to the server.
   </section>
   <section id="requests:GetSelectionOwner">
     <title>GetSelectionOwner</title>
-    <indexterm significance="preferred"><primary>GetSelectionOwner</primary></indexterm>
+    <indexterm zone="requests:GetSelectionOwner" significance="preferred"><primary>GetSelectionOwner</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -4182,7 +4187,7 @@ is returned, then there is no owner for the selection.
   </section>
   <section id="requests:ConvertSelection">
     <title>ConvertSelection</title>
-    <indexterm significance="preferred"><primary>ConvertSelection</primary></indexterm>
+    <indexterm zone="requests:ConvertSelection" significance="preferred"><primary>ConvertSelection</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -4241,7 +4246,7 @@ The arguments are passed on unchanged in either of the events.
   </section>
   <section id="requests:SendEvent">
     <title>SendEvent</title>
-    <indexterm significance="preferred"><primary>SendEvent</primary></indexterm>
+    <indexterm zone="requests:SendEvent" significance="preferred"><primary>SendEvent</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -4341,7 +4346,7 @@ Active grabs are ignored for this request.
   </section>
   <section id="requests:GrabPointer">
     <title>GrabPointer</title>
-    <indexterm significance="preferred"><primary>GrabPointer</primary></indexterm>
+    <indexterm zone="requests:GrabPointer" significance="preferred"><primary>GrabPointer</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -4519,7 +4524,7 @@ replaced by the current server time.
   </section>
   <section id="requests:UngrabPointer">
     <title>UngrabPointer</title>
-    <indexterm significance="preferred"><primary>UngrabPointer</primary></indexterm>
+    <indexterm zone="requests:UngrabPointer" significance="preferred"><primary>UngrabPointer</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -4566,8 +4571,8 @@ completely outside the boundaries of the root window.
   </section>
   <section id="requests:GrabButton">
     <title>GrabButton</title>
-    <indexterm significance="preferred"><primary>GrabButton</primary></indexterm>
-    <indexterm><primary>Button</primary><secondary>grabbing</secondary></indexterm>
+    <indexterm zone="requests:GrabButton" significance="preferred"><primary>GrabButton</primary></indexterm>
+    <indexterm zone="requests:GrabButton"><primary>Button</primary><secondary>grabbing</secondary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -4638,7 +4643,7 @@ Errors:
 <!-- .eM -->
 <para>
 This request establishes a passive grab.
-<indexterm><primary>Passive grab</primary><secondary>pointer</secondary></indexterm>
+<indexterm zone="requests:GrabButton"><primary>Passive grab</primary><secondary>pointer</secondary></indexterm>
 In the future,
 the pointer is actively grabbed as described in
 <link linkend="requests:GrabPointer"><emphasis role='bold'>GrabPointer</emphasis></link>,
@@ -4703,7 +4708,7 @@ The request has no effect on an active grab.
   </section>
   <section id="requests:UngrabButton">
     <title>UngrabButton</title>
-    <indexterm significance="preferred"><primary>UngrabButton</primary></indexterm>
+    <indexterm zone="requests:UngrabButton" significance="preferred"><primary>UngrabButton</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -4757,7 +4762,7 @@ The request has no effect on an active grab.
   </section>
   <section id="requests:ChangeActivePointerGrab">
     <title>ChangeActivePointerGrab</title>
-    <indexterm significance="preferred"><primary>ChangeActivePointerGrab</primary></indexterm>
+    <indexterm zone="requests:ChangeActivePointerGrab" significance="preferred"><primary>ChangeActivePointerGrab</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -4809,7 +4814,7 @@ with
   </section>
   <section id="requests:GrabKeyboard">
     <title>GrabKeyboard</title>
-    <indexterm significance="preferred"><primary>GrabKeyboard</primary></indexterm>
+    <indexterm zone="requests:GrabKeyboard" significance="preferred"><primary>GrabKeyboard</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -4950,7 +4955,7 @@ replaced by the current server time.
   </section>
   <section id="requests:UngrabKeyboard">
     <title>UngrabKeyboard</title>
-    <indexterm significance="preferred"><primary>UngrabKeyboard</primary></indexterm>
+    <indexterm zone="requests:UngrabKeyboard" significance="preferred"><primary>UngrabKeyboard</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -4995,7 +5000,7 @@ becomes not viewable.
   </section>
   <section id="requests:GrabKey">
     <title>GrabKey</title>
-    <indexterm significance="preferred"><primary>GrabKey</primary></indexterm>
+    <indexterm zone="requests:GrabKey" significance="preferred"><primary>GrabKey</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -5048,7 +5053,7 @@ Errors:
 <!-- .eM -->
 <para>
 This request establishes a passive grab on the keyboard.
-<indexterm><primary>Passive grab</primary><secondary>keyboard</secondary></indexterm>
+<indexterm zone="requests:GrabKey"><primary>Passive grab</primary><secondary>keyboard</secondary></indexterm>
 In the future,
 the keyboard is actively grabbed as described in
 <link linkend="requests:GrabKeyboard"><emphasis role='bold'>GrabKeyboard</emphasis></link>,
@@ -5115,7 +5120,7 @@ error is generated if there is a conflicting grab for any combination.
   </section>
   <section id="requests:UngrabKey">
     <title>UngrabKey</title>
-    <indexterm significance="preferred"><primary>UngrabKey</primary></indexterm>
+    <indexterm zone="requests:UngrabKey" significance="preferred"><primary>UngrabKey</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -5169,7 +5174,7 @@ This request has no effect on an active grab.
   </section>
   <section id="requests:AllowEvents">
     <title>AllowEvents</title>
-    <indexterm significance="preferred"><primary>AllowEvents</primary></indexterm>
+    <indexterm zone="requests:AllowEvents" significance="preferred"><primary>AllowEvents</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -5378,8 +5383,8 @@ releases both.
   </section>
   <section id="requests:GrabServer">
     <title>GrabServer</title>
-    <indexterm significance="preferred"><primary>GrabServer</primary></indexterm>
-    <indexterm><primary>Server</primary><secondary>grabbing</secondary></indexterm>
+    <indexterm zone="requests:GrabServer" significance="preferred"><primary>GrabServer</primary></indexterm>
+    <indexterm zone="requests:GrabServer"><primary>Server</primary><secondary>grabbing</secondary></indexterm>
 <para>
 This request disables processing of requests and close-downs on all
 connections other than the one this request arrived on.
@@ -5388,7 +5393,7 @@ connections other than the one this request arrived on.
   </section>
   <section id="requests:UngrabServer">
     <title>UngrabServer</title>
-    <indexterm significance="preferred"><primary>UngrabServer</primary></indexterm>
+    <indexterm zone="requests:UngrabServer" significance="preferred"><primary>UngrabServer</primary></indexterm>
 <para>
 This request restarts processing of requests and close-downs
 on other connections.
@@ -5397,7 +5402,7 @@ on other connections.
   </section>
   <section id="requests:QueryPointer">
     <title>QueryPointer</title>
-    <indexterm significance="preferred"><primary>QueryPointer</primary></indexterm>
+    <indexterm zone="requests:QueryPointer" significance="preferred"><primary>QueryPointer</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -5478,7 +5483,7 @@ may lag the physical state if device event processing is frozen.
   </section>
   <section id="requests:GetMotionEvents">
     <title>GetMotionEvents</title>
-    <indexterm significance="preferred"><primary>GetMotionEvents</primary></indexterm>
+    <indexterm zone="requests:GetMotionEvents" significance="preferred"><primary>GetMotionEvents</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -5556,7 +5561,7 @@ If the stop time is in the future, it is equivalent to specifying
   </section>
   <section id="requests:TranslateCoordinates">
     <title>TranslateCoordinates</title>
-    <indexterm significance="preferred"><primary>TranslateCoordinates</primary></indexterm>
+    <indexterm zone="requests:TranslateCoordinates" significance="preferred"><primary>TranslateCoordinates</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -5624,7 +5629,7 @@ then that child is returned.
   </section>
   <section id="requests:WarpPointer">
     <title>WarpPointer</title>
-    <indexterm significance="preferred"><primary>WarpPointer</primary></indexterm>
+    <indexterm zone="requests:WarpPointer" significance="preferred"><primary>WarpPointer</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -5705,7 +5710,7 @@ moved the pointer.
   </section>
   <section id="requests:SetInputFocus">
     <title>SetInputFocus</title>
-    <indexterm significance="preferred"><primary>SetInputFocus</primary></indexterm>
+    <indexterm zone="requests:SetInputFocus" significance="preferred"><primary>SetInputFocus</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -5815,7 +5820,7 @@ but the last-focus-change time is not affected.
   </section>
   <section id="requests:GetInputFocus">
     <title>GetInputFocus</title>
-    <indexterm significance="preferred"><primary>GetInputFocus</primary></indexterm>
+    <indexterm zone="requests:GetInputFocus" significance="preferred"><primary>GetInputFocus</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -5855,7 +5860,7 @@ This request returns the current focus state.
   </section>
   <section id="requests:QueryKeymap">
     <title>QueryKeymap</title>
-    <indexterm significance="preferred"><primary>QueryKeymap</primary></indexterm>
+    <indexterm zone="requests:QueryKeymap" significance="preferred"><primary>QueryKeymap</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -5890,7 +5895,7 @@ may lag the physical state if device event processing is frozen.
   </section>
   <section id="requests:OpenFont">
     <title>OpenFont</title>
-    <indexterm significance="preferred"><primary>OpenFont</primary></indexterm>
+    <indexterm zone="requests:OpenFont" significance="preferred"><primary>OpenFont</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -5944,7 +5949,7 @@ and can be stored as a component of any graphics context.
   </section>
   <section id="requests:CloseFont">
     <title>CloseFont</title>
-    <indexterm significance="preferred"><primary>CloseFont</primary></indexterm>
+    <indexterm zone="requests:CloseFont" significance="preferred"><primary>CloseFont</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -5977,7 +5982,7 @@ The font itself will be freed when no other resource references it.
   </section>
   <section id="requests:QueryFont">
     <title>QueryFont</title>
-    <indexterm significance="preferred"><primary>QueryFont</primary></indexterm>
+    <indexterm zone="requests:QueryFont" significance="preferred"><primary>QueryFont</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='3' align='left' rowsep='0'>
   <colspec colname='c1' colsep='0'/>
@@ -6280,7 +6285,7 @@ server-dependent.
   </section>
   <section id="requests:QueryTextExtents">
     <title>QueryTextExtents</title>
-    <indexterm significance="preferred"><primary>QueryTextExtents</primary></indexterm>
+    <indexterm zone="requests:QueryTextExtents" significance="preferred"><primary>QueryTextExtents</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -6394,7 +6399,7 @@ then undefined characters in the string are also ignored.
   </section>
   <section id="requests:ListFonts">
     <title>ListFonts</title>
-    <indexterm significance="preferred"><primary>ListFonts</primary></indexterm>
+    <indexterm zone="requests:ListFonts" significance="preferred"><primary>ListFonts</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -6447,7 +6452,7 @@ The returned names are in lowercase.
   </section>
   <section id="requests:ListFontsWithInfo">
     <title>ListFontsWithInfo</title>
-    <indexterm significance="preferred"><primary>ListFontsWithInfo</primary></indexterm>
+    <indexterm zone="requests:ListFontsWithInfo" significance="preferred"><primary>ListFontsWithInfo</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -6526,7 +6531,7 @@ sequence.
   </section>
   <section id="requests:SetFontPath">
     <title>SetFontPath</title>
-    <indexterm significance="preferred"><primary>SetFontPath</primary></indexterm>
+    <indexterm zone="requests:SetFontPath" significance="preferred"><primary>SetFontPath</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -6574,7 +6579,7 @@ The meaning of an error from this request is system specific.
   </section>
   <section id="requests:GetFontPath">
     <title>GetFontPath</title>
-    <indexterm significance="preferred"><primary>GetFontPath</primary></indexterm>
+    <indexterm zone="requests:GetFontPath" significance="preferred"><primary>GetFontPath</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -6603,7 +6608,7 @@ This request returns the current search path for fonts.
   </section>
   <section id="requests:CreatePixmap">
     <title>CreatePixmap</title>
-    <indexterm significance="preferred"><primary>CreatePixmap</primary></indexterm>
+    <indexterm zone="requests:CreatePixmap" significance="preferred"><primary>CreatePixmap</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -6666,7 +6671,7 @@ window as a drawable to this request.
   </section>
   <section id="requests:FreePixmap">
     <title>FreePixmap</title>
-    <indexterm significance="preferred"><primary>FreePixmap</primary></indexterm>
+    <indexterm zone="requests:FreePixmap" significance="preferred"><primary>FreePixmap</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -6699,7 +6704,7 @@ The pixmap storage will be freed when no other resource references it.
   </section>
   <section id="requests:CreateGC">
     <title>CreateGC</title>
-    <indexterm significance="preferred"><primary>CreateGC</primary></indexterm>
+    <indexterm zone="requests:CreateGC" significance="preferred"><primary>CreateGC</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -7731,7 +7736,7 @@ changes to a single gcontext.
   </section>
   <section id="requests:ChangeGC">
     <title>ChangeGC</title>
-    <indexterm significance="preferred"><primary>ChangeGC</primary></indexterm>
+    <indexterm zone="requests:ChangeGC" significance="preferred"><primary>ChangeGC</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -7795,7 +7800,7 @@ a subset of the components may have been altered.
   </section>
   <section id="requests:CopyGC">
     <title>CopyGC</title>
-    <indexterm significance="preferred"><primary>CopyGC</primary></indexterm>
+    <indexterm zone="requests:CopyGC" significance="preferred"><primary>CopyGC</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -7840,7 +7845,7 @@ error results).
   </section>
   <section id="requests:SetDashes">
     <title>SetDashes</title>
-    <indexterm significance="preferred"><primary>SetDashes</primary></indexterm>
+    <indexterm zone="requests:SetDashes" significance="preferred"><primary>SetDashes</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -7939,7 +7944,7 @@ would be included in the dash when drawn unclipped.
   </section>
   <section id="requests:SetClipRectangles">
     <title>SetClipRectangles</title>
-    <indexterm significance="preferred"><primary>SetClipRectangles</primary></indexterm>
+    <indexterm zone="requests:SetClipRectangles" significance="preferred"><primary>SetClipRectangles</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -8035,7 +8040,7 @@ extents.
   </section>
   <section id="requests:FreeGC">
     <title>FreeGC</title>
-    <indexterm significance="preferred"><primary>FreeGC</primary></indexterm>
+    <indexterm zone="requests:FreeGC" significance="preferred"><primary>FreeGC</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -8068,7 +8073,7 @@ and destroys the gcontext.
   </section>
   <section id="requests:ClearArea">
     <title>ClearArea</title>
-    <indexterm significance="preferred"><primary>ClearArea</primary></indexterm>
+    <indexterm zone="requests:ClearArea" significance="preferred"><primary>ClearArea</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -8142,7 +8147,7 @@ window in this request.
   </section>
   <section id="requests:CopyArea">
     <title>CopyArea</title>
-    <indexterm significance="preferred"><primary>CopyArea</primary></indexterm>
+    <indexterm zone="requests:CopyArea" significance="preferred"><primary>CopyArea</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -8238,7 +8243,7 @@ graphics-exposures, clip-x-origin, clip-y-origin, clip-mask
   </section>
   <section id="requests:CopyPlane">
     <title>CopyPlane</title>
-    <indexterm significance="preferred"><primary>CopyPlane</primary></indexterm>
+    <indexterm zone="requests:CopyPlane" significance="preferred"><primary>CopyPlane</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -8320,7 +8325,7 @@ clip-mask
   </section>
   <section id="requests:PolyPoint">
     <title>PolyPoint</title>
-    <indexterm significance="preferred"><primary>PolyPoint</primary></indexterm>
+    <indexterm zone="requests:PolyPoint" significance="preferred"><primary>PolyPoint</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -8383,7 +8388,7 @@ clip-x-origin, clip-y-origin, clip-mask
   </section>
   <section id="requests:PolyLine">
     <title>PolyLine</title>
-    <indexterm significance="preferred"><primary>PolyLine</primary></indexterm>
+    <indexterm zone="requests:PolyLine" significance="preferred"><primary>PolyLine</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -8472,7 +8477,7 @@ tile-stipple-x-origin, tile-stipple-y-origin, dash-offset, dashes
   </section>
   <section id="requests:PolySegment">
     <title>PolySegment</title>
-    <indexterm significance="preferred"><primary>PolySegment</primary></indexterm>
+    <indexterm zone="requests:PolySegment" significance="preferred"><primary>PolySegment</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -8546,7 +8551,7 @@ tile-stipple-x-origin, tile-stipple-y-origin, dash-offset, dashes
   </section>
   <section id="requests:PolyRectangle">
     <title>PolyRectangle</title>
-    <indexterm significance="preferred"><primary>PolyRectangle</primary></indexterm>
+    <indexterm zone="requests:PolyRectangle" significance="preferred"><primary>PolyRectangle</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -8617,7 +8622,7 @@ tile-stipple-x-origin, tile-stipple-y-origin, dash-offset, dashes
   </section>
   <section id="requests:PolyArc">
     <title>PolyArc</title>
-    <indexterm significance="preferred"><primary>PolyArc</primary></indexterm>
+    <indexterm zone="requests:PolyArc" significance="preferred"><primary>PolyArc</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -8791,7 +8796,7 @@ tile-stipple-x-origin, tile-stipple-y-origin, dash-offset, dashes
   </section>
   <section id="requests:FillPoly">
     <title>FillPoly</title>
-    <indexterm significance="preferred"><primary>FillPoly</primary></indexterm>
+    <indexterm zone="requests:FillPoly" significance="preferred"><primary>FillPoly</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -8902,7 +8907,7 @@ tile-stipple-x-origin, tile-stipple-y-origin
   </section>
   <section id="requests:PolyFillRectangle">
     <title>PolyFillRectangle</title>
-    <indexterm significance="preferred"><primary>PolyFillRectangle</primary></indexterm>
+    <indexterm zone="requests:PolyFillRectangle" significance="preferred"><primary>PolyFillRectangle</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -8970,7 +8975,7 @@ tile-stipple-x-origin, tile-stipple-y-origin
   </section>
   <section id="requests:PolyFillArc">
     <title>PolyFillArc</title>
-    <indexterm significance="preferred"><primary>PolyFillArc</primary></indexterm>
+    <indexterm zone="requests:PolyFillArc" significance="preferred"><primary>PolyFillArc</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -9062,7 +9067,7 @@ tile-stipple-x-origin, tile-stipple-y-origin
   </section>
   <section id="requests:PutImage">
     <title>PutImage</title>
-    <indexterm significance="preferred"><primary>PutImage</primary></indexterm>
+    <indexterm zone="requests:PutImage" significance="preferred"><primary>PutImage</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -9188,7 +9193,7 @@ GC mode-dependent components: foreground, background
   </section>
   <section id="requests:GetImage">
     <title>GetImage</title>
-    <indexterm significance="preferred"><primary>GetImage</primary></indexterm>
+    <indexterm zone="requests:GetImage" significance="preferred"><primary>GetImage</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -9317,7 +9322,7 @@ It is intended specifically for rudimentary hardcopy support.
   </section>
   <section id="requests:PolyText8">
     <title>PolyText8</title>
-    <indexterm significance="preferred"><primary>PolyText8</primary></indexterm>
+    <indexterm zone="requests:PolyText8" significance="preferred"><primary>PolyText8</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='3' align='left' rowsep='0'>
   <colspec colname='c1' colsep='0'/>
@@ -9430,7 +9435,7 @@ tile-stipple-x-origin, tile-stipple-y-origin
   </section>
   <section id="requests:PolyText16">
     <title>PolyText16</title>
-    <indexterm significance="preferred"><primary>PolyText16</primary></indexterm>
+    <indexterm zone="requests:PolyText16" significance="preferred"><primary>PolyText16</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='3' align='left' rowsep='0'>
   <colspec colname='c1' colsep='0'/>
@@ -9517,7 +9522,7 @@ CHAR2B is taken as the most significant byte).
   </section>
   <section id="requests:ImageText8">
     <title>ImageText8</title>
-    <indexterm significance="preferred"><primary>ImageText8</primary></indexterm>
+    <indexterm zone="requests:ImageText8" significance="preferred"><primary>ImageText8</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -9607,7 +9612,7 @@ subwindow-mode, clip-x-origin, clip-y-origin, clip-mask
   </section>
   <section id="requests:ImageText16">
     <title>ImageText16</title>
-    <indexterm significance="preferred"><primary>ImageText16</primary></indexterm>
+    <indexterm zone="requests:ImageText16" significance="preferred"><primary>ImageText16</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -9662,7 +9667,7 @@ CHAR2B is taken as the most significant byte).
   </section>
   <section id="requests:CreateColormap">
     <title>CreateColormap</title>
-    <indexterm significance="preferred"><primary>CreateColormap</primary></indexterm>
+    <indexterm zone="requests:CreateColormap" significance="preferred"><primary>CreateColormap</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -9770,7 +9775,7 @@ in all cases, none of these entries can be freed with
   </section>
   <section id="requests:FreeColormap">
     <title>FreeColormap</title>
-    <indexterm significance="preferred"><primary>FreeColormap</primary></indexterm>
+    <indexterm zone="requests:FreeColormap" significance="preferred"><primary>FreeColormap</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -9821,7 +9826,7 @@ This request has no effect on a default colormap for a screen.
   </section>
   <section id="requests:CopyColormapAndFree">
     <title>CopyColormapAndFree</title>
-    <indexterm significance="preferred"><primary>CopyColormapAndFree</primary></indexterm>
+    <indexterm zone="requests:CopyColormapAndFree" significance="preferred"><primary>CopyColormapAndFree</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -9881,7 +9886,7 @@ and that have not been freed since they were allocated.
   </section>
   <section id="requests:InstallColormap">
     <title>InstallColormap</title>
-    <indexterm significance="preferred"><primary>InstallColormap</primary></indexterm>
+    <indexterm zone="requests:InstallColormap" significance="preferred"><primary>InstallColormap</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -9951,7 +9956,7 @@ the required list).
   </section>
   <section id="requests:UninstallColormap">
     <title>UninstallColormap</title>
-    <indexterm significance="preferred"><primary>UninstallColormap</primary></indexterm>
+    <indexterm zone="requests:UninstallColormap" significance="preferred"><primary>UninstallColormap</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -10001,7 +10006,7 @@ event is generated on every window having that colormap as an attribute.
   </section>
   <section id="requests:ListInstalledColormaps">
     <title>ListInstalledColormaps</title>
-    <indexterm significance="preferred"><primary>ListInstalledColormaps</primary></indexterm>
+    <indexterm zone="requests:ListInstalledColormaps" significance="preferred"><primary>ListInstalledColormaps</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -10050,7 +10055,7 @@ request).
   </section>
   <section id="requests:AllocColor">
     <title>AllocColor</title>
-    <indexterm significance="preferred"><primary>AllocColor</primary></indexterm>
+    <indexterm zone="requests:AllocColor" significance="preferred"><primary>AllocColor</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -10109,7 +10114,7 @@ the same read-only entry, allowing entries to be shared.
   </section>
   <section id="requests:AllocNamedColor">
     <title>AllocNamedColor</title>
-    <indexterm significance="preferred"><primary>AllocNamedColor</primary></indexterm>
+    <indexterm zone="requests:AllocNamedColor" significance="preferred"><primary>AllocNamedColor</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -10178,7 +10183,7 @@ and the visual values specify the values actually used in the colormap.
   </section>
   <section id="requests:AllocColorCells">
     <title>AllocColorCells</title>
-    <indexterm significance="preferred"><primary>AllocColorCells</primary></indexterm>
+    <indexterm zone="requests:AllocColorCells" significance="preferred"><primary>AllocColorCells</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -10261,7 +10266,7 @@ The RGB values of the allocated entries are undefined.
   </section>
   <section id="requests:AllocColorPlanes">
     <title>AllocColorPlanes</title>
-    <indexterm significance="preferred"><primary>AllocColorPlanes</primary></indexterm>
+    <indexterm zone="requests:AllocColorPlanes" significance="preferred"><primary>AllocColorPlanes</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -10352,7 +10357,7 @@ corresponding independent entries are updated.
   </section>
   <section id="requests:FreeColors">
     <title>FreeColors</title>
-    <indexterm significance="preferred"><primary>FreeColors</primary></indexterm>
+    <indexterm zone="requests:FreeColors" significance="preferred"><primary>FreeColors</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -10433,7 +10438,7 @@ it is arbitrary as to which pixel is reported.
   </section>
   <section id="requests:StoreColors">
     <title>StoreColors</title>
-    <indexterm significance="preferred"><primary>StoreColors</primary></indexterm>
+    <indexterm zone="requests:StoreColors" significance="preferred"><primary>StoreColors</primary></indexterm>
 
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
@@ -10519,7 +10524,7 @@ it is arbitrary as to which pixel is reported.
   </section>
   <section id="requests:StoreNamedColor">
     <title>StoreNamedColor</title>
-    <indexterm significance="preferred"><primary>StoreNamedColor</primary></indexterm>
+    <indexterm zone="requests:StoreNamedColor" significance="preferred"><primary>StoreNamedColor</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -10580,7 +10585,7 @@ errors are the same as in
   </section>
   <section id="requests:QueryColors">
     <title>QueryColors</title>
-    <indexterm significance="preferred"><primary>QueryColors</primary></indexterm>
+    <indexterm zone="requests:QueryColors" significance="preferred"><primary>QueryColors</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -10651,7 +10656,7 @@ it is arbitrary as to which pixel is reported.
   </section>
   <section id="requests:LookupColor">
     <title>LookupColor</title>
-    <indexterm significance="preferred"><primary>LookupColor</primary></indexterm>
+    <indexterm zone="requests:LookupColor" significance="preferred"><primary>LookupColor</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -10711,7 +10716,7 @@ and uppercase and lowercase do not matter.
   </section>
   <section id="requests:CreateCursor">
     <title>CreateCursor</title>
-    <indexterm significance="preferred"><primary>CreateCursor</primary></indexterm>
+    <indexterm zone="requests:CreateCursor" significance="preferred"><primary>CreateCursor</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -10810,7 +10815,7 @@ The server might or might not make a copy of the pixmap.
   </section>
   <section id="requests:CreateGlyphCursor">
     <title>CreateGlyphCursor</title>
-    <indexterm significance="preferred"><primary>CreateGlyphCursor</primary></indexterm>
+    <indexterm zone="requests:CreateGlyphCursor" significance="preferred"><primary>CreateGlyphCursor</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -10898,7 +10903,7 @@ them are to be made.
   </section>
   <section id="requests:FreeCursor">
     <title>FreeCursor</title>
-    <indexterm significance="preferred"><primary>FreeCursor</primary></indexterm>
+    <indexterm zone="requests:FreeCursor" significance="preferred"><primary>FreeCursor</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -10931,7 +10936,7 @@ The cursor storage will be freed when no other resource references it.
   </section>
   <section id="requests:RecolorCursor">
     <title>RecolorCursor</title>
-    <indexterm significance="preferred"><primary>RecolorCursor</primary></indexterm>
+    <indexterm zone="requests:RecolorCursor" significance="preferred"><primary>RecolorCursor</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -10975,7 +10980,7 @@ the change is visible immediately.
   </section>
   <section id="requests:QueryBestSize">
     <title>QueryBestSize</title>
-    <indexterm significance="preferred"><primary>QueryBestSize</primary></indexterm>
+    <indexterm zone="requests:QueryBestSize" significance="preferred"><primary>QueryBestSize</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -11062,7 +11067,7 @@ error results).
   </section>
   <section id="requests:QueryExtension">
     <title>QueryExtension</title>
-    <indexterm significance="preferred"><primary>QueryExtension</primary></indexterm>
+    <indexterm zone="requests:QueryExtension" significance="preferred"><primary>QueryExtension</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -11129,7 +11134,7 @@ and uppercase and lowercase matter.
   </section>
   <section id="requests:ListExtensions">
     <title>ListExtensions</title>
-    <indexterm significance="preferred"><primary>ListExtensions</primary></indexterm>
+    <indexterm zone="requests:ListExtensions" significance="preferred"><primary>ListExtensions</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -11157,7 +11162,7 @@ This request returns a list of all extensions supported by the server.
   </section>
   <section id="requests:SetModifierMapping">
     <title>SetModifierMapping</title>
-    <indexterm significance="preferred"><primary>SetModifierMapping</primary></indexterm>
+    <indexterm zone="requests:SetModifierMapping" significance="preferred"><primary>SetModifierMapping</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -11264,7 +11269,7 @@ status.
   </section>
   <section id="requests:GetModifierMapping">
     <title>GetModifierMapping</title>
-    <indexterm significance="preferred"><primary>GetModifierMapping</primary></indexterm>
+    <indexterm zone="requests:GetModifierMapping" significance="preferred"><primary>GetModifierMapping</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -11317,7 +11322,7 @@ The order of keycodes within each set is chosen arbitrarily by the server.
   </section>
   <section id="requests:ChangeKeyboardMapping">
     <title>ChangeKeyboardMapping</title>
-    <indexterm significance="preferred"><primary>ChangeKeyboardMapping</primary></indexterm>
+    <indexterm zone="requests:ChangeKeyboardMapping" significance="preferred"><primary>ChangeKeyboardMapping</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -11405,7 +11410,7 @@ it is merely stored for reading and writing by clients
   </section>
   <section id="requests:GetKeyboardMapping">
     <title>GetKeyboardMapping</title>
-    <indexterm significance="preferred"><primary>GetKeyboardMapping</primary></indexterm>
+    <indexterm zone="requests:GetKeyboardMapping" significance="preferred"><primary>GetKeyboardMapping</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -11492,7 +11497,7 @@ is used to fill in unused elements for individual keycodes.
   </section>
   <section id="requests:ChangeKeyboardControl">
     <title>ChangeKeyboardControl</title>
-    <indexterm significance="preferred"><primary>ChangeKeyboardControl</primary></indexterm>
+    <indexterm zone="requests:ChangeKeyboardControl" significance="preferred"><primary>ChangeKeyboardControl</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -11663,7 +11668,7 @@ a subset of the controls may have been altered.
   </section>
   <section id="requests:GetKeyboardControl">
     <title>GetKeyboardControl</title>
-    <indexterm significance="preferred"><primary>GetKeyboardControl</primary></indexterm>
+    <indexterm zone="requests:GetKeyboardControl" significance="preferred"><primary>GetKeyboardControl</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -11732,7 +11737,7 @@ with the least significant bit in the byte representing key 8N.
   </section>
   <section id="requests:Bell">
     <title>Bell</title>
-    <indexterm significance="preferred"><primary>Bell</primary></indexterm>
+    <indexterm zone="requests:Bell" significance="preferred"><primary>Bell</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -11778,7 +11783,7 @@ When percent is negative, it is:
   </section>
   <section id="requests:SetPointerMapping">
     <title>SetPointerMapping</title>
-    <indexterm significance="preferred"><primary>SetPointerMapping</primary></indexterm>
+    <indexterm zone="requests:SetPointerMapping" significance="preferred"><primary>SetPointerMapping</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -11852,7 +11857,7 @@ status.
   </section>
   <section id="requests:GetPointerMapping">
     <title>GetPointerMapping</title>
-    <indexterm significance="preferred"><primary>GetPointerMapping</primary></indexterm>
+    <indexterm zone="requests:GetPointerMapping" significance="preferred"><primary>GetPointerMapping</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -11886,7 +11891,7 @@ The nominal mapping for a pointer is the identity mapping: map[i]=i.
   </section>
   <section id="requests:ChangePointerControl">
     <title>ChangePointerControl</title>
-    <indexterm significance="preferred"><primary>ChangePointerControl</primary></indexterm>
+    <indexterm zone="requests:ChangePointerControl" significance="preferred"><primary>ChangePointerControl</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -11938,7 +11943,7 @@ error, as does a zero value for acceleration-denominator.
   </section>
   <section id="requests:GetPointerControl">
     <title>GetPointerControl</title>
-    <indexterm significance="preferred"><primary>GetPointerControl</primary></indexterm>
+    <indexterm zone="requests:GetPointerControl" significance="preferred"><primary>GetPointerControl</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -11972,7 +11977,7 @@ This request returns the current acceleration and threshold for the pointer.
   </section>
   <section id="requests:SetScreenSaver">
     <title>SetScreenSaver</title>
-    <indexterm significance="preferred"><primary>SetScreenSaver</primary></indexterm>
+    <indexterm zone="requests:SetScreenSaver" significance="preferred"><primary>SetScreenSaver</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -12054,7 +12059,7 @@ randomly reorigined periodically.
   </section>
   <section id="requests:GetScreenSaver">
     <title>GetScreenSaver</title>
-    <indexterm significance="preferred"><primary>GetScreenSaver</primary></indexterm>
+    <indexterm zone="requests:GetScreenSaver" significance="preferred"><primary>GetScreenSaver</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -12097,7 +12102,7 @@ This request returns the current screen-saver control values.
   </section>
   <section id="requests:ForceScreenSaver">
     <title>ForceScreenSaver</title>
-    <indexterm significance="preferred"><primary>ForceScreenSaver</primary></indexterm>
+    <indexterm zone="requests:ForceScreenSaver" significance="preferred"><primary>ForceScreenSaver</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -12141,7 +12146,7 @@ as if device input had just been received.
   </section>
   <section id="requests:ChangeHosts">
     <title>ChangeHosts</title>
-    <indexterm significance="preferred"><primary>ChangeHosts</primary></indexterm>
+    <indexterm zone="requests:ChangeHosts" significance="preferred"><primary>ChangeHosts</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -12176,7 +12181,7 @@ Errors:
 <!-- .eM -->
 <para>
 This request adds or removes the specified host from the access control list.
-<indexterm><primary>Access control list</primary></indexterm>
+<indexterm zone="requests:ChangeHosts"><primary>Access control list</primary></indexterm>
 When the access control mechanism is enabled and a client attempts to
 establish a connection to the server,
 the host on which the client resides must be in the access control list,
@@ -12193,9 +12198,9 @@ error results).
 An initial access control list can usually be specified,
 typically by naming a file that the server reads at startup and reset.
 </para>
-<para>
+<para id="address_families">
 The following address families are defined.
-<indexterm><primary>Types</primary><secondary>HOST</secondary></indexterm>
+<indexterm zone="address_families"><primary>Types</primary><secondary>HOST</secondary></indexterm>
 A server is not required to support these families
 and may support families not listed here.
 Use of an unsupported family, an improper address format,
@@ -12258,7 +12263,7 @@ or public key encryption, are recommended.
   </section>
   <section id="requests:ListHosts">
     <title>ListHosts</title>
-    <indexterm significance="preferred"><primary>ListHosts</primary></indexterm>
+    <indexterm zone="requests:ListHosts" significance="preferred"><primary>ListHosts</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -12299,7 +12304,7 @@ Each HOST is padded to a multiple of four bytes.
   </section>
   <section id="requests:SetAccessControl">
     <title>SetAccessControl</title>
-    <indexterm significance="preferred"><primary>SetAccessControl</primary></indexterm>
+    <indexterm zone="requests:SetAccessControl" significance="preferred"><primary>SetAccessControl</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -12342,7 +12347,7 @@ error results).
   </section>
   <section id="requests:SetCloseDownMode">
     <title>SetCloseDownMode</title>
-    <indexterm significance="preferred"><primary>SetCloseDownMode</primary></indexterm>
+    <indexterm zone="requests:SetCloseDownMode" significance="preferred"><primary>SetCloseDownMode</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -12383,7 +12388,7 @@ in <link linkend="connection_close">section 10</link>.
   </section>
   <section id="requests:KillClient">
     <title>KillClient</title>
-    <indexterm significance="preferred"><primary>KillClient</primary></indexterm>
+    <indexterm zone="requests:KillClient" significance="preferred"><primary>KillClient</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -12430,7 +12435,7 @@ are destroyed.
   </section>
   <section id="requests:NoOperation">
     <title>NoOperation</title>
-    <indexterm significance="preferred"><primary>NoOperation</primary></indexterm>
+    <indexterm zone="requests:NoOperation" significance="preferred"><primary>NoOperation</primary></indexterm>
 <para>
 This request has no arguments and no results,
 but the request length field
@@ -12617,7 +12622,7 @@ can both be used to modify the active grab.
 
   <section id="events:input">
     <title>Input Device events</title>
-    <indexterm significance="preferred"><primary>Input device</primary><secondary>events</secondary></indexterm>
+    <indexterm zone="events:input" significance="preferred"><primary>Input device</primary><secondary>events</secondary></indexterm>
 
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
@@ -12625,31 +12630,31 @@ can both be used to modify the active grab.
   <tbody>
     <row rowsep='0'>
       <entry>
-<indexterm significance="preferred"><primary>KeyPress</primary></indexterm>
+<indexterm zone="events:KeyPress" significance="preferred"><primary>KeyPress</primary></indexterm>
 <emphasis role='bold' id="events:KeyPress">KeyPress</emphasis>
       </entry>
     </row>
     <row rowsep='0'>
       <entry>
-<indexterm significance="preferred"><primary>KeyRelease</primary></indexterm>
+<indexterm zone="events:KeyRelease" significance="preferred"><primary>KeyRelease</primary></indexterm>
 <emphasis role='bold' id="events:KeyRelease">KeyRelease</emphasis>
       </entry>
     </row>
     <row rowsep='0'>
       <entry>
-<indexterm significance="preferred"><primary>ButtonPress</primary></indexterm>
+<indexterm zone="events:ButtonPress" significance="preferred"><primary>ButtonPress</primary></indexterm>
 <emphasis role='bold' id="events:ButtonPress">ButtonPress</emphasis>
       </entry>
     </row>
     <row rowsep='0'>
       <entry>
-<indexterm significance="preferred"><primary>ButtonRelease</primary></indexterm>
+<indexterm zone="events:ButtonRelease" significance="preferred"><primary>ButtonRelease</primary></indexterm>
 <emphasis role='bold' id="events:ButtonRelease">ButtonRelease</emphasis>
       </entry>
     </row>
     <row rowsep='0'>
       <entry>
-<indexterm significance="preferred"><primary>MotionNotify</primary></indexterm>
+<indexterm zone="events:MotionNotify" significance="preferred"><primary>MotionNotify</primary></indexterm>
 <emphasis role='bold' id="events:MotionNotify">MotionNotify</emphasis>
       </entry>
     </row>
@@ -12820,13 +12825,13 @@ request.
   <tbody>
     <row rowsep='0'>
       <entry>
-<indexterm significance="preferred"><primary>EnterNotify</primary></indexterm>
+<indexterm zone="events:EnterNotify" significance="preferred"><primary>EnterNotify</primary></indexterm>
 <emphasis role='bold' id="events:EnterNotify">EnterNotify</emphasis>
       </entry>
     </row>
     <row rowsep='0'>
       <entry>
-<indexterm significance="preferred"><primary>LeaveNotify</primary></indexterm>
+<indexterm zone="events:LeaveNotify" significance="preferred"><primary>LeaveNotify</primary></indexterm>
 <emphasis role='bold' id="events:LeaveNotify">LeaveNotify</emphasis>
       </entry>
     </row>
@@ -13175,7 +13180,7 @@ and final positions for the events.
   </section>
   <section id="events:input_focus">
     <title>Input Focus events</title>
-    <indexterm significance="preferred"><primary>Input focus</primary><secondary>events</secondary></indexterm>
+    <indexterm zone="events:input_focus" significance="preferred"><primary>Input focus</primary><secondary>events</secondary></indexterm>
 
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
@@ -13183,13 +13188,13 @@ and final positions for the events.
   <tbody>
     <row rowsep='0'>
       <entry>
-<indexterm significance="preferred"><primary>FocusIn</primary></indexterm>
+<indexterm zone="events:FocusIn" significance="preferred"><primary>FocusIn</primary></indexterm>
 <emphasis role='bold' id="events:FocusIn">FocusIn</emphasis>
       </entry>
     </row>
     <row rowsep='0'>
       <entry>
-<indexterm significance="preferred"><primary>FocusOut</primary></indexterm>
+<indexterm zone="events:FocusOut" significance="preferred"><primary>FocusOut</primary></indexterm>
 <emphasis role='bold' id="events:FocusOut">FocusOut</emphasis>
       </entry>
     </row>
@@ -13691,7 +13696,7 @@ above) as if the focus were to change from G to F.
   </section>
   <section id="events:KeymapNotify">
     <title>KeymapNotify</title>
-    <indexterm significance="preferred"><primary>KeymapNotify</primary></indexterm>
+    <indexterm zone="events:KeymapNotify" significance="preferred"><primary>KeymapNotify</primary></indexterm>
 
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
@@ -13725,7 +13730,7 @@ and
   </section>
   <section id="events:Expose">
     <title>Expose</title>
-    <indexterm significance="preferred"><primary>Expose</primary></indexterm>
+    <indexterm zone="events:Expose" significance="preferred"><primary>Expose</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -13832,7 +13837,7 @@ events is not constrained.
   </section>
   <section id="events:GraphicsExposure">
     <title>GraphicsExposure</title>
-    <indexterm significance="preferred"><primary>GraphicsExposure</primary></indexterm>
+    <indexterm zone="events:GraphicsExposure" significance="preferred"><primary>GraphicsExposure</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -13907,7 +13912,7 @@ and minor-opcode is always zero.
   </section>
   <section id="events:NoExposure">
     <title>NoExposure</title>
-    <indexterm significance="preferred"><primary>NoExposure</primary></indexterm>
+    <indexterm zone="events:NoExposure" significance="preferred"><primary>NoExposure</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -13961,7 +13966,7 @@ and the minor-opcode is always zero.
   </section>
   <section id="events:VisibilityNotify">
     <title>VisibilityNotify</title>
-    <indexterm significance="preferred"><primary>VisibilityNotify</primary></indexterm>
+    <indexterm zone="events:VisibilityNotify" significance="preferred"><primary>VisibilityNotify</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -14054,7 +14059,7 @@ events is not constrained.
   </section>
   <section id="events:CreateNotify">
     <title>CreateNotify</title>
-    <indexterm significance="preferred"><primary>CreateNotify</primary></indexterm>
+    <indexterm zone="events:CreateNotify" significance="preferred"><primary>CreateNotify</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -14104,7 +14109,7 @@ request.
   </section>
   <section id="events:DestroyNotify">
     <title>DestroyNotify</title>
-    <indexterm significance="preferred"><primary>DestroyNotify</primary></indexterm>
+    <indexterm zone="events:DestroyNotify" significance="preferred"><primary>DestroyNotify</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -14150,7 +14155,7 @@ otherwise constrained.
   </section>
   <section id="events:UnmapNotify">
     <title>UnmapNotify</title>
-    <indexterm significance="preferred"><primary>UnmapNotify</primary></indexterm>
+    <indexterm zone="events:UnmapNotify" significance="preferred"><primary>UnmapNotify</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -14196,7 +14201,7 @@ when the window itself had a win-gravity of
   </section>
   <section id="events:MapNotify">
     <title>MapNotify</title>
-    <indexterm significance="preferred"><primary>MapNotify</primary></indexterm>
+    <indexterm zone="events:MapNotify" significance="preferred"><primary>MapNotify</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -14238,7 +14243,7 @@ The override-redirect flag is from the window's attribute.
   </section>
   <section id="events:MapRequest">
     <title>MapRequest</title>
-    <indexterm significance="preferred"><primary>MapRequest</primary></indexterm>
+    <indexterm zone="events:MapRequest" significance="preferred"><primary>MapRequest</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -14272,7 +14277,7 @@ request is issued on an unmapped window with an override-redirect attribute of
   </section>
   <section id="events:ReparentNotify">
     <title>ReparentNotify</title>
-    <indexterm significance="preferred"><primary>ReparentNotify</primary></indexterm>
+    <indexterm zone="events:ReparentNotify" significance="preferred"><primary>ReparentNotify</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -14322,7 +14327,7 @@ The override-redirect flag is from the window's attribute.
   </section>
   <section id="events:ConfigureNotify">
     <title>ConfigureNotify</title>
-    <indexterm significance="preferred"><primary>ConfigureNotify</primary></indexterm>
+    <indexterm zone="events:ConfigureNotify" significance="preferred"><primary>ConfigureNotify</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -14389,7 +14394,7 @@ The override-redirect flag is from the window's attribute.
   </section>
   <section id="events:GravityNotify">
     <title>GravityNotify</title>
-    <indexterm significance="preferred"><primary>GravityNotify</primary></indexterm>
+    <indexterm zone="events:GravityNotify" significance="preferred"><primary>GravityNotify</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -14433,7 +14438,7 @@ and specify the position of the upper-left outer corner of the window.
   </section>
   <section id="events:ResizeRequest">
     <title>ResizeRequest</title>
-    <indexterm significance="preferred"><primary>ResizeRequest</primary></indexterm>
+    <indexterm zone="events:ResizeRequest" significance="preferred"><primary>ResizeRequest</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -14473,7 +14478,7 @@ The width and height are the requested inside size, not including the border.
   </section>
   <section id="events:ConfigureRequest">
     <title>ConfigureRequest</title>
-    <indexterm significance="preferred"><primary>ConfigureRequest</primary></indexterm>
+    <indexterm zone="events:ConfigureRequest" significance="preferred"><primary>ConfigureRequest</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -14547,7 +14552,7 @@ and
   </section>
   <section id="events:CirculateNotify">
     <title>CirculateNotify</title>
-    <indexterm significance="preferred"><primary>CirculateNotify</primary></indexterm>
+    <indexterm zone="events:CirculateNotify" significance="preferred"><primary>CirculateNotify</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -14596,7 +14601,7 @@ Otherwise, it is below all siblings.
   </section>
   <section id="events:CirculateRequest">
     <title>CirculateRequest</title>
-    <indexterm significance="preferred"><primary>CirculateRequest</primary></indexterm>
+    <indexterm zone="events:CirculateRequest" significance="preferred"><primary>CirculateRequest</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -14638,7 +14643,7 @@ and the place specifies what the new position in the stacking order should be.
   </section>
   <section id="events:PropertyNotify">
     <title>PropertyNotify</title>
-    <indexterm significance="preferred"><primary>PropertyNotify</primary></indexterm>
+    <indexterm zone="events:PropertyNotify" significance="preferred"><primary>PropertyNotify</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -14705,7 +14710,7 @@ The timestamp indicates the server time when the property was changed.
   </section>
   <section id="events:SelectionClear">
     <title>SelectionClear</title>
-    <indexterm significance="preferred"><primary>SelectionClear</primary></indexterm>
+    <indexterm zone="events:SelectionClear" significance="preferred"><primary>SelectionClear</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -14750,7 +14755,7 @@ request.
   </section>
   <section id="events:SelectionRequest">
     <title>SelectionRequest</title>
-    <indexterm significance="preferred"><primary>SelectionRequest</primary></indexterm>
+    <indexterm zone="events:SelectionRequest" significance="preferred"><primary>SelectionRequest</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -14823,7 +14828,7 @@ standard <citetitle>Inter-Client Communication Conventions Manual</citetitle>.
   </section>
   <section id="events:SelectionNotify">
     <title>SelectionNotify</title>
-    <indexterm significance="preferred"><primary>SelectionNotify</primary></indexterm>
+    <indexterm zone="events:SelectionNotify" significance="preferred"><primary>SelectionNotify</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -14878,7 +14883,7 @@ or when a selection conversion could not be performed (indicated with property
   </section>
   <section id="events:ColormapNotify">
     <title>ColormapNotify</title>
-    <indexterm significance="preferred"><primary>ColormapNotify</primary></indexterm>
+    <indexterm zone="events:ColormapNotify" significance="preferred"><primary>ColormapNotify</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -14935,7 +14940,7 @@ the state indicates whether the colormap is currently installed.
   </section>
   <section id="events:MappingNotify">
     <title>MappingNotify</title>
-    <indexterm significance="preferred"><primary>MappingNotify</primary></indexterm>
+    <indexterm zone="events:MappingNotify" significance="preferred"><primary>MappingNotify</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>
@@ -14987,7 +14992,7 @@ then first-keycode and count indicate the range of altered keycodes.
   </section>
   <section id="events:ClientMessage">
     <title>ClientMessage</title>
-    <indexterm significance="preferred"><primary>ClientMessage</primary></indexterm>
+    <indexterm zone="events:ClientMessage" significance="preferred"><primary>ClientMessage</primary></indexterm>
 <informaltable frame='none'>
   <tgroup cols='1' align='left'>
   <colspec colname='c1' colsep='0'/>