[gnome-search-tool] Port to new documentation infrastructure

[Javier JardÃn <jjardon src gnome org>]

commit ca5de216261bd8e6971f9cc5c16fedc7624216db
Author: Javier JardÃn <jjardon gnome org>
Date:   Wed Aug 22 10:27:01 2012 +0900

    Port to new documentation infrastructure
    
    Use yelp-tools instead gnome-doc-utils

 autogen.sh                                      |    2 +-
 configure.ac                                    |    3 ++-
 help/C/{gnome-search-tool.xml => index.docbook} |    2 +-
 help/C/legal.xml                                |    2 +-
 help/Makefile.am                                |   13 +++++++------
 help/gnome-search-tool.omf.in                   |    9 ---------
 src/gsearchtool-callbacks.c                     |    2 +-
 7 files changed, 13 insertions(+), 20 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index 18fc21f..74e8481 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -17,4 +17,4 @@ which gnome-autogen.sh || {
     exit 1
 }
 
-USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh
+USE_GNOME2_MACROS=1 . gnome-autogen.sh
diff --git a/configure.ac b/configure.ac
index 62ecf89..87f68aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,7 +39,8 @@ AC_CACHE_SAVE
 
 GLIB_GSETTINGS
 
-GNOME_DOC_INIT
+# User documentation
+YELP_HELP_INIT
 
 dnl strftime extension checks
 msg_strftime=no
diff --git a/help/C/gnome-search-tool.xml b/help/C/index.docbook
similarity index 99%
rename from help/C/gnome-search-tool.xml
rename to help/C/index.docbook
index 970797f..7c63aa1 100644
--- a/help/C/gnome-search-tool.xml
+++ b/help/C/index.docbook
@@ -181,7 +181,7 @@
     </releaseinfo> 
     <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" type="help">GNOME Feedback Page</ulink>. 
+      <para>To report a bug or make a suggestion regarding the &app; application or 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 -->
     </legalnotice> 
diff --git a/help/C/legal.xml b/help/C/legal.xml
index ac97e1d..899282c 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 6beebe6..de7b864 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,8 +1,9 @@
-include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
+ YELP_HELP_RULES@
 
-DOC_MODULE = gnome-search-tool
-DOC_ENTITIES = legal.xml
-DOC_INCLUDES = 
+HELP_ID = gnome-search-tool
 
-DOC_LINGUAS = ca cs de el en_GB es eu fi fr it ja ko oc ru sl sv te uk zh_CN
+HELP_FILES = \
+	index.docbook \
+	legal.xml
+
+HELP_LINGUAS = ca cs de el en_GB es eu fi fr it ja ko oc ru sl sv te uk zh_CN
diff --git a/src/gsearchtool-callbacks.c b/src/gsearchtool-callbacks.c
index 9b45093..d4cfb49 100644
--- a/src/gsearchtool-callbacks.c
+++ b/src/gsearchtool-callbacks.c
@@ -185,7 +185,7 @@ click_help_cb (GtkWidget * widget,
 	GtkWidget * window = data;
 	GError * error = NULL;
 
-	gtk_show_uri (gtk_widget_get_screen (widget), "ghelp:gnome-search-tool",  
+	gtk_show_uri (gtk_widget_get_screen (widget), "help:gnome-search-tool",
 	              gtk_get_current_event_time (), &error);
 	if (error) {
 		GtkWidget * dialog;