[orca/gnome-3-6] Use new documentation infrastructure

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

commit 7251f3de69bad3b957520181329df89d1af7ed5b
Author: Javier JardÃn <jjardon gnome org>
Date:   Fri Aug 10 03:38:47 2012 +0900

    Use new documentation infrastructure

 .gitignore        |    1 -
 Makefile.am       |    2 --
 autogen.sh        |    2 +-
 configure.ac      |    3 ++-
 help/C/index.page |    2 +-
 help/Makefile.am  |   11 +++++------
 m4/.gitignore     |    1 -
 src/orca/orca.py  |    2 +-
 8 files changed, 10 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d89ed71..adc143f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,7 +15,6 @@ config.sub
 configure
 debug.out
 depcomp
-gnome-doc-utils.make
 install-sh
 intltool-extract.in
 intltool-extract
diff --git a/Makefile.am b/Makefile.am
index 55b303f..a7e4353 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,6 @@ DISTCHECK_CONFIGURE_FLAGS =     \
 	--disable-scrollkeeper
 
 DISTCLEANFILES =                \
-	gnome-doc-utils.make	\
 	orca-autostart.desktop  \
 	orca.desktop
 
@@ -38,7 +37,6 @@ EXTRA_DIST =                \
 	$(autostart_in_files) \
 	$(desktop_in_files) \
 	$(icon_DATA)        \
-	gnome-doc-utils.make \
 	ChangeLog           \
 	MAINTAINERS
 
diff --git a/autogen.sh b/autogen.sh
index 4ca9349..12771cf 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -21,4 +21,4 @@ which gnome-autogen.sh || {
 
 REQUIRED_AUTOMAKE_VERSION=1.9
 
-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 a0ec5c8..0fab90f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,8 @@ GETTEXT_PACKAGE=AC_PACKAGE_TARNAME
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [gettext package])
 
-GNOME_DOC_INIT([0.17.3])
+# User Documentation
+YELP_HELP_INIT
 
 PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= gtk_required_version])
 PKG_CHECK_MODULES([PYGOBJECT], [pygobject-3.0 >= pygobject_required_version])
diff --git a/help/C/index.page b/help/C/index.page
index 3cecdba..a381944 100644
--- a/help/C/index.page
+++ b/help/C/index.page
@@ -19,7 +19,7 @@
   <note style="important">
     <title>Before You Begin</title>
     <p>
-      Read the <link href="ghelp:gnome-help#a11y">Universal Access Help</link>
+      Read the <link href="help:gnome-help#a11y">Universal Access Help</link>
     </p>
   </note>
   <section id="getting_started" style="2column">
diff --git a/help/Makefile.am b/help/Makefile.am
index 62923f9..5c09463 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,7 +1,7 @@
-include $(top_srcdir)/gnome-doc-utils.make
+ YELP_HELP_RULES@
 
-DOC_ID = orca
-DOC_FIGURES = \
+HELP_ID = orca
+HELP_MEDIA = \
 	figures/main_window.png \
 	figures/orca_find.png \
 	figures/orca-logo.png \
@@ -49,7 +49,7 @@ DOC_FIGURES = \
 	figures/profiles_load.png \
 	figures/profiles_save_as.png
 
-DOC_PAGES = \
+HELP_FILES = \
 	commands_bookmarks.page \
 	commands_braille.page \
 	commands_chat.page \
@@ -101,5 +101,4 @@ DOC_PAGES = \
 	preferences_table_navigation.page \
 	preferences_text_attributes.page
 
-DOC_LINGUAS = de el es fr gl hu sl
-dist-hook: doc-dist-hook
+HELP_LINGUAS = de el es fr gl hu sl
diff --git a/m4/.gitignore b/m4/.gitignore
index 8e2862d..beef047 100644
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -2,7 +2,6 @@ codeset.m4
 gettext.m4
 glibc2.m4
 glibc21.m4
-gnome-doc-utils.m4
 iconv.m4
 intdiv0.m4
 intl.m4
diff --git a/src/orca/orca.py b/src/orca/orca.py
index 93d10ee..8d45c4a 100644
--- a/src/orca/orca.py
+++ b/src/orca/orca.py
@@ -537,7 +537,7 @@ def helpForOrca(script=None, inputEvent=None, page=""):
 
     Returns True to indicate the input event has been consumed.
     """
-    uri = "ghelp:orca"
+    uri = "help:orca"
     if page:
         uri += "?%s" % page
     Gtk.show_uri(Gdk.Screen.get_default(),