Merge remote-tracking branch 'origin/released'

42 files changed, 963 insertions, 384 deletions

diff --git a/libXaw/specs/AsciiSink.xml b/libXaw/specs/AsciiSink.xml
index 06bc87dc4..aba588b6c 100644
--- a/libXaw/specs/AsciiSink.xml
+++ b/libXaw/specs/AsciiSink.xml
@@ -38,7 +38,7 @@ handling Tab and Carriage
 Return.\fP    The source object also reports the text window metrics to the
 text widgets.
 </para>
-<sect2 id="asciisink_resources">
+<sect2 id='AsciiSink::Resources'>
 <title>Resources</title>
 <para>
 <!-- .LP -->
diff --git a/libXaw/specs/AsciiSource.xml b/libXaw/specs/AsciiSource.xml
index bd51f990a..b3ca6da12 100644
--- a/libXaw/specs/AsciiSource.xml
+++ b/libXaw/specs/AsciiSource.xml
@@ -50,7 +50,7 @@ into an internal buffer.  This buffer may then be modified, provided the
 text widget is in the correct edit mode, just as if it were a source of
 type <function>XawAsciiString</function>.  Unlike R3 and earlier versions of the AsciiSrc,
 it is now possible to specify an editable disk source.  The file is not
-updated, however, until a call to <function>XawAsciiSave</function> is made.  When the
+updated, however, until a call to <xref linkend='XawAsciiSave' xrefstyle='select: title'/> is made.  When the
 source is in this mode the <function>useStringInPlace</function> resource is ignored.
 </para>
 <para>
@@ -68,22 +68,22 @@ In the default case for AsciiSrc objects of type <function>XawAsciiString</funct
 the resource <function>useStringInPlace</function> is false,
 and the widget owns the string.  The initial value of the
 string resource, and any update made by the application
-programmer to the string resource with <function>XtSetValues</function>, is copied
+programmer to the string resource with <xref linkend='XtSetValues' xrefstyle='select: title'/>, is copied
 into memory private to the widget, and managed internally by the widget.
 The application writer
 does not need to worry about running out of buffer space
 (subject to the total memory available to the application).
 The performance does not decay linearly as the buffer grows
 large, as is necessarily the case when the text buffer is used
-in place.   The application writer must use <function>XtGetValues</function> to
+in place.   The application writer must use <xref linkend='XtGetValues' xrefstyle='select: title'/> to
 determine the contents of the text buffer, which will return
 a copy of the widget's text buffer as
-it existed at the time of the <function>XtGetValues</function> call.   This copy
+it existed at the time of the <xref linkend='XtGetValues' xrefstyle='select: title'/> call.   This copy
 is not affected by subsequent updates to the text buffer, i.e.,
 it is not updated as the user types input into the text buffer.
 This copy is freed upon the next call to XtGetValues to
 retrieve the string resource; however, to conserve memory,
-there is a convenience routine, <function>XawAsciiSourceFreeString</function>, allowing the
+there is a convenience routine, <xref linkend='XawAsciiSourceFreeString' xrefstyle='select: title'/>, allowing the
 application programmer to direct the widget to free the copy.
 </para>
 <para>
@@ -94,12 +94,12 @@ is the string owner.  The widget will take the value
 of the string resource as its own text buffer, and the <function>length</function>
 resource indicates the buffer size.   In this case
 the buffer contents change as the user types at the widget;
-it is not necessary to call <function>XtGetValues</function> on the string
+it is not necessary to call <xref linkend='XtGetValues' xrefstyle='select: title'/> on the string
 resource to determine the contents of the buffer-it will
 simply return the address of the application's implementation
 of the text buffer.
 </para>
-<sect2 id="asciisource_resources">
+<sect2 id='AsciiSource::Resources'>
 <title>Resources</title>
 <para>
 <!-- .LP -->
@@ -206,7 +206,7 @@ retrieved from the argument list or from the resource database:
 <!-- .Ou Bold -->
 </para>
 </sect2>
-<sect2 id="asciisource_convenience_routines">
+<sect2 id='AsciiSource::Convenience_Routines'>
 <title>Convenience Routines</title>
 <para>
 <!-- .LP -->
@@ -220,11 +220,11 @@ commonly used functionality of the AsciiSrc.
 <!-- .LP -->
 When the AsciiSrc widget is not in <function>useStringInPlace</function> mode
 space must be allocated whenever the file is saved, or the string is
-requested with a call to <function>XtGetValues</function>.  This memory is allocated on the
+requested with a call to <xref linkend='XtGetValues' xrefstyle='select: title'/>.  This memory is allocated on the
 fly, and remains valid until the next time a string needs to be allocated.
 You may save memory by freeing this string as soon as you are done
-with it by calling <function>XawAsciiSourceFreeString</function>.
-<funcsynopsis>
+with it by calling <xref linkend='XawAsciiSourceFreeString' xrefstyle='select: title'/>.
+<funcsynopsis id='XawAsciiSourceFreeString'>
 <funcprototype>
   <funcdef>void<function> XawAsciiSourceFreeString</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
@@ -247,8 +247,8 @@ Specifies the AsciiSrc object.
 <para>
 <!-- .LP -->
 This function will free the memory that contains the string pointer returned
-by <function>XtGetValues</function>.  This will normally happen automatically when
-the next call to <function>XtGetValues</function> occurs, or when the widget is destroyed.
+by <xref linkend='XtGetValues' xrefstyle='select: title'/>.  This will normally happen automatically when
+the next call to <xref linkend='XtGetValues' xrefstyle='select: title'/> occurs, or when the widget is destroyed.
 </para>
 </sect3>
 <sect3 id="Saving_Files">
@@ -256,8 +256,8 @@ the next call to <function>XtGetValues</function> occurs, or when the widget is
 <para>
 <!-- .LP -->
 To save the changes made in the current text source into a file use
-<function>XawAsciiSave</function>.
-<funcsynopsis>
+<xref linkend='XawAsciiSave' xrefstyle='select: title'/>.
+<funcsynopsis id='XawAsciiSave'>
 <funcprototype>
   <funcdef>Boolean<function> XawAsciiSave</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
@@ -279,7 +279,7 @@ Specifies the AsciiSrc object.
 </para>
 <para>
 <!-- .LP -->
-<function>XawAsciiSave</function> returns <function>True</function> if the save was successful.
+<xref linkend='XawAsciiSave' xrefstyle='select: title'/> returns <function>True</function> if the save was successful.
 It will update the file named in the <function>string</function> resource.
 If the buffer has not been changed, no action will be taken.  This function
 only works on an AsciiSrc of type <function>XawAsciiFile</function>.
@@ -288,8 +288,8 @@ only works on an AsciiSrc of type <function>XawAsciiFile</function>.
 <!-- .LP -->
 <!-- .sp 1 -->
 To save the contents of the current text buffer into a named file use
-<function>XawAsciiSaveAsFile</function>.
-<funcsynopsis>
+<xref linkend='XawAsciiSaveAsFile' xrefstyle='select: title'/>.
+<funcsynopsis id='XawAsciiSaveAsFile'>
 <funcprototype>
   <funcdef>Boolean<function> XawAsciiSaveAsFile</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
@@ -323,7 +323,7 @@ The name of the file to save the current buffer into.
 <para>
 <!-- .LP -->
 This function returns <function>True</function> if the save was successful.
-<function>XawAsciiSaveAsFile</function> will work with a buffer of either type
+<xref linkend='XawAsciiSaveAsFile' xrefstyle='select: title'/> will work with a buffer of either type
 <function>XawAsciiString</function> or type <function>XawAsciiFile</function>.
 </para>
 </sect3>
@@ -332,10 +332,10 @@ This function returns <function>True</function> if the save was successful.
 <para>
 <!-- .LP -->
 To find out if the text buffer in an AsciiSrc object has changed
-since the last time it was saved with <function>XawAsciiSave</function> or queried
+since the last time it was saved with <xref linkend='XawAsciiSave' xrefstyle='select: title'/> or queried
 <!-- .IN "XawAsciiSave" "" -->
-use <function>XawAsciiSourceChanged</function>.
-<funcsynopsis>
+use <xref linkend='XawAsciiSourceChanged' xrefstyle='select: title'/>.
+<funcsynopsis id='XawAsciiSourceChanged'>
 <funcprototype>
   <funcdef>Boolean<function> XawAsciiSourceChanged</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
@@ -359,8 +359,8 @@ Specifies the AsciiSrc object.
 <!-- .LP -->
 This function will return <function>True</function> if the source has changed since
 the last time it was saved or queried.  The internal change flag is
-reset whenever the string is queried via <function>XtGetValues</function> or the
-buffer is saved via <function>XawAsciiSave</function>.
+reset whenever the string is queried via <xref linkend='XtGetValues' xrefstyle='select: title'/> or the
+buffer is saved via <xref linkend='XawAsciiSave' xrefstyle='select: title'/>.
 
 </para>
 </sect3>
diff --git a/libXaw/specs/AsciiText.xml b/libXaw/specs/AsciiText.xml
index 1a336d6c8..156e0c029 100644
--- a/libXaw/specs/AsciiText.xml
+++ b/libXaw/specs/AsciiText.xml
@@ -47,9 +47,9 @@ specifying these resources in a resource file it is necessary to use
 <emphasis remap='I'>*AsciiText.resource_name</emphasis>, since they actually belong to the
 children of the AsciiText widget, and not the AsciiText widget itself.
 However, these resources may be set directly on the AsciiText widget at
-widget creation time, or via <function>XtSetValues</function>.
+widget creation time, or via <xref linkend='XtSetValues' xrefstyle='select: title'/>.
 </para>
-<sect2 id="asciitext_resources">
+<sect2 id='AsciiText::Resources'>
 <title>Resources</title>
 <para>
 <!-- .LP -->
diff --git a/libXaw/specs/Box.xml b/libXaw/specs/Box.xml
index fe93b42d3..692d7d236 100644
--- a/libXaw/specs/Box.xml
+++ b/libXaw/specs/Box.xml
@@ -38,7 +38,7 @@ are often called ButtonBox widgets, but the children are not
 limited to buttons.  The Box's children are arranged on a background that
 has its own specified dimensions and color.
 </para>
-<sect2 id="box_resources">
+<sect2 id='Box::Resources'>
 <title>Resources</title>
 <para>
 <!-- .LP -->
diff --git a/libXaw/specs/CH1.xml b/libXaw/specs/CH1.xml
index a4fb08c2d..8d913b8a7 100644
--- a/libXaw/specs/CH1.xml
+++ b/libXaw/specs/CH1.xml
@@ -1,4 +1,4 @@
-<chapter id="athena_widgets_and_the_intrinsics">
+<chapter id='Athena_Widgets_and_The_Intrinsics'>
 <title>Athena Widgets and The Intrinsics</title>
 <para>
 The X Toolkit is made up of two distinct pieces, the Xt Intrinsics and a
@@ -42,7 +42,7 @@ design allows for, but does not necessarily encourage, the free mixing
 of radically differing widget implementations.
 </para>
 
-<sect1 id="Introduction_to_the_tk">
+<sect1 id='Introduction_to_the_X_Toolkit'>
 <title>Introduction to the X Toolkit</title>
 <para>
 <!-- .LP -->
@@ -130,7 +130,7 @@ Format of the Widget Reference Chapters
 </para>
 <para>
 <!-- .LP -->
-In addition to the terms already defined for X programming (see 
+In addition to the terms already defined for X programming (see
 <emphasis remap='I'>Xlib - C Language Interface</emphasis>),
 the following terms are specific to the Intrinsics and Athena widget set
 and used throughout this document.
@@ -646,7 +646,7 @@ resource is changed.
     <listitem>
       <para>
 This resource is only settable at widget creation time, and may not
-be modified with <function>XtSetValues</function>.
+be modified with <xref linkend='XtSetValues' xrefstyle='select: title'/>.
       </para>
     </listitem>
   </varlistentry>
@@ -716,7 +716,7 @@ resource defaults to <function>False</function> in the Intrinsics, but is redefi
 default to <function>True</function> when an application is using the Athena widget
 set.  An application programmer may override this default and set the
 resource back to <function>False</function> if the application does not need the window
-manager to give it the input focus.  See the 
+manager to give it the input focus.  See the
 <emphasis remap='I'>X Toolkit Intrinsics - C Language Interface</emphasis> for details
 on the <emphasis remap='I'>input</emphasis> resource.
 
diff --git a/libXaw/specs/CH2.xml b/libXaw/specs/CH2.xml
index 08f0ff569..98ac97ee1 100644
--- a/libXaw/specs/CH2.xml
+++ b/libXaw/specs/CH2.xml
@@ -1,5 +1,5 @@
 <chapter><title>Using Widgets</title>
-<sect1 id="using_widgets">
+<sect1 id='Using_Widgets'>
 <title>Using Widgets</title>
 <para>
 Widgets serve as the primary tools for building a user interface or
@@ -35,7 +35,7 @@ description of the programming interface is provided in the document
 If it is desirable that the application take advantage of
 internationalization (i18n), you must establish locale with
 <function>XtSetLanguageProc</function>
-before <function>XtDisplayInitialize</function> or <function>XtAppInitialize</function>
+before <function>XtDisplayInitialize</function> or <xref linkend='XtAppInitialize' xrefstyle='select: title'/>
 is called.  For full details, please refer to the document
 <emphasis remap='I'>X Toolkit Intrinsics - C Language Interface</emphasis>, section 2.2. However, the following simplest-case
 call is sufficient in many or most applications.
@@ -69,7 +69,7 @@ of programs in the default "C" locale.
 <!-- .XE -->
 You must call a toolkit initialization function before invoking any
 other toolkit routines (besides locale setting, above).
-<function>XtAppInitialize</function>
+<xref linkend='XtAppInitialize' xrefstyle='select: title'/>
 opens the X server connection, parses the command line,
 and creates an initial widget that will serve as the root of
 a tree of widgets created by this application.
@@ -77,7 +77,7 @@ a tree of widgets created by this application.
 <!-- .IN "toolkit initialization" "" "@DEF@" -->
 <!-- .IN "XtAppInitialize" "" "@DEF@" -->
 <!-- .IN "fallback resources" "" "@DEF@" -->
-<funcsynopsis>
+<funcsynopsis id='XtAppInitialize'>
 <funcprototype>
   <funcdef>Widget<function> XtAppInitialize</function></funcdef>
   <paramdef>XtAppContext<parameter> app_context_return</parameter></paramdef>
@@ -126,7 +126,7 @@ first letter of the application name. For example, the application named
 Specifies how to parse the command line for any application-specific
 resources.
 The options argument is passed as a parameter to
-<function>XrmParseCommand</function> . 
+<olink targetdoc='libX11' targetptr='XrmParseCommand'><function>XrmParseCommand</function></olink>.
 For further information,
 see <emphasis remap='I'>Xlib - C Language Interface</emphasis>.
       </para>
@@ -220,10 +220,10 @@ Creating a widget is a three-step process.  First, the widget instance
 is allocated, and various instance-specific attributes are set by
 using <function>XtCreateWidget</function>.  Second, the widget's parent is informed
 of the new child by using <function>XtManageChild</function>.  Finally, X windows are
-created for the parent and all its children by using <function>XtRealizeWidget</function>
+created for the parent and all its children by using <xref linkend='XtRealizeWidget' xrefstyle='select: title'/>
 and specifying the top-most widget. The first two steps can be
-combined by using <function>XtCreateManagedWidget</function>.  In addition,
-<function>XtRealizeWidget</function> is automatically called when the child becomes
+combined by using <xref linkend='XtCreateManagedWidget' xrefstyle='select: title'/>.  In addition,
+<xref linkend='XtRealizeWidget' xrefstyle='select: title'/> is automatically called when the child becomes
 managed if the parent is already realized.
 </para>
 <para>
@@ -231,7 +231,7 @@ managed if the parent is already realized.
 To allocate, initialize, and manage a widget, use
 <function>XtCreateManagedWidget .</function>
 <!-- .IN "XtCreateManagedWidget" "" "@DEF@" -->
-<funcsynopsis>
+<funcsynopsis id='XtCreateManagedWidget'>
 <funcprototype>
   <funcdef>Widget<function> XtCreateManagedWidget</function></funcdef>
   <paramdef>String<parameter> name</parameter></paramdef>
@@ -659,7 +659,7 @@ directory is
 <!-- .XE -->
 <!-- .IN "realizing widgets" "" "@DEF@" -->
 The
-<function>XtRealizeWidget</function>
+<xref linkend='XtRealizeWidget' xrefstyle='select: title'/>
 function performs two tasks:
 </para>
 <itemizedlist>
@@ -675,7 +675,7 @@ for performance reasons.
 Creates an X window for the widget and, if it is a composite widget,
 realizes each of its managed children.
 <!-- .IN "XtRealizeWidget" "" "@DEF@" -->
-<funcsynopsis>
+<funcsynopsis id='XtRealizeWidget'>
 <funcprototype>
   <funcdef>void<function> XtRealizeWidget</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
@@ -708,9 +708,9 @@ see the <emphasis remap='I'>X Toolkit Intrinsics - C Language Interface</emphasi
 Now that the application has created, managed and realized its
 widgets, it is ready to process the events that will be delivered by the
 X Server to this client.  A function call that will process the
-events is <function>XtAppMainLoop</function>.
+events is <xref linkend='XtAppMainLoop' xrefstyle='select: title'/>.
 <!-- .IN "XtAppMainLoop" "" "@DEF@" -->
-<funcsynopsis>
+<funcsynopsis id='XtAppMainLoop'>
 <funcprototype>
   <funcdef>void<function> XtAppMainLoop</function></funcdef>
   <paramdef>XtAppContext<parameter> app_context</parameter></paramdef>
@@ -725,7 +725,7 @@ events is <function>XtAppMainLoop</function>.
     <listitem>
       <para>
 Specifies the application context of this application.  The value is
-normally returned by <function>XtAppInitialize</function>.
+normally returned by <xref linkend='XtAppInitialize' xrefstyle='select: title'/>.
     </para>
   </listitem>
   </varlistentry>
@@ -786,13 +786,13 @@ Set an argument value
 <!-- .LP -->
 By default,
 widget windows are mapped (made viewable) automatically by
-<function>XtRealizeWidget</function>.  This behavior can be disabled by using
-<function>XtSetMappedWhenManaged</function>, making the client responsible for calling
-<function>XtMapWidget</function> to make the widget viewable.
+<xref linkend='XtRealizeWidget' xrefstyle='select: title'/>.  This behavior can be disabled by using
+<xref linkend='XtSetMappedWhenManaged' xrefstyle='select: title'/>, making the client responsible for calling
+<xref linkend='XtMapWidget' xrefstyle='select: title'/> to make the widget viewable.
 <!-- .IN "XtSetMappedWhenManaged" "" "@DEF@" -->
 <!-- .IN "XtMapWidget" "" "" -->
 <!-- .IN "XtRealizeWidget" "" "" -->
-<funcsynopsis>
+<funcsynopsis id='XtSetMappedWhenManaged'>
 <funcprototype>
   <funcdef>void<function> XtSetMappedWhenManaged</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
@@ -821,9 +821,9 @@ Specifies the new value.
 If map_when_managed is <function>True</function>, the widget is mapped automatically
 when it is realized.  If map_when_managed is <function>False</function>, the client
 must call
-<function>XtMapWidget</function>
+<xref linkend='XtMapWidget' xrefstyle='select: title'/>
 or make a second call to
-<function>XtSetMappedWhenManaged</function>
+<xref linkend='XtSetMappedWhenManaged' xrefstyle='select: title'/>
 to cause the child window to be mapped.
     </para>
   </listitem>
@@ -834,10 +834,10 @@ to cause the child window to be mapped.
 <!-- .LP -->
 <!-- .sp -->
 The definition for
-<function>XtMapWidget</function>
+<xref linkend='XtMapWidget' xrefstyle='select: title'/>
 is:
 <!-- .IN "XtMapWidget" "" "@DEF@" -->
-<funcsynopsis>
+<funcsynopsis id='XtMapWidget'>
 <funcprototype>
   <funcdef>void<function> XtMapWidget</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
@@ -862,13 +862,13 @@ Specifies the widget.
 When you are creating several children in sequence for a previously
 realized common parent it is generally more efficient to construct a
 list of children as they are created (using <function>XtCreateWidget</function>) and
-then use <function>XtManageChildren</function> to request that their parent managed
+then use <xref linkend='XtManageChildren' xrefstyle='select: title'/> to request that their parent managed
 them all at once.  By managing a list of children at one time, the
 parent can avoid wasteful duplication of geometry processing and the
 associated ``screen flash''.
 <!-- .IN "XtManageChildren" "" "@DEF@" -->
 <!-- .IN "XtCreateWidget" "" "" -->
-<funcsynopsis>
+<funcsynopsis id='XtManageChildren'>
 <funcprototype>
   <funcdef>void<function> XtManageChildren</function></funcdef>
   <paramdef>WidgetList<parameter> children</parameter></paramdef>
@@ -916,9 +916,9 @@ see the <emphasis remap='I'>X Toolkit Intrinsics - C Language Interface</emphasi
 <para>
 <!-- .LP -->
 To destroy a widget instance of any type, use
-<function>XtDestroyWidget</function>
+<xref linkend='XtDestroyWidget' xrefstyle='select: title'/>
 <!-- .IN "XtDestroyWidget" "" "@DEF@" -->
-<funcsynopsis>
+<funcsynopsis id='XtDestroyWidget'>
 <funcprototype>
   <funcdef>void<function> XtDestroyWidget</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
@@ -940,7 +940,7 @@ Specifies the widget.
 </para>
 <para>
 <!-- .LP -->
-<function>XtDestroyWidget</function>
+<xref linkend='XtDestroyWidget' xrefstyle='select: title'/>
 destroys the widget and recursively destroys any children that it may have,
 including the windows created by its children.
 After calling
@@ -957,7 +957,7 @@ To retrieve the current value of a resource attribute associated
 with a widget instance, use
 <function>XtGetValues .</function>
 <!-- .IN "XtGetValues" "" "@DEF@" -->
-<funcsynopsis>
+<funcsynopsis id='XtGetValues'>
 <funcprototype>
   <funcdef>void<function> XtGetValues</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
@@ -1018,7 +1018,7 @@ To modify the current value of a resource attribute associated with a
 widget instance, use
 <function>XtSetValues .</function>
 <!-- .IN "XtSetValues" "" "@DEF@" -->
-<funcsynopsis>
+<funcsynopsis id='XtSetValues'>
 <funcprototype>
   <funcdef>void<function> XtSetValues</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
@@ -1066,7 +1066,7 @@ Specifies the number of arguments in the argument list.
 The arguments and values that are passed will depend on the widget
 being modified.  Some widgets may not allow certain resources to be
 modified after the widget instance has been created or realized.
-No notification is given if any part of a <function>XtSetValues</function> request is
+No notification is given if any part of a <xref linkend='XtSetValues' xrefstyle='select: title'/> request is
 ignored.
 </para>
 <para>
@@ -1076,7 +1076,7 @@ For further information about these functions, see the <emphasis remap='I'>X Too
 <!-- .IN "XtSetValues" "" "" -->
 <!-- .NT -->
 The argument list entry for
-<function>XtGetValues</function>
+<xref linkend='XtGetValues' xrefstyle='select: title'/>
 specifies the address to which the caller wants the value copied.  The
 argument list entry for
 <function>XtSetValues ,</function>
@@ -1100,7 +1100,7 @@ Widgets can communicate changes in their state to their clients
 by means of a callback facility.
 The format for a client's callback handler is:
 <!-- .IN "CallbackProc" "" "@DEF@" -->
-<funcsynopsis>
+<funcsynopsis id='CallbackProc'>
 <funcprototype>
   <funcdef>void<function> CallbackProc</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
@@ -1154,7 +1154,7 @@ it passes the current position of the thumb in <emphasis remap='I'>call_data</em
 <!-- .LP -->
 Callbacks can be registered either by creating an argument containing
 the callback list described below or by using the special convenience
-routines <function>XtAddCallback</function> and <function>XtAddCallbacks</function>.  When the widget
+routines <xref linkend='XtAddCallback' xrefstyle='select: title'/> and <function>XtAddCallbacks</function>.  When the widget
 is created, a pointer to a list of callback procedure and data pairs can
 be passed in the argument list to
 <function>XtCreateWidget .</function>
@@ -1191,10 +1191,10 @@ callback when the callback list is executed.
 <para>
 <!-- .LP -->
 The second method for registering callbacks is to use
-<function>XtAddCallback</function>
+<xref linkend='XtAddCallback' xrefstyle='select: title'/>
 after the widget has been created.
 <!-- .IN "XtAddCallback" "" "@DEF@" -->
-<funcsynopsis>
+<funcsynopsis id='XtAddCallback'>
 <funcprototype>
   <funcdef>void<function> XtAddCallback</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
@@ -1249,7 +1249,7 @@ Specifies the data to be passed to the callback when it is invoked.
 </para>
 <para>
 <!-- .LP -->
-<function>XtAddCallback</function>
+<xref linkend='XtAddCallback' xrefstyle='select: title'/>
 adds the specified callback to the list for the named widget.
 </para>
 <para>
@@ -1310,7 +1310,7 @@ and
   <listitem>
     <para>
 Call the
-<function>XtAppInitialize</function>
+<xref linkend='XtAppInitialize' xrefstyle='select: title'/>
 <!-- .IN "XtAppInitialize" -->
 function before invoking any other toolkit or Xlib functions.
 For further information,
@@ -1336,7 +1336,7 @@ For further information, see Section 2.9.2.2.  <!-- xref -->
   <listitem>
     <para>
 When the argument list is set up, create the widget with the
-<function>XtCreateManagedWidget</function> function.  For further information, see
+<xref linkend='XtCreateManagedWidget' xrefstyle='select: title'/> function.  For further information, see
 Section 2.2 and the <emphasis remap='I'>X Toolkit Intrinsics - C Language Interface</emphasis>.
 <!-- .IN "XtCreateManagedWidget" -->
     </para>
@@ -1346,7 +1346,7 @@ Section 2.2 and the <emphasis remap='I'>X Toolkit Intrinsics - C Language Interf
 If the widget has any callback routines, set by the
 <function>XtNcallback</function>
 argument or the
-<function>XtAddCallback</function>
+<xref linkend='XtAddCallback' xrefstyle='select: title'/>
 function, declare these routines within the application.
 <!-- .IN "XtAddCallback" -->
     </para>
@@ -1355,7 +1355,7 @@ function, declare these routines within the application.
     <para>
 After creating the initial widget hierarchy, windows must be created
 for each widget by calling
-<function>XtRealizeWidget</function>
+<xref linkend='XtRealizeWidget' xrefstyle='select: title'/>
 on the top level widget.
 <!-- .IN "XtRealizeWidget" -->
     </para>
@@ -1591,7 +1591,7 @@ This matches any widget in the Foo application that is named <emphasis remap='I'
 <para>
 <!-- .LP -->
 The root of all application widget trees is the widget returned by
-<function>XtAppInitialize</function>.  Even though this is actually an
+<xref linkend='XtAppInitialize' xrefstyle='select: title'/>.  Even though this is actually an
 ApplicationShell widget, the toolkit replaces its widget class with the
 class name of the application.  The name of this widget is either
 the name used to invoke the application (<function>argv[0]</function>) or the name of
@@ -1880,11 +1880,12 @@ can be used, as in the first approach, for easier code maintenance.
 The best way to understand how to use any programming library is by
 trying some simple examples.  A collection of example programs that
 introduces each of the widgets in that Athena widget set, as well as many
-important toolkit programming concepts, is available in the X11R6
+important toolkit programming concepts, is available in the X11R5 contrib
 release as distributed by the X Consortium.  It can be found in the
-distribution directory <function>contrib/examples/mit/Xaw</function>, but see your
-site administrator for the exact location of these files on your system.
-See the README file from that directory for a guide to the examples.
+directory <filename>contrib/examples/Xaw</filename> in the archive
+at <ulink url="http://www.x.org/releases/X11R5/contrib-1.tar.Z" />
+See the <filename>README</filename> file from that directory for a guide
+to the examples.
 </para>
 </sect2>
 </sect1>
diff --git a/libXaw/specs/CH3.xml b/libXaw/specs/CH3.xml
index 8fdefcc7b..37ee8b5ae 100644
--- a/libXaw/specs/CH3.xml
+++ b/libXaw/specs/CH3.xml
@@ -1,4 +1,4 @@
-<chapter id="simple_widgets">
+<chapter id='Simple_Widgets'>
 <title>Simple Widgets</title>
 
 <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"  href="CH3.intro.xml"/> -->
diff --git a/libXaw/specs/CH4.xml b/libXaw/specs/CH4.xml
index 00c89f78e..0546af551 100644
--- a/libXaw/specs/CH4.xml
+++ b/libXaw/specs/CH4.xml
@@ -1,4 +1,4 @@
-<chapter id="menus">
+<chapter id='Menus'>
 <title>Menus</title>
 <para>
 The Athena widget set provides support for single paned non-hierarchical
diff --git a/libXaw/specs/CH5.xml b/libXaw/specs/CH5.xml
index eb3f2fb3e..2636aff1e 100644
--- a/libXaw/specs/CH5.xml
+++ b/libXaw/specs/CH5.xml
@@ -1,4 +1,4 @@
-<chapter id="text_widgets">
+<chapter id='Text_Widgets'>
 <title>Text Widgets</title>
 
 <para>
@@ -37,8 +37,8 @@ modifications a user is allowed to make:
 <para>
 Read-only mode does not allow the user or the programmer to modify the text
 in the widget.  While the entire string may be reset in
-read-only mode with <function>XtSetValues</function>, it cannot be modified via
-with <function>XawTextReplace</function>.  Append-only and editable modes allow
+read-only mode with <xref linkend='XtSetValues' xrefstyle='select: title'/>, it cannot be modified via
+with <xref linkend='XawTextReplace' xrefstyle='select: title'/>.  Append-only and editable modes allow
 the text at the insertion point to be modified.  The only difference is
 that text may only be added to or removed from the end of a buffer in
 append-only mode.
diff --git a/libXaw/specs/CH6.xml b/libXaw/specs/CH6.xml
index e8009afb6..84243870f 100644
--- a/libXaw/specs/CH6.xml
+++ b/libXaw/specs/CH6.xml
@@ -1,4 +1,4 @@
-<chapter id="composite_and_constraint_widgets">
+<chapter id='Composite_and_Constraint_Widgets'>
 <title>Composite and Constraint Widgets</title>
 <para>
 These widgets may contain arbitrary widget children.  They implement a
@@ -87,7 +87,7 @@ application programmer.
 <para>
 <!-- .LP -->
 If the application wishes to change the size or location of
-any widget it should make a call to <function>XtSetValues</function>.  This will
+any widget it should make a call to <xref linkend='XtSetValues' xrefstyle='select: title'/>.  This will
 <!-- .IN "XtSetValues" "" -->
 allow the widget to ask its parent for the new size or location.
 As noted above the parent is allowed to refuse this request,
diff --git a/libXaw/specs/CH7.xml b/libXaw/specs/CH7.xml
index 4c491704b..a84e3cf5a 100644
--- a/libXaw/specs/CH7.xml
+++ b/libXaw/specs/CH7.xml
@@ -1,10 +1,10 @@
-<chapter id="creating_new_widgets__subclassing_">
+<chapter id='Creating_New_Widgets_Subclassing'>
 <title>Creating New Widgets (Subclassing)</title>
 <para>
 Although the task of creating a new widget may at first appear a little
 daunting, there is a basic simple pattern that all widgets follow.  The
 Athena Widget library contains a special widget called the
-<emphasis remap='I'>Template</emphasis> widget that is intended to assist 
+<emphasis remap='I'>Template</emphasis> widget that is intended to assist
 the novice widget programmer in writing a custom widget.
 </para>
 <para>
@@ -111,10 +111,10 @@ un-necessarily waste many resources.
 <para>
 In this section, an outline will be given of the procedure to follow to
 construct a special-purpose widget to address the items listed above.
-The reader should refer to the appropriate sections of the 
+The reader should refer to the appropriate sections of the
 <emphasis remap='I'>X Toolkit Intrinsics - C Language Interface</emphasis>
 for complete details of the material outlined here.  Section 1.4 of
-the <emphasis remap='I'>Intrinsics</emphasis> should be read in 
+the <emphasis remap='I'>Intrinsics</emphasis> should be read in
 conjunction with this section.
 </para>
 <para>
diff --git a/libXaw/specs/Dialog.xml b/libXaw/specs/Dialog.xml
index f77006c6a..aff03d7ec 100644
--- a/libXaw/specs/Dialog.xml
+++ b/libXaw/specs/Dialog.xml
@@ -40,7 +40,7 @@ into which the user types input.  The third line can contain buttons
 that let the user confirm or cancel the Dialog input.  Any of these
 areas may be omitted by the application.
 </para>
-<sect2 id="dialog_resources">
+<sect2 id='Dialog::Resources'>
 <title>Resources</title>
 <para>
 <!-- .LP -->
@@ -422,7 +422,7 @@ resizable      If this resource is False then the parent
 <!-- .Rl -->
 </para>
 </sect2>
-<sect2 id="dialog_layout_semantics">
+<sect2 id='Dialog::Layout_Semantics'>
 <title>Layout Semantics</title>
 <!-- .IN "Dialog widget" "layout semantics" -->
 <para>
@@ -431,7 +431,7 @@ tics.  One is used when initially laying out the children.
 The other is used when the Dialog is resized.
 </para>
 <para>
-The first layout method uses the <function>fromVert</function> mand <function>fromHoriz</function> 
+The first layout method uses the <function>fromVert</function> mand <function>fromHoriz</function>
 resources to place the children of the Dialog.  A single
 pass is made through the Dialog widget's children in the
 order that they were created.  Each child is then placed in
@@ -450,17 +450,17 @@ The second layout method is used when the Dialog is resized.
 It does not matter what causes this resize, and it is possi-
 ble for a resize to happen before the widget becomes visible
 (due to constraints imposed by the parent of the Dialog).
-This layout method uses the <function>bottom</function> , 
-<function>top</function> , <function>left</function> , and 
-<function>right</function> 
+This layout method uses the <function>bottom</function> ,
+<function>top</function> , <function>left</function> , and
+<function>right</function>
 resources.  These resources are used to determine what will
 happen to each edge of the child when the Dialog is resized.
-If a value of <function>XawChain</function> 
+If a value of <function>XawChain</function>
 <emphasis remap='I'>&lt;something&gt;</emphasis>
  is specified, the the edge
 of the child will remain a fixed distance from the <emphasis remap='I'>chain</emphasis>
-edge of the Dialog.  For example if <function>XawChainLeft</function> 
-mis specified for the <function>right</function> mresource of a child 
+edge of the Dialog.  For example if <function>XawChainLeft</function>
+mis specified for the <function>right</function> mresource of a child
 then the right edge
 of that child will remain a fixed distance from the left
 edge of the Dialog widget.  If a value of <function>XawRubber</function> mis spec-
@@ -556,7 +556,7 @@ own Dialog policy.
 </para>
 </sect3>
 </sect2>
-<sect2 id="Automatically_Created_Children_">
+<sect2 id='Automatically_Created_Children'>
 <title>Automatically Created Children.</title>
 <!-- .IN "Dialog widget" "automatically created children" -->
 <para>
@@ -573,14 +573,14 @@ available through the Dialog widget itself.
 <!-- .LP -->
 </para>
 </sect2>
-<sect2 id="dialog_convenience_routines">
+<sect2 id='Dialog::Convenience_Routines'>
 <title>Convenience Routines</title>
 <para>
 <!-- .LP -->
 To return the character string in the text field, use
 <!-- .PN XawDialogGetValueString . -->
 <!-- .IN "XawDialogGetValueString" "" "@DEF@" -->
-<funcsynopsis>
+<funcsynopsis id='XawDialogGetValueString'>
 <funcprototype>
   <funcdef>String<function> XawDialogGetValueString</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
@@ -605,19 +605,19 @@ Specifies the Dialog widget.
 This function returns a copy of the value string of the Dialog
 widget.  This string is allocated by the AsciiText widget and will
 remain valid and unchanged until another call to
-<function>XawDialogGetValueString</function> or an <function>XtGetValues</function> call on the
+<xref linkend='XawDialogGetValueString' xrefstyle='select: title'/> or an <xref linkend='XtGetValues' xrefstyle='select: title'/> call on the
 <function>value</function> widget, when the string will be automatically freed, and
 a new string is returned.  This string may be freed earlier by calling
-the function <function>XawAsciiSourceFreeString</function>.
+the function <xref linkend='XawAsciiSourceFreeString' xrefstyle='select: title'/>.
 <!-- .IN "XawAsciiSourceFreeString" "" -->
 </para>
 <para>
 <!-- .LP -->
 <!-- .sp -->
 To add a new button to the Dialog widget use
-<function>XawDialogAddButton</function>.
+<xref linkend='XawDialogAddButton' xrefstyle='select: title'/>.
 <!-- .IN "XawDialogAddButton" "" "@DEF@" -->
-<funcsynopsis>
+<funcsynopsis id='XawDialogAddButton'>
 <funcprototype>
   <funcdef>void<function> XawDialogAddButton</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
diff --git a/libXaw/specs/Form.xml b/libXaw/specs/Form.xml
index 13cc36a5a..a6e0a0c3b 100644
--- a/libXaw/specs/Form.xml
+++ b/libXaw/specs/Form.xml
@@ -42,7 +42,7 @@ at the right and bottom edges.  If a width and height is assigned
 to the Form that is too small for the layout, the children will
 be clipped by the right and bottom edges of the Form.
 </para>
-<sect2 id="form_resources">
+<sect2 id='Form::Resources'>
 <title>Resources</title>
 <para>
 <!-- .LP -->
@@ -243,7 +243,7 @@ retrieved from the argument list or from the resource database:
 <!-- .Xy -->
 </para>
 </sect2>
-<sect2 id="form_constraint_resources">
+<sect2 id='Form::Constraint_Resources'>
 <title>Constraint Resources</title>
 <para>
 <!-- .LP -->
@@ -372,7 +372,7 @@ resizable      If this resource is False then the parent
 </literallayout>
 <!-- .Bt -->
 </sect2>
-<sect2 id="form_layout_semantics">
+<sect2 id='Form::Layout_Semantics'>
 <title>Layout Semantics</title>
 <para>
 The Form widget uses two different sets of layout semantics.
@@ -380,16 +380,16 @@ One is used when initially laying out the children.  The
 other is used when the Form is resized.
 </para>
 <para>
-The first layout method uses the <function>fromVert</function> 
-and <function>fromHoriz</function> 
+The first layout method uses the <function>fromVert</function>
+and <function>fromHoriz</function>
 resources to place the children of the Form.  A single pass
 is made through the Form widget's children in the order that
 they were created.  Each child is then placed in the Form
 widget below or to the right of the widget specified by the
-<function>fromVert</function> and <function>fromHoriz</function> 
+<function>fromVert</function> and <function>fromHoriz</function>
 resources.  The distance the new
 child is placed from its left or upper neighbor is deter-
-mined by the <function>horizDistance</function> and 
+mined by the <function>horizDistance</function> and
 <function>vertDistance</function> resources.  This
 implies some things about how the order of creation affects
 the possible placement of the children.  The Form widget
@@ -401,14 +401,14 @@ The second layout method is used when the Form is resized.
 It does not matter what causes this resize, and it is possi-
 ble for a resize to happen before the widget becomes visible
 (due to constraints imposed by the parent of the Form).
-This layout method uses the <function>bottom</function>, 
-<function>top</function>, <function>left</function>, and 
+This layout method uses the <function>bottom</function>,
+<function>top</function>, <function>left</function>, and
 <function>right</function>
 resources.  These resources are used to determine what will
 happen to each edge of the child when the Form is resized.
-If a value of <function>XawChain</function> 
+If a value of <function>XawChain</function>
 &lt;<emphasis remap='I'>something</emphasis>&gt; is specified, the the edge
-of the child will remain a fixed distance from the 
+of the child will remain a fixed distance from the
 <emphasis remap='I'>chain</emphasis>
 edge of the Form.  For example if <function>XawChainLeft</function> is specified
 for the <function>right</function> resource of a child then the right edge of
@@ -468,7 +468,7 @@ children when the Form widget is resized.
   </tgroup>
 </informaltable>
 </para>
-<sect3 id="form_example">
+<sect3 id='Form::Example'>
 <title>Example</title>
 <para>
 <!-- .LP -->
@@ -480,7 +480,7 @@ Form, and never to resize.
 </para>
 </sect3>
 </sect2>
-<sect2 id="form_convenience_routines">
+<sect2 id='Form::Convenience_Routines'>
 <title>Convenience Routines</title>
 <para>
 <!-- .LP -->
@@ -488,7 +488,7 @@ To force or defer a re-layout of the Form, use
 <!-- .PN XawFormDoLayout . -->
 <!-- .IN "Form widget" "re-layout" -->
 <!-- .IN "XawFormDoLayout" "" "@DEF@" -->
-<funcsynopsis>
+<funcsynopsis id='XawFormDoLayout'>
 <funcprototype>
   <funcdef>void<function> XawFormDoLayout</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
diff --git a/libXaw/specs/Grip.xml b/libXaw/specs/Grip.xml
index 4e49d5ba0..73dd5a7ad 100644
--- a/libXaw/specs/Grip.xml
+++ b/libXaw/specs/Grip.xml
@@ -26,7 +26,7 @@ events (such as ButtonPress or ButtonRelease) may be handled.  The most
 common use for the Grip widget is as an attachment point for visually
 repositioning an object, such as the pane border in a Paned widget.
 </para>
-<sect2 id="grip_resources">
+<sect2 id='Grip::Resources'>
 <title>Resources</title>
 <para>
 <!-- .LP -->
diff --git a/libXaw/specs/Label.xml b/libXaw/specs/Label.xml
index 68962b5bd..65c4a9261 100644
--- a/libXaw/specs/Label.xml
+++ b/libXaw/specs/Label.xml
@@ -32,7 +32,7 @@ left, right, or center justified.  Normally, this widget
 can be neither selected nor directly edited by the user.
 It is intended for use as an output device only.
 </para>
-<sect2 id="label_resources">
+<sect2 id='Label::Resources'>
 <title>Resources</title>
 <para>
 <!-- .LP -->
diff --git a/libXaw/specs/List.xml b/libXaw/specs/List.xml
index 0bad43dde..2c541dcd0 100644
--- a/libXaw/specs/List.xml
+++ b/libXaw/specs/List.xml
@@ -30,7 +30,7 @@ columns. When one of the strings is selected, it is highlighted, and the
 List widget's <function>Notify</function> action is invoked, calling all routines on
 its callback list.  Only one string may be selected at a time.
 </para>
-<sect2 id="list_resources">
+<sect2 id='List::Resources'>
 <title>Resources</title>
 <para>
 <!-- .LP -->
@@ -476,7 +476,7 @@ NULL terminated.  If a value is not specified for the <function>list</function>,
 the <function>list</function>, and <function>longest</function> is set to the length of the name of the
 widget.  The <function>list</function> is used in place, and must be available
 to the List widget for the lifetime of this widget, or until it is
-changed with <function>XtSetValues</function> or <function>XawListChange</function>.
+changed with <xref linkend='XtSetValues' xrefstyle='select: title'/> or <xref linkend='XawListChange' xrefstyle='select: title'/>.
 <!-- .In -->
       </para>
     </listitem>
@@ -652,7 +652,7 @@ operating systems, and had to be changed.
 To change the list that is displayed, use
 <function>XawListChange .</function>
 <!-- .IN "XawListChange" "" "@DEF@" -->
-<funcsynopsis>
+<funcsynopsis id='XawListChange'>
 <funcprototype>
   <funcdef>void<function> XawListChange</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
@@ -724,11 +724,11 @@ regardless of the value specified here.
 </para>
 <para>
 <!-- .LP -->
-<function>XawListChange</function>
+<xref linkend='XawListChange' xrefstyle='select: title'/>
 will <emphasis remap='I'>unset</emphasis> all list elements that are currently <function>set</function> before
 the list is actually changed.  The <emphasis remap='I'>list</emphasis> is used in place, and must
 remain usable for the lifetime of the List widget, or until <emphasis remap='I'>list</emphasis>
-has been changed again with this function or with <function>XtSetValues</function>.
+has been changed again with this function or with <xref linkend='XtSetValues' xrefstyle='select: title'/>.
 </para>
 </sect2>
 <sect2 id="Highlighting_an_Item">
@@ -738,7 +738,7 @@ has been changed again with this function or with <function>XtSetValues</functio
 To highlight an item in the list, use
 <function>XawListHighlight .</function>
 <!-- .IN "XawListHighlight" "" "@DEF@" -->
-<funcsynopsis>
+<funcsynopsis id='XawListHighlight'>
 <funcprototype>
   <funcdef>void<function> XawListHighlight</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
@@ -774,7 +774,7 @@ highlighted.
 <!-- .LP -->
 Only one item can be highlighted at a time.
 If an item is already highlighted when
-<function>XawListHighlight</function>
+<xref linkend='XawListHighlight' xrefstyle='select: title'/>
 is called,
 the highlighted item is unhighlighted before the new item is highlighted.
 </para>
@@ -786,7 +786,7 @@ the highlighted item is unhighlighted before the new item is highlighted.
 To unhighlight the currently highlighted item in the list, use
 <function>XawListUnhighlight .</function>
 <!-- .IN "XawListUnhighlight" "" "@DEF@" -->
-<funcsynopsis>
+<funcsynopsis id='XawListUnhighlight'>
 <funcprototype>
   <funcdef>void<function> XawListUnhighlight</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
@@ -814,7 +814,7 @@ Specifies the List widget.
 To retrieve the list element that is currently <emphasis remap='I'>set</emphasis>, use
 <function>XawListShowCurrent .</function>
 <!-- .IN "XawListShowCurrent" "" "@DEF@" -->
-<funcsynopsis>
+<funcsynopsis id='XawListShowCurrent'>
 <funcprototype>
   <funcdef>XawListReturnStruct<function> *XawListShowCurrent</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
diff --git a/libXaw/specs/Makefile.am b/libXaw/specs/Makefile.am
index ebdbd729f..8663da226 100644
--- a/libXaw/specs/Makefile.am
+++ b/libXaw/specs/Makefile.am
@@ -1,29 +1,11 @@
-#
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-#
 
 if ENABLE_SPECS
-doc_sources = libXaw.xml
-dist_doc_DATA = $(doc_sources)				\
+
+# Main DocBook/XML files (DOCTYPE book)
+docbook = libXaw.xml
+
+# Included chapters, appendix, images
+chapters =						\
 	AsciiSink.xml					\
 	AsciiSource.xml					\
 	AsciiText.xml					\
@@ -70,37 +52,10 @@ dist_doc_DATA = $(doc_sources)				\
 	Tree.xml					\
 	Viewport.xml
 
-if HAVE_XMLTO
-doc_DATA = $(doc_sources:.xml=.html)
-
-if HAVE_FOP
-doc_DATA += $(doc_sources:.xml=.ps) $(doc_sources:.xml=.pdf)
-endif
-
-if HAVE_XMLTO_TEXT
-doc_DATA += $(doc_sources:.xml=.txt)
-endif
-
-if HAVE_STYLESHEETS
-XMLTO_FLAGS = -m $(XSL_STYLESHEET) \
-	--stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css
-endif
-
-CLEANFILES = $(doc_DATA)
-
-SUFFIXES = .xml .ps .pdf .txt .html
-
-%.txt: %.xml $(dist_doc_DATA)
-	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $<
-
-%.html: %.xml $(dist_doc_DATA)
-	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $<
-
-%.pdf: %.xml $(dist_doc_DATA)
-	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $<
+# The location where the DocBook/XML files and their generated formats are installed
+shelfdir = $(docdir)
 
-%.ps: %.xml $(dist_doc_DATA)
-	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $<
+# Generate DocBook/XML output formats with or without stylesheets
+include $(top_srcdir)/docbook.am
 
-endif HAVE_XMLTO
 endif ENABLE_SPECS
diff --git a/libXaw/specs/Makefile.in b/libXaw/specs/Makefile.in
new file mode 100644
index 000000000..1317760e4
--- /dev/null
+++ b/libXaw/specs/Makefile.in
@@ -0,0 +1,620 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+#
+# Generate output formats for a single DocBook/XML with/without chapters
+#
+# Variables set by the calling Makefile:
+# shelfdir: the location where the docs/specs are installed. Typically $(docdir)
+# docbook:  the main DocBook/XML file, no chapters, appendix or image files
+# chapters: all files pulled in by an XInclude statement and images.
+#
+
+#
+# This makefile is intended for Users Documentation and Functional Specifications.
+# Do not use for Developer Documentation which is not installed and does not require olink.
+# Refer to http://www.x.org/releases/X11R7.6/doc/xorg-docs/ReleaseNotes.html#id2584393
+# for an explanation on documents classification.
+#
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+DIST_COMMON = $(am__dist_shelf_DATA_DIST) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(top_srcdir)/docbook.am
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(docbook:.xml=.html)
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(docbook:.xml=.txt)
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_3 = $(docbook:.xml=.pdf) \
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	$(docbook:.xml=.ps)
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@am__append_4 = $(docbook:.xml=.html.db) \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	$(docbook:.xml=.pdf.db)
+subdir = specs
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
+SOURCES =
+DIST_SOURCES =
+am__dist_shelf_DATA_DIST = libXaw.xml AsciiSink.xml AsciiSource.xml \
+	AsciiText.xml Box.xml CH1.xml CH2.xml CH3.xml CH4.xml CH5.xml \
+	CH6.xml CH7.xml Command.xml Dialog.xml Form.xml Grip.xml \
+	Label.xml List.xml MenuButton.xml Paned.xml Panner.xml \
+	Porthole.xml Repeater.xml Scrollbar.xml SimpleMenu.xml \
+	Simple.xml SmeBSB.xml SmeLine.xml Sme.xml StripChart.xml \
+	Template_private_header_file.xml \
+	Template_public_header_file.xml \
+	Template_widget_source_file.xml Template.xml \
+	TextActions_default_translation_bindings.xml \
+	TextActions_text_widget_actions.xml TextActions.xml \
+	TextCustom.xml TextFuncs.xml TextSink.xml TextSource.xml \
+	Text.xml Toggle.xml TPage_Credits.xml Tree.xml Viewport.xml
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)"
+DATA = $(dist_shelf_DATA) $(shelf_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
+ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APP_MAN_DIR = @APP_MAN_DIR@
+APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BASE_CFLAGS = @BASE_CFLAGS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
+DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FILE_MAN_DIR = @FILE_MAN_DIR@
+FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+FOP = @FOP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_CMD = @INSTALL_CMD@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBEXT = @LIBEXT@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIB_MAN_DIR = @LIB_MAN_DIR@
+LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MAN_SUBSTS = @MAN_SUBSTS@
+MISC_MAN_DIR = @MISC_MAN_DIR@
+MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRICT_CFLAGS = @STRICT_CFLAGS@
+STRIP = @STRIP@
+STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@
+VERSION = @VERSION@
+XAW6_CFLAGS = @XAW6_CFLAGS@
+XAW6_LIBS = @XAW6_LIBS@
+XAW7_CFLAGS = @XAW7_CFLAGS@
+XAW7_LIBS = @XAW7_LIBS@
+XMLTO = @XMLTO@
+XORG_MAN_PAGE = @XORG_MAN_PAGE@
+XORG_SGML_PATH = @XORG_SGML_PATH@
+XSLTPROC = @XSLTPROC@
+XSL_STYLESHEET = @XSL_STYLESHEET@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+
+# Main DocBook/XML files (DOCTYPE book)
+@ENABLE_SPECS_TRUE@docbook = libXaw.xml
+
+# Included chapters, appendix, images
+@ENABLE_SPECS_TRUE@chapters = \
+@ENABLE_SPECS_TRUE@	AsciiSink.xml					\
+@ENABLE_SPECS_TRUE@	AsciiSource.xml					\
+@ENABLE_SPECS_TRUE@	AsciiText.xml					\
+@ENABLE_SPECS_TRUE@	Box.xml						\
+@ENABLE_SPECS_TRUE@	CH1.xml						\
+@ENABLE_SPECS_TRUE@	CH2.xml						\
+@ENABLE_SPECS_TRUE@	CH3.xml						\
+@ENABLE_SPECS_TRUE@	CH4.xml						\
+@ENABLE_SPECS_TRUE@	CH5.xml						\
+@ENABLE_SPECS_TRUE@	CH6.xml						\
+@ENABLE_SPECS_TRUE@	CH7.xml						\
+@ENABLE_SPECS_TRUE@	Command.xml					\
+@ENABLE_SPECS_TRUE@	Dialog.xml					\
+@ENABLE_SPECS_TRUE@	Form.xml					\
+@ENABLE_SPECS_TRUE@	Grip.xml					\
+@ENABLE_SPECS_TRUE@	Label.xml					\
+@ENABLE_SPECS_TRUE@	List.xml					\
+@ENABLE_SPECS_TRUE@	MenuButton.xml					\
+@ENABLE_SPECS_TRUE@	Paned.xml					\
+@ENABLE_SPECS_TRUE@	Panner.xml					\
+@ENABLE_SPECS_TRUE@	Porthole.xml					\
+@ENABLE_SPECS_TRUE@	Repeater.xml					\
+@ENABLE_SPECS_TRUE@	Scrollbar.xml					\
+@ENABLE_SPECS_TRUE@	SimpleMenu.xml					\
+@ENABLE_SPECS_TRUE@	Simple.xml					\
+@ENABLE_SPECS_TRUE@	SmeBSB.xml					\
+@ENABLE_SPECS_TRUE@	SmeLine.xml					\
+@ENABLE_SPECS_TRUE@	Sme.xml						\
+@ENABLE_SPECS_TRUE@	StripChart.xml					\
+@ENABLE_SPECS_TRUE@	Template_private_header_file.xml		\
+@ENABLE_SPECS_TRUE@	Template_public_header_file.xml			\
+@ENABLE_SPECS_TRUE@	Template_widget_source_file.xml			\
+@ENABLE_SPECS_TRUE@	Template.xml					\
+@ENABLE_SPECS_TRUE@	TextActions_default_translation_bindings.xml	\
+@ENABLE_SPECS_TRUE@	TextActions_text_widget_actions.xml		\
+@ENABLE_SPECS_TRUE@	TextActions.xml					\
+@ENABLE_SPECS_TRUE@	TextCustom.xml					\
+@ENABLE_SPECS_TRUE@	TextFuncs.xml					\
+@ENABLE_SPECS_TRUE@	TextSink.xml					\
+@ENABLE_SPECS_TRUE@	TextSource.xml					\
+@ENABLE_SPECS_TRUE@	Text.xml					\
+@ENABLE_SPECS_TRUE@	Toggle.xml					\
+@ENABLE_SPECS_TRUE@	TPage_Credits.xml				\
+@ENABLE_SPECS_TRUE@	Tree.xml					\
+@ENABLE_SPECS_TRUE@	Viewport.xml
+
+
+# The location where the DocBook/XML files and their generated formats are installed
+@ENABLE_SPECS_TRUE@shelfdir = $(docdir)
+
+# DocBook/XML generated output formats to be installed
+@ENABLE_SPECS_TRUE@shelf_DATA = $(am__append_1) $(am__append_2) \
+@ENABLE_SPECS_TRUE@	$(am__append_3) $(am__append_4)
+
+# DocBook/XML file with chapters, appendix and images it includes
+@ENABLE_SPECS_TRUE@dist_shelf_DATA = $(docbook) $(chapters)
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_SEARCHPATH_FLAGS = \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--searchpath "$(XORG_SGML_PATH)/X11" 		\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--searchpath "$(abs_top_builddir)"
+
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_OLINK_FLAGS = \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.html.xml \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--stringparam current.docid="$(<:.xml=)"
+
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_FLAGS = \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	$(XMLTO_SEARCHPATH_FLAGS)			\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	$(XMLTO_HTML_STYLESHEET_FLAGS)			\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	$(XMLTO_HTML_OLINK_FLAGS)
+
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_IMAGEPATH_FLAGS = --stringparam img.src.path=$(abs_builddir)/
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_PDF_OLINK_FLAGS = \
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.pdf.xml \
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--stringparam current.docid="$(<:.xml=)"
+
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-fo.xsl
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_FLAGS = \
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	$(XMLTO_SEARCHPATH_FLAGS)			\
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	$(XMLTO_FO_STYLESHEET_FLAGS)			\
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	$(XMLTO_FO_IMAGEPATH_FLAGS)			\
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	$(XMLTO_PDF_OLINK_FLAGS)
+
+
+# Generate documents cross-reference target databases
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_SEARCHPATH_FLAGS = \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	--path "$(XORG_SGML_PATH)/X11"			\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	--path "$(abs_top_builddir)"
+
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_OLINK_FLAGS = \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	--stringparam targets.filename "$@" 		\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	--stringparam collect.xref.targets "only" 	\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	--stringparam olink.base.uri "$(@:.db=)"
+
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_HTML_FLAGS = \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	$(XSLT_SEARCHPATH_FLAGS) 			\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	$(XSLT_OLINK_FLAGS)				\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	--nonet --xinclude				\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	$(STYLESHEET_SRCDIR)/xorg-xhtml.xsl
+
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_PDF_FLAGS = \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	$(XSLT_SEARCHPATH_FLAGS) 			\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	$(XSLT_OLINK_FLAGS)				\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	--nonet --xinclude				\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	$(STYLESHEET_SRCDIR)/xorg-fo.xsl
+
+@ENABLE_SPECS_TRUE@CLEANFILES = $(shelf_DATA)
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/docbook.am $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign specs/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign specs/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-dist_shelfDATA: $(dist_shelf_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(shelfdir)" || $(MKDIR_P) "$(DESTDIR)$(shelfdir)"
+	@list='$(dist_shelf_DATA)'; test -n "$(shelfdir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(shelfdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(shelfdir)" || exit $$?; \
+	done
+
+uninstall-dist_shelfDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_shelf_DATA)'; test -n "$(shelfdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(shelfdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(shelfdir)" && rm -f $$files
+install-shelfDATA: $(shelf_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(shelfdir)" || $(MKDIR_P) "$(DESTDIR)$(shelfdir)"
+	@list='$(shelf_DATA)'; test -n "$(shelfdir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(shelfdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(shelfdir)" || exit $$?; \
+	done
+
+uninstall-shelfDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(shelf_DATA)'; test -n "$(shelfdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(shelfdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(shelfdir)" && rm -f $$files
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-dist_shelfDATA install-shelfDATA
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-dist_shelfDATA uninstall-shelfDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	distclean distclean-generic distclean-libtool distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dist_shelfDATA \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-shelfDATA install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-dist_shelfDATA uninstall-shelfDATA
+
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml $(chapters)
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) xhtml-nochunks $<
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@%.txt: %.xml $(chapters)
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) txt $<
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.pdf: %.xml $(chapters)
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop pdf $<
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.ps: %.xml $(chapters)
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop ps $<
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.html.db: %.xml  $(chapters)
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	$(AM_V_GEN)$(XSLTPROC) $(XSLT_HTML_FLAGS) $<
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.pdf.db: %.xml $(chapters)
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	$(AM_V_GEN)$(XSLTPROC) $(XSLT_PDF_FLAGS) $<
+
+# Generate DocBook/XML output formats with or without stylesheets
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/libXaw/specs/MenuButton.xml b/libXaw/specs/MenuButton.xml
index b907fefb5..b7df723bb 100644
--- a/libXaw/specs/MenuButton.xml
+++ b/libXaw/specs/MenuButton.xml
@@ -459,8 +459,8 @@ MenuButton widget:
 </literallayout>
 </para>
 </sect3>
-<sect3 id="MenuButton_Actions_b">
-<title>MenuButton Actions_b</title>
+<sect3 id='MenuButton_Actions_b'>
+<title>MenuButton Actions</title>
 <para>
 <!-- .LP -->
 The full list of actions supported by MenuButton is:
diff --git a/libXaw/specs/Paned.xml b/libXaw/specs/Paned.xml
index 90c3809cc..6ab2f1d90 100644
--- a/libXaw/specs/Paned.xml
+++ b/libXaw/specs/Paned.xml
@@ -95,7 +95,7 @@ The default bindings for the Paned widget's grips are:
 </informaltable>
 </para>
 </sect2>
-<sect2 id="paned_resources">
+<sect2 id='Paned::Resources'>
 <title>Resources</title>
 <para>
 <!-- .LP -->
@@ -565,7 +565,7 @@ when the Paned widget is oriented vertically.
 <!-- .Mm -->
 <!-- .Nc -->
 This is not the same as the number of panes, since this also contains a
-grip for some of the panes, use <function>XawPanedGetNumSub</function> to retrieve the
+grip for some of the panes, use <xref linkend='XawPanedGetNumSub' xrefstyle='select: title'/> to retrieve the
 number of panes.
       </para>
     </listitem>
@@ -605,7 +605,7 @@ widget.
 </variablelist>
 </para>
 </sect2>
-<sect2 id="paned_constraint_resources">
+<sect2 id='Paned::Constraint_Resources'>
 <title>Constraint Resources</title>
 <para>
 <!-- .LP -->
@@ -775,7 +775,7 @@ forced to be resized.  See <function>Layout Semantics</function> for details.
 </variablelist>
 </para>
 </sect2>
-<sect2 id="paned_layout_semantics">
+<sect2 id='Paned::Layout_Semantics'>
 <title>Layout Semantics</title>
 <para>
 <!-- .LP -->
@@ -859,7 +859,7 @@ Invoking GripAction with <function>ThisBorderOnly</function> specified just move
 border between the panes.  No other panes are ever resized.
 </para>
 </sect3>
-<sect3 id="Resizing_Panes_after_the_Paned_widget_is_resized_">
+<sect3 id='Resizing_Panes_after_the_Paned_widget_is_resized'>
 <title>Resizing Panes after the Paned widget is resized.</title>
 <para>
 <!-- .LP -->
@@ -889,7 +889,7 @@ panes exactly.  If this is not possible then it will hunt through the
 children, from bottom to top (right to left), for a pane to resize.
 </para>
 </sect3>
-<sect3 id="paned_special_considerations">
+<sect3 id='Paned::Special_Considerations'>
 <title>Special Considerations</title>
 <para>
 <!-- .LP -->
@@ -970,7 +970,7 @@ grip's inactive cursor.  No second argument is needed in this case.
 </variablelist>
 </para>
 </sect2>
-<sect2 id="paned_convenience_routines">
+<sect2 id='Paned::Convenience_Routines'>
 <title>Convenience Routines</title>
 <para>
 <!-- .LP -->
@@ -980,7 +980,7 @@ To enable or disable a child's request for pane resizing,
 use
 <function>XawPanedAllowResize :</function>
 <!-- .IN "XawPanedAllowResize" "" "@DEF@" -->
-<funcsynopsis>
+<funcsynopsis id='XawPanedAllowResize'>
 <funcprototype>
   <funcdef>void<function> XawPanedAllowResize</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
@@ -1029,7 +1029,7 @@ constraint resource for the child.
 To change the minimum and maximum height settings for a pane, use
 <function>XawPanedSetMinMax :</function>
 <!-- .IN "XawPanedSetMinMax" "" "@DEF@" -->
-<funcsynopsis>
+<funcsynopsis id='XawPanedSetMinMax'>
 <funcprototype>
   <funcdef>void<function> XawPanedSetMinMax</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
@@ -1082,7 +1082,7 @@ constraint resources for the child.
 To retrieve the minimum and maximum height settings for a pane, use
 <function>XawPanedGetMinMax :</function>
 <!-- .IN "XawPanedGetMinMax" "" "@DEF@" -->
-<funcsynopsis>
+<funcsynopsis id='XawPanedGetMinMax'>
 <funcprototype>
   <funcdef>void<function> XawPanedGetMinMax</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
@@ -1137,7 +1137,7 @@ To enable or disable automatic recalculation of pane sizes and positions,
 use
 <function>XawPanedSetRefigureMode :</function>
 <!-- .IN "XawPanedSetRefigureMode" "" "@DEF@" -->
-<funcsynopsis>
+<funcsynopsis id='XawPanedSetRefigureMode'>
 <funcprototype>
   <funcdef>void<function> XawPanedSetRefigureMode</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
@@ -1180,9 +1180,9 @@ relayout until after all changes have been made.
 <!-- .sp -->
 <!-- .IN "Paned widget" "getting the number of children" -->
 To retrieve the number of panes in a paned widget use
-<function>XawPanedGetNumSub</function>:
+<xref linkend='XawPanedGetNumSub' xrefstyle='select: title'/>:
 <!-- .IN "XawPanedGetNumSub" "" "@DEF@" -->
-<funcsynopsis>
+<funcsynopsis id='XawPanedGetNumSub'>
 <funcprototype>
   <funcdef>int<function> XawPanedGetNumSub</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
diff --git a/libXaw/specs/Panner.xml b/libXaw/specs/Panner.xml
index a04bb1a96..f886af0dd 100644
--- a/libXaw/specs/Panner.xml
+++ b/libXaw/specs/Panner.xml
@@ -41,7 +41,7 @@ through callback procedures.  Notification may be done either
 continuously whenever the slider moves or discretely whenever the
 slider has been given a new location.
 </para>
-<sect2 id="panner_resources">
+<sect2 id='Panner::Resources'>
 <title>Resources</title>
 <para>
 <!-- .LP -->
@@ -688,7 +688,7 @@ The default bindings for Panner are:
 The functions registered on the <function>reportCallback</function> list are invoked by
 the <function>notify</function> action as follows:
 <!-- .IN "ReportProc" "" "@DEF@" -->
-<funcsynopsis>
+<funcsynopsis id='Panner::ReportProc'>
 <funcprototype>
   <funcdef>void<function> ReportProc</function></funcdef>
   <paramdef>Widget<parameter> panner</parameter></paramdef>
diff --git a/libXaw/specs/Porthole.xml b/libXaw/specs/Porthole.xml
index beda434ee..04525780c 100644
--- a/libXaw/specs/Porthole.xml
+++ b/libXaw/specs/Porthole.xml
@@ -29,7 +29,7 @@ widgets, only one of which may be managed at any particular time.
 The managed child widget is reparented within the porthole and is moved around
 by the application (typically under the control of a Panner widget).
 </para>
-<sect2 id="porthole_resources">
+<sect2 id='Porthole::Resources'>
 <title>Resources</title>
 <para>
 <!-- .LP -->
@@ -242,7 +242,7 @@ size or position.
 <!-- .Xy -->
 </para>
 </sect2>
-<sect2 id="porthold_layout_semantics">
+<sect2 id='Porthole::Layout_Semantics'>
 <title>Layout Semantics</title>
 <!-- .IN "Porthole widget" "layout semantics" -->
 <para>
@@ -262,7 +262,7 @@ Panner widget.
 The functions registered on the <function>reportCallback</function> list are invoked whenever
 the managed child changes size or position:
 <!-- .IN "ReportProc" "" "@DEF@" -->
-<funcsynopsis>
+<funcsynopsis id='Porthole::ReportProc'>
 <funcprototype>
   <funcdef>void<function> ReportProc</function></funcdef>
   <paramdef>Widget<parameter> porthole</parameter></paramdef>
@@ -281,7 +281,7 @@ the managed child changes size or position:
 Specifies the Porthole widget.
       </para>
     </listitem>
-  </varlistentry> 
+  </varlistentry>
   <varlistentry>
     <term>client_data</term>
     <listitem>
@@ -290,7 +290,7 @@ Specifies the Porthole widget.
 Specifies the client data.
       </para>
     </listitem>
-  </varlistentry> 
+  </varlistentry>
   <varlistentry>
     <term>report</term>
     <listitem>
@@ -300,7 +300,7 @@ Specifies a pointer to an <function>XawPannerReport</function> structure contain
 the location and size of the slider and the size of the canvas.
       </para>
     </listitem>
-  </varlistentry> 
+  </varlistentry>
 </variablelist>
 </sect2>
 </sect1>
diff --git a/libXaw/specs/Repeater.xml b/libXaw/specs/Repeater.xml
index 35cd69aee..289e14dd6 100644
--- a/libXaw/specs/Repeater.xml
+++ b/libXaw/specs/Repeater.xml
@@ -27,7 +27,7 @@ registered callbacks repeatedly, at an increasing rate.  The default translation
 does so for the duration the user holds down pointer button 1 while the pointer
 is on the Repeater.
 </para>
-<sect2 id="repeater_resources">
+<sect2 id='Repeater::Resources'>
 <title>Resources</title>
 <para>
 <!-- .LP -->
diff --git a/libXaw/specs/Scrollbar.xml b/libXaw/specs/Scrollbar.xml
index 87f6d68eb..f5d055343 100644
--- a/libXaw/specs/Scrollbar.xml
+++ b/libXaw/specs/Scrollbar.xml
@@ -54,7 +54,7 @@ procedure is invoked only when the button is released and the client
 callback procedure is responsible for moving the thumb.
 </para>
 
-<sect2 id="scrollbar_resources">
+<sect2 id='Scrollbar::Resources'>
 <title>Resources</title>
 
 <para>
@@ -663,7 +663,7 @@ The procedural interface for these functions is described here.
 The calling interface to the <function>scrollProc</function> callback procedure is:
 <!-- .IN "ScrollProc" "" "@DEF@" -->
 </para>
-<funcsynopsis>
+<funcsynopsis id='ScrollProc'>
 <funcprototype>
   <funcdef>void<function> ScrollProc</function></funcdef>
   <paramdef>Widget<parameter> scrollbar</parameter></paramdef>
@@ -720,7 +720,7 @@ be greater than the length of the Scrollbar.
 The calling interface to the <function>jumpProc</function> callback procedure is:
 </para>
 <!-- .IN "jumpProc" "" "@DEF@" -->
-<funcsynopsis>
+<funcsynopsis id='JumpProc'>
 <funcprototype>
   <funcdef>void<function> JumpProc</function></funcdef>
   <paramdef>Widget<parameter> scrollbar</parameter></paramdef>
@@ -792,7 +792,7 @@ To set the position and length of a Scrollbar thumb, use
 <!-- .PN XawScrollbarSetThumb . -->
 <!-- .IN "XawScrollbarSetThumb" "" "@DEF@" -->
 </para>
-<funcsynopsis>
+<funcsynopsis id='XawScrollbarSetThumb'>
 <funcprototype>
   <funcdef>void<function> XawScrollbarSetThumb</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
@@ -845,7 +845,7 @@ Values greater than 1.0 are truncated to 1.0.
 </para>
 
 <para>
-If called from <function>jumpProc</function>, <function>XawScrollbarSetThumb</function> has no effect.
+If called from <function>jumpProc</function>, <xref linkend='XawScrollbarSetThumb' xrefstyle='select: title'/> has no effect.
 </para>
 
 </sect2>
diff --git a/libXaw/specs/Simple.xml b/libXaw/specs/Simple.xml
index a21bc64f5..0d32f744c 100644
--- a/libXaw/specs/Simple.xml
+++ b/libXaw/specs/Simple.xml
@@ -26,7 +26,7 @@ of its own.  It main purpose is to be used as a common superclass for
 the other <emphasis remap='I'>simple</emphasis> Athena widgets.  This widget adds six resources
 to the resource list provided by the Core widget and its superclasses.
 </para>
-<sect2 id="simple_resources">
+<sect2 id='Simple::Resources'>
 <title>Resources</title>
 <para>
 <!-- .LP -->
diff --git a/libXaw/specs/SimpleMenu.xml b/libXaw/specs/SimpleMenu.xml
index 84ba039e7..a99608d67 100644
--- a/libXaw/specs/SimpleMenu.xml
+++ b/libXaw/specs/SimpleMenu.xml
@@ -23,7 +23,7 @@ Superclass	OverrideShell
 <!-- .LP -->
 The SimpleMenu widget is a container for the menu entries.  It is a
 direct subclass of shell, and is should be created with
-<function>XtCreatePopupShell</function>, not <function>XtCreateManagedWidget</function>.  This is the
+<function>XtCreatePopupShell</function>, not <xref linkend='XtCreateManagedWidget' xrefstyle='select: title'/>.  This is the
 only part of the menu that
 actually is associated with a window.  The SimpleMenu serves as the glue to bind
 the individual menu entries together into a menu.
@@ -632,7 +632,7 @@ translation table of the widget that will be popping up the menu.  The
 <function>MenuPopup</function> action is described in <emphasis remap='I'>(xT</emphasis>.
 <function>XawPositionSimpleMenu</function> is a global action procedure registered by
 the SimpleMenu widget when the first one is created or the convenience
-routine <function>XawSimpleMenuAddGlobalActions</function> is called.
+routine <xref linkend='XawSimpleMenuAddGlobalActions' xrefstyle='select: title'/> is called.
 </para>
 <para>
 <!-- .LP -->
@@ -689,9 +689,9 @@ The <function>XawPositionSimpleMenu</function> action routine may often be invok
 before any menus have been created.  This can occur when an
 application uses dynamic menu creation.  In these cases an application will
 need to register this global action routine by calling
-<function>XawSimpleMenuAddGlobalActions</function>:
+<xref linkend='XawSimpleMenuAddGlobalActions' xrefstyle='select: title'/>:
 <!-- .IN "XawSimpleMenuAddGlobalActions" "" "@DEF@" -->
-<funcsynopsis>
+<funcsynopsis id='XawSimpleMenuAddGlobalActions'>
 <funcprototype>
   <funcdef>void<function> XawSimpleMenuAddGlobalActions</function></funcdef>
   <paramdef>XtAppContext<parameter> app_con</parameter></paramdef>
@@ -723,9 +723,9 @@ is realized.
 <para>
 <!-- .LP -->
 To get the currently highlighted menu entry use
-<function>XawSimpleMenuGetActiveEntry</function>:
+<xref linkend='XawSimpleMenuGetActiveEntry' xrefstyle='select: title'/>:
 <!-- .IN "XawSimpleMenuGetActiveEntry" "" "@DEF@" -->
-<funcsynopsis>
+<funcsynopsis id='XawSimpleMenuGetActiveEntry'>
 <funcprototype>
   <funcdef>Widget<function> XawSimpleMenuGetActiveEntry</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
@@ -755,9 +755,9 @@ currently highlighted, or NULL if no entry is highlighted.
 <!-- .sp -->
 To clear the SimpleMenu widget's internal information about the
 currently highlighted menu entry use
-<function>XawSimpleMenuClearActiveEntry</function>:
+<xref linkend='XawSimpleMenuClearActiveEntry' xrefstyle='select: title'/>:
 <!-- .IN "XawSimpleMenuClearActiveEntry" "" "@DEF@" -->
-<funcsynopsis>
+<funcsynopsis id='XawSimpleMenuClearActiveEntry'>
 <funcprototype>
   <funcdef>Widget<function> XawSimpleMenuClearActiveEntry</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
diff --git a/libXaw/specs/Sme.xml b/libXaw/specs/Sme.xml
index 2d3d2f5f7..da3c4d15f 100644
--- a/libXaw/specs/Sme.xml
+++ b/libXaw/specs/Sme.xml
@@ -28,7 +28,7 @@ The Sme object is the base class for all menu entries.  While this
 object is mainly intended to be subclassed, it may be used in a menu to
 add blank space between menu entries.
 </para>
-<sect2 id="sme_resources">
+<sect2 id='Sme::Resources'>
 <title>Resources</title>
 <!-- .IN "SmeLine object" "resources" -->
 <para>
@@ -191,7 +191,7 @@ XtSetValues calls may come from the application while the Sme is highlighted,
 and if the SetValues method returns True, will result in an expose event.
 The SimpleMenu may later call the menu entry's <function>unhighlight</function>
 procedure.  However, due to the asynchronous nature of
-X, the expose event generated by <function>XtSetValues</function> will come <emphasis remap='I'>after</emphasis>
+X, the expose event generated by <xref linkend='XtSetValues' xrefstyle='select: title'/> will come <emphasis remap='I'>after</emphasis>
 this unhighlight.
     </para>
   </listitem>
diff --git a/libXaw/specs/SmeBSB.xml b/libXaw/specs/SmeBSB.xml
index 539bdcb03..3636e2e02 100644
--- a/libXaw/specs/SmeBSB.xml
+++ b/libXaw/specs/SmeBSB.xml
@@ -32,7 +32,7 @@ entry by entry basis.  The format of the string may either be the encoding
 of the 8 bit <function>font</function> utilized, or in a multi-byte encoding for use with a
 <function>fontSet</function>.
 </para>
-<sect2 id="smebsb_resources">
+<sect2 id='SmeBSB::Resources'>
 <title>Resources</title>
 <!-- .IN "SmeBSB object" "resources" -->
 <para>
@@ -189,7 +189,7 @@ All callback functions on this list are called when the SimpleMenu
 <emphasis remap='I'>notifies</emphasis> this entry that the user has selected it.
       </para>
     </listitem>
-  </varlistentry> 
+  </varlistentry>
   <varlistentry>
     <term>font</term>
     <listitem>
diff --git a/libXaw/specs/SmeLine.xml b/libXaw/specs/SmeLine.xml
index e53728c61..96c920b70 100644
--- a/libXaw/specs/SmeLine.xml
+++ b/libXaw/specs/SmeLine.xml
@@ -30,7 +30,7 @@ is able to change the color, height, and other attributes of the SmeLine
 objects on an entry by entry basis.  This object is not selectable, and
 will not highlight when the pointer cursor is over it.
 </para>
-<sect2 id="smeline_resources">
+<sect2 id='SmeLine::Resources'>
 <title>Resources</title>
 <!-- .IN "SmeLine object" "resources" -->
 <para>
diff --git a/libXaw/specs/StripChart.xml b/libXaw/specs/StripChart.xml
index f51f6fc83..8d5c0648a 100644
--- a/libXaw/specs/StripChart.xml
+++ b/libXaw/specs/StripChart.xml
@@ -28,7 +28,7 @@ to provide a graph of processor load.  The StripChart
 reads data from an application, and updates the chart
 at the <function>update</function> interval specified.
 </para>
-<sect2 id="stripchart_resources">
+<sect2 id='StripChart::Resources'>
 <title>Resources</title>
 <para>
 <!-- .LP -->
diff --git a/libXaw/specs/Template.xml b/libXaw/specs/Template.xml
index 2d94ca829..d9e2fc53d 100644
--- a/libXaw/specs/Template.xml
+++ b/libXaw/specs/Template.xml
@@ -4,7 +4,7 @@
 The public header file contains declarations that will be required by any
 application module that needs to refer to the widget; whether to create
 an instance of the class, to perform an
-<function>XtSetValues</function>
+<xref linkend='XtSetValues' xrefstyle='select: title'/>
 operation, or to call a public routine implemented by the widget class.
 </para>
 <para>
diff --git a/libXaw/specs/Template_public_header_file.xml b/libXaw/specs/Template_public_header_file.xml
index b17379677..6e8d609bc 100644
--- a/libXaw/specs/Template_public_header_file.xml
+++ b/libXaw/specs/Template_public_header_file.xml
@@ -4,7 +4,7 @@
 The public header file contains declarations that will be required by any
 application module that needs to refer to the widget; whether to create
 an instance of the class, to perform an
-<function>XtSetValues</function>
+<xref linkend='XtSetValues' xrefstyle='select: title'/>
 operation, or to call a public routine implemented by the widget class.
 </para>
 <para>
diff --git a/libXaw/specs/Text.xml b/libXaw/specs/Text.xml
index 3daf7d3e4..d2d5e3074 100644
--- a/libXaw/specs/Text.xml
+++ b/libXaw/specs/Text.xml
@@ -1,4 +1,4 @@
-<sect1 id="Text_Widget_">
+<sect1 id='Text_Widget'>
 <title>Text Widget</title>
 
 <literallayout class="monospaced">
@@ -20,7 +20,7 @@ mediator between the source and sink.
 This section lists the resources that are actually part of the
 Text widget, and explains the functionality provided by each.
 </para>
-<sect2 id="Resources_">
+<sect2 id='Text::Resources'>
 <title>Resources</title>
 
 <para>
diff --git a/libXaw/specs/TextActions.xml b/libXaw/specs/TextActions.xml
index 0af3bec48..0e54582df 100644
--- a/libXaw/specs/TextActions.xml
+++ b/libXaw/specs/TextActions.xml
@@ -63,7 +63,7 @@ may assume this to be the case.
 <para>
 <!-- .LP -->
 </para>
-<sect3 id="Cursor_Movement_Actions_fP">
+<sect3 id='Cursor_Movement_Actions'>
 <title>Cursor Movement Actions\fP</title>
 <para>
 <!-- .LP -->
@@ -813,7 +813,7 @@ section called <function>Text Selections for Users</function>.  To modify the se
 a programmer must construct a <function>XawTextSelectType</function> array (called the
 selection array), containing the selections desired, and pass this as
 the new value for the <function>selectionTypes</function> resource.  The selection
-array may also be modified using the <function>XawTextSetSelectionArray</function>
+array may also be modified using the <xref linkend='XawTextSetSelectionArray' xrefstyle='select: title'/>
 <!-- .IN "XawTextSetSelectionArray" "" -->
 function.  All selection arrays must end with the value
 <function>XawselectNull</function>.  The <function>selectionTypes</function> resource has no converter
diff --git a/libXaw/specs/TextActions_text_widget_actions.xml b/libXaw/specs/TextActions_text_widget_actions.xml
index 238727698..af7705204 100644
--- a/libXaw/specs/TextActions_text_widget_actions.xml
+++ b/libXaw/specs/TextActions_text_widget_actions.xml
@@ -63,7 +63,7 @@ may assume this to be the case.
 <para>
 <!-- .LP -->
 </para>
-<sect2 id="Cursor_Movement_Actions_fP">
+<sect2 id='Cursor_Movement_Actions'>
 <title>Cursor Movement Actions\fP</title>
 <para>
 <!-- .LP -->
@@ -813,7 +813,7 @@ section called <function>Text Selections for Users</function>.  To modify the se
 a programmer must construct a <function>XawTextSelectType</function> array (called the
 selection array), containing the selections desired, and pass this as
 the new value for the <function>selectionTypes</function> resource.  The selection
-array may also be modified using the <function>XawTextSetSelectionArray</function>
+array may also be modified using the <xref linkend='XawTextSetSelectionArray' xrefstyle='select: title'/>
 <!-- .IN "XawTextSetSelectionArray" "" -->
 function.  All selection arrays must end with the value
 <function>XawselectNull</function>.  The <function>selectionTypes</function> resource has no converter
diff --git a/libXaw/specs/TextFuncs.xml b/libXaw/specs/TextFuncs.xml
index 0d2ae8192..d7d3580b7 100644
--- a/libXaw/specs/TextFuncs.xml
+++ b/libXaw/specs/TextFuncs.xml
@@ -109,7 +109,7 @@ deprecated and will eventually be removed from the implementation.
 To select a piece of text, use
 <function>XawTextSetSelection : </function>
 <!-- .IN "XawTextSetSelection" "" "@DEF@" -->
-<funcsynopsis>
+<funcsynopsis id='XawTextSetSelection'>
 <funcprototype>
   <funcdef>void<function> XawTextSetSelection</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
@@ -152,7 +152,7 @@ Specifies the character position at which the selection ends.
 </para>
 <para>
 <!-- .LP -->
-See section 5.4 for a description of <function>XawTextPosition</function>.  <!-- xref --> 
+See section 5.4 for a description of <function>XawTextPosition</function>.  <!-- xref -->
 If redisplay is enabled, this function highlights the text and
 makes it the <function>PRIMARY</function> selection.  This function does not have any
 effect on <function>CUT_BUFFER0</function>.
@@ -166,9 +166,9 @@ effect on <function>CUT_BUFFER0</function>.
 <para>
 <!-- .LP -->
 To unhighlight previously highlighted text in a widget, use
-<function>XawTextUnsetSelection</function>:
+<xref linkend='XawTextUnsetSelection' xrefstyle='select: title'/>:
 <!-- .IN "XawTextUnsetSelection" "" "@DEF@" -->
-<funcsynopsis>
+<funcsynopsis id='XawTextUnsetSelection'>
 <funcprototype>
   <funcdef>void<function> XawTextUnsetSelection</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
@@ -194,9 +194,9 @@ Specifies the Text widget.
 <para>
 <!-- .LP -->
 To retrieve the text that has been selected by this
-text widget use <function>XawTextGetSelectionPos</function>:
+text widget use <xref linkend='XawTextGetSelectionPos' xrefstyle='select: title'/>:
 <!-- .IN "XawTextGetSelectionPos" "" "@DEF@" -->
-<funcsynopsis>
+<funcsynopsis id='XawTextGetSelectionPos'>
 <funcprototype>
   <funcdef>void<function> XawTextGetSelectionPos</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
@@ -239,7 +239,7 @@ Returns the end of the text selection.
 </para>
 <para>
 <!-- .LP -->
-See section 5.4 for a description of <function>XawTextPosition</function>. <!-- xref --> 
+See section 5.4 for a description of <function>XawTextPosition</function>. <!-- xref -->
 If the returned values are equal, no text is currently selected.
 </para>
 </sect2>
@@ -247,9 +247,9 @@ If the returned values are equal, no text is currently selected.
 <title>Replacing Text</title>
 <para>
 <!-- .LP -->
-To modify the text in an editable Text widget use <function>XawTextReplace</function>:
+To modify the text in an editable Text widget use <xref linkend='XawTextReplace' xrefstyle='select: title'/>:
 <!-- .IN "XawTextReplace" "" "@DEF@" -->
-<funcsynopsis>
+<funcsynopsis id='XawTextReplace'>
 <funcprototype>
   <funcdef>int<function> XawTextReplace</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
@@ -356,7 +356,7 @@ than the length of the Source.
 </para>
 <para>
 <!-- .LP -->
-The <function>XawTextReplace</function> arguments <function>start</function> and
+The <xref linkend='XawTextReplace' xrefstyle='select: title'/> arguments <function>start</function> and
 <emphasis remap='I'>end</emphasis> represent the text source character positions for the
 existing text that is to be replaced by the text in the text block.
 The characters from <emphasis remap='I'>start</emphasis> up to
@@ -371,9 +371,9 @@ text is inserted after <emphasis remap='I'>start</emphasis>.
 <para>
 <!-- .LP -->
 To search for a string in the Text widget, use
-<function>XawTextSearch</function>:
+<xref linkend='XawTextSearch' xrefstyle='select: title'/>:
 <!-- .IN "XawTextSearch" "" "@DEF@" -->
-<funcsynopsis>
+<funcsynopsis id='XawTextSearch'>
 <funcprototype>
   <funcdef>XawTextPosition<function> XawTextSearch</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
@@ -419,7 +419,7 @@ Specifies a text block structure that contains the text to search for.
 <para>
 <!-- .LP -->
 See section 5.4 for a description of <function>XawTextPosition</function> and <function>XawTextBlock</function>. <!-- xref -->
-The <function>XawTextSearch</function> function will begin at the insertion point
+The <xref linkend='XawTextSearch' xrefstyle='select: title'/> function will begin at the insertion point
 and search in the
 direction specified for a string that matches the one passed in
 <emphasis remap='I'>text</emphasis>.  If the string is found the location of the first
@@ -431,9 +431,9 @@ found then the value <function>XawTextSearchError</function> is returned.
 <title>Redisplaying Text</title>
 <para>
 <!-- .LP -->
-To redisplay a range of characters, use <function>XawTextInvalidate</function>:
+To redisplay a range of characters, use <xref linkend='XawTextInvalidate' xrefstyle='select: title'/>:
 <!-- .IN "XawTextInvalidate" "" "@DEF@" -->
-<funcsynopsis>
+<funcsynopsis id='XawTextInvalidate'>
 <funcprototype>
   <funcdef>void<function> XawTextInvalidate</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
@@ -477,7 +477,7 @@ Specifies the end of the text to redisplay.
 <para>
 <!-- .LP -->
 See section 5.4 for a description of <function>XawTextPosition</function>. <!-- xref -->
-The <function>XawTextInvalidate</function>
+The <xref linkend='XawTextInvalidate' xrefstyle='select: title'/>
 function causes the specified range of characters to be redisplayed
 immediately if redisplay is enabled or the next time that redisplay is
 enabled.
@@ -485,9 +485,9 @@ enabled.
 <para>
 <!-- .LP -->
 <!-- .sp 1 -->
-To enable redisplay, use <function>XawTextEnableRedisplay</function>:
+To enable redisplay, use <xref linkend='XawTextEnableRedisplay' xrefstyle='select: title'/>:
 <!-- .IN "XawTextEnableRedisplay" "" "@DEF@" -->
-<funcsynopsis>
+<funcsynopsis id='XawTextEnableRedisplay'>
 <funcprototype>
   <funcdef>void<function> XawTextEnableRedisplay</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
@@ -509,17 +509,17 @@ Specifies the Text widget.
 </para>
 <para>
 <!-- .LP -->
-The <function>XawTextEnableRedisplay</function> function flushes any changes due to
-batched updates when <function>XawTextDisableRedisplay</function>
+The <xref linkend='XawTextEnableRedisplay' xrefstyle='select: title'/> function flushes any changes due to
+batched updates when <xref linkend='XawTextDisableRedisplay' xrefstyle='select: title'/>
 was called and allows future changes to be reflected immediately.
 </para>
 <para>
 <!-- .LP -->
 <!-- .sp 1 -->
 To disable redisplay while making several changes, use
-<function>XawTextDisableRedisplay</function>.
+<xref linkend='XawTextDisableRedisplay' xrefstyle='select: title'/>.
 <!-- .IN "XawTextDisableRedisplay" "" "@DEF@" -->
-<funcsynopsis>
+<funcsynopsis id='XawTextDisableRedisplay'>
 <funcprototype>
   <funcdef>void<function> XawTextDisableRedisplay</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
@@ -541,16 +541,16 @@ Specifies the Text widget.
 </para>
 <para>
 <!-- .LP -->
-The <function>XawTextDisableRedisplay</function> function causes all changes to be
-batched until either <function>XawTextDisplay</function> or <function>XawTextEnableRedisplay</function>
+The <xref linkend='XawTextDisableRedisplay' xrefstyle='select: title'/> function causes all changes to be
+batched until either <xref linkend='XawTextDisplay' xrefstyle='select: title'/> or <xref linkend='XawTextEnableRedisplay' xrefstyle='select: title'/>
 is called.
 </para>
 <para>
 <!-- .LP -->
 <!-- .sp 1 -->
-To display batched updates, use <function>XawTextDisplay</function>:
+To display batched updates, use <xref linkend='XawTextDisplay' xrefstyle='select: title'/>:
 <!-- .IN "XawTextDisplay" "" "@DEF@" -->
-<funcsynopsis>
+<funcsynopsis id='XawTextDisplay'>
 <funcprototype>
   <funcdef>void<function> XawTextDisplay</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
@@ -572,7 +572,7 @@ Specifies the Text widget.
 </para>
 <para>
 <!-- .LP -->
-The <function>XawTextDisplay</function> function forces any accumulated updates to be
+The <xref linkend='XawTextDisplay' xrefstyle='select: title'/> function forces any accumulated updates to be
 displayed.
 </para>
 </sect2>
@@ -582,9 +582,9 @@ displayed.
 <!-- .LP -->
 To obtain the character position of the left-most character on the
 first line displayed in the widget (the value of the
-<function>displayPosition</function> resource), use <function>XawTextTopPosition</function>.
+<function>displayPosition</function> resource), use <xref linkend='XawTextTopPosition' xrefstyle='select: title'/>.
 <!-- .IN "XawTextTopPosition" "" @DEF@" -->
-<funcsynopsis>
+<funcsynopsis id='XawTextTopPosition'>
 <funcprototype>
   <funcdef>XawTextPosition<function> XawTextTopPosition</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
@@ -608,9 +608,9 @@ Specifies the Text widget.
 <!-- .LP -->
 <!-- .sp 1 -->
 To assign a new selection array to a text widget use
-<function>XawTextSetSelectionArray</function>:
+<xref linkend='XawTextSetSelectionArray' xrefstyle='select: title'/>:
 <!-- .IN "XawTextSetSelectionArray" "" "@DEF@" -->
-<funcsynopsis>
+<funcsynopsis id='XawTextSetSelectionArray'>
 <funcprototype>
   <funcdef>void<function> XawTextSetSelectionArray</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
@@ -651,9 +651,9 @@ Calling this function is equivalent to setting the value of the
 <!-- .LP -->
 <!-- .sp 1 -->
 To move the insertion point to the specified source position, use
-<function>XawTextSetInsertionPoint</function>:
+<xref linkend='XawTextSetInsertionPoint' xrefstyle='select: title'/>:
 <!-- .IN "XawTextSetInsertionPoint" "" "@DEF@" -->
-<funcsynopsis>
+<funcsynopsis id='XawTextSetInsertionPoint'>
 <funcprototype>
   <funcdef>void<function> XawTextSetInsertionPoint</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
@@ -695,9 +695,9 @@ equivalent to setting the <function>insertPosition</function> resource.
 <!-- .LP -->
 <!-- .sp 1 -->
 To obtain the current position of the insertion point, use
-<function>XawTextGetInsertionPoint</function>:
+<xref linkend='XawTextGetInsertionPoint' xrefstyle='select: title'/>:
 <!-- .IN "XawTextGetInsertionPoint" "" "@DEF@" -->
-<funcsynopsis>
+<funcsynopsis id='XawTextGetInsertionPoint'>
 <funcprototype>
   <funcdef>XawTextPosition<function> XawTextGetInsertionPoint</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
@@ -727,9 +727,9 @@ The result is equivalent to retrieving the value of the
 <!-- .LP -->
 <!-- .sp 1 -->
 To replace the text source in the specified widget, use
-<function>XawTextSetSource</function>:
+<xref linkend='XawTextSetSource' xrefstyle='select: title'/>:
 <!-- .IN "XawTextSetSource" "" "@DEF@" -->
-<funcsynopsis>
+<funcsynopsis id='XawTextSetSource'>
 <funcprototype>
   <funcdef>void<function> XawTextSetSource</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
@@ -781,9 +781,9 @@ A display update will be performed if redisplay is enabled.
 <!-- .LP -->
 <!-- .sp 1 -->
 To obtain the current text source for the specified widget, use
-<function>XawTextGetSource</function>:
+<xref linkend='XawTextGetSource' xrefstyle='select: title'/>:
 <!-- .IN "XawTextGetSource" "" "@DEF@" -->
-<funcsynopsis>
+<funcsynopsis id='XawTextGetSource'>
 <funcprototype>
   <funcdef>Widget<function> XawTextGetSource</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
@@ -812,9 +812,9 @@ using.
 <!-- .LP -->
 <!-- .sp -->
 To enable and disable the insertion point, use
-<function>XawTextDisplayCaret</function>:
+<xref linkend='XawTextDisplayCaret' xrefstyle='select: title'/>:
 <!-- .IN "XawTextDisplayCaret" "" "@DEF@" -->
-<funcsynopsis>
+<funcsynopsis id='XawTextDisplayCaret'>
 <funcprototype>
   <funcdef>void<function> XawTextDisplayCaret</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
@@ -849,7 +849,7 @@ Specifies whether or not the caret should be displayed.
 <!-- .LP -->
 If <function>visible</function> is <function>False</function> the insertion point will be disabled.
 The marker is re-enabled either by setting <function>visible</function> to <function>True</function>, by
-calling <function>XtSetValues</function>, or by executing the <function>display-caret</function>
+calling <xref linkend='XtSetValues' xrefstyle='select: title'/>, or by executing the <function>display-caret</function>
 action routine.
 </para>
 </sect2>
diff --git a/libXaw/specs/TextSink.xml b/libXaw/specs/TextSink.xml
index bafe557bd..93a2e0ef6 100644
--- a/libXaw/specs/TextSink.xml
+++ b/libXaw/specs/TextSink.xml
@@ -35,7 +35,7 @@ export.
 Since all text sinks will have some resources in common, the TextSink
 defines a few new resources.
 </para>
-<sect2 id="textsink_resources">
+<sect2 id='TextSink::Resources'>
 <title>Resources</title>
 <para>
 <!-- .LP -->
@@ -190,9 +190,9 @@ to be used as a sink by itself.
 <para>
 <!-- .LP -->
 To display a section of the text buffer contained in the text source
-use the function <function>DisplayText</function>:
+use the function <xref linkend='DisplayText' xrefstyle='select: title'/>:
 <!-- .IN "TextSink object" "DisplayText" "@DEF@" -->
-<funcsynopsis>
+<funcsynopsis id='DisplayText'>
 <funcprototype>
   <funcdef>void<function> DisplayText</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
@@ -281,9 +281,9 @@ be displayed.
 <para>
 <!-- .LP -->
 The function that controls the display of the text cursor is
-<function>InsertCursor</function>.  This function will be called whenever the text
+<xref linkend='InsertCursor' xrefstyle='select: title'/>.  This function will be called whenever the text
 widget desires to change the state of, or move the insert point.
-<funcsynopsis>
+<funcsynopsis id='InsertCursor'>
 <funcprototype>
   <funcdef>void<function> InsertCursor</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
@@ -346,13 +346,15 @@ Specifies the state of the cursor, may be one of <function>XawisOn</function> or
 <para>
 <!-- .LP -->
 To clear a portion of the Text window to its background color, the Text
-widget will call <function>ClearToBackground</function>.  The TextSink object already
-defines this function as calling <function>XClearArea</function> on the region passed.
+widget will call <xref linkend='ClearToBackground' xrefstyle='select: title'/>.  The TextSink object already
+defines this function as calling 
+<olink targetdoc='libX11' targetptr='XClearArea'><function>XClearArea</function></olink>
+on the region passed.
 This behavior will be used if you specify
 <function>XtInheritClearToBackground</function> for this method.
 <!-- .IN "XtInheritClearToBackground" "" -->
 <!-- .IN "TextSink object" "ClearToBackground" "@DEF@" -->
-<funcsynopsis>
+<funcsynopsis id='ClearToBackground'>
 <funcprototype>
   <funcdef>void<function> ClearToBackground</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
@@ -424,9 +426,9 @@ Specifies the height, in pixels, of the Region to clear.
 <para>
 <!-- .LP -->
 To find the text character position that will be rendered at a given x
-location the Text widget uses the function <function>FindPosition</function>:
+location the Text widget uses the function <xref linkend='FindPosition' xrefstyle='select: title'/>:
 <!-- .IN "TextSink object" "FindPosition" "@DEF@" -->
-<funcsynopsis>
+<funcsynopsis id='FindPosition'>
 <funcprototype>
   <funcdef>void<function> FindPosition</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
@@ -537,10 +539,10 @@ widget will only call it one line at a time.
 <para>
 <!-- .LP -->
 <!-- .sp -->
-Another means of finding a text position is provided by the <function>Resolve</function>
+Another means of finding a text position is provided by the <xref linkend='Resolve' xrefstyle='select: title'/>
 function:
 <!-- .IN "TextSink object" "Resolve" "@DEF@" -->
-<funcsynopsis>
+<funcsynopsis id='Resolve'>
 <funcprototype>
   <funcdef>void<function> Resolve</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
@@ -613,7 +615,7 @@ if <emphasis remap='I'>stopAtWordBreak</emphasis> is <function>True</function>.
 <!-- .LP -->
 This function need make no attempt to deal with line feeds.  The text
 widget will only call it one line at a time.  This is a more convenient
-interface to the <function>FindPosition</function> function, and provides a subset of its
+interface to the <xref linkend='FindPosition' xrefstyle='select: title'/> function, and provides a subset of its
 functionality.
 <!-- .IN "FindPosition" "" -->
 </para>
@@ -623,9 +625,9 @@ functionality.
 <para>
 <!-- .LP -->
 To find the distance in pixels between two text positions on the same
-line use the function <function>FindDistance</function>.
+line use the function <xref linkend='FindDistance' xrefstyle='select: title'/>.
 <!-- .IN "TextSink object" "FindDistance" "@DEF@" -->
-<funcsynopsis>
+<funcsynopsis id='FindDistance'>
 <funcprototype>
   <funcdef>void<function> FindDistance</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
@@ -727,11 +729,11 @@ widget will only call it one line at a time.
 <para>
 <!-- .LP -->
 To find the maximum number of lines that will fit into the current Text
-widget, use the function <function>MaxLines</function>.  The TextSink already defines
+widget, use the function <xref linkend='MaxLines' xrefstyle='select: title'/>.  The TextSink already defines
 this function to compute the maximum number of lines by using the height
 of <function>font</function>.
 <!-- .IN "TextSink object" "MaxLines" "@DEF@" -->
-<funcsynopsis>
+<funcsynopsis id='MaxLines'>
 <funcprototype>
   <funcdef>int<function> MaxLines</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
@@ -770,11 +772,11 @@ Returns the maximum number of lines that will fit in <emphasis remap='I'>height<
 <!-- .LP -->
 <!-- .sp -->
 To find the height required for a given number of text lines, use
-the function <function>MaxHeight</function>.  The TextSink already defines this
+the function <xref linkend='MaxHeight' xrefstyle='select: title'/>.  The TextSink already defines this
 function to compute the maximum height of the window by using the
 height of <function>font</function>.
 <!-- .IN "TextSink object" "MaxHeight" "@DEF@" -->
-<funcsynopsis>
+<funcsynopsis id='MaxHeight'>
 <funcprototype>
   <funcdef>int<function> MaxHeight</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
@@ -814,12 +816,12 @@ Returns the height that will be taken up by the number of lines passed.
 <title>Setting the Tab Stops</title>
 <para>
 <!-- .LP -->
-To set the tab stops for a text sink use the <function>SetTabs</function> function.
+To set the tab stops for a text sink use the <xref linkend='SetTabs' xrefstyle='select: title'/> function.
 The TextSink already defines this function to set the tab x location in
 pixels to be the number of characters times the figure width of
 <function>font</function>.
 <!-- .IN "TextSink object" "SetTabs" "@DEF@" -->
-<funcsynopsis>
+<funcsynopsis id='SetTabs'>
 <funcprototype>
   <funcdef>void<function> SetTabs</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
@@ -866,14 +868,14 @@ This function is responsible for the converting character positions passed
 to it into whatever internal positions the TextSink uses for tab placement.
 </para>
 </sect3>
-<sect3 id="Getting_the_Insert_Point_s_Size_and_Location">
+<sect3 id='Getting_the_Insert_Points_Size_and_Location'>
 <title>Getting the Insert Point's Size and Location</title>
 <para>
 <!-- .LP -->
 To get the size and location of the insert point use the
-<function>GetCursorBounds</function> function.
+<xref linkend='GetCursorBounds' xrefstyle='select: title'/> function.
 <!-- .IN "TextSink object" "GetCursorBounds" "@DEF@" -->
-<funcsynopsis>
+<funcsynopsis id='GetCursorBounds'>
 <funcprototype>
   <funcdef>void<function> GetCursorBounds</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
diff --git a/libXaw/specs/TextSource.xml b/libXaw/specs/TextSource.xml
index 51b9ae0c3..c90ae2960 100644
--- a/libXaw/specs/TextSource.xml
+++ b/libXaw/specs/TextSource.xml
@@ -22,7 +22,7 @@ Since all text sources will have some resources in common the
 TextSrc defines a few new resources.
 </para>
 
-<sect2 id="textsource_resources">
+<sect2 id='TextSource::Resources'>
 <title>Resources</title>
 <para>
 When creating an TextSrc object instance, the following resources are
@@ -133,14 +133,14 @@ used as a source by itself and bad things will probably happen.
   </tgroup>
 </informaltable>
 
-<sect3 id="Reading_Text_">
+<sect3 id='Reading_Text'>
 <title>Reading Text.</title>
 <para>
 <!-- .LP -->
-To read the text in a text source use the <function>Read</function> function:
+To read the text in a text source use the <xref linkend='Read' xrefstyle='select: title'/> function:
 <!-- .IN "TextSrc object" "Read" "@DEF@" -->
 </para>
-<funcsynopsis>
+<funcsynopsis id='Read'>
 <funcprototype>
   <funcdef>XawTextPosition<function> Read</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
@@ -199,18 +199,18 @@ characters read from the
 text buffer.  The function is not required to read <emphasis remap='I'>length</emphasis>
 characters if that many characters are in the file, it may break at
 any point that is convenient to the internal structure of the
-source.  It may take several calls to <function>Read</function> before the desired
+source.  It may take several calls to <xref linkend='Read' xrefstyle='select: title'/> before the desired
 portion of the text buffer is fully retrieved.
 </para>
 </sect3>
 
-<sect3 id="Replacing_Text_">
+<sect3 id='TextSource::Replacing_Text'>
 <title>Replacing Text.</title>
 <para>
-To replace or edit the text in a text buffer use the <function>Replace</function> function:
+To replace or edit the text in a text buffer use the <xref linkend='Replace' xrefstyle='select: title'/> function:
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='Replace'>
 <funcprototype>
   <funcdef>XawTextPosition<function> Replace</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
@@ -293,7 +293,7 @@ than the length of the Source.
 
 <para>
 <!-- .LP -->
-The <function>Replace</function> arguments <function>start</function> and <function>end</function> represent the
+The <xref linkend='Replace' xrefstyle='select: title'/> arguments <function>start</function> and <function>end</function> represent the
 text source character positions for the existing text that is to be
 replaced by the text in the text block.  The characters from
 <emphasis remap='I'>start</emphasis> up to but not including <emphasis remap='I'>end</emphasis> are deleted, and the
@@ -307,10 +307,10 @@ the new text is inserted after <emphasis remap='I'>start</emphasis>.
 <title>Scanning the TextSrc</title>
 <para>
 To search the text source for one of the predefined boundary types use
-the <function>Scan</function> function:
+the <xref linkend='Scan' xrefstyle='select: title'/> function:
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='Scan'>
 <funcprototype>
   <funcdef>XawTextPosition<function> Scan</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
@@ -382,7 +382,7 @@ Specifies whether the boundary itself should be included in the scan.
 
 <para>
 <!-- .LP -->
-The <function>Scan</function> function returns the position in the text source of the desired
+The <xref linkend='Scan' xrefstyle='select: title'/> function returns the position in the text source of the desired
 boundary.  It is expected to return a valid address for
 all calls made to it, thus if a particular request is made that would take
 the text widget beyond the end of the source it must return the
@@ -393,10 +393,10 @@ position of that end.
 <sect3 id="Searching_through_a_TextSrc">
 <title>Searching through a TextSrc</title>
 <para>
-To search for a particular string use the <function>Search</function> function.
+To search for a particular string use the <xref linkend='Search' xrefstyle='select: title'/> function.
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='Search'>
 <funcprototype>
   <funcdef>XawTextPosition<function> Search</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
@@ -466,7 +466,7 @@ the <function>ConvertSelection</function> function, to attempt the selection
 conversion.
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='ConvertSelections'>
 <funcprototype>
   <funcdef>Boolean<function> ConvertSelections</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
@@ -568,10 +568,10 @@ Text widget will attempt to convert the selection itself.
 
 <para>
 If the source needs to know when the text selection is modified it
-should define a <function>SetSelection</function> procedure:
+should define a <xref linkend='SetSelection' xrefstyle='select: title'/> procedure:
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='SetSelection'>
 <funcprototype>
   <funcdef>void<function> SetSelection</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
diff --git a/libXaw/specs/Toggle.xml b/libXaw/specs/Toggle.xml
index d5c239898..227aba2dc 100644
--- a/libXaw/specs/Toggle.xml
+++ b/libXaw/specs/Toggle.xml
@@ -38,7 +38,7 @@ Toggle widgets may also be part of a ``radio group.''  A radio group is a
 list of at least two Toggle widgets in which no more than one Toggle may
 be set at
 any time.  A radio group is identified by the widget ID of any one of
-its members.  The convenience routine <function>XawToggleGetCurrent</function> will
+its members.  The convenience routine <xref linkend='XawToggleGetCurrent' xrefstyle='select: title'/> will
 return information about the Toggle widget in the radio group.
 </para>
 
@@ -46,7 +46,7 @@ return information about the Toggle widget in the radio group.
 Toggle widget state is preserved across changes in sensitivity.
 </para>
 
-<sect2 id="toggle_resources">
+<sect2 id='Toggle::Resources'>
 <title>Resources</title>
 <para>
 When creating a Toggle widget instance, the following resources are
@@ -375,11 +375,11 @@ retrieved from the argument list or from the resource database:
     </term>
     <listitem>
       <para>
-Specifies the data that will be returned by <function>XawToggleGetCurrent</function>
+Specifies the data that will be returned by <xref linkend='XawToggleGetCurrent' xrefstyle='select: title'/>
 when this is the currently <emphasis remap='I'>set</emphasis> widget in the radio group.  This
 value is also used to identify the Toggle that will be set by a call to
-<function>XawToggleSetCurrent</function>.  The value NULL will be returned by
-<function>XawToggleGetCurrent</function> if no widget in a radio group is currently
+<xref linkend='XawToggleSetCurrent' xrefstyle='select: title'/>.  The value NULL will be returned by
+<xref linkend='XawToggleGetCurrent' xrefstyle='select: title'/> if no widget in a radio group is currently
 set.  Programmers must not specify NULL (or Zero) as <function>radioData</function>.
       </para>
     </listitem>
@@ -455,8 +455,8 @@ Toggle widget:
 </literallayout>
 </sect2>
 
-<sect2 id="Toggle_Actions_b">
-<title>Toggle Actions_b</title>
+<sect2 id='Toggle_Actions_b'>
+<title>Toggle Actions</title>
 <para>
 The full list of actions supported by Toggle is:
 </para>
@@ -593,22 +593,22 @@ its member widgets to <function>True</function>.
 </para>
 </sect2>
 
-<sect2 id="toggle_convenience_routines">
+<sect2 id='Toggle::Convenience_Routines'>
 <title>Convenience Routines</title>
 <para>
 The following functions allow easy access to the Toggle widget's radio
 group functionality.
 </para>
 
-<sect3 id="Changing_the_Toggle_s_Radio_Group_">
+<sect3 id='Changing_the_Toggles_Radio_Group'>
 <title>Changing the Toggle's Radio Group.</title>
 <para>
 To enable an application to change the Toggle's radio group, add
 the Toggle to a radio group, or remove the Toggle from a radio group, use
-<function>XawToggleChangeRadioGroup</function>.
+<xref linkend='XawToggleChangeRadioGroup' xrefstyle='select: title'/>.
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='XawToggleChangeRadioGroup'>
 <funcprototype>
   <funcdef>void<function> XawToggleChangeRadioGroup</function></funcdef>
   <paramdef>Widgetw,<parameter> radio_group</parameter></paramdef>
@@ -651,10 +651,10 @@ Finding the Currently selected Toggle in a radio group of Toggles
 
 <para>
 To find the currently selected Toggle in a radio group of Toggle widgets
-use <function>XawToggleGetCurrent</function>.
+use <xref linkend='XawToggleGetCurrent' xrefstyle='select: title'/>.
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='XawToggleGetCurrent'>
 <funcprototype>
   <funcdef>XtPointer<function> XawToggleGetCurrent</function></funcdef>
   <paramdef>XtPointer<parameter> XawToggleGetCurrent(radio_group)</parameter></paramdef>
@@ -687,10 +687,10 @@ Changing the Toggle that is set in a radio group.
 
 <para>
 To change the Toggle that is currently set in a radio group use
-<function>XawToggleSetCurrent</function>.
+<xref linkend='XawToggleSetCurrent' xrefstyle='select: title'/>.
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='XawToggleSetCurrent'>
 <funcprototype>
   <funcdef>void<function> XawToggleSetCurrent</function></funcdef>
   <paramdef>voidXawToggleSetCurrent(radio_group,<parameter> radio_data)</parameter></paramdef>
@@ -727,11 +727,11 @@ by the <emphasis remap='I'>radio_group</emphasis> argument.
 
 
 <para>
-<function>XawToggleSetCurrent</function> locates the Toggle widget to be set by
+<xref linkend='XawToggleSetCurrent' xrefstyle='select: title'/> locates the Toggle widget to be set by
 matching <emphasis remap='I'>radio_data</emphasis> against the <function>radioData</function> for each Toggle in
-the radio group.  If none match, <function>XawToggleSetCurrent</function> returns
+the radio group.  If none match, <xref linkend='XawToggleSetCurrent' xrefstyle='select: title'/> returns
 without making any changes.  If more than one Toggle matches,
-<function>XawToggleSetCurrent</function> will choose a Toggle to set arbitrarily.  If
+<xref linkend='XawToggleSetCurrent' xrefstyle='select: title'/> will choose a Toggle to set arbitrarily.  If
 this causes any Toggle widgets to change state, all routines in their
 callback lists will be invoked.  The callback routines for a Toggle that
 is to be unset will be called before the one that is to be set.
@@ -740,10 +740,10 @@ Unsetting all Toggles in a radio group.
 
 <para>
 To unset all Toggle widgets in a radio group use
-<function>XawToggleUnsetCurrent</function>.
+<xref linkend='XawToggleUnsetCurrent' xrefstyle='select: title'/>.
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='XawToggleUnsetCurrent'>
 <funcprototype>
   <funcdef>void<function> XawToggleUnsetCurrent</function></funcdef>
   <paramdef>void<parameter> XawToggleUnsetCurrent(radio_group)</parameter></paramdef>
diff --git a/libXaw/specs/Tree.xml b/libXaw/specs/Tree.xml
index bb51e80d1..71cadd126 100644
--- a/libXaw/specs/Tree.xml
+++ b/libXaw/specs/Tree.xml
@@ -25,7 +25,7 @@ another composite widget (such as the <function>Porthole</function> or <function
 that can be used to scroll around in the tree.
 </para>
 
-<sect2 id="tree_resources">
+<sect2 id='Tree::Resources'>
 <title>Resources</title>
 <para>
 When creating a Tree widget instance, the following resources are
@@ -286,7 +286,7 @@ constraint resource to their children.
 
 </sect2>
 
-<sect2 id="tree_constraint_resources">
+<sect2 id='Tree::Constraint_Resources'>
 <title>Constraint Resources</title>
 <para>
 Each child of the Tree widget must specify its superior node in the tree.  In
@@ -356,7 +356,7 @@ for the node to have no superior (and to therefore be at the top of the tree).
 </sect2>
 
 
-<sect2 id="tree_layout_semantics">
+<sect2 id='Tree::Layout_Semantics'>
 <title>Layout Semantics</title>
 <para>
 Each time a child is managed or unmanaged, the Tree widget will attempt
@@ -373,17 +373,17 @@ own size to the minimum dimensions required for the layout.
 
 </sect2>
 
-<sect2 id="tree_convenience_routines">
+<sect2 id='Tree::Convenience_Routines'>
 <title>Convenience Routines</title>
 <para>
 The most efficient way to layout a tree is to set
 <function>autoReconfigure</function>
 to False and then use the
-<function> XawTreeForceLayout</function>
+<xref linkend='XawTreeForceLayout' xrefstyle='select: title'/>
 routine to arrange the children.
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='XawTreeForceLayout'>
 <funcprototype>
   <funcdef>void<function> XawTreeForceLayout</function></funcdef>
   <paramdef>Widget<parameter> w</parameter></paramdef>
diff --git a/libXaw/specs/Viewport.xml b/libXaw/specs/Viewport.xml
index 3b3703639..767dc07a3 100644
--- a/libXaw/specs/Viewport.xml
+++ b/libXaw/specs/Viewport.xml
@@ -39,7 +39,7 @@ window, or when the data does not require scrolling, the Viewport widget
 automatically removes any scrollbars.  The <function>forceBars</function> option causes
 the Viewport widget to display all scrollbars permanently.
 </para>
-<sect2 id="viewport_resources">
+<sect2 id='Viewport::Resources'>
 <title>Resources</title>
 <para>
 <!-- .LP -->
@@ -347,7 +347,7 @@ the Viewport.
 </variablelist>
 </para>
 </sect2>
-<sect2 id="viewport_layout_semantics">
+<sect2 id='Viewport::Layout_Semantics'>
 <title>Layout Semantics</title>
 <para>
 <!-- .LP -->
@@ -374,7 +374,7 @@ appropriate dimension.
 <!-- .LP -->
 The scrollbar children of the Viewport are named <function>horizontal</function> and
 <function>vertical</function>.  By using these names the programmer can specify resources
-for the individual scrollbars.  <function>XtSetValues</function> can be used to modify
+for the individual scrollbars.  <xref linkend='XtSetValues' xrefstyle='select: title'/> can be used to modify
 the resources dynamically once the widget ID has been obtained with
 <function>XtNameToWidget</function>.
 <!-- .IN "XtNameToWidget" "" -->
diff --git a/libXaw/specs/libXaw.xml b/libXaw/specs/libXaw.xml
index d8a0a35bc..75880ad55 100644
--- a/libXaw/specs/libXaw.xml
+++ b/libXaw/specs/libXaw.xml
@@ -1,62 +1,68 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-                   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
+                   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+[
+<!ENTITY % defs SYSTEM "defs.ent"> %defs;
+]>
 
 <book id="libXaw">
 
 <bookinfo>
    <title>Athena Widget Set - C Language Interface</title>
    <subtitle>X Consortium Standard</subtitle>
-   <releaseinfo>X Version 11, Release 6.4</releaseinfo>
+   <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo>
    <authorgroup>
       <author>
-         <firstname>Chris</firstname><surname>Peterson</surname>
+         <firstname>Chris</firstname><othername>D.</othername><surname>Peterson</surname>
+         <affiliation><orgname>formerly MIT X Consortium</orgname></affiliation>
       </author>
    </authorgroup>
-   <copyright><year>1985</year><holder>X Consortium</holder></copyright>
-   <copyright><year>1986</year><holder>X Consortium</holder></copyright>
-   <copyright><year>1987</year><holder>X Consortium</holder></copyright>
-   <copyright><year>1988</year><holder>X Consortium</holder></copyright>
-   <copyright><year>1989</year><holder>X Consortium</holder></copyright>
-   <copyright><year>1991</year><holder>X Consortium</holder></copyright>
-   <copyright><year>1994</year><holder>X Consortium</holder></copyright>
-   <releaseinfo>libXaw 1.0.7</releaseinfo>
-   <affiliation><orgname>formerly MIT X Consortium</orgname></affiliation>
-   <productnumber>X Version 11, Release 7</productnumber>
+   <copyright><year>1985</year><year>1986</year><year>1987</year><year>1988</year>
+     <year>1989</year><year>1991</year><year>1994</year>
+     <holder>X Consortium</holder>
+   </copyright>
 
 <legalnotice>
 
 <para>
-Permission is hereby granted, free of charge, to any person obtaining a copy 
-of this software and associated documentation files 
-(the &ldquo;Software&rdquo;), to deal in the Software without restriction, 
-including without limitation the rights to use, copy, modify, merge, publish, 
-distribute, sublicense, and/or sell copies of the Software, and to permit 
-persons to whom the Software is furnished to do so, subject to the following 
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files
+(the &ldquo;Software&rdquo;), to deal in the Software without restriction,
+including without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to permit
+persons to whom the Software is furnished to do so, subject to the following
 conditions:
 </para>
 
 <para>
-The above copyright notice and this permission notice shall be included in all 
+The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
 </para>
 
 <para>
-THE SOFTWARE IS PROVIDED &ldquo;AS IS&rdquo;, WITHOUT WARRANTY OF ANY KIND, 
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN 
-NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 
+THE SOFTWARE IS PROVIDED &ldquo;AS IS&rdquo;, WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN
+NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 </para>
 
 <para>
-Except as contained in this notice, the name of the X Consortium shall not 
-be used in advertising or otherwise to promote the sale, use or other dealings 
+Except as contained in this notice, the name of the X Consortium shall not
+be used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from the X Consortium.
 </para>
 
+<para>X Window System is a trademark of The OpenGroup.</para>
+</legalnotice>
+
+<legalnotice>
+<para role ="multiLicensing">Copyright © 1985, 1986, 1987, 1988, 1989, 1991
+Digital Equipment Corporation, Maynard, Massachusetts.
+</para>
+
 <para>
 Permission to use, copy, modify and distribute this documentation for any
 purpose and without fee is hereby granted, provided that the above copyright
@@ -66,16 +72,11 @@ Digital not be used in in advertising or publicity pertaining
 to distribution of the software without specific, written prior permission.
 Digital makes no representations about the suitability of the
 software described herein for any purpose.
-It is provided ``as is'' without express or implied warranty.
-</para>
-
-<para>
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
+It is provided &ldquo;as is&rdquo; without express or implied warranty.
 </para>
 </legalnotice>
 </bookinfo>
+
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"  href="CH1.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"  href="CH2.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"  href="CH3.xml"/>