Merge remote-tracking branch 'origin/released'

Conflicts:
	pixman/pixman/pixman-mmx.c
	xorg-server/glx/glapi_gentable.c

14 files changed, 48 insertions, 25 deletions

diff --git a/libX11/specs/XKB/acknowledgement.xml b/libX11/specs/XKB/acknowledgement.xml
index 2977999c4..4ecb798c1 100644
--- a/libX11/specs/XKB/acknowledgement.xml
+++ b/libX11/specs/XKB/acknowledgement.xml
@@ -24,12 +24,20 @@ not only for the quality of this document, but for the quality of the
 Keyboard extension itself.
 </para>
 <para>
+<literallayout>
 Matt Landau
-</para>
-<para>
 Manager, X Window System
+X Consortium Inc.
+</literallayout>
 </para>
+<simplesect>
+<title>X Version 11, Release 7 addendum</title>
 <para>
-X Consortium Inc.
+This document is made available to you in modern formats such as HTML and PDF
+thanks to the efforts of Matt Dew, who converted the original troff sources to
+DocBook/XML and edited them into shape; Fernando Carrijo, who converted the
+images to SVG format; and Gaetan Nadon, who set up the formatting machinery in
+the libX11 builds and performed further editing of the DocBook markup.
 </para>
+</simplesect>
 </preface>
diff --git a/libX11/specs/i18n/localedb/localedb.xml b/libX11/specs/i18n/localedb/localedb.xml
index caacd82d5..ed9000769 100644
--- a/libX11/specs/i18n/localedb/localedb.xml
+++ b/libX11/specs/i18n/localedb/localedb.xml
@@ -422,7 +422,7 @@ for this fontset.  The format of value is;
 
 <para>
 For detail definition of CHARSET_REGISTRY-CHARSET_ENCODING, refer
-"X Logical Font Descriptions" document.
+to the <olink targetdoc='xlfd' targetptr='xlfd'><citetitle>X Logical Font Description Conventions</citetitle></olink> document.
 </para>
 <literallayout>
 example:
@@ -778,7 +778,7 @@ END XLC_XLOCALE
 [1] <emphasis remap='I'>ISO/IEC 9899:1990 C Language Standard</emphasis>
 </para>
 <para>
-[2] <emphasis remap='I'>X Logical Font Descriptions</emphasis>
+[2] <olink targetdoc='xlfd' targetptr='xlfd'><citetitle>X Logical Font Description Conventions</citetitle></olink>
 </para>
 
 </sect1>
diff --git a/libX11/specs/libX11/AppD.xml b/libX11/specs/libX11/AppD.xml
index f3c0e2f6a..fdea46894 100644
--- a/libX11/specs/libX11/AppD.xml
+++ b/libX11/specs/libX11/AppD.xml
@@ -361,7 +361,7 @@ The next two functions set and read the <property>WM_ZOOM_HINTS</property> prope
 To set the zoom hints for a window, use
 <xref linkend='XSetZoomHints' xrefstyle='select: title'/>.
 This function is no longer supported by the
-<emphasis remap='I'>Inter-Client Communication Conventions Manual</emphasis>.
+<citetitle>Inter-Client Communication Conventions Manual</citetitle>.
 </para>
 <indexterm significance="preferred"><primary>XSetZoomHints</primary></indexterm>
 <!-- .sM -->
@@ -431,7 +431,7 @@ errors.
 To read the zoom hints for a window, use
 <xref linkend='XGetZoomHints' xrefstyle='select: title'/>.
 This function is no longer supported by the
-<emphasis remap='I'>Inter-Client Communication Conventions Manual</emphasis>.
+<citetitle>Inter-Client Communication Conventions Manual</citetitle>.
 </para>
 <indexterm significance="preferred"><primary>XGetZoomHints</primary></indexterm>
 <!-- .sM -->
diff --git a/libX11/specs/libX11/CH01.xml b/libX11/specs/libX11/CH01.xml
index 081e80c46..67744cfa2 100644
--- a/libX11/specs/libX11/CH01.xml
+++ b/libX11/specs/libX11/CH01.xml
@@ -685,7 +685,7 @@ What you do inside of your top-level window, however,
 is up to your application.
 For further information,
 see <link linkend='Inter_Client_Communication_Functions'>chapter 14</link>
-and the <citetitle>Inter-Client Communication Conventions Manual</citetitle>.
+and the <olink targetdoc='icccm' targetptr='icccm'><citetitle>Inter-Client Communication Conventions Manual</citetitle></olink>.
     </para>
   </listitem>
 </itemizedlist>
diff --git a/libX11/specs/libX11/CH03.xml b/libX11/specs/libX11/CH03.xml
index e2468580d..7d2b20e52 100644
--- a/libX11/specs/libX11/CH03.xml
+++ b/libX11/specs/libX11/CH03.xml
@@ -1214,7 +1214,7 @@ you should set these properties for top-level windows before mapping them.
 <!-- .LP -->
 For further information,
 see <link linkend='Inter_Client_Communication_Functions'>chapter 14</link> and
-the <emphasis remap='I'>Inter-Client Communication Conventions Manual</emphasis>.
+the <olink targetdoc='icccm' targetptr='icccm'><citetitle>Inter-Client Communication Conventions Manual</citetitle></olink>.
 </para>
 <para>
 <!-- .LP -->
diff --git a/libX11/specs/libX11/CH04.xml b/libX11/specs/libX11/CH04.xml
index a3f47d543..9cdfd1a7f 100644
--- a/libX11/specs/libX11/CH04.xml
+++ b/libX11/specs/libX11/CH04.xml
@@ -893,8 +893,8 @@ see <link linkend='Inter_Client_Communication_Functions'>chapter 14</link>.
 <!-- .LP -->
 The core protocol imposes no semantics on these property names,
 but semantics are specified in other X Consortium standards,
-such as the <emphasis remap='I'>Inter-Client Communication Conventions Manual</emphasis>
-and the <emphasis remap='I'>X Logical Font Description Conventions</emphasis>.
+such as the <olink targetdoc='icccm' targetptr='icccm'><citetitle>Inter-Client Communication Conventions Manual</citetitle></olink>
+and the <olink targetdoc='xlfd' targetptr='xlfd'><citetitle>X Logical Font Description Conventions</citetitle></olink>.
 </para>
 <para>
 <!-- .LP -->
diff --git a/libX11/specs/libX11/CH06.xml b/libX11/specs/libX11/CH06.xml
index 1a6709cd7..b84ce95cc 100644
--- a/libX11/specs/libX11/CH06.xml
+++ b/libX11/specs/libX11/CH06.xml
@@ -7109,8 +7109,9 @@ a class of output devices.
 <indexterm><primary>Device Color Characterization</primary></indexterm>
 For details about how color characterization data is
 stored in root window properties,
-see the section on Device Color Characterization in the
-<emphasis remap='I'>Inter-Client Communication Conventions Manual</emphasis>.
+see <olink targetdoc='icccm' targetptr='Device_Color_Characterization'>the
+section on Device Color Characterization in the
+<citetitle>Inter-Client Communication Conventions Manual</citetitle></olink>.
 The LINEAR_RGB function set is provided by Xlib
 and will support most color monitors.
 Function sets may require data that differs
diff --git a/libX11/specs/libX11/CH08.xml b/libX11/specs/libX11/CH08.xml
index b2348b5ae..e4afa37fa 100644
--- a/libX11/specs/libX11/CH08.xml
+++ b/libX11/specs/libX11/CH08.xml
@@ -2995,7 +2995,7 @@ A font is not guaranteed to have any properties.
 The interpretation of the property value (for example, long or unsigned long)
 must be derived from <emphasis remap='I'>a priori</emphasis> knowledge of the property. 
 A basic set of font properties is specified in the X Consortium standard
-<emphasis remap='I'>X Logical Font Description Conventions</emphasis>.
+<olink targetdoc='xlfd' targetptr='xlfd'><citetitle>X Logical Font Description Conventions</citetitle></olink>.
 </para>
 <sect2 id="Loading_and_Freeing_Fonts">
 <title>Loading and Freeing Fonts</title>
@@ -3067,7 +3067,7 @@ In the pattern,
 the ``?'' character will match any single character, 
 and the ``*'' character will match any number of characters.
 A structured format for font names is specified in the X Consortium standard 
-<emphasis remap='I'>X Logical Font Description Conventions</emphasis>.
+<olink targetdoc='xlfd' targetptr='xlfd'><citetitle>X Logical Font Description Conventions</citetitle></olink>.
 If 
 <xref linkend='XLoadFont' xrefstyle='select: title'/>
 was unsuccessful at loading the specified font, 
diff --git a/libX11/specs/libX11/CH10.xml b/libX11/specs/libX11/CH10.xml
index 2024592b5..9c12ef710 100644
--- a/libX11/specs/libX11/CH10.xml
+++ b/libX11/specs/libX11/CH10.xml
@@ -4632,8 +4632,10 @@ The owner should convert the selection based on the specified target type
 and send a
 <symbol>SelectionNotify</symbol>
 event back to the requestor.
-A complete specification for using selections is given in the X Consortium
-standard <emphasis remap='I'>Inter-Client Communication Conventions Manual</emphasis>.
+A <olink targetdoc='icccm'
+targetptr='Peer_to_Peer_Communication_by_Means_of_Selections'>complete
+specification for using selections</olink> is given in the X Consortium
+standard <citetitle>Inter-Client Communication Conventions Manual</citetitle>.
 </para>
 </sect2>
 <sect2 id="SelectionNotify_Events">
diff --git a/libX11/specs/libX11/CH12.xml b/libX11/specs/libX11/CH12.xml
index ae8017b2b..cc14fe649 100644
--- a/libX11/specs/libX11/CH12.xml
+++ b/libX11/specs/libX11/CH12.xml
@@ -1926,7 +1926,7 @@ error.
 Xlib provides functions that you can use to set and get the input focus.
 The input focus is a shared resource, and cooperation among clients is
 required for correct interaction.  See the
-<emphasis remap='I'>Inter-Client Communication Conventions Manual</emphasis> 
+<olink targetdoc='icccm' targetptr='Input_Focus'><citetitle>Inter-Client Communication Conventions Manual</citetitle></olink>
 for input focus policy.
 </para>
 <para>
diff --git a/libX11/specs/libX11/CH14.xml b/libX11/specs/libX11/CH14.xml
index ee14b95ee..6dc947a9c 100644
--- a/libX11/specs/libX11/CH14.xml
+++ b/libX11/specs/libX11/CH14.xml
@@ -4,11 +4,12 @@
 <chapter id='Inter_Client_Communication_Functions'>
 <title>Inter-Client Communication Functions</title>
 <para>
-The Inter-Client Communication Conventions Manual, hereafter referred to as the <acronym>ICCCM</acronym>,
+The <citetitle>Inter-Client Communication Conventions Manual</citetitle>,
+hereafter referred to as the <acronym>ICCCM</acronym>,
 details the X Consortium approved conventions that govern inter-client communications. These
 conventions ensure peer-to-peer client cooperation in the use of selections, cut buffers, and shared
 resources as well as client cooperation with window and session managers. For further information,
-see the Inter-Client Communication Conventions Manual.
+see the <olink targetdoc='icccm' targetptr='icccm'><citetitle>Inter-Client Communication Conventions Manual</citetitle></olink>.
 </para>
 <para>
 Xlib provides a number of standard properties and programming interfaces that are <acronym>ICCCM</acronym>
@@ -313,8 +314,9 @@ function sends a <property>WM_CHANGE_STATE</property>
 <symbol>ClientMessage</symbol>
 event with a format of 32 and a first data element of 
 <symbol>IconicState</symbol>
-(as described in section 4.1.4 of the 
-<emphasis remap='I'>Inter-Client Communication Conventions Manual</emphasis>)
+(as described in <olink targetdoc='icccm' targetptr='Changing_Window_State'
+>section 4.1.4 of the
+<citetitle>Inter-Client Communication Conventions Manual</citetitle></olink>)
 and a window of w
 to the root window of the specified screen
 with an event mask set to
diff --git a/libX11/specs/libX11/credits.xml b/libX11/specs/libX11/credits.xml
index c8fdfecb4..c3d1f7383 100644
--- a/libX11/specs/libX11/credits.xml
+++ b/libX11/specs/libX11/credits.xml
@@ -224,4 +224,14 @@ Massachusetts Institute of Technology
 </literallayout>
 </para>
 </simplesect>
+<simplesect>
+<title>Release 7</title>
+<para>
+This document is made available to you in modern formats such as HTML and PDF
+thanks to the efforts of Matt Dew, who converted the original troff sources to
+DocBook/XML and edited them into shape; along with Gaetan Nadon and
+Alan Coopersmith, who set up the formatting machinery in the libX11 builds and
+performed further editing of the DocBook markup.
+</para>
+</simplesect>
 </preface>
diff --git a/libX11/specs/libX11/glossary.xml b/libX11/specs/libX11/glossary.xml
index 51fa30293..14ad2e2dd 100644
--- a/libX11/specs/libX11/glossary.xml
+++ b/libX11/specs/libX11/glossary.xml
@@ -1689,8 +1689,8 @@ see the <glossterm linkend="glossary:Host_Portable_Character_Encoding">Host Port
 <indexterm significance="preferred"><primary><acronym>XLFD</acronym></primary></indexterm>
   <glossdef>
     <para>
-The X Logical Font Description Conventions that define a standard syntax 
-for structured font names.
+The <olink targetdoc='xlfd' targetptr='xlfd'><citetitle>X Logical Font Description Conventions</citetitle></olink>
+that define a standard syntax for structured font names.
     </para>
   </glossdef>
 </glossentry>
diff --git a/libX11/src/XlibInt.c b/libX11/src/XlibInt.c
index bd34bbeff..59a7585d8 100644
--- a/libX11/src/XlibInt.c
+++ b/libX11/src/XlibInt.c
@@ -905,7 +905,7 @@ void _XEnq(
 	extension = ((xGenericEvent*)event)->extension;
 
 	qelt->event.type = type;
-	/* If an extension has registerd a generic_event_vec handler, then
+	/* If an extension has registered a generic_event_vec handler, then
 	 * it can handle event cookies. Otherwise, proceed with the normal
 	 * event handlers.
 	 *