From 930445b0d0fa005d2338d117f0582f24ddc87a23 Mon Sep 17 00:00:00 2001
From: rbuj <robert.buj@gmail.com>
Date: Thu, 14 Mar 2019 11:19:48 +0100
Subject: Help: Use XInclude instead of ENTITY for legal.xml

The ENTITY is expanded in i18n process, and legal.xml file
is never read.
---
 accessx-status/docs/C/index.docbook | 4 +---
 battstat/docs/C/index.docbook       | 6 +-----
 charpick/help/C/index.docbook       | 6 +-----
 cpufreq/help/C/index.docbook        | 6 +-----
 drivemount/help/C/index.docbook     | 6 +-----
 geyes/docs/C/index.docbook          | 4 ++--
 mateweather/docs/C/index.docbook    | 7 ++-----
 multiload/docs/C/index.docbook      | 6 +-----
 netspeed/help/C/index.docbook       | 3 +--
 stickynotes/docs/C/index.docbook    | 5 ++---
 trashapplet/docs/C/index.docbook    | 6 +-----
 11 files changed, 14 insertions(+), 45 deletions(-)

diff --git a/accessx-status/docs/C/index.docbook b/accessx-status/docs/C/index.docbook
index 7aafd140..9ec6d9b7 100644
--- a/accessx-status/docs/C/index.docbook
+++ b/accessx-status/docs/C/index.docbook
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" 
 "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-  <!ENTITY legal SYSTEM "legal.xml">
   <!ENTITY applet "Keyboard Accessibility Monitor">
 ]>
 
@@ -50,8 +49,7 @@
 		<publishername>GNOME Documentation Project</publishername>
 	 </publisher>
 
-&legal;
-
+	 <xi:include href="legal.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
 	 <authorgroup>
 	 	<author>
diff --git a/battstat/docs/C/index.docbook b/battstat/docs/C/index.docbook
index 361d2bfa..d2bfd2f5 100644
--- a/battstat/docs/C/index.docbook
+++ b/battstat/docs/C/index.docbook
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
 "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-  <!ENTITY legal SYSTEM "legal.xml">
   <!ENTITY appletversion "1.10.2">
   <!ENTITY applet "Battery Charge Monitor">
 ]>
@@ -66,10 +65,7 @@
       <publishername> GNOME Documentation Project </publishername>
     </publisher>
   
-    &legal;
-<!-- This file  contains link to license for the documentation (GNU FDL), and 
-     other legal stuff such as "NO WARRANTY" statement. Please do not change 
-     any of this. -->
+    <xi:include href="legal.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
     <authorgroup>
       <author>
diff --git a/charpick/help/C/index.docbook b/charpick/help/C/index.docbook
index cc21f701..2ed725f4 100644
--- a/charpick/help/C/index.docbook
+++ b/charpick/help/C/index.docbook
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?><!-- -*- indent-tabs-mode: nil -*- -->
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" 
 "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-  <!ENTITY legal SYSTEM "legal.xml">
   <!ENTITY appletversion "1.10.2">
   <!ENTITY manrevision "2.11">
   <!ENTITY date "July 2015">
@@ -53,11 +52,8 @@
     <publishername>GNOME Documentation Project</publishername>
   </publisher>
 
-  &legal;
+  <xi:include href="legal.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
-   <!-- This file  contains link to license for the documentation (GNU FDL), and 
-        other legal stuff such as "NO WARRANTY" statement. Please do not change 
-	any of this. -->
    <authorgroup>
      <author>
        <firstname>MATE Documentation Team</firstname>
diff --git a/cpufreq/help/C/index.docbook b/cpufreq/help/C/index.docbook
index 459cedd8..90418cab 100644
--- a/cpufreq/help/C/index.docbook
+++ b/cpufreq/help/C/index.docbook
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
 "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-  <!ENTITY legal SYSTEM "legal.xml">
   <!ENTITY appletversion "1.10.2">
   <!ENTITY applet "CPU Frequency Scaling Monitor">
 ]>
@@ -49,10 +48,7 @@
 		<publishername>GNOME Documentation Project</publishername>
 	 </publisher> 
 
-&legal;
-<!-- This file  contains link to license for the documentation (GNU FDL), and 
-     other legal stuff such as "NO WARRANTY" statement. Please do not change 
-     any of this. -->
+	 <xi:include href="legal.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
 	 <authorgroup> 
             <author>
diff --git a/drivemount/help/C/index.docbook b/drivemount/help/C/index.docbook
index 8b224303..9a395f1d 100644
--- a/drivemount/help/C/index.docbook
+++ b/drivemount/help/C/index.docbook
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
 "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-  <!ENTITY legal SYSTEM "legal.xml">
   <!ENTITY appversion "1.10.2">
   <!ENTITY manrevision "2.12">
   <!ENTITY date "July 2015">
@@ -61,10 +60,7 @@
       <publishername> GNOME Documentation Project </publishername>
     </publisher>
 
-   &legal;
-   <!-- This file  contains link to license for the documentation (GNU FDL), and 
-        other legal stuff such as "NO WARRANTY" statement. Please do not change 
-	any of this. -->
+    <xi:include href="legal.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
     <authorgroup> 
       <author>
diff --git a/geyes/docs/C/index.docbook b/geyes/docs/C/index.docbook
index 900249ea..a1313d90 100644
--- a/geyes/docs/C/index.docbook
+++ b/geyes/docs/C/index.docbook
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
 "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-  <!ENTITY legal SYSTEM "legal.xml">
   <!ENTITY appletversion "1.10.2">
   <!ENTITY manrevision "2.8">
   <!ENTITY date "July 2015">
@@ -58,7 +57,8 @@
 	 <publisher>
 		<publishername>GNOME Documentation Project</publishername>
 	 </publisher>
-&legal;
+
+	 <xi:include href="legal.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
 	 <authorgroup> 
 		<author> 
diff --git a/mateweather/docs/C/index.docbook b/mateweather/docs/C/index.docbook
index dffb56d3..efbb0b3a 100644
--- a/mateweather/docs/C/index.docbook
+++ b/mateweather/docs/C/index.docbook
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
 "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-  <!ENTITY legal SYSTEM "legal.xml">
   <!ENTITY appletversion "1.10.2">
   <!ENTITY applet "Weather Report">
 ]>
@@ -73,10 +72,8 @@ customizable.</para>
       <publisher>
 		<publishername> GNOME Documentation Project </publishername>
       </publisher>
-        &legal;
-      <!-- This file  contains link to license for the documentation (GNU FDL), and 
-           other legal stuff such as "NO WARRANTY" statement. Please do not change 
-           any of this. -->
+
+      <xi:include href="legal.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
       	 
       <authorgroup>
 	<author>
diff --git a/multiload/docs/C/index.docbook b/multiload/docs/C/index.docbook
index 273724e1..0217b92f 100644
--- a/multiload/docs/C/index.docbook
+++ b/multiload/docs/C/index.docbook
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
 "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-  <!ENTITY legal SYSTEM "legal.xml">
   <!ENTITY appletversion "1.10.2">
   <!ENTITY manrevision "2.12">
   <!ENTITY date "July 2015">
@@ -57,10 +56,7 @@
       <publishername> GNOME Documentation Project </publishername>
     </publisher>
 
-    &legal;
-<!-- This file  contains link to license for the documentation (GNU FDL), and
-     other legal stuff such as "NO WARRANTY" statement. Please do not change
-     any of this. -->
+    <xi:include href="legal.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
     <authorgroup>
 
diff --git a/netspeed/help/C/index.docbook b/netspeed/help/C/index.docbook
index 1cd2d866..02d89484 100644
--- a/netspeed/help/C/index.docbook
+++ b/netspeed/help/C/index.docbook
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY legal SYSTEM "legal.xml">
   <!ENTITY appletversion "1.10.1">
   <!ENTITY manrevision "1.3">
   <!ENTITY date "July 2015">
@@ -47,7 +46,7 @@
       <publishername>GNOME Documentation Project</publishername> 
     </publisher>
 
-	&legal;
+    <xi:include href="legal.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
     
     <authorgroup>
 	  <author role="maintainer">
diff --git a/stickynotes/docs/C/index.docbook b/stickynotes/docs/C/index.docbook
index b9d6ea9c..9596a954 100644
--- a/stickynotes/docs/C/index.docbook
+++ b/stickynotes/docs/C/index.docbook
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
 "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-  <!ENTITY legal SYSTEM "legal.xml">
   <!ENTITY appletversion "1.10.2">
   <!ENTITY applet "Sticky Notes">
 ]>
@@ -62,8 +61,8 @@ Template last modified Mar 12, 2002
 	<publisher>
 	    <publishername>GNOME Documentation Project</publishername>
 	</publisher>
-	
-	&legal;
+
+	<xi:include href="legal.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
 	<authorgroup>
           <author>
diff --git a/trashapplet/docs/C/index.docbook b/trashapplet/docs/C/index.docbook
index 3401c142..379273ea 100644
--- a/trashapplet/docs/C/index.docbook
+++ b/trashapplet/docs/C/index.docbook
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
 "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-  <!ENTITY legal SYSTEM "legal.xml">
   <!ENTITY appletversion "1.10.2">
   <!ENTITY manrevision "2.12">
   <!ENTITY date "July 2015">
@@ -50,10 +49,7 @@
 		<publishername> GNOME Documentation Project </publishername>
 	 </publisher>
 
-&legal;
-<!-- This file  contains link to license for the documentation (GNU FDL), and 
-     other legal stuff such as "NO WARRANTY" statement. Please do not change 
-     any of this. -->
+	 <xi:include href="legal.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
 	 <authorgroup> 
 		<author> 
-- 
cgit v1.2.1