Merge branch 'dev-yelp-tools'

8 files changed, 23 insertions, 37 deletions

diff --git a/help/clock/C/mate-applet-clock.xml b/help/clock/C/index.docbook
index 416018c5..4152c33d 100644
--- a/help/clock/C/mate-applet-clock.xml
+++ b/help/clock/C/index.docbook
@@ -178,7 +178,7 @@
 		</releaseinfo>
 	 <legalnotice>
 		<title>Feedback</title>
-		<para> To report a bug or make a suggestion regarding the &applet; applet or this manual, follow the directions in the <ulink url="ghelp:mate-feedback" type="help">MATE Feedback Page</ulink>. </para>
+		<para> To report a bug or make a suggestion regarding the &applet; applet or this manual, follow the directions in the <ulink url="help:mate-feedback" type="help">MATE Feedback Page</ulink>. </para>
 
 	 </legalnotice>
 	 <abstract role="description">
diff --git a/help/clock/C/legal.xml b/help/clock/C/legal.xml
index 16b471c2..999af980 100644
--- a/help/clock/C/legal.xml
+++ b/help/clock/C/legal.xml
@@ -6,7 +6,7 @@ terms of the GNU Free DocumentationLicense (GFDL), Version 1.1 or any later
 version published by the Free Software Foundation with no Invariant Sections, 	  no Front-Cover Texts, and
 no Back-Cover Texts. You can find a copy of the GFDL at this 
 
-		<ulink url="ghelp:fdl" type="help">link</ulink> 
+		<ulink url="help:fdl" type="help">link</ulink> 
 
 or in the file COPYING-DOCS distributed with this manual.</para>
 <para> 
diff --git a/help/clock/Makefile.am b/help/clock/Makefile.am
index 658d88cd..80e31873 100644
--- a/help/clock/Makefile.am
+++ b/help/clock/Makefile.am
@@ -1,9 +1,13 @@
-include $(top_srcdir)/mate-doc-utils.make
-dist-hook: doc-dist-hook
+@YELP_HELP_RULES@
 
-DOC_MODULE = mate-applet-clock
-DOC_INCLUDES = legal.xml
+HELP_ID = clock
 
-DOC_LINGUAS = ar ca cs da de el en_GB es eu fi fr it ja ko nl oc pa pt pt_BR ru sr sv th uk zh_CN zh_HK zh_TW
+HELP_FILES = \
+	index.docbook \
+	legal.xml
+
+HELP_MEDIA =
+
+HELP_LINGUAS = ar ca cs da de el en_GB es eu fi fr it ja ko nl oc pa pt pt_BR ru sr sv th uk zh_CN zh_HK zh_TW
 
 -include $(top_srcdir)/git.mk
diff --git a/help/clock/mate-applet-clock.omf.in b/help/clock/mate-applet-clock.omf.in
deleted file mode 100644
index 5540289e..00000000
--- a/help/clock/mate-applet-clock.omf.in
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<omf>
-  <resource>
-    <subject category="GNOME|Applets|Accessories"/>
-    <type>
-      user's guide
-    </type>
-    <relation seriesid="dc1bc4d4-40e7-11d6-8b82-b4eda00d7b63"/>
-    <rights type="GNU FDL" license.version="1.1" holder="Sun Microsystems"/>
-   </resource>        
-</omf>
diff --git a/help/fish/C/mate-applet-fish.xml b/help/fish/C/index.docbook
index 0760a6f8..4d340e0d 100644
--- a/help/fish/C/mate-applet-fish.xml
+++ b/help/fish/C/index.docbook
@@ -150,7 +150,7 @@
 		<title>Feedback</title>
 		<para> To report a bug or make a suggestion regarding the &applet; applet or this
 		  manual, follow the directions in the
-		  <ulink url="ghelp:mate-feedback" type="help">MATE Feedback Page</ulink>. </para>
+		  <ulink url="help:mate-feedback" type="help">MATE Feedback Page</ulink>. </para>
 
 	 </legalnotice>
 	 <abstract role="description">
diff --git a/help/fish/C/legal.xml b/help/fish/C/legal.xml
index 29f07269..ba4807ba 100644
--- a/help/fish/C/legal.xml
+++ b/help/fish/C/legal.xml
@@ -6,7 +6,7 @@
            by the Free Software Foundation with no Invariant Sections,
            no Front-Cover Texts, and no Back-Cover Texts.  You can find
            a copy of the GFDL at this <ulink type="help"
-           url="ghelp:fdl">link</ulink> or in the file COPYING-DOCS
+           url="help:fdl">link</ulink> or in the file COPYING-DOCS
            distributed with this manual.
           </para>
           <para> This manual is part of a collection of MATE manuals
@@ -73,4 +73,4 @@
            </orderedlist>
          </para>
    </legalnotice>
- 
\ No newline at end of file
+ 
diff --git a/help/fish/Makefile.am b/help/fish/Makefile.am
index 1c4694cb..380b96c5 100644
--- a/help/fish/Makefile.am
+++ b/help/fish/Makefile.am
@@ -1,9 +1,13 @@
-include $(top_srcdir)/mate-doc-utils.make
-dist-hook: doc-dist-hook
+@YELP_HELP_RULES@
 
-DOC_MODULE = mate-applet-fish
-DOC_INCLUDES = legal.xml
+HELP_ID = fish
 
-DOC_LINGUAS = ca cs de el en_GB es eu fi fr it ja ko oc ru sv th uk zh_CN
+HELP_FILES = \
+	index.docbook \
+	legal.xml
+
+HELP_MEDIA =
+
+HELP_LINGUAS = ca cs de el en_GB es eu fi fr it ja ko oc ru sv th uk zh_CN
 
 -include $(top_srcdir)/git.mk
diff --git a/help/fish/mate-applet-fish.omf.in b/help/fish/mate-applet-fish.omf.in
deleted file mode 100644
index 1a815f55..00000000
--- a/help/fish/mate-applet-fish.omf.in
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<omf>

-  <resource>

-    <subject category="GNOME|Applets|Amusement"/>

-    <type>

-      user's guide

-    </type>

-    <relation seriesid="e9efbc8c-40e7-11d6-815d-e721de25f633"/>

-    <rights type="GNU FDL" license.version="1.1" holder="Sun Microsystems"/>

-  </resource>

-</omf>