20 files changed, 65 insertions, 62 deletions
diff --git a/Makefile.am b/Makefile.am
index ab70e1b..8980d63 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,6 @@ man_MANS = mate-system-monitor.1
 
 EXTRA_DIST = \
 	$(man_MANS) \
-	mate-doc-utils.make \
 	mate-system-monitor.desktop.in \
 	intltool-extract.in \
 	intltool-merge.in \
diff --git a/autogen.sh b/autogen.sh
index decea78..1a65288 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -13,7 +13,12 @@ PKG_NAME="mate-system-monitor"
 }
 
 which mate-autogen || {
-    echo "You need to install mate-common from the MATE Git"
+    echo "You need to install mate-common"
+    exit 1
+}
+
+which yelp-build || {
+    echo "You need to install yelp-tools"
     exit 1
 }
 
diff --git a/configure.ac b/configure.ac
index 1089a15..9291a09 100644
--- a/configure.ac
+++ b/configure.ac
@@ -70,7 +70,8 @@ AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",
                    [The gettext catalog name])
 AM_GLIB_GNU_GETTEXT
-MATE_DOC_INIT
+
+YELP_HELP_INIT
 
 dnl Set PACKAGE_LOCALE_DIR in config.h.
 GLIB_DEFINE_LOCALEDIR(PACKAGE_LOCALE_DIR)
diff --git a/help/C/mate-system-monitor.xml b/help/C/index.docbook
index acd2c40..a59ab3f 100644
--- a/help/C/mate-system-monitor.xml
+++ b/help/C/index.docbook
@@ -139,7 +139,7 @@
     <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:mate-feedback" type="help">MATE Feedback Page</ulink>. 
+        To report a bug or make a suggestion regarding the &app; application or this manual, follow the directions in the <ulink url="help:mate-feedback" type="help">MATE Feedback Page</ulink>. 
       </para>
 
 <!-- Translators may also add here feedback address for translations -->
diff --git a/help/C/legal.xml b/help/C/legal.xml
index acb0b40..9c4e248 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 MATE manuals
diff --git a/help/Makefile.am b/help/Makefile.am
index 7e6855b..49c975b 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,10 +1,8 @@
-include $(top_srcdir)/mate-doc-utils.make
-dist-hook: doc-dist-hook
+@YELP_HELP_RULES@
 
-DOC_MODULE = mate-system-monitor
-DOC_ENTITIES = legal.xml
-DOC_INCLUDES =
-DOC_FIGURES = figures/addColumn.png \
+HELP_ID = mate-system-monitor
+HELP_FILES = index.docbook legal.xml
+HELP_MEDIA = figures/addColumn.png \
 	      figures/changePriority.png \
 	      figures/colorPanel.png \
   	      figures/columnContextMenu.png \
@@ -18,5 +16,5 @@ DOC_FIGURES = figures/addColumn.png \
 	      figures/systemMonitor.png \
 	      figures/viewMenu.png
 
-DOC_LINGUAS = ar bg ca cs da de el es fr oc pa sv zh_CN
+HELP_LINGUAS = ar bg ca cs da de el es fr oc pa sv zh_CN
 
diff --git a/help/ar/ar.po b/help/ar/ar.po
index 157462c..83750e5 100644
--- a/help/ar/ar.po
+++ b/help/ar/ar.po
@@ -55,7 +55,7 @@ msgid "MATE Documentation Project"
 msgstr "مشروع وثائق جنوم"
 
 #: C/mate-system-monitor.xml:2(para)
-msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License (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 type=\"help\" url=\"ghelp:fdl\">link</ulink> or in the file COPYING-DOCS distributed with this manual."
+msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License (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 type=\"help\" url=\"help:fdl\">link</ulink> or in the file COPYING-DOCS distributed with this manual."
 msgstr ""
 
 #: C/mate-system-monitor.xml:12(para)
@@ -136,8 +136,8 @@ msgid "Feedback"
 msgstr "تغذية راجعة"
 
 #: C/mate-system-monitor.xml:115(para)
-msgid "To report a bug or make a suggestion regarding the System Monitor application or this manual, follow the directions in the <ulink url=\"ghelp:mate-feedback\" type=\"help\">MATE Feedback Page</ulink>."
-msgstr "للإبلاغ عن مشكلة أو تقديم اقتراح يخص مراقب النّظام أو هذا الدليل. اتبع الإرشادات في  <ulink url=\"ghelp:mate-feedback\" type=\"help\">MATE Feedback Page</ulink>."
+msgid "To report a bug or make a suggestion regarding the System Monitor application or this manual, follow the directions in the <ulink url=\"help:mate-feedback\" type=\"help\">MATE Feedback Page</ulink>."
+msgstr "للإبلاغ عن مشكلة أو تقديم اقتراح يخص مراقب النّظام أو هذا الدليل. اتبع الإرشادات في  <ulink url=\"help:mate-feedback\" type=\"help\">MATE Feedback Page</ulink>."
 
 #: C/mate-system-monitor.xml:123(para)
 msgid "User manual for System Monitor"
diff --git a/help/bg/bg.po b/help/bg/bg.po
index 2250fab..c29089b 100644
--- a/help/bg/bg.po
+++ b/help/bg/bg.po
@@ -18,7 +18,7 @@ msgid ""
 "the terms of the GNU Free Documentation License (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 type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
+"of the GFDL at this <ulink type=\"help\" url=\"help:fdl\">link</ulink> or "
 "in the file COPYING-DOCS distributed with this manual."
 msgstr ""
 "Предоставя се разрешение за копиране, разпространение и/или промяна на този "
@@ -26,7 +26,7 @@ msgstr ""
 "версия 1.1 или всяка следваща версия, издадена от Фондация „Свободен "
 "софтуер“; без „Непроменливи раздели“, „Текстове на предната корица“, както и "
 "„Текстове на задната корица“. Копие на лиценза може да бъде намерено <ulink "
-"type=\"help\" url=\"ghelp:fdl\">тук</ulink> или във файла COPYING-DOCS, "
+"type=\"help\" url=\"help:fdl\">тук</ulink> или във файла COPYING-DOCS, "
 "разпространяван с това ръководство."
 
 #: ../C/legal.xml:12(para)
@@ -216,12 +216,12 @@ msgstr "Обратна връзка"
 #: ../C/mate-system-monitor.xml:115(para)
 msgid ""
 "To report a bug or make a suggestion regarding the System Monitor "
-"application or this manual, follow the directions in the <ulink url=\"ghelp:"
+"application or this manual, follow the directions in the <ulink url=\"help:"
 "mate-feedback\" type=\"help\">MATE Feedback Page</ulink>."
 msgstr ""
 "За да докладвате за грешка или да направите предложение относно „Наблюдение "
 "на системата“ или това ръководство, следвайте указанията, описани в <ulink "
-"url=\"ghelp:mate-feedback\" type=\"help\">Страницата за обратна връзка на "
+"url=\"help:mate-feedback\" type=\"help\">Страницата за обратна връзка на "
 "MATE</ulink>."
 
 #: ../C/mate-system-monitor.xml:123(para)
diff --git a/help/ca/ca.po b/help/ca/ca.po
index 07d40d8..f2a2ad9 100644
--- a/help/ca/ca.po
+++ b/help/ca/ca.po
@@ -58,7 +58,7 @@ msgid ""
 "the terms of the GNU Free Documentation License (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 type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
+"of the GFDL at this <ulink type=\"help\" url=\"help:fdl\">link</ulink> or "
 "in the file COPYING-DOCS distributed with this manual."
 msgstr ""
 "Teniu permís per a copiar, distribuir i/o modificar aquest document, sota "
@@ -66,7 +66,7 @@ msgstr ""
 "qualsevol versió publicada posteriorment per la Free Software Foundation, "
 "sense seccions invariants, sense texts de portada i sense texts de "
 "contraportada. Podeu trobar una còpia de la GFDL en aquest <ulink type=\"help"
-"\" url=\"ghelp:fdl\">enllaç</ulink> o en el fitxer COPYING-DOCS distribuït "
+"\" url=\"help:fdl\">enllaç</ulink> o en el fitxer COPYING-DOCS distribuït "
 "amb aquest manual."
 
 #: C/mate-system-monitor.xml:12(para)
@@ -215,12 +215,12 @@ msgstr "Comentaris"
 #: C/mate-system-monitor.xml:115(para)
 msgid ""
 "To report a bug or make a suggestion regarding the System Monitor "
-"application or this manual, follow the directions in the <ulink url=\"ghelp:"
+"application or this manual, follow the directions in the <ulink url=\"help:"
 "mate-feedback\" type=\"help\">MATE Feedback Page</ulink>."
 msgstr ""
 "Per a informar d'un error o fer algun suggeriment quant al "
 "<application>monitor del sistema</application> o d'aquest manual, seguiu les "
-"indicacions a la <ulink url=\"ghelp:mate-feedback\" type=\"help\">Pàgina de "
+"indicacions a la <ulink url=\"help:mate-feedback\" type=\"help\">Pàgina de "
 "comentaris del MATE</ulink>."
 
 #: C/mate-system-monitor.xml:123(para)
diff --git a/help/cs/cs.po b/help/cs/cs.po
index 3410636..8592afd 100644
--- a/help/cs/cs.po
+++ b/help/cs/cs.po
@@ -68,8 +68,8 @@ msgid "MATE Documentation Project"
 msgstr "Dokumentační projekt MATE"
 
 #: C/mate-system-monitor.xml:2(para)
-msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License (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 type=\"help\" url=\"ghelp:fdl\">link</ulink> or in the file COPYING-DOCS distributed with this manual."
-msgstr "Je povoleno kopírovat, šířit a/nebo upravovat tento dokument za podmínek GNU Free Documentation License, verze 1.1 nebo jakékoli další verze vydané nadací Free Software Foundation; bez neměnných oddílů, bez textů předních desek a bez textů zadních desek. Kopie této licence je zahrnuta v oddílu jménem <ulink type=\"help\" url=\"ghelp:fdl\">GNU Free Documentation License</ulink> nebo v souboru COPYING-DOCS dodávaném s touto příručkou."
+msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License (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 type=\"help\" url=\"help:fdl\">link</ulink> or in the file COPYING-DOCS distributed with this manual."
+msgstr "Je povoleno kopírovat, šířit a/nebo upravovat tento dokument za podmínek GNU Free Documentation License, verze 1.1 nebo jakékoli další verze vydané nadací Free Software Foundation; bez neměnných oddílů, bez textů předních desek a bez textů zadních desek. Kopie této licence je zahrnuta v oddílu jménem <ulink type=\"help\" url=\"help:fdl\">GNU Free Documentation License</ulink> nebo v souboru COPYING-DOCS dodávaném s touto příručkou."
 
 #: C/mate-system-monitor.xml:12(para)
 msgid "This manual is part of a collection of MATE manuals distributed under the GFDL. If you want to distribute this manual separately from the collection, you can do so by adding a copy of the license to the manual, as described in section 6 of the license."
@@ -173,8 +173,8 @@ msgid "Feedback"
 msgstr "Ohlasy"
 
 #: C/mate-system-monitor.xml:141(para)
-msgid "To report a bug or make a suggestion regarding the System Monitor application or this manual, follow the directions in the <ulink url=\"ghelp:mate-feedback\" type=\"help\">MATE Feedback Page</ulink>."
-msgstr "Pokud chcete oznámit chybu nebo navrhnout vylepšení vztahující se k aplikaci Sledování systému nebo této příručce, postupujte dle instrukcí na stránce <ulink url=\"ghelp:mate-feedback\" type=\"help\">Stránka s ohlasy na MATE</ulink>."
+msgid "To report a bug or make a suggestion regarding the System Monitor application or this manual, follow the directions in the <ulink url=\"help:mate-feedback\" type=\"help\">MATE Feedback Page</ulink>."
+msgstr "Pokud chcete oznámit chybu nebo navrhnout vylepšení vztahující se k aplikaci Sledování systému nebo této příručce, postupujte dle instrukcí na stránce <ulink url=\"help:mate-feedback\" type=\"help\">Stránka s ohlasy na MATE</ulink>."
 
 #: C/mate-system-monitor.xml:149(para)
 msgid "System Monitor gives users a graphical user interface for monitoring CPU, network, and memory activities as well as a way for viewing and stopping system processes."
diff --git a/help/da/da.po b/help/da/da.po
index 7a299f6..988f825 100644
--- a/help/da/da.po
+++ b/help/da/da.po
@@ -153,10 +153,10 @@ msgstr "Tilbagemelding"
 #: ../C/mate-system-monitor.xml:141(para)
 msgid ""
 "To report a bug or make a suggestion regarding the System Monitor "
-"application or this manual, follow the directions in the <ulink url=\"ghelp:"
+"application or this manual, follow the directions in the <ulink url=\"help:"
 "mate-feedback\" type=\"help\">MATE Feedback Page</ulink>."
 msgstr ""
-"Følg vejledningen på <ulink url=\"ghelp:mate-feedback\" type=\"help\">MATE-"
+"Følg vejledningen på <ulink url=\"help:mate-feedback\" type=\"help\">MATE-"
 "feedbacksiden</ulink> for at rapportere fejl eller indsende forslag til "
 "programmet Systemovervågning eller denne manual."
 
@@ -1690,14 +1690,14 @@ msgid ""
 "the terms of the GNU Free Documentation License (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 type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
+"of the GFDL at this <ulink type=\"help\" url=\"help:fdl\">link</ulink> or "
 "in the file COPYING-DOCS distributed with this manual."
 msgstr ""
 "Der gives tilladelse til at kopiere, distribuere og/eller ændre dette "
 "dokument under betingelserne i GNU Free Documentation License (GFDL), "
 "version 1.1 eller enhver nyere version, udgivet af Free Software Foundation "
 "uden invariante afsnit, uden forsidetekster, og uden bagsidetekster. Du kan "
-"finde en kopi af GFDL'en her: <ulink type=\"help\" url=\"ghelp:fdl\">link</"
+"finde en kopi af GFDL'en her: <ulink type=\"help\" url=\"help:fdl\">link</"
 "ulink>, eller i filen COPYING-DOCS der distribueres med denne manual."
 
 #: ../C/legal.xml:12(para)
diff --git a/help/de/de.po b/help/de/de.po
index 694a5d0..54a5734 100644
--- a/help/de/de.po
+++ b/help/de/de.po
@@ -70,7 +70,7 @@ msgid ""
 "the terms of the GNU Free Documentation License (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 type=\"help\" url=\"ghelp:fdl\">link</ulink> or in "
+"of the GFDL at this <ulink type=\"help\" url=\"help:fdl\">link</ulink> or in "
 "the file COPYING-DOCS distributed with this manual."
 msgstr ""
 "Das vorliegende Dokument kann gemäß den Bedingungen der GNU Free "
@@ -78,7 +78,7 @@ msgstr ""
 "Software Foundation veröffentlichten Version ohne unveränderbare Abschnitte "
 "sowie ohne Texte auf dem vorderen und hinteren Buchdeckel kopiert, verteilt "
 "und/oder modifiziert werden. Eine Kopie der GFDL finden Sie unter diesem "
-"<ulink type=\"help\" url=\"ghelp:fdl\">Link</ulink> oder in der mit diesem "
+"<ulink type=\"help\" url=\"help:fdl\">Link</ulink> oder in der mit diesem "
 "Handbuch gelieferten Datei COPYING-DOCS."
 
 #: C/mate-system-monitor.xml:12(para)
@@ -257,11 +257,11 @@ msgstr "Rückmeldungen"
 #: C/mate-system-monitor.xml:141(para)
 msgid ""
 "To report a bug or make a suggestion regarding the System Monitor application "
-"or this manual, follow the directions in the <ulink url=\"ghelp:mate-feedback"
+"or this manual, follow the directions in the <ulink url=\"help:mate-feedback"
 "\" type=\"help\">MATE Feedback Page</ulink>."
 msgstr ""
 "Um Fehler zu melden oder einen Vorschlag zur Systemüberwachung oder zu diesem "
-"Handbuch zu machen, folgen Sie den Anweisungen auf der <ulink url=\"ghelp:"
+"Handbuch zu machen, folgen Sie den Anweisungen auf der <ulink url=\"help:"
 "mate-feedback\" type=\"help\">MATE-Seite für Rückmeldungen</ulink>."
 
 #: C/mate-system-monitor.xml:149(para)
diff --git a/help/el/el.po b/help/el/el.po
index 4143dfd..fd90e37 100644
--- a/help/el/el.po
+++ b/help/el/el.po
@@ -71,14 +71,14 @@ msgid ""
 "the terms of the GNU Free Documentation License (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 type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
+"of the GFDL at this <ulink type=\"help\" url=\"help:fdl\">link</ulink> or "
 "in the file COPYING-DOCS distributed with this manual."
 msgstr ""
 "Δίνεται άδεια για αντιγραφή, διανομή και/ή τροποποίηση του εγγράφου υπό τους "
 "όρους της Ελεύθερης Άδειας Τεκμηρίωσης GNU (GFDL), Έκδοση 1.1 ή "
 "μεταγενέστερη εκδιδόμενη από το Ίδρυμα Ελεύθερου Λογισμικού χωρίς Σταθερά "
 "Εδάφια, χωρίς Εξώφυλλα Κειμένου, και χωρίς Οπισθόφυλλα Κειμένου. Μπορείτε να "
-"βρείτε ένα αντίγραφο της GFDL σε αυτόν τον <ulink type=\"help\" url=\"ghelp:"
+"βρείτε ένα αντίγραφο της GFDL σε αυτόν τον <ulink type=\"help\" url=\"help:"
 "fdl\">σύνδεσμο</ulink> ή στο αρχείο COPYING-DOCS που διανεμήθηκε με αυτόν "
 "τον οδηγό."
 
@@ -248,12 +248,12 @@ msgstr "Ανάδραση"
 #: C/mate-system-monitor.xml:141(para)
 msgid ""
 "To report a bug or make a suggestion regarding the System Monitor "
-"application or this manual, follow the directions in the <ulink url=\"ghelp:"
+"application or this manual, follow the directions in the <ulink url=\"help:"
 "mate-feedback\" type=\"help\">MATE Feedback Page</ulink>."
 msgstr ""
 "Για να αναφέρετε κάποιο σφάλμα ή να προτείνετε κάτι που αφορά την εφαρμογή "
 "«Παρακολούθηση συστήματος» ή αυτό το εγχειρίδιο, ακολουθήστε τις οδηγίες στην "
-"σελίδα <ulink url=\"ghelp:mate-feedback\" type=\"help\">MATE Feedback "
+"σελίδα <ulink url=\"help:mate-feedback\" type=\"help\">MATE Feedback "
 "Page</ulink>."
 
 #: C/mate-system-monitor.xml:149(para)
diff --git a/help/es/es.po b/help/es/es.po
index 0dcfc96..75ed96e 100644
--- a/help/es/es.po
+++ b/help/es/es.po
@@ -74,7 +74,7 @@ msgid ""
 "the terms of the GNU Free Documentation License (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 type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
+"of the GFDL at this <ulink type=\"help\" url=\"help:fdl\">link</ulink> or "
 "in the file COPYING-DOCS distributed with this manual."
 msgstr ""
 "Se otorga permiso para copiar, distribuir y/o modificar este documento bajo "
@@ -82,7 +82,7 @@ msgstr ""
 "cualquier otra versión posterior publicada por la Free Software Foundation; "
 "sin Secciones Invariantes ni Textos de Cubierta Delantera ni Textos de "
 "Cubierta Trasera. Puede encontrar una copia de la licencia GFDL en este "
-"<ulink type=\"help\" url=\"ghelp:fdl\">enlace</ulink> o en el archivo "
+"<ulink type=\"help\" url=\"help:fdl\">enlace</ulink> o en el archivo "
 "COPYING-DOCS distribuido con este manual."
 
 #: C/mate-system-monitor.xml:12(para)
@@ -257,11 +257,11 @@ msgstr "Comentarios"
 #: C/mate-system-monitor.xml:141(para)
 msgid ""
 "To report a bug or make a suggestion regarding the System Monitor "
-"application or this manual, follow the directions in the <ulink url=\"ghelp:"
+"application or this manual, follow the directions in the <ulink url=\"help:"
 "mate-feedback\" type=\"help\">MATE Feedback Page</ulink>."
 msgstr ""
 "Para informar sobre un fallo o hacer sugerencias sobre el Monitor del "
-"sistema o sobre este manual, siga las indicaciones en la <ulink url=\"ghelp:"
+"sistema o sobre este manual, siga las indicaciones en la <ulink url=\"help:"
 "mate-feedback\" type=\"help\">Página de comentarios de MATE</ulink>."
 
 #: C/mate-system-monitor.xml:149(para)
diff --git a/help/fr/fr.po b/help/fr/fr.po
index 582159d..252d76f 100644
--- a/help/fr/fr.po
+++ b/help/fr/fr.po
@@ -76,7 +76,7 @@ msgid ""
 "the terms of the GNU Free Documentation License (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 type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
+"of the GFDL at this <ulink type=\"help\" url=\"help:fdl\">link</ulink> or "
 "in the file COPYING-DOCS distributed with this manual."
 msgstr ""
 "Permission vous est donnée de copier, distribuer et/ou modifier ce document "
@@ -84,7 +84,7 @@ msgstr ""
 "ou ultérieure publiée par la Free Software Foundation sans section "
 "inaltérable, sans texte de première page de couverture ni texte de dernière "
 "page de couverture. Vous trouverez un exemplaire de cette licence en suivant "
-"ce <ulink type=\"help\" url=\"ghelp:fdl\">lien</ulink> ou dans le fichier "
+"ce <ulink type=\"help\" url=\"help:fdl\">lien</ulink> ou dans le fichier "
 "COPYING-DOCS fourni avec le présent manuel."
 
 #: C/mate-system-monitor.xml:12(para)
@@ -259,11 +259,11 @@ msgstr "Votre avis"
 #: C/mate-system-monitor.xml:141(para)
 msgid ""
 "To report a bug or make a suggestion regarding the System Monitor "
-"application or this manual, follow the directions in the <ulink url=\"ghelp:"
+"application or this manual, follow the directions in the <ulink url=\"help:"
 "mate-feedback\" type=\"help\">MATE Feedback Page</ulink>."
 msgstr ""
 "Pour rapporter une anomalie ou émettre une suggestion concernant le Moniteur "
-"système ou ce manuel, procédez comme indiqué sur la <ulink url=\"ghelp:mate-"
+"système ou ce manuel, procédez comme indiqué sur la <ulink url=\"help:mate-"
 "feedback\" type=\"help\">page de réactions sur MATE</ulink>."
 
 #: C/mate-system-monitor.xml:149(para)
diff --git a/help/oc/oc.po b/help/oc/oc.po
index 593eb87..3905fda 100644
--- a/help/oc/oc.po
+++ b/help/oc/oc.po
@@ -68,7 +68,7 @@ msgid ""
 "the terms of the GNU Free Documentation License (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 type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
+"of the GFDL at this <ulink type=\"help\" url=\"help:fdl\">link</ulink> or "
 "in the file COPYING-DOCS distributed with this manual."
 msgstr ""
 
@@ -185,7 +185,7 @@ msgstr ""
 #: C/mate-system-monitor.xml:115(para)
 msgid ""
 "To report a bug or make a suggestion regarding the System Monitor "
-"application or this manual, follow the directions in the <ulink url=\"ghelp:"
+"application or this manual, follow the directions in the <ulink url=\"help:"
 "mate-feedback\" type=\"help\">MATE Feedback Page</ulink>."
 msgstr ""
 
diff --git a/help/pa/pa.po b/help/pa/pa.po
index 17acf3f..97cc6a4 100644
--- a/help/pa/pa.po
+++ b/help/pa/pa.po
@@ -62,13 +62,13 @@ msgid ""
 "the terms of the GNU Free Documentation License (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 type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
+"of the GFDL at this <ulink type=\"help\" url=\"help:fdl\">link</ulink> or "
 "in the file COPYING-DOCS distributed with this manual."
 msgstr ""
 "ਇਹ ਦਸਤਾਵੇਜ਼ ਨੂੰ ਗਨੂ ਮੁਕਤ ਦਸਤਾਵੇਜ਼ ਲਾਈਸੈਂਸ (GFDL), ਵਰਜਨ 1.1 ਜਾਂ ਨਵੇਂ, ਜੋ ਕਿ ਫਰੀ ਸਾਫਟਵੇਅਰ "
 "ਫਾਊਡੇਸ਼ਨ ਵਲੋਂ ਬਦਲਵੇਂ ਭਾਗ, ਨਾ ਮੁੱਢਲੇ-ਢੱਕਣ ਪਾਠ ਅਤੇ ਨਾ ਹੀ ਪਿੱਛੇ-ਢੱਕਣ ਪਾਠ ਨਾਲ ਜਾਰੀ ਹੈ, ਦੀਆਂ ਸ਼ਰਤਾਂ "
 "ਅਧੀਨ ਨਕਲ ਕਰਨ, ਵੰਡਣ ਅਤੇ/ਜਾਂ ਸੋਧਣ ਦਾ ਅਧਿਕਾਰ ਦਿੱਤਾ ਗਿਆ ਹੈ। ਤੁਸੀਂ GFDL ਦੀ ਨਕਲ <ulink "
-"type=\"help\" url=\"ghelp:fdl\"> ਸਬੰਧ</ulink> ਉੱਤੇ ਜਾਂ ਇਹ ਦਸਤਾਵੇਜ਼ 'ਚ COPYING-DOCS "
+"type=\"help\" url=\"help:fdl\"> ਸਬੰਧ</ulink> ਉੱਤੇ ਜਾਂ ਇਹ ਦਸਤਾਵੇਜ਼ 'ਚ COPYING-DOCS "
 "ਫਾਇਲ ਵਿੱਚੋਂ ਲੈ ਸਕਦੇ ਹੋ।"
 
 #: C/mate-system-monitor.xml:12(para)
@@ -213,11 +213,11 @@ msgstr "ਸੁਝਾਅ"
 #: C/mate-system-monitor.xml:115(para)
 msgid ""
 "To report a bug or make a suggestion regarding the System Monitor "
-"application or this manual, follow the directions in the <ulink url=\"ghelp:"
+"application or this manual, follow the directions in the <ulink url=\"help:"
 "mate-feedback\" type=\"help\">MATE Feedback Page</ulink>."
 msgstr ""
 "ਸਿਸਟਮ ਮਾਨੀਟਰ ਕਾਰਜ ਜਾਂ ਇਹ ਦਸਤਾਵੇਜ਼ ਬਾਰੇ ਬੱਗ ਰਿਪੋਰਟ ਦੇਣ ਜਾਂ ਸੁਝਾਅ ਲਈ, <ulink url="
-"\"ghelp:mate-feedback\" type=\"help\">ਗਨੋਮ ਸੁਝਾਅ ਸਫ਼ਾ</ulink> ਦੀਆਂ ਹਦਾਇਤਾਂ ਦੀ "
+"\"help:mate-feedback\" type=\"help\">ਗਨੋਮ ਸੁਝਾਅ ਸਫ਼ਾ</ulink> ਦੀਆਂ ਹਦਾਇਤਾਂ ਦੀ "
 "ਪਾਲਨਾ ਕਰੋ।"
 
 #: C/mate-system-monitor.xml:123(para)
diff --git a/help/sv/sv.po b/help/sv/sv.po
index d2cf131..570a6df 100644
--- a/help/sv/sv.po
+++ b/help/sv/sv.po
@@ -50,8 +50,8 @@ msgid "MATE Documentation Project"
 msgstr "Dokumentationsprojekt för MATE"
 
 #: C/mate-system-monitor.xml:2(para)
-msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License (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 type=\"help\" url=\"ghelp:fdl\">link</ulink> or in the file COPYING-DOCS distributed with this manual."
-msgstr "Tillstånd att kopiera, distribuera och/eller modifiera detta dokument ges under villkoren i GNU Free Documentation License (GFDL), version 1.1 eller senare, utgivet av Free Software Foundation utan standardavsnitt och omslagstexter.  En kopia av GFDL finns att hämta på denna <ulink type=\"help\" url=\"ghelp:fdl\">länk</ulink> eller i filen COPYING-DOCS som medföljer denna handbok."
+msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License (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 type=\"help\" url=\"help:fdl\">link</ulink> or in the file COPYING-DOCS distributed with this manual."
+msgstr "Tillstånd att kopiera, distribuera och/eller modifiera detta dokument ges under villkoren i GNU Free Documentation License (GFDL), version 1.1 eller senare, utgivet av Free Software Foundation utan standardavsnitt och omslagstexter.  En kopia av GFDL finns att hämta på denna <ulink type=\"help\" url=\"help:fdl\">länk</ulink> eller i filen COPYING-DOCS som medföljer denna handbok."
 
 #: C/mate-system-monitor.xml:12(para)
 msgid "This manual is part of a collection of MATE manuals distributed under the GFDL. If you want to distribute this manual separately from the collection, you can do so by adding a copy of the license to the manual, as described in section 6 of the license."
@@ -131,8 +131,8 @@ msgid "Feedback"
 msgstr "Återkoppling"
 
 #: C/mate-system-monitor.xml:115(para)
-msgid "To report a bug or make a suggestion regarding the System Monitor application or this manual, follow the directions in the <ulink url=\"ghelp:mate-feedback\" type=\"help\">MATE Feedback Page</ulink>."
-msgstr "För att rapportera ett fel eller föreslå någonting angående programmet Systemövervakare eller den här handboken, följ anvisningarna på <ulink url=\"ghelp:mate-feedback\" type=\"help\">MATE:s återkopplingssida</ulink>."
+msgid "To report a bug or make a suggestion regarding the System Monitor application or this manual, follow the directions in the <ulink url=\"help:mate-feedback\" type=\"help\">MATE Feedback Page</ulink>."
+msgstr "För att rapportera ett fel eller föreslå någonting angående programmet Systemövervakare eller den här handboken, följ anvisningarna på <ulink url=\"help:mate-feedback\" type=\"help\">MATE:s återkopplingssida</ulink>."
 
 #: C/mate-system-monitor.xml:123(para)
 msgid "User manual for System Monitor"
diff --git a/help/zh_CN/zh_CN.po b/help/zh_CN/zh_CN.po
index 33ecc6e..0973ec2 100644
--- a/help/zh_CN/zh_CN.po
+++ b/help/zh_CN/zh_CN.po
@@ -73,12 +73,12 @@ msgid ""
 "the terms of the GNU Free Documentation License (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 type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
+"of the GFDL at this <ulink type=\"help\" url=\"help:fdl\">link</ulink> or "
 "in the file COPYING-DOCS distributed with this manual."
 msgstr ""
 "对此文档之复制、颁发和/或修改必须遵循自由软件基金会 (Free Software "
 "Foundation) 发布的 GNU 自由文档许可证 (GFDL) 版本 1.1 或更高版本，该许可证没"
-"有固定的部分、没有封面和背页文本。您可以在 <ulink type=\"help\" url=\"ghelp:"
+"有固定的部分、没有封面和背页文本。您可以在 <ulink type=\"help\" url=\"help:"
 "fdl\">此处</ulink> 或在随本手册一起分发的 COPYING-DOCS 文件中找到 GFDL 的副"
 "本。"
 
@@ -237,10 +237,10 @@ msgstr "反馈"
 #: C/mate-system-monitor.xml:141(para)
 msgid ""
 "To report a bug or make a suggestion regarding the System Monitor "
-"application or this manual, follow the directions in the <ulink url=\"ghelp:"
+"application or this manual, follow the directions in the <ulink url=\"help:"
 "mate-feedback\" type=\"help\">MATE Feedback Page</ulink>."
 msgstr ""
-"要对系统监视器程序或本手册报告错误或提出建议，请查看 <ulink url=\"ghelp:"
+"要对系统监视器程序或本手册报告错误或提出建议，请查看 <ulink url=\"help:"
 "mate-feedback\" type=\"help\">MATE 反馈页</ulink>的指导。"
 
 #: C/mate-system-monitor.xml:149(para)
diff --git a/src/callbacks.cpp b/src/callbacks.cpp
index 88f04af..181beb9 100644
--- a/src/callbacks.cpp
+++ b/src/callbacks.cpp
@@ -177,7 +177,7 @@ void
 cb_help_contents (GtkAction *action, gpointer data)
 {
   GError* error = 0;
-  if (!g_app_info_launch_default_for_uri("ghelp:mate-system-monitor", NULL, &error)) {
+  if (!g_app_info_launch_default_for_uri("help:mate-system-monitor", NULL, &error)) {
     g_warning("Could not display help : %s", error->message);
     g_error_free(error);
   }