GNOME.org
 

[gnome-terminal/gnome-3-6] Port to new documentation infrastructure

commit 19d2862ad4112edba426fdc780079cd09533b939
Author: Javier JardÃn <jjardon gnome org>
Date:   Fri Aug 17 01:57:00 2012 +0900

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

 Makefile.am                                   |    6 -
 autogen.sh                                    |    1 -
 configure.ac                                  |    8 +-
 help/C/{gnome-terminal.xml => index.docbook}  |    4 +-
 help/C/legal.xml                              |    4 +-
 help/Makefile.am                              |   20 +-
 help/bg/Makefile.am                           |   10 -
 help/bg/figures/gnome-terminal-default.png    |  Bin 17871 -> 0 bytes
 help/bg/figures/gnome-terminal-tabbed.png     |  Bin 23057 -> 0 bytes
 help/bg/gnome-terminal-bg.omf                 |   18 -
 help/bg/gnome-terminal.xml                    |  943 -----------------
 help/bg/legal.xml                             |    9 -
 help/gnome-terminal.omf.in                    |    9 -
 help/ja/Makefile.am                           |   10 -
 help/ja/figures/gnome-terminal-default.png    |  Bin 9267 -> 0 bytes
 help/ja/figures/gnome-terminal-tabbed.png     |  Bin 11765 -> 0 bytes
 help/ja/gnome-terminal-ja.omf                 |   35 -
 help/ja/gnome-terminal.xml                    | 1388 ------------------------
 help/ja/legal.xml                             |   47 -
 help/ro/Makefile.am                           |   10 -
 help/ro/figures/gnome-terminal-default.png    |  Bin 8503 -> 0 bytes
 help/ro/figures/gnome-terminal-tabbed.png     |  Bin 8571 -> 0 bytes
 help/ro/gnome-terminal-ro.omf                 |   35 -
 help/ro/gnome-terminal.xml                    | 1403 -------------------------
 help/ro/legal.xml                             |   70 --
 help/zh_TW/Makefile.am                        |   10 -
 help/zh_TW/figures/gnome-terminal-default.png |  Bin 10085 -> 0 bytes
 help/zh_TW/figures/gnome-terminal-tabbed.png  |  Bin 10175 -> 0 bytes
 help/zh_TW/gnome-terminal-zh_TW.omf           |   35 -
 help/zh_TW/gnome-terminal.xml                 | 1212 ---------------------
 help/zh_TW/legal.xml                          |   54 -
 src/terminal-util.c                           |    4 +-
 32 files changed, 18 insertions(+), 5327 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 27547fd..fe47669 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,9 +17,6 @@ EXTRA_DIST = 			\
 	ChangeLog.pre-2-23	\
 	ChangeLog.README	\
 	HACKING			\
-	gnome-doc-utils.make	\
-	xmldocs.make		\
-	omf.make		\
 	$(NULL)
 
 CLEANFILES = \
@@ -40,9 +37,6 @@ MAINTAINERCLEANFILES = \
 	$(srcdir)/ltmain.sh \
 	$(srcdir)/missing \
 	$(srcdir)/mkinstalldirs \
-	$(srcdir)/omf.make \
-	$(srcdir)/xmldocs.make \
-	$(srcdir)/gnome-doc-utils.make	\
 	`find "$(srcdir)" -type f -name Makefile.in -print` \
 	$(NULL)
 
diff --git a/autogen.sh b/autogen.sh
index 632be31..dd81a8e 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -13,6 +13,5 @@ which gnome-autogen.sh || {
     echo "You need to install gnome-common from the GNOME SVN"
     exit 1
 }
-USE_COMMON_DOC_BUILD=yes
 
 . gnome-autogen.sh
diff --git a/configure.ac b/configure.ac
index d5acfb0..4a41ded 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,9 @@ AC_HEADER_STDC
 AM_PROG_LIBTOOL
 IT_PROG_INTLTOOL([0.40.0])
 
-GNOME_COMMON_INIT
+# User documentation
+YELP_HELP_INIT
+
 GNOME_DEBUG_CHECK
 
 AM_GLIB_GNU_GETTEXT
@@ -173,10 +175,6 @@ gnome-terminal.desktop.in
 src/Makefile
 src/terminal-version.h
 help/Makefile
-help/bg/Makefile
-help/ro/Makefile
-help/ja/Makefile
-help/zh_TW/Makefile
 po/Makefile.in
 ])
 AC_OUTPUT
diff --git a/help/C/gnome-terminal.xml b/help/C/index.docbook
similarity index 99%
rename from help/C/gnome-terminal.xml
rename to help/C/index.docbook
index b76c4b5..0538589 100644
--- a/help/C/gnome-terminal.xml
+++ b/help/C/index.docbook
@@ -212,7 +212,7 @@ text-based commands through a shell such as Bash.
         </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" 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" type="help">GNOME Feedback Page</ulink>. </para>
      </legalnotice> 
   </articleinfo> 
   <indexterm> 
@@ -946,7 +946,7 @@ text-based commands through a shell such as Bash.
                 </term> 
              <listitem> 
                 <para>
-                  Select the <guilabel>Use colours from system theme</guilabel> option to use the colors that are specified in the GNOME Desktop theme that is selected in the <guilabel>Theme</guilabel> tab of the <ulink type="help" url="ghelp:user-guide?prefs-theme"><application>Appearance</application> preference tool</ulink>.
+                  Select the <guilabel>Use colours from system theme</guilabel> option to use the colors that are specified in the GNOME Desktop theme that is selected in the <guilabel>Theme</guilabel> tab of the <ulink type="help" url="help:user-guide/prefs-theme"><application>Appearance</application> preference tool</ulink>.
                 </para>
                 <para>
                   Use the <guilabel>Built-in schemes</guilabel> drop-down list to specify the foreground and background colors for the terminal. <application>&app;</application> supports the following foreground and background color combinations: 
diff --git a/help/C/legal.xml b/help/C/legal.xml
index d6906f9..e1c4a93 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
@@ -73,4 +73,4 @@
            </orderedlist>
          </para>
    </legalnotice>
- 
\ No newline at end of file
+ 
diff --git a/help/Makefile.am b/help/Makefile.am
index 033c3e1..40f483d 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,17 +1,15 @@
-include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
+ YELP_HELP_RULES@
 
-DOC_MODULE = gnome-terminal
-DOC_ENTITIES = legal.xml
-DOC_INCLUDES = 
-DOC_FIGURES = figures/gnome-terminal-default.png \
-              figures/gnome-terminal-tabbed.png 
-#	      figures/terminal-window.png   This image is not used.
+HELP_ID = gnome-terminal
 
-DOC_LINGUAS = da de ca cs el en_GB es fr gl it ko oc pt_BR ru sl sv uk zh_CN
+HELP_FILES = \
+	index.docbook \
+	legal.xml
 
-# Move to DOC_LINGUAS in transition to gnome-doc-utils
+HELP_MEDIA = \
+	figures/gnome-terminal-default.png \
+	figures/gnome-terminal-tabbed.png
 
-SUBDIRS = bg ro ja zh_TW
+HELP_LINGUAS = da de ca cs el en_GB es fr gl it ko oc pt_BR ru sl sv uk zh_CN
 
 -include $(top_srcdir)/git.mk
diff --git a/src/terminal-util.c b/src/terminal-util.c
index e36cba9..2c24a9a 100644
--- a/src/terminal-util.c
+++ b/src/terminal-util.c
@@ -175,9 +175,9 @@ terminal_util_show_help (const char *topic,
     return;
 
   if (topic) {
-    url = g_strdup_printf ("ghelp://%s?%s", uri, topic);
+    url = g_strdup_printf ("help:%s/%s", uri, topic);
   } else {
-    url = g_strdup_printf ("ghelp://%s", uri);
+    url = g_strdup_printf ("help:%s", uri);
   }
 
   if (!open_url (GTK_WINDOW (parent), url, gtk_get_current_event_time (), &error))
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]