From 2ced54ba17c63fda9f5da417f4dd0d5380db8b59 Mon Sep 17 00:00:00 2001
From: Stefano Karapetsas <stefano@karapetsas.com>
Date: Fri, 12 Jul 2013 22:00:50 +0200
Subject: Use yelp-tools instead of mate-doc-utils
---
Makefile.am | 7 +-
applets/clock/clock-utils.c | 4 +-
applets/fish/fish.c | 4 +-
applets/notification_area/main.c | 2 +-
applets/wncklet/wncklet.c | 4 +-
configure.ac | 4 +-
help/clock/C/index.docbook | 466 ++++++++++++++++++++++++++++++++++
help/clock/C/legal.xml | 2 +-
help/clock/C/mate-applet-clock.xml | 466 ----------------------------------
help/clock/Makefile.am | 14 +-
help/clock/mate-applet-clock.omf.in | 11 -
help/fish/C/index.docbook | 265 +++++++++++++++++++
help/fish/C/legal.xml | 4 +-
help/fish/C/mate-applet-fish.xml | 265 -------------------
help/fish/Makefile.am | 14 +-
help/fish/mate-applet-fish.omf.in | 11 -
mate-panel/libpanel-util/panel-show.c | 4 +-
mate-panel/panel.c | 1 +
18 files changed, 765 insertions(+), 783 deletions(-)
create mode 100644 help/clock/C/index.docbook
delete mode 100644 help/clock/C/mate-applet-clock.xml
delete mode 100644 help/clock/mate-applet-clock.omf.in
create mode 100644 help/fish/C/index.docbook
delete mode 100644 help/fish/C/mate-applet-fish.xml
delete mode 100644 help/fish/mate-applet-fish.omf.in
diff --git a/Makefile.am b/Makefile.am
index aeb373fb..6aa5c924 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,11 +15,7 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-introspection --disable-s
EXTRA_DIST = \
COPYING-DOCS \
- HACKING \
- mate-doc-utils.make
-
-DISTCLEANFILES = \
- mate-doc-utils.make
+ HACKING
MAINTAINERCLEANFILES = \
$(srcdir)/INSTALL \
@@ -36,7 +32,6 @@ MAINTAINERCLEANFILES = \
`find "$(srcdir)" -type f -name Makefile.in -print` \
$(srcdir)/configure \
$(srcdir)/gtk-doc.make \
- $(srcdir)/m4/mate-doc-utils.m4 \
$(srcdir)/m4/gtk-doc.m4 \
$(srcdir)/m4/intltool.m4 \
$(srcdir)/m4/libtool.m4 \
diff --git a/applets/clock/clock-utils.c b/applets/clock/clock-utils.c
index e6e46fa5..16dbcb9a 100644
--- a/applets/clock/clock-utils.c
+++ b/applets/clock/clock-utils.c
@@ -67,9 +67,9 @@ clock_utils_display_help (GtkWidget *widget,
char *uri;
if (link_id)
- uri = g_strdup_printf ("ghelp:%s?%s", doc_id, link_id);
+ uri = g_strdup_printf ("help:%s?%s", doc_id, link_id);
else
- uri = g_strdup_printf ("ghelp:%s", doc_id);
+ uri = g_strdup_printf ("help:%s", doc_id);
gtk_show_uri (gtk_widget_get_screen (widget), uri,
gtk_get_current_event_time (), &error);
diff --git a/applets/fish/fish.c b/applets/fish/fish.c
index 3d2c727c..01b9ed6c 100644
--- a/applets/fish/fish.c
+++ b/applets/fish/fish.c
@@ -147,9 +147,9 @@ static void show_help(FishApplet* fish, const char* link_id)
#define FISH_HELP_DOC "fish"
if (link_id)
- uri = g_strdup_printf ("ghelp:%s?%s", FISH_HELP_DOC, link_id);
+ uri = g_strdup_printf ("help:%s?%s", FISH_HELP_DOC, link_id);
else
- uri = g_strdup_printf ("ghelp:%s", FISH_HELP_DOC);
+ uri = g_strdup_printf ("help:%s", FISH_HELP_DOC);
gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (fish)), uri,
gtk_get_current_event_time (), &error);
diff --git a/applets/notification_area/main.c b/applets/notification_area/main.c
index 38832a7f..f752ca02 100644
--- a/applets/notification_area/main.c
+++ b/applets/notification_area/main.c
@@ -66,7 +66,7 @@ static void help_cb(GtkAction* action, AppletData* data)
char* uri;
#define NA_HELP_DOC "user-guide"
- uri = g_strdup_printf("ghelp:%s?%s", NA_HELP_DOC, "panels-notification-area");
+ uri = g_strdup_printf("help:%s?%s", NA_HELP_DOC, "panels-notification-area");
gtk_show_uri(gtk_widget_get_screen(GTK_WIDGET(data->applet)), uri, gtk_get_current_event_time(), &error);
diff --git a/applets/wncklet/wncklet.c b/applets/wncklet/wncklet.c
index 2b530c5f..819a1518 100644
--- a/applets/wncklet/wncklet.c
+++ b/applets/wncklet/wncklet.c
@@ -45,9 +45,9 @@ void wncklet_display_help(GtkWidget* widget, const char* doc_id, const char* lin
char* uri;
if (link_id)
- uri = g_strdup_printf("ghelp:%s?%s", doc_id, link_id);
+ uri = g_strdup_printf("help:%s?%s", doc_id, link_id);
else
- uri = g_strdup_printf("ghelp:%s", doc_id);
+ uri = g_strdup_printf("help:%s", doc_id);
gtk_show_uri(gtk_widget_get_screen(widget), uri, gtk_get_current_event_time(), &error);
diff --git a/configure.ac b/configure.ac
index 5aace91c..7071640c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -258,9 +258,9 @@ dnl gtk-doc stuff
GTK_DOC_CHECK([1.0])
-dnl mate-doc-utils stuff
+dnl yelp-tools stuff
-MATE_DOC_INIT
+YELP_HELP_INIT
GLIB_GSETTINGS
diff --git a/help/clock/C/index.docbook b/help/clock/C/index.docbook
new file mode 100644
index 00000000..4152c33d
--- /dev/null
+++ b/help/clock/C/index.docbook
@@ -0,0 +1,466 @@
+<?xml version="1.0"?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+ <!ENTITY legal SYSTEM "legal.xml">
+ <!ENTITY appletversion "2.5.3.1">
+ <!ENTITY manrevision "2.7">
+ <!ENTITY date "January 2010">
+ <!ENTITY applet "Clock">
+]>
+<!--
+ (Do not remove this comment block.)
+ Maintained by the MATE Documentation Project
+ http://developer.gnome.org/projects/gdp
+ Template version: 2.0 beta
+ Template last modified Feb 11, 2002
+
+-->
+<!-- =============Document Header ============================= -->
+<article id="index" lang="en">
+<!-- please do not change the id; for translations, change lang to -->
+<!-- appropriate code -->
+ <articleinfo>
+ <title>&applet; Manual</title>
+ <copyright>
+ <year>2009</year>
+ <year>2010</year>
+ <holder>Paul Cutler</holder>
+ </copyright>
+ <copyright>
+ <year>2002</year>
+ <year>2003</year>
+ <year>2004</year>
+ <holder>Sun Microsystems</holder>
+ </copyright>
+ <copyright>
+ <year>2000</year>
+ <holder>Dan Mueth</holder>
+ </copyright>
+<!-- translators: uncomment this:
+
+ <copyright>
+ <year>2002</year>
+ <holder>ME-THE-TRANSLATOR (Latin translation)</holder>
+ </copyright>
+
+ -->
+<!-- An address can be added to the publisher information. If a role is
+ not specified, the publisher/author is the same for all versions of the
+ document. -->
+ <publisher role="maintainer">
+ <publishername> MATE 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
+ any of this. -->
+
+ <authorgroup>
+ <author>
+ <firstname>Paul </firstname>
+ <surname> Cutler</surname>
+ <affiliation>
+ <orgname>MATE Documentation Project</orgname>
+ <address> <email>pcutler@gnome.org</email> </address>
+ </affiliation>
+ </author>
+ <author>
+ <firstname>Sun </firstname>
+ <surname>Microsystems</surname>
+ <affiliation>
+ <orgname>MATE Documentation Project</orgname>
+ <address></address>
+ </affiliation>
+ </author>
+ <author>
+ <firstname>Dan </firstname>
+ <surname> Mueth</surname>
+ <affiliation>
+ <orgname>MATE Documentation Project</orgname>
+ <address> <email>d-mueth@uchicago.edu</email> </address>
+ </affiliation>
+ </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>
+ </affiliation>
+ <contrib>Latin translation</contrib>
+ </othercredit>
+-->
+ </authorgroup>
+
+ <releaseinfo revision="2.28" role="review">
+ </releaseinfo>
+
+ <revhistory>
+
+ <revision>
+ <revnumber>&applet; Applet Manual V&manrevision;</revnumber>
+ <date>&date;</date>
+ <revdescription>
+ <para role="author">Paul Cutler</para>
+ <para role="publisher">MATE Documentation Project</para>
+ </revdescription>
+ </revision>
+ <revision>
+ <revnumber>Clock Applet Manual V2.6</revnumber>
+ <date>&date;</date>
+ <revdescription>
+ <para role="author">Paul Cutler</para>
+ <para role="publisher">MATE Documentation Project</para>
+ </revdescription>
+ </revision>
+ <revision>
+ <revnumber>Clock Applet Manual V2.5</revnumber>
+ <date>February 2004</date>
+ <revdescription>
+ <para role="author">Sun Microsystems</para>
+ <para role="publisher">MATE Documentation Project</para>
+ </revdescription>
+ </revision>
+ <revision>
+ <revnumber>Clock Applet Manual V2.4</revnumber>
+ <date>September 2003</date>
+ <revdescription>
+ <para role="author">Sun Microsystems</para>
+ <para role="publisher">MATE Documentation Project</para>
+ </revdescription>
+ </revision>
+ <revision>
+ <revnumber>Clock Applet Manual V2.3</revnumber>
+ <date>January 2003</date>
+ <revdescription>
+ <para role="author">Sun Microsystems</para>
+ <para role="publisher">MATE Documentation Project</para>
+ </revdescription>
+ </revision>
+ <revision>
+ <revnumber>Clock Applet Manual V2.2</revnumber>
+ <date>August 2002</date>
+ <revdescription>
+ <para role="author">Sun Microsystems</para>
+ <para role="publisher">MATE Documentation Project</para>
+ </revdescription>
+ </revision>
+ <revision>
+ <revnumber>Clock Applet Manual V2.1</revnumber>
+ <date>June 2002</date>
+ <revdescription>
+ <para role="author">Sun Microsystems</para>
+ <para role="publisher">MATE Documentation Project</para>
+ </revdescription>
+ </revision>
+ <revision>
+ <revnumber>Clock Applet Manual V2.0</revnumber>
+ <date>March 2002</date>
+ <revdescription>
+ <para role="author">Sun Microsystems</para>
+ <para role="publisher">MATE Documentation Project</para>
+ </revdescription>
+ </revision>
+ <revision>
+ <revnumber>&applet; Applet Manual</revnumber>
+ <date>April 2000</date>
+ <revdescription>
+ <para role="author">Dan Mueth
+ <email>d-mueth@uchicago.edu</email></para>
+ <para role="publisher">MATE Documentation Project</para>
+ </revdescription>
+ </revision>
+ </revhistory>
+ <releaseinfo> This manual describes version &appletversion; of the &applet; applet.
+ </releaseinfo>
+ <legalnotice>
+ <title>Feedback</title>
+ <para> To report a bug or make a suggestion regarding the &applet; applet or this manual, follow the directions in the <ulink url="help:mate-feedback" type="help">MATE Feedback Page</ulink>. </para>
+
+ </legalnotice>
+ <abstract role="description">
+ <para>The <application>&applet;</application> applet displays the date and time, and when clicked, displays a calendar. The <application>&applet;</application> can be customized to show seconds or a 12 or 24 hour clock.</para>
+ </abstract>
+ </articleinfo>
+ <indexterm>
+ <primary>Clock</primary>
+ </indexterm>
+<!-- ============= Document Body ============================= -->
+
+<!-- ============= Introduction ============================== -->
+
+ <sect1 id="clock-introduction">
+ <title>Introduction</title>
+
+<!-- ==== Figure ============================================= -->
+ <figure id="clock-fig">
+ <title>&applet; Applet</title>
+ <screenshot>
+ <mediaobject>
+ <imageobject><imagedata fileref="figures/clock_applet.png"
+ format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>Shows &applet; applet.</phrase>
+ </textobject>
+ </mediaobject>
+ </screenshot>
+ </figure>
+ <!-- ==== End of Figure ======================================= -->
+<para>
+The <application>&applet;</application> applet displays the date and time, and when clicked, displays a calendar. The <application>&applet;</application> can be customized to show seconds or a 12 or 24 hour clock.
+</para>
+
+
+
+<sect2 id="clock-introduction-add">
+<title>To Add &applet; to a Panel</title>
+ <para>Perform the following steps:</para>
+ <orderedlist>
+ <listitem>
+ <para>
+ Right-click on the panel.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Choose <guimenuitem>Add to Panel</guimenuitem>.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Scroll down the list of items in the <guilabel>Add to Panel</guilabel> dialog, then select <guilabel>Clock</guilabel>.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Click <guibutton>Add</guibutton>.
+ </para>
+ </listitem>
+ </orderedlist>
+ </sect2>
+</sect1>
+<!-- ================ Usage ================================ -->
+
+ <sect1 id="clock-usage">
+ <title>Usage</title>
+
+ <sect2 id="clock-usage-calendar">
+ <title>To Show the Calendar</title>
+ <para>Click on the applet to open a small calendar showing the current month. To close the calendar, click again on the part of the applet that is in the panel.</para>
+
+ <para>You can change the month shown in the calendar by clicking the arrows to each side of the month and year text.</para>
+
+ <para>Double-click a day in the calendar to launch the <application>Evolution</application> groupware application.</para>
+ </sect2>
+
+ <sect2 id="clock-usage-copy">
+ <title>To Insert the Date or Time Into an Application</title>
+<para>The <application>&applet;</application> applet takes the time from the system clock.
+</para>
+<para>
+ To insert the date or time from the <application>&applet;</application> applet into an application, perform the following steps:</para>
+ <orderedlist>
+ <listitem>
+ <para>Right-click on the <application>&applet;</application> applet.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Choose one of the following menu items from the applet popup menu:
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <guimenuitem>Copy Time</guimenuitem>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <guimenuitem>Copy Date</guimenuitem>
+ </para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+ <listitem>
+ <para>
+ Point to the location in your application where you want to insert the item.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Paste</guimenuitem> </menuchoice> or middle-click to insert the item.
+ </para>
+ </listitem>
+ </orderedlist>
+ </sect2>
+
+ <sect2 id="clock-usage-adjust">
+ <title>To Adjust the System Date or Time</title>
+ <para>To adjust the system date or time that the <application>&applet;</application> applet displays, perform the following steps: </para>
+ <orderedlist>
+ <listitem>
+ <para>Right-click on the applet, then choose <guimenuitem>Adjust Date & Time</guimenuitem>.
+ </para>
+ </listitem>
+ <listitem>
+ <para>Type the <literal>root</literal> password, then click <guibutton>OK</guibutton>.
+ </para>
+ </listitem>
+ <listitem>
+ <para>The <application>&applet;</application> applet starts the system tool that sets the system date and time. Use the tool to adjust the date and time.
+ </para>
+ </listitem>
+ </orderedlist>
+ </sect2>
+
+</sect1>
+
+<!-- ============= Preferences ============================= -->
+
+<sect1 id="clock-settings">
+<title>Clock Preferences</title>
+ <para>
+ To configure the <application>&applet;</application>, right-click on the applet, then choose <guimenuitem>Preferences</guimenuitem>. You will be presented with three tabs to change preferences for <guimenuitem>General</guimenuitem>, <guimenuitem>Locations</guimenuitem> or <guimenuitem>Weather</guimenuitem>.</para>
+
+
+<sect2 id="generalprefs">
+ <title>General Preferences</title>
+ <variablelist>
+ <varlistentry>
+ <term><guilabel>Clock Format</guilabel></term>
+ <listitem>
+ <para>Select one of the following options:</para>
+ <itemizedlist>
+ <listitem>
+ <para><guilabel>12 hour</guilabel></para>
+ <para>Display the time in the a.m./p.m. format.</para>
+ <note><para>This option is not shown if your session language does not use the 12 hour clock.
+ </para></note>
+ </listitem>
+ <listitem>
+ <para><guilabel>24 hour</guilabel></para>
+ <para>Display the time in the 00.00 to 24.00 format.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><guilabel>Show the date</guilabel></term>
+ <listitem>
+ <para>Select this option to display the date in the applet.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><guilabel>Show seconds</guilabel></term>
+ <listitem>
+ <para>Select this option to display seconds in the applet.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><guilabel>Show the weather</guilabel></term>
+ <listitem>
+ <para>Select this option to display the the current weather forecast at your location.
+ The weather will be displayed as an icon for sunny, cloudy, rain or more.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><guilabel>Show temperature</guilabel></term>
+ <listitem>
+ <para>Select this option to display the temperature at your location.</para>
+ </listitem>
+ </varlistentry>
+
+ </variablelist>
+
+</sect2>
+
+<sect2 id="locationprefs">
+ <title>Location Preferences</title>
+
+ <variablelist>
+ <varlistentry>
+ <term><guilabel>Locations</guilabel></term>
+ <listitem>
+ <para>You can add one or more locations and their local time to be displayed in the Clock.
+ To add a location:</para>
+ <itemizedlist>
+ <listitem>
+ <para>Press <guilabel>Add</guilabel></para>
+ </listitem>
+ <listitem>
+ <para>Type the city, region or country name and as you type a list of options will appear
+ in a drop down box. Select a match from the pop-up and the <guilabel>Timezone</guilabel>,
+ <guilabel>Latitude</guilabel>, and <guilabel>Longitude</guilabel> entries will be
+ automatically filled in.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+
+</sect2>
+
+
+<sect2 id="weatherprefs">
+ <title>Weather Preferences</title>
+
+ <variablelist>
+ <varlistentry>
+ <term><guilabel>Weather</guilabel></term>
+ <listitem>
+ <para>You can display the Temperature unit in one of the following options from the drop down box:
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para><guilabel>F</guilabel> (Fahrenheit)</para>
+ </listitem>
+ <listitem>
+ <para><guilabel>C</guilabel> (Celsius)</para>
+ </listitem>
+ <listitem>
+ <para><guilabel>K</guilabel> (Kelvin)</para>
+ </listitem>
+ <listitem>
+ <para><guilabel>Default</guilabel> The default display for your region.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><guilabel>Wind speed unit</guilabel></term>
+ <listitem>
+ <para>You can display the Speed unit in one of the following options from the drop down box:
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para><guilabel>Beaufort scale</guilabel></para>
+ </listitem>
+ <listitem>
+ <para><guilabel>Knots</guilabel></para>
+ </listitem>
+ <listitem>
+ <para><guilabel>mph</guilabel> (miles per hour)</para>
+ </listitem>
+ <listitem>
+ <para><guilabel>km/h</guilabel> (kilometers per hour)</para>
+ </listitem>
+ <listitem>
+ <para><guilabel>Dm/a</guilabel> (meters per second)</para>
+ </listitem>
+ <listitem>
+ <para><guilabel>Default</guilabel> The default display for your region.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+
+
+</sect2>
+</sect1>
+
+</article>
diff --git a/help/clock/C/legal.xml b/help/clock/C/legal.xml
index 16b471c2..999af980 100644
--- a/help/clock/C/legal.xml
+++ b/help/clock/C/legal.xml
@@ -6,7 +6,7 @@ terms of the GNU Free DocumentationLicense (GFDL), Version 1.1 or any later
version published 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 url="ghelp:fdl" type="help">link</ulink>
+ <ulink url="help:fdl" type="help">link</ulink>
or in the file COPYING-DOCS distributed with this manual.</para>
<para>
diff --git a/help/clock/C/mate-applet-clock.xml b/help/clock/C/mate-applet-clock.xml
deleted file mode 100644
index 416018c5..00000000
--- a/help/clock/C/mate-applet-clock.xml
+++ /dev/null
@@ -1,466 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
- <!ENTITY legal SYSTEM "legal.xml">
- <!ENTITY appletversion "2.5.3.1">
- <!ENTITY manrevision "2.7">
- <!ENTITY date "January 2010">
- <!ENTITY applet "Clock">
-]>
-<!--
- (Do not remove this comment block.)
- Maintained by the MATE Documentation Project
- http://developer.gnome.org/projects/gdp
- Template version: 2.0 beta
- Template last modified Feb 11, 2002
-
--->
-<!-- =============Document Header ============================= -->
-<article id="index" lang="en">
-<!-- please do not change the id; for translations, change lang to -->
-<!-- appropriate code -->
- <articleinfo>
- <title>&applet; Manual</title>
- <copyright>
- <year>2009</year>
- <year>2010</year>
- <holder>Paul Cutler</holder>
- </copyright>
- <copyright>
- <year>2002</year>
- <year>2003</year>
- <year>2004</year>
- <holder>Sun Microsystems</holder>
- </copyright>
- <copyright>
- <year>2000</year>
- <holder>Dan Mueth</holder>
- </copyright>
-<!-- translators: uncomment this:
-
- <copyright>
- <year>2002</year>
- <holder>ME-THE-TRANSLATOR (Latin translation)</holder>
- </copyright>
-
- -->
-<!-- An address can be added to the publisher information. If a role is
- not specified, the publisher/author is the same for all versions of the
- document. -->
- <publisher role="maintainer">
- <publishername> MATE 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
- any of this. -->
-
- <authorgroup>
- <author>
- <firstname>Paul </firstname>
- <surname> Cutler</surname>
- <affiliation>
- <orgname>MATE Documentation Project</orgname>
- <address> <email>pcutler@gnome.org</email> </address>
- </affiliation>
- </author>
- <author>
- <firstname>Sun </firstname>
- <surname>Microsystems</surname>
- <affiliation>
- <orgname>MATE Documentation Project</orgname>
- <address></address>
- </affiliation>
- </author>
- <author>
- <firstname>Dan </firstname>
- <surname> Mueth</surname>
- <affiliation>
- <orgname>MATE Documentation Project</orgname>
- <address> <email>d-mueth@uchicago.edu</email> </address>
- </affiliation>
- </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>
- </affiliation>
- <contrib>Latin translation</contrib>
- </othercredit>
--->
- </authorgroup>
-
- <releaseinfo revision="2.28" role="review">
- </releaseinfo>
-
- <revhistory>
-
- <revision>
- <revnumber>&applet; Applet Manual V&manrevision;</revnumber>
- <date>&date;</date>
- <revdescription>
- <para role="author">Paul Cutler</para>
- <para role="publisher">MATE Documentation Project</para>
- </revdescription>
- </revision>
- <revision>
- <revnumber>Clock Applet Manual V2.6</revnumber>
- <date>&date;</date>
- <revdescription>
- <para role="author">Paul Cutler</para>
- <para role="publisher">MATE Documentation Project</para>
- </revdescription>
- </revision>
- <revision>
- <revnumber>Clock Applet Manual V2.5</revnumber>
- <date>February 2004</date>
- <revdescription>
- <para role="author">Sun Microsystems</para>
- <para role="publisher">MATE Documentation Project</para>
- </revdescription>
- </revision>
- <revision>
- <revnumber>Clock Applet Manual V2.4</revnumber>
- <date>September 2003</date>
- <revdescription>
- <para role="author">Sun Microsystems</para>
- <para role="publisher">MATE Documentation Project</para>
- </revdescription>
- </revision>
- <revision>
- <revnumber>Clock Applet Manual V2.3</revnumber>
- <date>January 2003</date>
- <revdescription>
- <para role="author">Sun Microsystems</para>
- <para role="publisher">MATE Documentation Project</para>
- </revdescription>
- </revision>
- <revision>
- <revnumber>Clock Applet Manual V2.2</revnumber>
- <date>August 2002</date>
- <revdescription>
- <para role="author">Sun Microsystems</para>
- <para role="publisher">MATE Documentation Project</para>
- </revdescription>
- </revision>
- <revision>
- <revnumber>Clock Applet Manual V2.1</revnumber>
- <date>June 2002</date>
- <revdescription>
- <para role="author">Sun Microsystems</para>
- <para role="publisher">MATE Documentation Project</para>
- </revdescription>
- </revision>
- <revision>
- <revnumber>Clock Applet Manual V2.0</revnumber>
- <date>March 2002</date>
- <revdescription>
- <para role="author">Sun Microsystems</para>
- <para role="publisher">MATE Documentation Project</para>
- </revdescription>
- </revision>
- <revision>
- <revnumber>&applet; Applet Manual</revnumber>
- <date>April 2000</date>
- <revdescription>
- <para role="author">Dan Mueth
- <email>d-mueth@uchicago.edu</email></para>
- <para role="publisher">MATE Documentation Project</para>
- </revdescription>
- </revision>
- </revhistory>
- <releaseinfo> This manual describes version &appletversion; of the &applet; applet.
- </releaseinfo>
- <legalnotice>
- <title>Feedback</title>
- <para> To report a bug or make a suggestion regarding the &applet; applet or this manual, follow the directions in the <ulink url="ghelp:mate-feedback" type="help">MATE Feedback Page</ulink>. </para>
-
- </legalnotice>
- <abstract role="description">
- <para>The <application>&applet;</application> applet displays the date and time, and when clicked, displays a calendar. The <application>&applet;</application> can be customized to show seconds or a 12 or 24 hour clock.</para>
- </abstract>
- </articleinfo>
- <indexterm>
- <primary>Clock</primary>
- </indexterm>
-<!-- ============= Document Body ============================= -->
-
-<!-- ============= Introduction ============================== -->
-
- <sect1 id="clock-introduction">
- <title>Introduction</title>
-
-<!-- ==== Figure ============================================= -->
- <figure id="clock-fig">
- <title>&applet; Applet</title>
- <screenshot>
- <mediaobject>
- <imageobject><imagedata fileref="figures/clock_applet.png"
- format="PNG"/>
- </imageobject>
- <textobject>
- <phrase>Shows &applet; applet.</phrase>
- </textobject>
- </mediaobject>
- </screenshot>
- </figure>
- <!-- ==== End of Figure ======================================= -->
-<para>
-The <application>&applet;</application> applet displays the date and time, and when clicked, displays a calendar. The <application>&applet;</application> can be customized to show seconds or a 12 or 24 hour clock.
-</para>
-
-
-
-<sect2 id="clock-introduction-add">
-<title>To Add &applet; to a Panel</title>
- <para>Perform the following steps:</para>
- <orderedlist>
- <listitem>
- <para>
- Right-click on the panel.
- </para>
- </listitem>
- <listitem>
- <para>
- Choose <guimenuitem>Add to Panel</guimenuitem>.
- </para>
- </listitem>
- <listitem>
- <para>
- Scroll down the list of items in the <guilabel>Add to Panel</guilabel> dialog, then select <guilabel>Clock</guilabel>.
- </para>
- </listitem>
- <listitem>
- <para>
- Click <guibutton>Add</guibutton>.
- </para>
- </listitem>
- </orderedlist>
- </sect2>
-</sect1>
-<!-- ================ Usage ================================ -->
-
- <sect1 id="clock-usage">
- <title>Usage</title>
-
- <sect2 id="clock-usage-calendar">
- <title>To Show the Calendar</title>
- <para>Click on the applet to open a small calendar showing the current month. To close the calendar, click again on the part of the applet that is in the panel.</para>
-
- <para>You can change the month shown in the calendar by clicking the arrows to each side of the month and year text.</para>
-
- <para>Double-click a day in the calendar to launch the <application>Evolution</application> groupware application.</para>
- </sect2>
-
- <sect2 id="clock-usage-copy">
- <title>To Insert the Date or Time Into an Application</title>
-<para>The <application>&applet;</application> applet takes the time from the system clock.
-</para>
-<para>
- To insert the date or time from the <application>&applet;</application> applet into an application, perform the following steps:</para>
- <orderedlist>
- <listitem>
- <para>Right-click on the <application>&applet;</application> applet.
- </para>
- </listitem>
- <listitem>
- <para>
- Choose one of the following menu items from the applet popup menu:
- </para>
- <itemizedlist>
- <listitem>
- <para>
- <guimenuitem>Copy Time</guimenuitem>
- </para>
- </listitem>
- <listitem>
- <para>
- <guimenuitem>Copy Date</guimenuitem>
- </para>
- </listitem>
- </itemizedlist>
- </listitem>
- <listitem>
- <para>
- Point to the location in your application where you want to insert the item.
- </para>
- </listitem>
- <listitem>
- <para>
- Choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Paste</guimenuitem> </menuchoice> or middle-click to insert the item.
- </para>
- </listitem>
- </orderedlist>
- </sect2>
-
- <sect2 id="clock-usage-adjust">
- <title>To Adjust the System Date or Time</title>
- <para>To adjust the system date or time that the <application>&applet;</application> applet displays, perform the following steps: </para>
- <orderedlist>
- <listitem>
- <para>Right-click on the applet, then choose <guimenuitem>Adjust Date & Time</guimenuitem>.
- </para>
- </listitem>
- <listitem>
- <para>Type the <literal>root</literal> password, then click <guibutton>OK</guibutton>.
- </para>
- </listitem>
- <listitem>
- <para>The <application>&applet;</application> applet starts the system tool that sets the system date and time. Use the tool to adjust the date and time.
- </para>
- </listitem>
- </orderedlist>
- </sect2>
-
-</sect1>
-
-<!-- ============= Preferences ============================= -->
-
-<sect1 id="clock-settings">
-<title>Clock Preferences</title>
- <para>
- To configure the <application>&applet;</application>, right-click on the applet, then choose <guimenuitem>Preferences</guimenuitem>. You will be presented with three tabs to change preferences for <guimenuitem>General</guimenuitem>, <guimenuitem>Locations</guimenuitem> or <guimenuitem>Weather</guimenuitem>.</para>
-
-
-<sect2 id="generalprefs">
- <title>General Preferences</title>
- <variablelist>
- <varlistentry>
- <term><guilabel>Clock Format</guilabel></term>
- <listitem>
- <para>Select one of the following options:</para>
- <itemizedlist>
- <listitem>
- <para><guilabel>12 hour</guilabel></para>
- <para>Display the time in the a.m./p.m. format.</para>
- <note><para>This option is not shown if your session language does not use the 12 hour clock.
- </para></note>
- </listitem>
- <listitem>
- <para><guilabel>24 hour</guilabel></para>
- <para>Display the time in the 00.00 to 24.00 format.</para>
- </listitem>
- </itemizedlist>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><guilabel>Show the date</guilabel></term>
- <listitem>
- <para>Select this option to display the date in the applet.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><guilabel>Show seconds</guilabel></term>
- <listitem>
- <para>Select this option to display seconds in the applet.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><guilabel>Show the weather</guilabel></term>
- <listitem>
- <para>Select this option to display the the current weather forecast at your location.
- The weather will be displayed as an icon for sunny, cloudy, rain or more.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><guilabel>Show temperature</guilabel></term>
- <listitem>
- <para>Select this option to display the temperature at your location.</para>
- </listitem>
- </varlistentry>
-
- </variablelist>
-
-</sect2>
-
-<sect2 id="locationprefs">
- <title>Location Preferences</title>
-
- <variablelist>
- <varlistentry>
- <term><guilabel>Locations</guilabel></term>
- <listitem>
- <para>You can add one or more locations and their local time to be displayed in the Clock.
- To add a location:</para>
- <itemizedlist>
- <listitem>
- <para>Press <guilabel>Add</guilabel></para>
- </listitem>
- <listitem>
- <para>Type the city, region or country name and as you type a list of options will appear
- in a drop down box. Select a match from the pop-up and the <guilabel>Timezone</guilabel>,
- <guilabel>Latitude</guilabel>, and <guilabel>Longitude</guilabel> entries will be
- automatically filled in.</para>
- </listitem>
- </itemizedlist>
- </listitem>
- </varlistentry>
- </variablelist>
-
-</sect2>
-
-
-<sect2 id="weatherprefs">
- <title>Weather Preferences</title>
-
- <variablelist>
- <varlistentry>
- <term><guilabel>Weather</guilabel></term>
- <listitem>
- <para>You can display the Temperature unit in one of the following options from the drop down box:
- </para>
- <itemizedlist>
- <listitem>
- <para><guilabel>F</guilabel> (Fahrenheit)</para>
- </listitem>
- <listitem>
- <para><guilabel>C</guilabel> (Celsius)</para>
- </listitem>
- <listitem>
- <para><guilabel>K</guilabel> (Kelvin)</para>
- </listitem>
- <listitem>
- <para><guilabel>Default</guilabel> The default display for your region.</para>
- </listitem>
- </itemizedlist>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><guilabel>Wind speed unit</guilabel></term>
- <listitem>
- <para>You can display the Speed unit in one of the following options from the drop down box:
- </para>
- <itemizedlist>
- <listitem>
- <para><guilabel>Beaufort scale</guilabel></para>
- </listitem>
- <listitem>
- <para><guilabel>Knots</guilabel></para>
- </listitem>
- <listitem>
- <para><guilabel>mph</guilabel> (miles per hour)</para>
- </listitem>
- <listitem>
- <para><guilabel>km/h</guilabel> (kilometers per hour)</para>
- </listitem>
- <listitem>
- <para><guilabel>Dm/a</guilabel> (meters per second)</para>
- </listitem>
- <listitem>
- <para><guilabel>Default</guilabel> The default display for your region.</para>
- </listitem>
- </itemizedlist>
- </listitem>
- </varlistentry>
- </variablelist>
-
-
-</sect2>
-</sect1>
-
-</article>
diff --git a/help/clock/Makefile.am b/help/clock/Makefile.am
index 658d88cd..80e31873 100644
--- a/help/clock/Makefile.am
+++ b/help/clock/Makefile.am
@@ -1,9 +1,13 @@
-include $(top_srcdir)/mate-doc-utils.make
-dist-hook: doc-dist-hook
+@YELP_HELP_RULES@
-DOC_MODULE = mate-applet-clock
-DOC_INCLUDES = legal.xml
+HELP_ID = clock
-DOC_LINGUAS = ar ca cs da de el en_GB es eu fi fr it ja ko nl oc pa pt pt_BR ru sr sv th uk zh_CN zh_HK zh_TW
+HELP_FILES = \
+ index.docbook \
+ legal.xml
+
+HELP_MEDIA =
+
+HELP_LINGUAS = ar ca cs da de el en_GB es eu fi fr it ja ko nl oc pa pt pt_BR ru sr sv th uk zh_CN zh_HK zh_TW
-include $(top_srcdir)/git.mk
diff --git a/help/clock/mate-applet-clock.omf.in b/help/clock/mate-applet-clock.omf.in
deleted file mode 100644
index 5540289e..00000000
--- a/help/clock/mate-applet-clock.omf.in
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<omf>
- <resource>
- <subject category="GNOME|Applets|Accessories"/>
- <type>
- user's guide
- </type>
- <relation seriesid="dc1bc4d4-40e7-11d6-8b82-b4eda00d7b63"/>
- <rights type="GNU FDL" license.version="1.1" holder="Sun Microsystems"/>
- </resource>
-</omf>
diff --git a/help/fish/C/index.docbook b/help/fish/C/index.docbook
new file mode 100644
index 00000000..4d340e0d
--- /dev/null
+++ b/help/fish/C/index.docbook
@@ -0,0 +1,265 @@
+<?xml version="1.0"?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+ <!ENTITY legal SYSTEM "legal.xml">
+ <!ENTITY appletversion "3.4.7.4ac19">
+ <!ENTITY manrevision "2.5">
+ <!ENTITY date "June 2009">
+ <!ENTITY applet "Fish">
+]>
+
+<!--
+ (Do not remove this comment block.)
+ Maintained by the MATE Documentation Project
+ http://developer.gnome.org/projects/gdp
+ Template version: 2.0 beta
+ Template last modified Mar 12, 2002
+
+-->
+
+<article id="index" lang="en">
+<!-- please do not change the id; for translations, change lang to -->
+<!-- appropriate code -->
+ <articleinfo>
+ <title>&applet; Manual</title>
+ <copyright>
+ <year>2009</year>
+ <holder>Paul Cutler</holder>
+ </copyright>
+ <copyright>
+ <year>2002</year>
+ <year>2003</year>
+ <holder>Sun Microsystems</holder>
+ </copyright>
+ <copyright>
+ <year>2000</year>
+ <holder>Telsa Gwynne</holder>
+ </copyright>
+<!-- translators: uncomment this:
+
+ <copyright>
+ <year>2002</year>
+ <holder>ME-THE-TRANSLATOR (Latin translation)</holder>
+ </copyright>
+
+ -->
+
+ <publisher role="maintainer">
+ <publishername>MATE Documentation Project</publishername>
+ </publisher>
+
+&legal;
+
+
+ <authorgroup>
+ <author>
+ <firstname>Paul</firstname>
+ <surname>Cutler</surname>
+ <affiliation>
+ <orgname>MATE Documentation Project</orgname>
+ <address> <email>pcutler@gnome.org</email> </address>
+ </affiliation>
+ </author>
+ <author>
+ <firstname>Sun</firstname>
+ <surname>MATE Documentation Team</surname>
+ <affiliation>
+ <orgname>Sun Microsystems</orgname>
+ <address></address>
+ </affiliation>
+ </author>
+ <author>
+ <firstname>Telsa</firstname>
+ <surname>Gwynne</surname>
+ <affiliation>
+ <orgname>MATE Documentation Project</orgname>
+ <address> <email>hobbit@aloss.ukuu.org.uk</email> </address>
+ </affiliation>
+ </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>
+ </affiliation>
+ <contrib>Latin translation</contrib>
+ </othercredit>
+-->
+ </authorgroup>
+
+ <releaseinfo revision="2.28" role="review">
+ </releaseinfo>
+
+ <revhistory>
+ <revision>
+ <revnumber>&applet; Applet Manual V&manrevision;</revnumber>
+ <date>&date;</date>
+ <revdescription>
+ <para role="author">Sun MATE Documentation Team</para>
+ <para role="publisher">MATE Documentation Project</para>
+ </revdescription>
+ </revision>
+ <revision>
+ <revnumber>Fish Applet Manual V2.4</revnumber>
+ <date>&date;</date>
+ <revdescription>
+ <para role="author">Sun MATE Documentation Team</para>
+ <para role="publisher">MATE Documentation Project</para>
+ </revdescription>
+ </revision>
+ <revision>
+ <revnumber>Fish Applet Manual V2.2</revnumber>
+ <date>January 2003</date>
+ <revdescription>
+ <para role="author">Sun MATE Documentation Team</para>
+ <para role="publisher">MATE Documentation Project</para>
+ </revdescription>
+ </revision>
+ <revision>
+ <revnumber>Fish Applet Manual V2.1</revnumber>
+ <date>August 2002</date>
+ <revdescription>
+ <para role="author">Sun MATE Documentation Team</para>
+ <para role="publisher">MATE Documentation Project</para>
+ </revdescription>
+ </revision>
+ <revision>
+ <revnumber>Fish Applet Manual V2.0</revnumber>
+ <date>May 2002</date>
+ <revdescription>
+ <para role="author">Sun MATE Documentation Team</para>
+ <para role="publisher">MATE Documentation Project</para>
+ </revdescription>
+ </revision>
+ <revision>
+ <revnumber>Fish Applet Manual</revnumber>
+ <date>2000</date>
+ <revdescription>
+ <para role="author">Telsa Gwynne
+ <email>hobbit@aloss.ukuu.org.uk</email></para>
+ <para role="publisher">MATE Documentation Project</para>
+ </revdescription>
+ </revision>
+ </revhistory>
+ <releaseinfo> This manual describes version &appletversion; of &applet;.
+ </releaseinfo>
+ <legalnotice>
+ <title>Feedback</title>
+ <para> To report a bug or make a suggestion regarding the &applet; applet or this
+ manual, follow the directions in the
+ <ulink url="help:mate-feedback" type="help">MATE Feedback Page</ulink>. </para>
+
+ </legalnotice>
+ <abstract role="description">
+ <para>The &applet; applet displays an animated image in the panel and gives you
+ your fortune when clicked.</para>
+ </abstract>
+ </articleinfo>
+ <indexterm>
+ <primary>Fish</primary>
+ </indexterm>
+
+<!-- ============= Document Body ============================= -->
+<!-- ============= Introduction ============================== -->
+<sect1 id="fish-introduction">
+<title>Introduction</title>
+<!-- ==== Figure ============================================= -->
+ <figure id="fish-fig">
+ <title>&applet; Applet</title>
+ <screenshot>
+ <mediaobject>
+ <imageobject><imagedata fileref="figures/fish_applet.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>Shows Fish applet.</phrase>
+ </textobject>
+ </mediaobject>
+ </screenshot>
+ </figure>
+ <!-- ==== End of Figure ======================================= -->
+<para>The <application>&applet;</application> applet displays an animated fish in the panel. You can customize the fish's name and the program that is run when the fish is clicked in the panel. By default, the program that is run when the fish is clicked is <application>Fortune</application>, which displays a usually comical random message from a database of quotations.</para>
+
+
+
+
+<para>You can customize the image shown and the command that is run when it is clicked.</para>
+<sect2 id="fish-introduction-add">
+<title>To Add &applet; to a Panel</title>
+ <para>Perform the following steps:</para>
+ <orderedlist>
+ <listitem>
+ <para>
+ Right-click on the panel.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Choose <guimenuitem>Add to Panel</guimenuitem>.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Scroll down the list of items in the <guilabel>Add to Panel</guilabel> dialog, then select <guilabel>Fish</guilabel>.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Click <guibutton>Add</guibutton>.
+ </para>
+ </listitem>
+ </orderedlist>
+ </sect2></sect1>
+
+<sect1 id="fish-usage">
+<title>Usage</title>
+<para>Click on the applet to display the <guilabel>Wanda the Fish</guilabel> dialog. The dialog typically displays a fortune cookie. You can configure the applet to specify the command to run when you click on the applet. See <xref linkend="fish-settings"/> for more information.</para>
+</sect1>
+
+<!-- ============= Preferences ================================ -->
+<sect1 id="fish-settings">
+<title>Preferences</title>
+<para>To configure <application>&applet;</application>, right-click on the <application>
+&applet;</application> applet, then choose <guimenu>Preferences</guimenu>. </para>
+<variablelist>
+<varlistentry>
+<term><guilabel>Name of fish</guilabel> </term>
+<listitem>
+<para>Use this text box to specify the name of the fish.</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term><guilabel>Command to run when clicked</guilabel> </term>
+<listitem>
+<para>By default, <application>&applet;</application> runs the <literal>fortune</literal> command when you click on the applet. Use this text box to specify an alternative command to run. </para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term><guilabel>File</guilabel> </term>
+<listitem>
+<para>Use this field to select the image to display in the applet. You can select an image that is supplied with the applet or a personal image.</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term><guilabel>Total frames in animation</guilabel> </term>
+<listitem>
+<para>Use this spin box to specify the number of frames in the animation. </para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term><guilabel>Pause per frame</guilabel> </term>
+<listitem>
+<para>Use this spin box to specify the pause in seconds between each frame in the animation.</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term><guilabel>Rotate on vertical panels</guilabel> </term>
+<listitem>
+<para>Select this option to rotate the applet image when you add the applet to a vertical panel.</para>
+</listitem>
+</varlistentry>
+</variablelist>
+</sect1>
+</article>
diff --git a/help/fish/C/legal.xml b/help/fish/C/legal.xml
index 29f07269..ba4807ba 100644
--- a/help/fish/C/legal.xml
+++ b/help/fish/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 MATE manuals
@@ -73,4 +73,4 @@
</orderedlist>
</para>
</legalnotice>
-
\ No newline at end of file
+
diff --git a/help/fish/C/mate-applet-fish.xml b/help/fish/C/mate-applet-fish.xml
deleted file mode 100644
index 0760a6f8..00000000
--- a/help/fish/C/mate-applet-fish.xml
+++ /dev/null
@@ -1,265 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
- <!ENTITY legal SYSTEM "legal.xml">
- <!ENTITY appletversion "3.4.7.4ac19">
- <!ENTITY manrevision "2.5">
- <!ENTITY date "June 2009">
- <!ENTITY applet "Fish">
-]>
-
-<!--
- (Do not remove this comment block.)
- Maintained by the MATE Documentation Project
- http://developer.gnome.org/projects/gdp
- Template version: 2.0 beta
- Template last modified Mar 12, 2002
-
--->
-
-<article id="index" lang="en">
-<!-- please do not change the id; for translations, change lang to -->
-<!-- appropriate code -->
- <articleinfo>
- <title>&applet; Manual</title>
- <copyright>
- <year>2009</year>
- <holder>Paul Cutler</holder>
- </copyright>
- <copyright>
- <year>2002</year>
- <year>2003</year>
- <holder>Sun Microsystems</holder>
- </copyright>
- <copyright>
- <year>2000</year>
- <holder>Telsa Gwynne</holder>
- </copyright>
-<!-- translators: uncomment this:
-
- <copyright>
- <year>2002</year>
- <holder>ME-THE-TRANSLATOR (Latin translation)</holder>
- </copyright>
-
- -->
-
- <publisher role="maintainer">
- <publishername>MATE Documentation Project</publishername>
- </publisher>
-
-&legal;
-
-
- <authorgroup>
- <author>
- <firstname>Paul</firstname>
- <surname>Cutler</surname>
- <affiliation>
- <orgname>MATE Documentation Project</orgname>
- <address> <email>pcutler@gnome.org</email> </address>
- </affiliation>
- </author>
- <author>
- <firstname>Sun</firstname>
- <surname>MATE Documentation Team</surname>
- <affiliation>
- <orgname>Sun Microsystems</orgname>
- <address></address>
- </affiliation>
- </author>
- <author>
- <firstname>Telsa</firstname>
- <surname>Gwynne</surname>
- <affiliation>
- <orgname>MATE Documentation Project</orgname>
- <address> <email>hobbit@aloss.ukuu.org.uk</email> </address>
- </affiliation>
- </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>
- </affiliation>
- <contrib>Latin translation</contrib>
- </othercredit>
--->
- </authorgroup>
-
- <releaseinfo revision="2.28" role="review">
- </releaseinfo>
-
- <revhistory>
- <revision>
- <revnumber>&applet; Applet Manual V&manrevision;</revnumber>
- <date>&date;</date>
- <revdescription>
- <para role="author">Sun MATE Documentation Team</para>
- <para role="publisher">MATE Documentation Project</para>
- </revdescription>
- </revision>
- <revision>
- <revnumber>Fish Applet Manual V2.4</revnumber>
- <date>&date;</date>
- <revdescription>
- <para role="author">Sun MATE Documentation Team</para>
- <para role="publisher">MATE Documentation Project</para>
- </revdescription>
- </revision>
- <revision>
- <revnumber>Fish Applet Manual V2.2</revnumber>
- <date>January 2003</date>
- <revdescription>
- <para role="author">Sun MATE Documentation Team</para>
- <para role="publisher">MATE Documentation Project</para>
- </revdescription>
- </revision>
- <revision>
- <revnumber>Fish Applet Manual V2.1</revnumber>
- <date>August 2002</date>
- <revdescription>
- <para role="author">Sun MATE Documentation Team</para>
- <para role="publisher">MATE Documentation Project</para>
- </revdescription>
- </revision>
- <revision>
- <revnumber>Fish Applet Manual V2.0</revnumber>
- <date>May 2002</date>
- <revdescription>
- <para role="author">Sun MATE Documentation Team</para>
- <para role="publisher">MATE Documentation Project</para>
- </revdescription>
- </revision>
- <revision>
- <revnumber>Fish Applet Manual</revnumber>
- <date>2000</date>
- <revdescription>
- <para role="author">Telsa Gwynne
- <email>hobbit@aloss.ukuu.org.uk</email></para>
- <para role="publisher">MATE Documentation Project</para>
- </revdescription>
- </revision>
- </revhistory>
- <releaseinfo> This manual describes version &appletversion; of &applet;.
- </releaseinfo>
- <legalnotice>
- <title>Feedback</title>
- <para> To report a bug or make a suggestion regarding the &applet; applet or this
- manual, follow the directions in the
- <ulink url="ghelp:mate-feedback" type="help">MATE Feedback Page</ulink>. </para>
-
- </legalnotice>
- <abstract role="description">
- <para>The &applet; applet displays an animated image in the panel and gives you
- your fortune when clicked.</para>
- </abstract>
- </articleinfo>
- <indexterm>
- <primary>Fish</primary>
- </indexterm>
-
-<!-- ============= Document Body ============================= -->
-<!-- ============= Introduction ============================== -->
-<sect1 id="fish-introduction">
-<title>Introduction</title>
-<!-- ==== Figure ============================================= -->
- <figure id="fish-fig">
- <title>&applet; Applet</title>
- <screenshot>
- <mediaobject>
- <imageobject><imagedata fileref="figures/fish_applet.png" format="PNG"/>
- </imageobject>
- <textobject>
- <phrase>Shows Fish applet.</phrase>
- </textobject>
- </mediaobject>
- </screenshot>
- </figure>
- <!-- ==== End of Figure ======================================= -->
-<para>The <application>&applet;</application> applet displays an animated fish in the panel. You can customize the fish's name and the program that is run when the fish is clicked in the panel. By default, the program that is run when the fish is clicked is <application>Fortune</application>, which displays a usually comical random message from a database of quotations.</para>
-
-
-
-
-<para>You can customize the image shown and the command that is run when it is clicked.</para>
-<sect2 id="fish-introduction-add">
-<title>To Add &applet; to a Panel</title>
- <para>Perform the following steps:</para>
- <orderedlist>
- <listitem>
- <para>
- Right-click on the panel.
- </para>
- </listitem>
- <listitem>
- <para>
- Choose <guimenuitem>Add to Panel</guimenuitem>.
- </para>
- </listitem>
- <listitem>
- <para>
- Scroll down the list of items in the <guilabel>Add to Panel</guilabel> dialog, then select <guilabel>Fish</guilabel>.
- </para>
- </listitem>
- <listitem>
- <para>
- Click <guibutton>Add</guibutton>.
- </para>
- </listitem>
- </orderedlist>
- </sect2></sect1>
-
-<sect1 id="fish-usage">
-<title>Usage</title>
-<para>Click on the applet to display the <guilabel>Wanda the Fish</guilabel> dialog. The dialog typically displays a fortune cookie. You can configure the applet to specify the command to run when you click on the applet. See <xref linkend="fish-settings"/> for more information.</para>
-</sect1>
-
-<!-- ============= Preferences ================================ -->
-<sect1 id="fish-settings">
-<title>Preferences</title>
-<para>To configure <application>&applet;</application>, right-click on the <application>
-&applet;</application> applet, then choose <guimenu>Preferences</guimenu>. </para>
-<variablelist>
-<varlistentry>
-<term><guilabel>Name of fish</guilabel> </term>
-<listitem>
-<para>Use this text box to specify the name of the fish.</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term><guilabel>Command to run when clicked</guilabel> </term>
-<listitem>
-<para>By default, <application>&applet;</application> runs the <literal>fortune</literal> command when you click on the applet. Use this text box to specify an alternative command to run. </para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term><guilabel>File</guilabel> </term>
-<listitem>
-<para>Use this field to select the image to display in the applet. You can select an image that is supplied with the applet or a personal image.</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term><guilabel>Total frames in animation</guilabel> </term>
-<listitem>
-<para>Use this spin box to specify the number of frames in the animation. </para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term><guilabel>Pause per frame</guilabel> </term>
-<listitem>
-<para>Use this spin box to specify the pause in seconds between each frame in the animation.</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term><guilabel>Rotate on vertical panels</guilabel> </term>
-<listitem>
-<para>Select this option to rotate the applet image when you add the applet to a vertical panel.</para>
-</listitem>
-</varlistentry>
-</variablelist>
-</sect1>
-</article>
diff --git a/help/fish/Makefile.am b/help/fish/Makefile.am
index 1c4694cb..380b96c5 100644
--- a/help/fish/Makefile.am
+++ b/help/fish/Makefile.am
@@ -1,9 +1,13 @@
-include $(top_srcdir)/mate-doc-utils.make
-dist-hook: doc-dist-hook
+@YELP_HELP_RULES@
-DOC_MODULE = mate-applet-fish
-DOC_INCLUDES = legal.xml
+HELP_ID = fish
-DOC_LINGUAS = ca cs de el en_GB es eu fi fr it ja ko oc ru sv th uk zh_CN
+HELP_FILES = \
+ index.docbook \
+ legal.xml
+
+HELP_MEDIA =
+
+HELP_LINGUAS = ca cs de el en_GB es eu fi fr it ja ko oc ru sv th uk zh_CN
-include $(top_srcdir)/git.mk
diff --git a/help/fish/mate-applet-fish.omf.in b/help/fish/mate-applet-fish.omf.in
deleted file mode 100644
index 1a815f55..00000000
--- a/help/fish/mate-applet-fish.omf.in
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<omf>
- <resource>
- <subject category="GNOME|Applets|Amusement"/>
- <type>
- user's guide
- </type>
- <relation seriesid="e9efbc8c-40e7-11d6-815d-e721de25f633"/>
- <rights type="GNU FDL" license.version="1.1" holder="Sun Microsystems"/>
- </resource>
-</omf>
diff --git a/mate-panel/libpanel-util/panel-show.c b/mate-panel/libpanel-util/panel-show.c
index 0795b837..51167874 100644
--- a/mate-panel/libpanel-util/panel-show.c
+++ b/mate-panel/libpanel-util/panel-show.c
@@ -271,9 +271,9 @@ panel_show_help (GdkScreen *screen,
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
if (link)
- uri = g_strdup_printf ("ghelp:%s?%s", doc, link);
+ uri = g_strdup_printf ("help:%s?%s", doc, link);
else
- uri = g_strdup_printf ("ghelp:%s", doc);
+ uri = g_strdup_printf ("help:%s", doc);
gtk_show_uri (screen, uri, gtk_get_current_event_time (), &local_error);
diff --git a/mate-panel/panel.c b/mate-panel/panel.c
index c3a5a8ab..2b9929d3 100644
--- a/mate-panel/panel.c
+++ b/mate-panel/panel.c
@@ -608,6 +608,7 @@ drop_urilist (PanelWidget *panel,
g_ascii_strncasecmp (uri, "ftp:", strlen ("ftp:")) == 0 ||
g_ascii_strncasecmp (uri, "gopher:", strlen ("gopher:")) == 0 ||
g_ascii_strncasecmp (uri, "ghelp:", strlen ("ghelp:")) == 0 ||
+ g_ascii_strncasecmp (uri, "help:", strlen ("ghelp:")) == 0 ||
g_ascii_strncasecmp (uri, "man:", strlen ("man:")) == 0 ||
g_ascii_strncasecmp (uri, "info:", strlen ("info:")) == 0) {
/* FIXME: probably do this only on link,
--
cgit v1.2.1