[librsvg: 32/38] Try to make Docbook 5 really work...

[Federico Mena Quintero <federico src gnome org>]

commit 1273639b93dea51af1b0dd39651bf15c3bbff2d9
Author: Federico Mena Quintero <federico gnome org>
Date:   Fri Jan 25 11:21:11 2019 -0600

    Try to make Docbook 5 really work...

 doc/rsvg-docs.xml     | 24 ++++++++++--------------
 librsvg/rsvg-handle.c | 11 +++++------
 librsvg/rsvg.h        |  4 ++--
 3 files changed, 17 insertions(+), 22 deletions(-)
---
diff --git a/doc/rsvg-docs.xml b/doc/rsvg-docs.xml
index 12b50518..d744e2e0 100644
--- a/doc/rsvg-docs.xml
+++ b/doc/rsvg-docs.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE book
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML 5.0//EN"
+               "http://www.oasis-open.org/docbook/xml/5.0";
 [
   <!ENTITY version SYSTEM "version.xml">
 ]>
-<book xmlns="http://docbook.org/ns/docbook";
-      xmlns:xi="http://www.w3.org/2001/XInclude";
-      xmlns:xlink="http://www.w3.org/1999/xlink";
-      version="5.1">
+<book xmlns:xi="http://www.w3.org/2001/XInclude";>
   <!--
     Copyright © 2009, 2010 Christian Persch
     Copyright © 2017 Federico Mena Quintero
@@ -24,7 +22,7 @@
       For librsvg version &version;
 
       The latest version of this documentation can be found on-line at the
-      <link xlink:href="http://library.gnome.org/devel/rsvg/index.html"; role="online-location">GNOME 
Library</link>.
+      <link href="http://library.gnome.org/devel/rsvg/index.html"; role="online-location">GNOME 
Library</link>.
     </releaseinfo>
 
     <copyright>
@@ -57,7 +55,7 @@
 
         You may obtain a copy of the <citetitle>GNU General Public Licence</citetitle>
         from the Free Software Foundation at
-        <link xlink:href="http://www.gnu.org/licences/";>GNU Licences web site</link>
+        <link href="http://www.gnu.org/licences/";>GNU Licences web site</link>
         or by writing to:
 
         <address>
@@ -70,16 +68,14 @@
     </legalnotice>
   </info>
 
-  <part xml:id="rsvg">
+  <part id="rsvg">
     <title>API Reference</title>
     <partintro>
       <para>
         Librsvg is a library for rendering Scalable Vector Graphics 1.1
-        files (<link
-        xlink:href="https://www.w3.org/TR/SVG/";>SVG 1.1</link>).
+        files (<link href="https://www.w3.org/TR/SVG/";>SVG 1.1</link>).
         Specifically, it can take non-animated, non-scripted SVG data
-        and render it into a <link
-        xlink:href="https://www.cairographics.org/";>Cairo</link>
+        and render it into a <link href="https://www.cairographics.org/";>Cairo</link>
         surface.  Normally this means an in-memory raster surface, but
         it could also be any of the other surface types that Cairo
         supports.
@@ -87,7 +83,7 @@
 
       <para>
        Librsvg supports many of the graphic features in the <link
-       xlink:href="https://www.w3.org/TR/SVG/";>SVG 1.1
+       href="https://www.w3.org/TR/SVG/";>SVG 1.1
        specification</link>.  The main features of SVG 1.1 that
        librsvg does not support are the following:
       </para>
@@ -192,7 +188,7 @@
     <para>
       You may obtain a copy of the <citetitle>GNU General Public Licence</citetitle>
       from the Free Software Foundation at
-      <link xlink:href="http://www.gnu.org/licences/";>GNU Licences web site</link>
+      <link href="http://www.gnu.org/licences/";>GNU Licences web site</link>
       or by writing to:
 
       <address>
diff --git a/librsvg/rsvg-handle.c b/librsvg/rsvg-handle.c
index 13410756..5028a9bf 100644
--- a/librsvg/rsvg-handle.c
+++ b/librsvg/rsvg-handle.c
@@ -31,9 +31,9 @@
  * or in the most general form, from a #GInputStream that will provide SVG data.
  *
  * Librsvg supports reading <link
- * xlink:href="https://www.w3.org/TR/SVG11/";>SVG 1.1</link> data, and is
+ * href="https://www.w3.org/TR/SVG11/";>SVG 1.1</link> data, and is
  * gradually adding support for features in <link
- * xlink:href="https://www.w3.org/TR/SVG2/";>SVG 2</link>.  Librsvg also supports
+ * href="https://www.w3.org/TR/SVG2/";>SVG 2</link>.  Librsvg also supports
  * SVGZ files, which is just an SVG stream compressed with the GZIP algorithm.
  *
  * # The "base file" and resolving references to external files
@@ -44,7 +44,7 @@
  * and that it has an image element like this:
  *
  * |[
- * <image xlink:href="resources/foo.png" .../>
+ * <image href="resources/foo.png" .../>
  * ]|
  *
  * In this case, librsvg needs to know the location of the toplevel
@@ -89,7 +89,7 @@
  *   </listitem>
  *
  *   <listitem>
- *     If referenced URLs have a "<literal>resource<literal>" scheme, that is,
+ *     If referenced URLs have a "<literal>resource</literal>" scheme, that is,
  *     if they are included into your binary program with GLib's resource
  *     mechanism, they are allowed to be loaded (provided that the base URL is
  *     also a "<literal>resource</literal>", per the previous rule).
@@ -104,8 +104,7 @@
  *   <listitem>
  *     A relative URL must resolve to the same directory as the base URL, or to
  *     one of its subdirectories.  Librsvg will canonicalize filenames, by
- *     removing ".." path components, and resolving symbolic links, Filenames
- *     are canonicalized (".." is removed in path components, to decide whether
+ *     removing ".." path components and resolving symbolic links, to decide whether
  *     files meet these conditions.
  *   </listitem>
  * </orderedlist>
diff --git a/librsvg/rsvg.h b/librsvg/rsvg.h
index c5aed1cb..845d7c15 100644
--- a/librsvg/rsvg.h
+++ b/librsvg/rsvg.h
@@ -198,7 +198,7 @@ gboolean rsvg_handle_has_sub (RsvgHandle * handle, const char *id);
  * @RSVG_HANDLE_FLAGS_NONE: No flags are set.
  * @RSVG_HANDLE_FLAG_UNLIMITED: Disable safety limits in the XML parser.
  *   Libxml2 has <link
- *   xlink:href="https://gitlab.gnome.org/GNOME/libxml2/blob/master/include/libxml/parserInternals.h";>several
+ *   href="https://gitlab.gnome.org/GNOME/libxml2/blob/master/include/libxml/parserInternals.h";>several
  *   limits</link> designed to keep malicious XML content from consuming too
  *   much memory while parsing.  For security reasons, this should only be used
  *   for trusted input!
@@ -210,7 +210,7 @@ gboolean rsvg_handle_has_sub (RsvgHandle * handle, const char *id);
  *  Keeps the image data when loading images, for use by cairo when painting to
  *  e.g. a PDF surface.  For example, this will make the a resulting PDF file
  *  smaller and faster.  Please see <link
- *  
xlink:href="https://www.cairographics.org/manual/cairo-cairo-surface-t.html#cairo-surface-set-mime-data";>the
+ *  href="https://www.cairographics.org/manual/cairo-cairo-surface-t.html#cairo-surface-set-mime-data";>the
  *  Cairo documentation</link> for details.
  *  Since: 2.40.3
  */