[Xfce4-commits] [xfce/libxfce4util] 04/04: Fix documentation warnings

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

s   k   u   n   n   y   k       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository xfce/libxfce4util.

commit fd5f1f059f0ee2e4e3f5e38c561e6278a3e5aee5
Author: Romain B <skunnyk at alteroot.org>
Date:   Sun Dec 10 13:05:38 2017 +0100

    Fix documentation warnings
    
    - Use a more modern way to handle docs sections
    - Also fix warnings introduced by gobject introspection ( https://wiki.gnome.org/action/show/Projects/GObjectIntrospection/Annotations#GTK-Doc_support )
---
 docs/libxfce4util-docs.xml | 89 ++++++++++++++++++++--------------------------
 1 file changed, 39 insertions(+), 50 deletions(-)

diff --git a/docs/libxfce4util-docs.xml b/docs/libxfce4util-docs.xml
index 67779ba..fdbf4f9 100644
--- a/docs/libxfce4util-docs.xml
+++ b/docs/libxfce4util-docs.xml
@@ -1,60 +1,49 @@
 <?xml version="1.0"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-<!ENTITY libxfce4util-StandardMacros SYSTEM "xml/libxfce4util-config.xml">
-<!ENTITY libxfce4util-Internationalisation SYSTEM "xml/xfce-i18n.xml">
-<!ENTITY libxfce4util-License SYSTEM "xml/xfce-license.xml">
-<!ENTITY libxfce4util-Kiosk SYSTEM "xml/xfce-kiosk.xml">
-<!ENTITY libxfce4util-Resource SYSTEM "xml/xfce-resource.xml">
-<!ENTITY libxfce4util-RcParser SYSTEM "xml/xfce-rc.xml">
-<!ENTITY libxfce4util-FileUtils-Functions SYSTEM "xml/xfce-fileutils.xml">
-<!ENTITY libxfce4util-MiscUtils-Functions SYSTEM "xml/xfce-miscutils.xml">
-<!ENTITY libxfce4util-Unicode-Functions SYSTEM "xml/xfce-utf8.xml">
-<!ENTITY libxfce4util-Generics SYSTEM "xml/xfce-generics.xml">
-<!ENTITY libxfce4util-Signal-Handling SYSTEM "xml/xfce-posix-signal-handler.xml">
-<!ENTITY version SYSTEM "version.xml">
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                      "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+[
+  <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
 ]>
 
 <book id="index">
-	<bookinfo>
-		<title>libxfce4util Reference Manual</title>
-		<releaseinfo>for libxfce4util &version;</releaseinfo>
-	</bookinfo>
+    <bookinfo>
+        <title>libxfce4util Reference Manual</title>
+        <releaseinfo>for libxfce4util <xi:include href="version.xml" parse="text"/></releaseinfo>
+    </bookinfo>
 
-	<chapter id="reference">
-		<title>libxfce4util Overview</title>
-		<para>
-			libxfce4util is a general-purpose utility library
-			with core application support for the Xfce Desktop
-			Environment.
-		</para>
-	</chapter>
+    <chapter id="reference">
+        <title>libxfce4util Overview</title>
+        <para>
+            libxfce4util is a general-purpose utility library
+            with core application support for the Xfce Desktop
+            Environment.
+        </para>
+    </chapter>
 
-	<chapter id="libxfce4util-fundamentals">
-		<title>Xfce Fundamentals</title>
-		&libxfce4util-StandardMacros;
-		&libxfce4util-Internationalisation;
-		&libxfce4util-License;
-	</chapter>
+    <chapter id="libxfce4util-fundamentals">
+        <title>Xfce Fundamentals</title>
+        <xi:include href="xml/libxfce4util-config.xml"/>
+        <xi:include href="xml/xfce-i18n.xml"/>
+        <xi:include href="xml/xfce-license.xml"/>
+    </chapter>
 
-	<chapter id="libxfce4util-core">
-		<title>Xfce Core Application support</title>
-		&libxfce4util-Kiosk;
-		&libxfce4util-Signal-Handling;
-	</chapter>
+    <chapter id="libxfce4util-core">
+        <title>Xfce Core Application support</title>
+        <xi:include href="xml/xfce-kiosk.xml"/>
+        <xi:include href="xml/xfce-posix-signal-handler.xml"/>
+    </chapter>
 
-	<chapter id="libxfce4util-utilities">
-		<title>Xfce Utilities</title>
-		&libxfce4util-Resource;
-		&libxfce4util-RcParser;
-		&libxfce4util-FileUtils-Functions;
-		&libxfce4util-MiscUtils-Functions;
-		&libxfce4util-Unicode-Functions;
-	</chapter>
-
-	<chapter id="libxfce4util-datatypes">
-		<title>Xfce Data types</title>
-		&libxfce4util-Generics;
-	</chapter>
+    <chapter id="libxfce4util-utilities">
+        <title>Xfce Utilities</title>
+        <xi:include href="xml/xfce-resource.xml"/>
+        <xi:include href="xml/xfce-rc.xml"/>
+        <xi:include href="xml/xfce-fileutils.xml"/>
+        <xi:include href="xml/xfce-utf8.xml"/>
+    </chapter>
 
+    <chapter id="libxfce4util-datatypes">
+        <title>Xfce Data types</title>
+        <xi:include href="xml/xfce-generics.xml"/>
+    </chapter>
+    <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
 </book>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.