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



commit b9398b668a1e5f9db497780677b8f217d11ad20b
Author: Javier JardÃn <jjardon gnome org>
Date:   Tue Sep 4 03:32:09 2012 +0900

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

 Makefile.am                         |    4 +-
 autogen.sh                          |    2 +-
 configure.in                        |    4 +-
 help/C/{totem.xml => index.docbook} |  262 +++++++++++++++++-----------------
 help/C/legal.xml                    |    2 +-
 help/Makefile.am                    |   18 ++--
 help/totem.omf.in                   |   13 --
 src/totem-object.c                  |    2 +-
 8 files changed, 147 insertions(+), 160 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 52d4ad6..5a39774 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,7 +14,6 @@ EXTRA_DIST =			\
 	AUTHORS NEWS		\
 	totem.spec.in		\
 	totem.spec		\
-	gnome-doc-utils.make	\
 	ChangeLog.pre-gitlog	\
 	MAINTAINERS		\
 	totem.doap
@@ -42,8 +41,7 @@ MAINTAINERCLEANFILES = \
 	$(srcdir)/xmldocs.make \
 	`find "$(srcdir)" -type f -name Makefile.in -print`
 
-DISTCLEANFILES = intltool-extract intltool-merge intltool-update \
-		 gnome-doc-utils.make
+DISTCLEANFILES = intltool-extract intltool-merge intltool-update
 
 DIST_SUBDIRS = $(NORMAL_SUBDIRS) browser-plugin
 DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --enable-gtk-doc --with-nautilusdir='$${libdir}/nautilus/extensions-2.0-distcheck' --enable-vala=no --enable-introspection
diff --git a/autogen.sh b/autogen.sh
index 43690b7..ea854bf 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -17,4 +17,4 @@ which gnome-autogen.sh || {
 	exit 1
 }
 
-REQUIRED_PKG_CONFIG_VERSION=0.17.1 REQUIRED_AUTOMAKE_VERSION=1.11 USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh --enable-debug $*
+REQUIRED_PKG_CONFIG_VERSION=0.17.1 REQUIRED_AUTOMAKE_VERSION=1.11 USE_GNOME2_MACROS=1 . gnome-autogen.sh --enable-debug $*
diff --git a/configure.in b/configure.in
index 50e1602..9253fac 100644
--- a/configure.in
+++ b/configure.in
@@ -27,7 +27,9 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"], [Define to the Gettext
 AC_SUBST(GETTEXT_PACKAGE)
 IT_PROG_INTLTOOL([0.40.0])
 
-GNOME_DOC_INIT([0.20.3])
+# User Documentation
+YELP_HELP_INIT
+
 GOBJECT_INTROSPECTION_CHECK([0.6.7])
 
 AC_PROG_CXX
diff --git a/help/C/totem.xml b/help/C/index.docbook
similarity index 92%
rename from help/C/totem.xml
rename to help/C/index.docbook
index 7fd6188..9cfb730 100644
--- a/help/C/totem.xml
+++ b/help/C/index.docbook
@@ -7,14 +7,14 @@
   <!ENTITY date "February 2009">
   <!ENTITY app "Totem Movie Player">
   <!-- Information about the entities
-       The legal.xml file contains legal information, there is no need to edit the file. 
+       The legal.xml file contains legal information, there is no need to edit the file.
        Use the appversion entity to specify the version of the application.
        Use the manrevision entity to specify the revision number of this manual.
        Use the date entity to specify the release date of this manual.
        Use the app entity to specify the name of the application. -->
 ]>
 
-<!-- 
+<!--
       (Do not remove this comment block.)
   Maintained by the GNOME Documentation Project
   http://developer.gnome.org/projects/gdp
@@ -26,10 +26,10 @@
 <article id="index" lang="en">
 <!-- please do not change the id; for translations, change lang to -->
 <!-- appropriate code -->
-  <articleinfo> 
-    <title><application>&app;</application> Manual</title>       
-    <copyright> 
-      <year>2003</year> 
+  <articleinfo>
+    <title><application>&app;</application> Manual</title>
+    <copyright>
+      <year>2003</year>
       <holder>Chee Bin HOH</holder>
     </copyright>
     <copyright>
@@ -47,48 +47,48 @@ DVDs among many others. Features include TV-out, fullscreen,
 subtitles, and more.</para>
     </abstract>
 
-    <publisher> 
-      <publishername> GNOME Documentation Project </publishername> 
-    </publisher> 
+    <publisher>
+      <publishername> GNOME Documentation Project </publishername>
+    </publisher>
 
     &legal;
-    <!-- This file  contains link to license for the documentation (GNU FDL), and 
-         other legal stuff such as "NO WARRANTY" statement. Please do not change 
+    <!-- This file  contains link to license for the documentation (GNU FDL), and
+         other legal stuff such as "NO WARRANTY" statement. Please do not change
 	 any of this. -->
 
-    <authorgroup> 
-      <author role="maintainer"> 
-	<firstname>Chee Bin</firstname> 
-	<surname>HOH</surname> 
-	<affiliation> 
-  	  <orgname>GNOME Documentation Project</orgname> 
+    <authorgroup>
+      <author role="maintainer">
+	<firstname>Chee Bin</firstname>
+	<surname>HOH</surname>
+	<affiliation>
+  	  <orgname>GNOME Documentation Project</orgname>
 	</affiliation>
 	<email>cbhoh gnome org</email>
       </author>
       <author>
-	<firstname>Baptiste</firstname> 
-	<surname>Mille-Mathias</surname> 
-	<affiliation> 
+	<firstname>Baptiste</firstname>
+	<surname>Mille-Mathias</surname>
+	<affiliation>
           <orgname>GNOME Documentation project</orgname>
         </affiliation>
         <contrib>Update documentation</contrib>
         <email>baptiste millemathias gmail org</email>
       </author>
        <author>
-	<firstname>Philip</firstname> 
+	<firstname>Philip</firstname>
 	<surname>Withnall</surname>
         <contrib>Update documentation</contrib>
 	<email>philip tecnocode co uk</email>
-      </author>   
+      </author>
 
 <!-- This is appropriate place for other contributors: translators,
      maintainers,  etc. Commented out by default.
       <othercredit role="translator">
-	<firstname>Latin</firstname> 
-	<surname>Translator 1</surname> 
-	<affiliation> 
-          <orgname>Latin Translation Team</orgname> 
-  	  <address> <email>translator gnome org</email> </address> 
+	<firstname>Latin</firstname>
+	<surname>Translator 1</surname>
+	<affiliation>
+          <orgname>Latin Translation Team</orgname>
+  	  <address> <email>translator gnome org</email> </address>
         </affiliation>
         <contrib>Latin translation</contrib>
       </othercredit>
@@ -105,46 +105,46 @@ subtitles, and more.</para>
 <!-- For example, if the GNOME desktop release is V2.x, the first version of the manual that -->
 <!-- is written in that desktop timeframe is V2.0, the second version of the manual is V2.1, etc. -->
 <!-- When the desktop release version changes to V3.x, the revision number of the manual changes -->
-<!-- to V3.0, and so on. -->  
+<!-- to V3.0, and so on. -->
     <revhistory>
-      <revision> 
-        <revnumber>&app; Manual V2.0</revnumber> 
-	<date>August 2006</date> 
-	<revdescription> 
+      <revision>
+        <revnumber>&app; Manual V2.0</revnumber>
+	<date>August 2006</date>
+	<revdescription>
 	  <para role="author">Chee Bin HOH
 	    <email>cbhoh gnome org</email>
 	  </para>
 	  <para role="publisher">GNOME Documentation Project</para>
-        </revdescription> 
+        </revdescription>
       </revision>
-      <revision> 
-        <revnumber>&app; Manual V&manrevision;</revnumber> 
-	<date>&date;</date> 
-	<revdescription> 
+      <revision>
+        <revnumber>&app; Manual V&manrevision;</revnumber>
+	<date>&date;</date>
+	<revdescription>
 	  <para role="author">Philip Withnall
 	    <email>philip tecnocode co uk</email>
 	  </para>
 	  <para role="publisher">GNOME Documentation Project</para>
-        </revdescription> 
+        </revdescription>
       </revision>
-    </revhistory> 
+    </revhistory>
 
     <releaseinfo>This manual describes version &appversion; of &app;.
-    </releaseinfo> 
-    <legalnotice> 
-      <title>Feedback</title> 
+    </releaseinfo>
+    <legalnotice>
+      <title>Feedback</title>
       <para>To report a bug or make a suggestion regarding the <application>&app;</application> application or
-        this manual, follow the directions in the 
-        <ulink url="ghelp:user-guide#feedback" type="help">GNOME Feedback Page</ulink>. 
+        this manual, follow the directions in the
+        <ulink url="help:user-guide#feedback" type="help">GNOME Feedback Page</ulink>.
       </para>
-    </legalnotice> 
-  </articleinfo> 
+    </legalnotice>
+  </articleinfo>
 
-  <indexterm zone="index"> 
-    <primary>&app;</primary> 
-  </indexterm> 
-  <indexterm zone="index"> 
-    <primary>totem</primary> 
+  <indexterm zone="index">
+    <primary>&app;</primary>
+  </indexterm>
+  <indexterm zone="index">
+    <primary>totem</primary>
   </indexterm>
 
 
@@ -152,18 +152,18 @@ subtitles, and more.</para>
 <!-- ============= Introduction ============================== -->
 <!-- Use the Introduction section to give a brief overview of what
      the application is and what it does. -->
-  <sect1 id="totem-introduction"> 
-    <title>Introduction</title> 
+  <sect1 id="totem-introduction">
+    <title>Introduction</title>
     <para>The <application>&app;</application> application is a movie player for the GNOME desktop based on
       the GStreamer framework and xine library, and enables you to play movies or songs.
     </para>
     <para><application>&app;</application> provides the following features:</para>
-    <itemizedlist> 
-      <listitem> 
+    <itemizedlist>
+      <listitem>
 	<para>Support for a variety of video and audio files.</para>
       </listitem>
       <listitem>
-	<para>A variety of zoom levels and aspect ratios, and a fullscreen view.</para> 
+	<para>A variety of zoom levels and aspect ratios, and a fullscreen view.</para>
       </listitem>
       <listitem>
         <para>Seek and volume controls.</para>
@@ -180,7 +180,7 @@ subtitles, and more.</para>
       <listitem>
 	<para>Comprehensive set of plugins, including a subtitle downloader, YouTube browser, and disc burner.</para>
       </listitem>
-    </itemizedlist> 
+    </itemizedlist>
     <note>
       <para><application>&app;</application> also comes with additional functionality such as:
       </para>
@@ -204,37 +204,37 @@ subtitles, and more.</para>
      to start the application and to describe the user interface components
      of the application. If there is other information that it is important
      for readers to know before they start using the application, you should
-     also include this information here. 
-     If the information about how to get started is very short, you can 
+     also include this information here.
+     If the information about how to get started is very short, you can
      include it in the Introduction and omit this section. -->
 
-  <sect1 id="totem-getting-started"> 
-    <title>Getting Started</title> 
+  <sect1 id="totem-getting-started">
+    <title>Getting Started</title>
 
     <sect2 id="totem-start">
       <title>To Start <application>&app;</application></title>
       <para>You can start <application>&app;</application> in the following ways:
-      </para> 
+      </para>
       <variablelist>
 	<varlistentry>
 	  <term><guimenu>Applications</guimenu> menu</term>
 	  <listitem>
-	    <para>Choose  
+	    <para>Choose
               <menuchoice>
 		<guisubmenu>Sound &amp; Video</guisubmenu>
 		<guimenuitem>Movie Player</guimenuitem>
-	      </menuchoice>. 
+	      </menuchoice>.
             </para>
 	  </listitem>
 	</varlistentry>
 	<varlistentry>
 	  <term>Command line</term>
 	  <listitem>
-	    <para>To start <application>&app;</application> from a command line, type the following command, 
+	    <para>To start <application>&app;</application> from a command line, type the following command,
     	      then press <keycap>Return</keycap>:</para>
-	    <para> 
-            <command>totem</command> 
-            </para> 
+	    <para>
+            <command>totem</command>
+            </para>
 	    <tip>
 	      <para>To view other command line options that are available,
                 type <command>totem --help</command>, then press <keycap>Return</keycap>.
@@ -250,22 +250,22 @@ subtitles, and more.</para>
       <para>When you start <application>&app;</application>, the following window is displayed.</para>
 
       <!-- ==== Figure ==== -->
-      <figure id="totem-start-fig"> 
-	<title><application>&app;</application> Start Up Window</title> 
-	<screenshot> 
-	  <mediaobject> 
+      <figure id="totem-start-fig">
+	<title><application>&app;</application> Start Up Window</title>
+	<screenshot>
+	  <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="figures/totem_start_window.png" format="PNG"/> 
+	      <imagedata fileref="figures/totem_start_window.png" format="PNG"/>
 	    </imageobject>
-	    <textobject> 
+	    <textobject>
 	      <phrase>Shows <application>&app;</application> main window with
 		  sidebar opened on playlist. Contains
 		  menubar, display area, sidebar, elapsed time slider, seek control
 		  buttons, volume slider and statusbar.
           </phrase>
-	    </textobject> 
-	  </mediaobject> 
-	</screenshot> 
+	    </textobject>
+	  </mediaobject>
+	</screenshot>
       </figure>
       <!-- ==== End of Figure ==== -->
 
@@ -277,7 +277,7 @@ subtitles, and more.</para>
 	<varlistentry>
 	  <term>Menubar.</term>
   	  <listitem>
-  	    <para>The menus on the menubar contain all of the commands you need to use in 
+	    <para>The menus on the menubar contain all of the commands you need to use in
             <application>&app;</application>.</para>
  	  </listitem>
    	</varlistentry>
@@ -332,14 +332,14 @@ subtitles, and more.</para>
 <!-- =========== End of Getting Started ====================== -->
 
 <!-- =========== Usage ======================================= -->
-<!-- Use this section to describe how to use the application to perform the tasks for 
+<!-- Use this section to describe how to use the application to perform the tasks for
   which the application is designed. -->
-  <sect1 id="totem-usage"> 
-    <title>Usage</title> 
+  <sect1 id="totem-usage">
+    <title>Usage</title>
 
     <!-- ================ Usage Subsection ================================ -->
-    <sect2 id="totem-open-file"> 
-      <title>To Open a File</title> 
+    <sect2 id="totem-open-file">
+      <title>To Open a File</title>
       <para>To open a video or an audio file, choose
         <menuchoice>
 	  <shortcut><keycombo><keycap>Ctrl</keycap><keycap>O</keycap></keycombo></shortcut>
@@ -347,14 +347,14 @@ subtitles, and more.</para>
 	  <guisubmenu>Open</guisubmenu>
         </menuchoice>.
         The <application>Select Movies or Playlists</application> dialog is displayed.
-		Select the file or files you want to open, then click 
-	<guibutton>OK</guibutton>. 
+		Select the file or files you want to open, then click
+	<guibutton>OK</guibutton>.
       </para>
       <para>You can drag a file from another application such as a file manager to the
         <application>&app;</application> window. If you drag the file to the display area, the file will replace the current
         playlist and will start playing immediately. If you drag the file to the playlist in the sidebar, the file will be
         appended to the current playlist. The <application>&app;</application> application
-        will open the file and play the movie or song. <application>&app;</application> 
+        will open the file and play the movie or song. <application>&app;</application>
         displays the title of the movie or song in the titlebar of
         the window and in the playlist in the sidebar.
       </para>
@@ -368,7 +368,7 @@ subtitles, and more.</para>
           file manager to open it in the <application>&app;</application> window.
         </para>
       </tip>
-    </sect2> 
+    </sect2>
 
     <sect2 id="totem-usage-open-location">
       <title>To Open a Location</title>
@@ -389,7 +389,7 @@ subtitles, and more.</para>
 	      <para>Insert the disc in the optical device of your computer, then choose
           	<menuchoice><guimenu>Movie</guimenu><guimenuitem>Play Disc</guimenuitem>
               </menuchoice>.</para>
-             <para>To eject a DVD or VCD, choose 
+             <para>To eject a DVD or VCD, choose
         <menuchoice>
 	  <shortcut><keycombo><keycap>Ctrl</keycap><keycap>E</keycap></keycombo></shortcut>
 	  <guimenu>Movie</guimenu>
@@ -400,22 +400,22 @@ subtitles, and more.</para>
 
     <sect2 id="totem-usage-pause">
       <title>To Pause a Movie or Song</title>
-      <para>To pause a movie or song that is playing, click on the 
+      <para>To pause a movie or song that is playing, click on the
         <inlinemediaobject>
 	  <imageobject><imagedata fileref="figures/totem_pause_button.png" format="PNG"/></imageobject>
           <textobject><phrase>Shows pause button.</phrase></textobject>
-        </inlinemediaobject> button, or choose 
+        </inlinemediaobject> button, or choose
         <menuchoice>
 	  <shortcut><keycombo><keycap>Ctrl</keycap><keycap>Space</keycap></keycombo></shortcut>
 	  <guimenu>Movie</guimenu>
           <guimenuitem>Play / Pause</guimenuitem>
         </menuchoice>. You may also use the <keycap>P</keycap> key to pause or play a movie.
       </para>
-      <para>To resume playing a movie or song, click on the 
+      <para>To resume playing a movie or song, click on the
         <inlinemediaobject>
 	  <imageobject><imagedata fileref="figures/totem_play_button.png" format="PNG"/></imageobject>
           <textobject><phrase>Shows play button.</phrase></textobject>
-        </inlinemediaobject> button again, or choose 
+        </inlinemediaobject> button again, or choose
         <menuchoice>
 	  <shortcut><keycombo><keycap>Ctrl</keycap><keycap>Space</keycap></keycombo></shortcut>
 	  <guimenu>Movie</guimenu>
@@ -426,7 +426,7 @@ subtitles, and more.</para>
 
     <sect2 id="totem-usage-view-properties">
       <title>To View Properties of a Movie or Song</title>
-      <para>To view the properties of a movie or song, choose 
+      <para>To view the properties of a movie or song, choose
         <menuchoice>
 	  <guimenu>View</guimenu>
 	  <guimenuitem>Sidebar</guimenuitem></menuchoice> to make the sidebar
@@ -465,12 +465,12 @@ subtitles, and more.</para>
 	<varlistentry>
 	  <term>To skip to a time</term>
 	  <listitem>
-	    <para>To skip to a specific elapsed time in the movie or song, choose 
+	    <para>To skip to a specific elapsed time in the movie or song, choose
               <menuchoice>
 		<shortcut><keycombo><keycap>Ctrl</keycap><keycap>K</keycap></keycombo></shortcut>
                 <guimenu>Go</guimenu>
 		<guimenuitem>Skip to</guimenuitem>
-              </menuchoice>. The <application>Skip to</application> dialog is displayed. Use the 
+              </menuchoice>. The <application>Skip to</application> dialog is displayed. Use the
               spin box to specify the elapsed time (in seconds) to skip to, then
               click <guibutton>OK</guibutton>.
             </para>
@@ -483,13 +483,13 @@ subtitles, and more.</para>
 	<varlistentry>
 	  <term>To move to the next movie or song</term>
 	  <listitem>
-	    <para>To move to the next movie or song, choose 
+	    <para>To move to the next movie or song, choose
               <menuchoice>
                 <shortcut><keycombo><keycap>Alt</keycap><keycap>Right</keycap></keycombo></shortcut>
                 <guimenu>Go</guimenu>
                 <guimenuitem>Next Chapter/Movie</guimenuitem>
-              </menuchoice> or click on the 
-              <inlinemediaobject> 
+              </menuchoice> or click on the
+              <inlinemediaobject>
 	        <imageobject><imagedata fileref="figures/totem_next_button.png" format="PNG"/></imageobject>
 	        <textobject><phrase>Shows a seek next button</phrase></textobject>
               </inlinemediaobject> button.
@@ -499,13 +499,13 @@ subtitles, and more.</para>
 	<varlistentry>
 	  <term>To move to the previous movie or song</term>
 	  <listitem>
-	    <para>To move to the previous movie or song, choose 
+	    <para>To move to the previous movie or song, choose
               <menuchoice>
                 <shortcut><keycombo><keycap>Alt</keycap><keycap>Left</keycap></keycombo></shortcut>
                 <guimenu>Go</guimenu>
                 <guimenuitem>Previous Chapter/Movie</guimenuitem>
               </menuchoice> or click on the
-              <inlinemediaobject> 
+              <inlinemediaobject>
 	        <imageobject><imagedata fileref="figures/totem_previous_button.png" format="PNG"/></imageobject>
 	        <textobject><phrase>Shows a seek previous button</phrase></textobject>
               </inlinemediaobject> button.
@@ -519,7 +519,7 @@ subtitles, and more.</para>
       <title>To Change the Zoom Factor</title>
 	  <sect3 id="totem-usage-change-size">
 		<title>To Change the Video Size</title>
-      <para>To change the zoom factor of the display area, you can use the 
+      <para>To change the zoom factor of the display area, you can use the
         following methods:
       </para>
       <itemizedlist>
@@ -535,7 +535,7 @@ subtitles, and more.</para>
     </listitem>
 	<listitem>
 	  <para>To change the size of the original movie or visualization,
-            choose 
+            choose
             <menuchoice>
 	      <shortcut><keycombo><keycap>Ctrl</keycap><keycap>0</keycap></keycombo></shortcut>
 	      <guimenu>View</guimenu><guimenuitem>Fit Window to Movie</guimenuitem>
@@ -557,18 +557,18 @@ subtitles, and more.</para>
 
     <sect2 id="totem-usage-adjust-volume">
       <title>To Adjust the Volume</title>
-      <para>To increase the volume, choose 
+      <para>To increase the volume, choose
         <menuchoice>
 	  <shortcut><keycap>Up</keycap></shortcut>
           <guimenu>Sound</guimenu>
           <guimenuitem>Volume Up</guimenuitem>
-        </menuchoice>. 
+        </menuchoice>.
         To decrease the volume, choose
         <menuchoice>
 	  <shortcut><keycap>Down</keycap></shortcut>
           <guimenu>Sound</guimenu>
           <guimenuitem>Volume Down</guimenuitem>
-        </menuchoice>.         
+        </menuchoice>.
       </para>
       <para>You can also use the volume button: click on the volume button and choose the volume level with the slider.</para>
     </sect2>
@@ -589,12 +589,12 @@ subtitles, and more.</para>
 
     <sect2 id="totem-usage-show-control">
       <title>To Show or Hide Controls</title>
-      <para>To show or hide the <application>&app;</application> window controls, choose 
+      <para>To show or hide the <application>&app;</application> window controls, choose
         <menuchoice>
 	  <shortcut><keycombo><keycap>Ctrl</keycap><keycap>H</keycap></keycombo></shortcut>
           <guimenu>View</guimenu>
           <guimenuitem>Show Controls</guimenuitem>
-        </menuchoice>, or press the <keycap>H</keycap> key. 
+        </menuchoice>, or press the <keycap>H</keycap> key.
         You can also right-click on the <application>&app;</application> window, then choose
         <menuchoice>
 	  <shortcut><keycombo><keycap>Ctrl</keycap><keycap>H</keycap></keycombo></shortcut>
@@ -614,11 +614,11 @@ subtitles, and more.</para>
 
       <sect3 id="totem-usage-playlist-show-hide">
 	<title>To Show or Hide the Playlist</title>
-	<para>To show or hide the playlist, choose 
+	<para>To show or hide the playlist, choose
           <menuchoice>
 	    <guimenu>View</guimenu><guimenuitem>Sidebar</guimenuitem>
           </menuchoice> or click on the <guibutton>Sidebar</guibutton> button, and
-		  choose <guimenu>Playlist</guimenu> on the top of 
+		  choose <guimenu>Playlist</guimenu> on the top of
 		  the sidebar.</para>
       </sect3>
 
@@ -630,7 +630,7 @@ subtitles, and more.</para>
 	      <term>To add a track or movie</term>
 	      <listitem>
 		<para>To add a track or movie to the playlist, click on the <guibutton>Add</guibutton>
-                  button. The <application>Select Movies or Playlists</application> dialog is displayed. Select the file that you 
+                  button. The <application>Select Movies or Playlists</application> dialog is displayed. Select the file that you
                   want to add to the playlist, then click <guibutton>Add</guibutton>.
                 </para>
               </listitem>
@@ -655,7 +655,7 @@ subtitles, and more.</para>
 	    <varlistentry>
 	      <term>To move a track or movie up the playlist</term>
 	      <listitem>
-		<para>To move a track or movie up the playlist, select the item from the 
+		<para>To move a track or movie up the playlist, select the item from the
                   playlist, then click on the <guibutton>Move Up</guibutton> button.
                 </para>
               </listitem>
@@ -663,7 +663,7 @@ subtitles, and more.</para>
 	    <varlistentry>
 	      <term>To move a track or movie down the playlist</term>
 	      <listitem>
-		<para>To move a track or movie down the playlist, select the item from the 
+		<para>To move a track or movie down the playlist, select the item from the
                   playlist, then click on the <guibutton>Move Down</guibutton> button.
                 </para>
               </listitem>
@@ -711,7 +711,7 @@ subtitles, and more.</para>
 
     <sect2 id="totem-usage-take-screenshot">
       <title>To Take a Screenshot</title>
-      <para>To take a screenshot of the movie or visualization that is playing, choose 
+      <para>To take a screenshot of the movie or visualization that is playing, choose
         <menuchoice>
           <guimenu>Edit</guimenu>
           <guimenuitem>Take Screenshot</guimenuitem>
@@ -918,7 +918,7 @@ subtitles, and more.</para>
       <para>The <guilabel>Video Disc Recorder</guilabel> plugin allows you to burn the current playlist to a DVD or VCD using <application>Brasero</application>.</para>
       <para>To burn the current playlist, choose <menuchoice><guimenu>Movie</guimenu><guimenuitem>Create Video Disc</guimenuitem></menuchoice>.
         A <application>Brasero</application> dialog will be displayed, giving options for converting the movies to the appropriate format and burning them to disc. For more
-        information, see the <ulink type="help" url="ghelp:brasero?brasero-new-project-video">Brasero documentation</ulink>.</para>
+        information, see the <ulink type="help" url="help:brasero/brasero-new-project-video">Brasero documentation</ulink>.</para>
     </sect2>
     <sect2 id="totem-plugins-youtube">
       <title>YouTube Browser</title>
@@ -946,7 +946,7 @@ subtitles, and more.</para>
   </sect1>
 
 <!-- =========== Usage ======================================= -->
-<!-- Use this section to describe how to customize the 
+<!-- Use this section to describe how to customize the
      application. -->
   <sect1 id="totem-prefs">
     <title>Preferences</title>
@@ -962,11 +962,11 @@ subtitles, and more.</para>
 	<varlistentry>
 	  <term>Networking</term>
 	  <listitem>
-	    <para>Select network connection speed from the <guilabel>Connection speed</guilabel> 
+	    <para>Select network connection speed from the <guilabel>Connection speed</guilabel>
               drop-down list.
             </para>
           </listitem>
-        </varlistentry>	
+        </varlistentry>
 	<varlistentry>
 	  <term>Text Subtitles</term>
 	  <listitem>
@@ -985,7 +985,7 @@ subtitles, and more.</para>
               </listitem>
             </itemizedlist>
           </listitem>
-        </varlistentry>	
+        </varlistentry>
       </variablelist>
     </sect2>
     <sect2 id="totem-prefs-display">
@@ -1070,11 +1070,11 @@ subtitles, and more.</para>
   </sect1>
 
 <!-- ============= Bugs ================================== -->
-<!-- This section is optional and is commented out by default. 
-     You can use it to describe known bugs and limitations of the 
+<!-- This section is optional and is commented out by default.
+     You can use it to describe known bugs and limitations of the
 	  program if there are any - please be frank and list all
-     problems you know of. 
-  
+     problems you know of.
+
   <sect1 id="mayapp-bugs">
   <title>Known Bugs and Limitations</title>
   <para> </para>
@@ -1087,26 +1087,26 @@ subtitles, and more.</para>
       section is optional: primary place for this info is "About.." box of
       the program. However, if you do wish to include this info in the
       manual, this is the place to put it. Alternatively, you can put this information in the title page.-->
-  <sect1 id="totem-about"> 
-    <title>About <application>&app;</application></title> 
+  <sect1 id="totem-about">
+    <title>About <application>&app;</application></title>
     <para><application>&app;</application> is written by
       Bastien Nocera (<email>hadess hadess net</email>),
       Julien Moutte (<email>julien moutte net</email>) for the GStreamer backend,
       and Guenter Bartsch (<email>guenter users sourceforge net</email>).
-      To find more information about <application>&app;</application>, please visit the 
-      <ulink url="http://projects.gnome.org/totem/"; type="http"><application>&app;</application> 
-      website</ulink>. 
+      To find more information about <application>&app;</application>, please visit the
+      <ulink url="http://projects.gnome.org/totem/"; type="http"><application>&app;</application>
+      website</ulink>.
     </para>
     <para>
       To report a bug or make a suggestion regarding the <application>&app;</application> application or
-      this manual, follow the directions in the 
-      <ulink url="ghelp:user-guide#feedback" type="help">GNOME Feedback Page</ulink>. 
+      this manual, follow the directions in the
+      <ulink url="help:user-guide#feedback" type="help">GNOME Feedback Page</ulink>.
     </para>
     <para> This program is distributed under the terms of the GNU
       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> 
+  </sect1>
 </article>
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 45b4442..1d837b4 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,13 +1,13 @@
-include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
+ YELP_HELP_RULES@
 
-DOC_MODULE = totem
-DOC_ENTITIES = legal.xml
-DOC_H_FILE = totem-docs.h
-DOC_H_DOCS = C/totem.xml
-DOC_INCLUDES = 
+HELP_ID = totem
 
-DOC_FIGURES  = 	figures/totem_show_playlist_button.png 	\
+HELP_FILES = \
+	index.docbook \
+	legal.xml
+
+HELP_MEDIA = \
+		figures/totem_show_playlist_button.png 	\
 		figures/totem_next_button.png		\
 		figures/totem_start_window.png		\
 		figures/totem_pause_button.png		\
@@ -16,6 +16,6 @@ DOC_FIGURES  = 	figures/totem_show_playlist_button.png 	\
 		figures/totem_volume_mute_button.png	\
 		figures/totem_previous_button.png
 
-DOC_LINGUAS = bg ca cs da de el en_GB es eu fi fr gl it ja oc pa pl pt_BR ro ru sl sv te uk zh_CN zh_HK zh_TW
+HELP_LINGUAS = bg ca cs da de el en_GB es eu fi fr gl it ja oc pa pl pt_BR ro ru sl sv te uk zh_CN zh_HK zh_TW
 
 -include $(top_srcdir)/git.mk
diff --git a/src/totem-object.c b/src/totem-object.c
index 27f2df0..66edc0e 100644
--- a/src/totem-object.c
+++ b/src/totem-object.c
@@ -2129,7 +2129,7 @@ totem_action_show_help (TotemObject *totem)
 {
 	GError *error = NULL;
 
-	if (gtk_show_uri (gtk_widget_get_screen (totem->win), "ghelp:totem", gtk_get_current_event_time (), &error) == FALSE) {
+	if (gtk_show_uri (gtk_widget_get_screen (totem->win), "help:totem", gtk_get_current_event_time (), &error) == FALSE) {
 		totem_action_error (totem, _("Totem could not display the help contents."), error->message);
 		g_error_free (error);
 	}



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