[gnome-user-share] Use new documentation infrastructure



commit 2b5601c0b91f9e644e89ac2420b903cfb231175f
Author: Javier JardÃn <jjardon gnome org>
Date:   Sat Aug 11 01:45:20 2012 +0900

    Use new documentation infrastructure

 configure.in                                   |    3 ++-
 help/C/{gnome-user-share.xml => index.docbook} |    2 +-
 help/C/legal.xml                               |    2 +-
 help/Makefile.am                               |   17 ++++++++++-------
 help/gnome-user-share.omf.in                   |   11 -----------
 src/file-share-properties.c                    |    2 +-
 6 files changed, 15 insertions(+), 22 deletions(-)
---
diff --git a/configure.in b/configure.in
index 17f7f11..d67decd 100644
--- a/configure.in
+++ b/configure.in
@@ -31,7 +31,8 @@ AC_TYPE_PID_T
 AC_TYPE_SIZE_T
 AC_TYPE_UID_T
 
-GNOME_DOC_INIT
+# Documentation
+YELP_HELP_INIT
 
 AC_ARG_WITH([httpd],
 	    [AS_HELP_STRING([--with-httpd],[Specify the binary used for the Apache httpd binary (default: httpd)])],
diff --git a/help/C/gnome-user-share.xml b/help/C/index.docbook
similarity index 99%
rename from help/C/gnome-user-share.xml
rename to help/C/index.docbook
index 43330cb..ddcedd9 100644
--- a/help/C/gnome-user-share.xml
+++ b/help/C/index.docbook
@@ -35,7 +35,7 @@
 	 <releaseinfo>This manual describes version &appversion; of &app;.</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:user-guide?feedback-bugs" type="help">GNOME Feedback Page</ulink>.</para>
+		<para>To report a bug or make a suggestion regarding the &app; application or this manual, follow the directions in the <ulink url="help:user-guide/feedback-bugs" type="help">GNOME Feedback Page</ulink>.</para>
 	 </legalnotice>
     <abstract role="description">
       <para>&app; is a session service that enables easy sharing of files
diff --git a/help/C/legal.xml b/help/C/legal.xml
index 312c12e..5d73dc0 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 c899c49..bacc0c1 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,14 +1,17 @@
-include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
+ YELP_HELP_RULES@
 
-DOC_MODULE = gnome-user-share
-DOC_ENTITIES =
-DOC_INCLUDES = legal.xml
-DOC_FIGURES = figures/file-sharing-preferences.png \
+HELP_ID = gnome-user-share
+
+HELP_FILES = \
+	index.docbook \
+	legal.xml
+
+HELP_MEDIA = \
+	figures/file-sharing-preferences.png \
 	figures/sharing-over-the-network.png \
 	figures/sharing-over-bluetooth.png \
 	figures/receiving-over-bluetooth.png
 
-DOC_LINGUAS = ca cs de el en_GB es eu fr gl it pt_BR ro ru sl sv zh_CN
+HELP_LINGUAS = ca cs de el en_GB es eu fr gl it pt_BR ro ru sl sv zh_CN
 
 -include $(top_srcdir)/git.mk
diff --git a/src/file-share-properties.c b/src/file-share-properties.c
index 3e48b10..59e9f1b 100644
--- a/src/file-share-properties.c
+++ b/src/file-share-properties.c
@@ -457,7 +457,7 @@ help_button_clicked (GtkButton *button, GtkWidget *window)
 {
 	GError *error = NULL;
 
-	if (gtk_show_uri (gtk_widget_get_screen (window), "ghelp:gnome-user-share", gtk_get_current_event_time (), &error) == FALSE) {
+	if (gtk_show_uri (gtk_widget_get_screen (window), "help:gnome-user-share", gtk_get_current_event_time (), &error) == FALSE) {
 		GtkWidget *dialog;
 
 		dialog = error_dialog (_("Could not display the help contents."), error->message, GTK_WINDOW (window));



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]