Use new documentation infrastructure

4 files changed, 12 insertions, 18 deletions

diff --git a/help/C/glade.xml b/help/C/index.docbook
index a97eaa88..985b36a6 100644
--- a/help/C/glade.xml
+++ b/help/C/index.docbook
@@ -134,7 +134,7 @@
     <legalnotice> 
       <title>Feedback</title> 
       <para>To report a bug or make a suggestion regarding the &app; application or
-      this manual, follow the directions in the <ulink url="ghelp:gnome-feedback"
+      this manual, follow the directions in the <ulink url="help:gnome-feedback"
 	  type="help">GNOME Feedback Page</ulink>.
       </para>
 <!-- Translators may also add here feedback address for translations -->
@@ -477,7 +477,7 @@ copies.</para>
       General Public license as published by the Free Software
       Foundation; either version 2 of the License, or (at your option)
       any later version. A copy of this license can be found at this
-      <ulink url="ghelp:gpl" type="help">link</ulink>, or in the file
+      <ulink url="help:gpl" type="help">link</ulink>, or in the file
       COPYING included with the source code of this program. </para>
   </sect1> 
 
diff --git a/help/C/legal.xml b/help/C/legal.xml
index 312c12eb..5d73dc0d 100644
--- a/help/C/legal.xml
+++ b/help/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 GNOME manuals
diff --git a/help/Makefile.am b/help/Makefile.am
index 70836e32..51dc5d91 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,9 +1,12 @@
+@YELP_HELP_RULES@
 
-include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
+HELP_ID = glade
 
-DOC_MODULE = glade
-DOC_INCLUDES = legal.xml
-DOC_FIGURES = figures/main-window.png
+HELP_FILES = \
+	index.docbook \
+	legal.xml
 
-DOC_LINGUAS = bg ca cs de el en_GB es eu fr gl hi it ja oc pt_BR ru sl sv uk zh_CN
+HELP_MEDIA = \
+	figures/main-window.png
+
+HELP_LINGUAS = bg ca cs de el en_GB es eu fr gl hi it ja oc pt_BR ru sl sv uk zh_CN
diff --git a/help/glade.omf.in b/help/glade.omf.in
deleted file mode 100644
index a683d54e..00000000
--- a/help/glade.omf.in
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<omf>
-  <resource>
-    <subject category="GNOME|Development|Applications"/>
-    <type>user's guide</type>
-    <relation seriesid="aeee6e58-266b-11db-9d4a-93a924887d12"/>
-    <rights type="GNU FDL" license.version="1.1" holder="Vincent Geddes"/>
-  </resource>
-</omf>