24 files changed, 52 insertions, 50 deletions

diff --git a/Makefile.am b/Makefile.am
index 460dce3..2e91e16 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,8 +19,7 @@ EXTRA_DIST =						\
 	HACKING						\
 	intltool-extract.in				\
 	intltool-merge.in				\
-	intltool-update.in				\
-	mate-doc-utils.make
+	intltool-update.in
 
 clean-local :
 	rm -f *~
diff --git a/applets/brightness/gpm-common.c b/applets/brightness/gpm-common.c
index 0d0e536..2249d63 100644
--- a/applets/brightness/gpm-common.c
+++ b/applets/brightness/gpm-common.c
@@ -173,9 +173,9 @@ gpm_help_display (const gchar *link_id)
 	gchar *uri;
 
 	if (link_id != NULL)
-		uri = g_strconcat ("ghelp:mate-power-manager?", link_id, NULL);
+		uri = g_strconcat ("help:mate-power-manager?", link_id, NULL);
 	else
-		uri = g_strdup ("ghelp:mate-power-manager");
+		uri = g_strdup ("help:mate-power-manager");
 
 	gtk_show_uri (NULL, uri, GDK_CURRENT_TIME, &error);
 
diff --git a/applets/inhibit/gpm-common.c b/applets/inhibit/gpm-common.c
index 0d0e536..2249d63 100644
--- a/applets/inhibit/gpm-common.c
+++ b/applets/inhibit/gpm-common.c
@@ -173,9 +173,9 @@ gpm_help_display (const gchar *link_id)
 	gchar *uri;
 
 	if (link_id != NULL)
-		uri = g_strconcat ("ghelp:mate-power-manager?", link_id, NULL);
+		uri = g_strconcat ("help:mate-power-manager?", link_id, NULL);
 	else
-		uri = g_strdup ("ghelp:mate-power-manager");
+		uri = g_strdup ("help:mate-power-manager");
 
 	gtk_show_uri (NULL, uri, GDK_CURRENT_TIME, &error);
 
diff --git a/autogen.sh b/autogen.sh
index 193b10a..d53e0eb 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -13,7 +13,12 @@ PKG_NAME="mate-power-manager"
 }
 
 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 912c362..0976d85 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@ LT_INIT
 IT_PROG_INTLTOOL([0.35.0])
 
 MATE_COMPILE_WARNINGS
-MATE_DOC_INIT
+YELP_HELP_INIT
 
 AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
 
diff --git a/help/C/mate-power-manager.xml b/help/C/index.docbook
index 8a4a7ee..8a4a7ee 100644
--- a/help/C/mate-power-manager.xml
+++ b/help/C/index.docbook
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 813cb60..863f554 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-power-manager
-DOC_ENTITIES = legal.xml
-DOC_INCLUDES = 
-DOC_FIGURES = \
+HELP_ID = mate-power-manager
+HELP_FILES = index.docbook legal.xml
+HELP_MEDIA = \
 	figures/applet-brightness.png \
 	figures/applet-inhibit.png \
 	figures/gpm-cell-capacity.png \
@@ -19,4 +17,4 @@ DOC_FIGURES = \
 	figures/gpm-unplugged.png \
 	figures/gs-prefs.png
 
-DOC_LINGUAS = ca de el en_GB es eu fi fr hu it oc pa ru sv zh_CN
+HELP_LINGUAS = ca de el en_GB es eu fi fr hu it oc pa ru sv zh_CN
diff --git a/help/ca/ca.po b/help/ca/ca.po
index 7dc8abc..762f15d 100644
--- a/help/ca/ca.po
+++ b/help/ca/ca.po
@@ -157,7 +157,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 "
@@ -165,7 +165,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-power-manager.xml:12(para)
diff --git a/help/de/de.po b/help/de/de.po
index 3aa4b92..761d713 100644
--- a/help/de/de.po
+++ b/help/de/de.po
@@ -136,7 +136,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 "
@@ -144,7 +144,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-power-manager.xml:12(para)
diff --git a/help/el/el.po b/help/el/el.po
index 308ea22..1651efe 100644
--- a/help/el/el.po
+++ b/help/el/el.po
@@ -159,7 +159,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 ""
 "Χορηγείται άδεια αντιγραφής, διανομής και/ή τροποποίησης του παρόντος "
@@ -167,7 +167,7 @@ msgstr ""
 "(GFDL), ή οποιασδήποτε μεταγενέστερης έκδοσής της από το Ίδρυμα Ελεύθερου "
 "Λογισμικού (FSF), χωρίς αμετάβλητα τμήματα, κείμενα εξώφυλλου και κείμενα "
 "οπισθόφυλλου. Αντίγραφο της άδειας GFDL είναι διαθέσιμο στον ακόλουθο <ulink "
-"type=\"help\" url=\"ghelp:fdl\">σύνδεσμο</ulink>, ή στο αρχείο COPYING-DOCS "
+"type=\"help\" url=\"help:fdl\">σύνδεσμο</ulink>, ή στο αρχείο COPYING-DOCS "
 "που διανέμεται μαζί με το παρόν εγχειρίδιο."
 
 #: C/mate-power-manager.xml:12(para)
diff --git a/help/en_GB/en_GB.po b/help/en_GB/en_GB.po
index 94d6e84..7287600 100644
--- a/help/en_GB/en_GB.po
+++ b/help/en_GB/en_GB.po
@@ -158,14 +158,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 ""
 "Permission is granted to copy, distribute and/or modify this document under "
 "the terms of the GNU Free Documentation Licence (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."
 
 #: ../C/mate-power-manager.xml:12(para)
diff --git a/help/es/es.po b/help/es/es.po
index 6faa4ef..deef1e1 100644
--- a/help/es/es.po
+++ b/help/es/es.po
@@ -159,14 +159,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 ""
 "Se concede permiso para copiar, distribuir o modificar este documento según "
 "las condiciones de la GNU Free Documentation License (GFDL), versión 1.1 o "
 "cualquier versión posterior publicada por la Free Software Foundation, sin "
 "Secciones invariantes, Textos de portada y Textos de contraportada. "
-"Encontrará una copia de la GFDL en este <ulink type=\"help\" url=\"ghelp:fdl"
+"Encontrará una copia de la GFDL en este <ulink type=\"help\" url=\"help:fdl"
 "\">enlace</ulink> o en el archivo COPYING-DOCS distribuido con este manual."
 
 #: C/mate-power-manager.xml:12(para)
@@ -1101,7 +1101,7 @@ msgstr ""
 "Este programa se distribuye bajo los términos de la Licencia Pública General "
 "GNU tal como la publica la Free Software Foundation; tanto en la versión 2 "
 "de la Licencia, o (a su opción) cualquier otra versión posterior. Puede "
-"encontrarse una copia de esta licencia en este <ulink url=\"ghelp:gpl\" type="
+"encontrarse una copia de esta licencia en este <ulink url=\"help:gpl\" type="
 "\"help\">enlace</ulink>, o en el archivo COPYING incluido con el código "
 "fuente de este programa."
 
diff --git a/help/eu/eu.po b/help/eu/eu.po
index bee592f..817832a 100644
--- a/help/eu/eu.po
+++ b/help/eu/eu.po
@@ -144,7 +144,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 ""
 "Baimena ematen da dokumentu hau kopiatu, banatu eta/edo aldatzeko Free "
@@ -152,7 +152,7 @@ msgstr ""
 "Lizentziaren 1.1. bertsioan edo berriago batean ezarritako baldintzak "
 "betetzen badira; Atal Aldaezinik, Aurreko azaleko testurik eta Atzeko "
 "azaleko testurik gabe. GFDL lizentziaren kopia <ulink type=\"help\" url="
-"\"ghelp:fdl\">esteka</ulink> honetan edo eskuliburu honekin batera ematen "
+"\"help:fdl\">esteka</ulink> honetan edo eskuliburu honekin batera ematen "
 "den COPYING-DOCS fitxategian aurkituko duzu."
 
 #: C/mate-power-manager.xml:12(para)
diff --git a/help/fi/fi.po b/help/fi/fi.po
index d36ba52..7ffec71 100644
--- a/help/fi/fi.po
+++ b/help/fi/fi.po
@@ -112,8 +112,8 @@ msgid "Richard Hughes"
 msgstr "Richard Hughes"
 
 #: C/mate-power-manager.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 "Tätä asiakirjaa saa kopioida, jakaa edelleen ja/tai muokata Free Software Foundationin julkaiseman GNU Free Documentation Licensen (GFDL) version 1.1 tai valinnaisesti myöhemmän version mukaisesti, ilman vaatimuksia muuttamattomista osioista ja etu- tai takakansiteksteistä. Kopion GFDL:stä voi nähdä napsauttamalla <ulink type=\"help\" url=\"ghelp:fdl\">tätä linkkiä</ulink>, tai lukemalla ohjeen mukana toimitetun COPYING-DOCS-nimisen tiedoston."
+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 "Tätä asiakirjaa saa kopioida, jakaa edelleen ja/tai muokata Free Software Foundationin julkaiseman GNU Free Documentation Licensen (GFDL) version 1.1 tai valinnaisesti myöhemmän version mukaisesti, ilman vaatimuksia muuttamattomista osioista ja etu- tai takakansiteksteistä. Kopion GFDL:stä voi nähdä napsauttamalla <ulink type=\"help\" url=\"help:fdl\">tätä linkkiä</ulink>, tai lukemalla ohjeen mukana toimitetun COPYING-DOCS-nimisen tiedoston."
 
 #: C/mate-power-manager.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."
diff --git a/help/fr/fr.po b/help/fr/fr.po
index b3e06d5..9942155 100644
--- a/help/fr/fr.po
+++ b/help/fr/fr.po
@@ -160,7 +160,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 "
@@ -168,7 +168,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-power-manager.xml:12(para)
@@ -1752,7 +1752,7 @@ msgstr ""
 "Ce programme est distribué selon les termes de la GNU General Public "
 "License, tels que publiés par la Free Software Foundation ; soit la version "
 "2 de cette licence ou (à votre choix) toute version ultérieure. Une copie de "
-"cette licence est disponible à <ulink url=\"ghelp:gpl\" type=\"help\">ce "
+"cette licence est disponible à <ulink url=\"help:gpl\" type=\"help\">ce "
 "lien</ulink> ou dans le fichier COPYING inclus dans le code source de ce "
 "programme."
 
diff --git a/help/hu/hu.po b/help/hu/hu.po
index 5cbf1f3..e927b4b 100644
--- a/help/hu/hu.po
+++ b/help/hu/hu.po
@@ -145,7 +145,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 ""
 "E közlemény felhatalmazást ad önnek jelen dokumentum sokszorosítására, "
@@ -153,7 +153,7 @@ msgstr ""
 "kiadott GNU Szabad Dokumentációs Licenc 1.1-es, vagy bármely azt követő "
 "verziójának feltételei alapján.Nincs Nem Változtatható Szakasz, nincs Címlap-"
 "szöveg, nincs Hátlap-szöveg. E licenc egy példányát <ulink type=\"help\" url="
-"\"ghelp:fdl\">itt</ulink>, vagy a kézikönyvvel szállított COPYING-DOCS "
+"\"help:fdl\">itt</ulink>, vagy a kézikönyvvel szállított COPYING-DOCS "
 "fájlban találja."
 
 #: C/mate-power-manager.xml:12(para)
diff --git a/help/it/it.po b/help/it/it.po
index cb81450..b495c3e 100644
--- a/help/it/it.po
+++ b/help/it/it.po
@@ -156,14 +156,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 ""
 "Questo documento può essere copiato, distribuito o modificato in base ai "
 "termini della GNU Free Documentation License (GFDL), versione 1.1 o di "
 "versioni successive pubblicate dalla Free Software Foundation che siano "
 "prive di sezioni invariabili, frontespizi e retrocopertine. La GFDL è "
-"disponibile accedendo a questo <ulink url=\"ghelp:fdl\" type=\"help\">link</"
+"disponibile accedendo a questo <ulink url=\"help:fdl\" type=\"help\">link</"
 "ulink> o nel file COPYING-DOCS distribuito con questo manuale."
 
 #: C/mate-power-manager.xml:12(para)
diff --git a/help/oc/oc.po b/help/oc/oc.po
index 5378e4d..fbcd7a0 100644
--- a/help/oc/oc.po
+++ b/help/oc/oc.po
@@ -159,7 +159,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 ""
 
diff --git a/help/pa/pa.po b/help/pa/pa.po
index 3e325f2..4ec0cff 100644
--- a/help/pa/pa.po
+++ b/help/pa/pa.po
@@ -166,13 +166,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-power-manager.xml:12(para)
diff --git a/help/ru/ru.po b/help/ru/ru.po
index f684cb0..6e56771 100644
--- a/help/ru/ru.po
+++ b/help/ru/ru.po
@@ -95,7 +95,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 ""
 "Разрешается копировать, распространять и/или изменять этот документ на "
@@ -103,7 +103,7 @@ msgstr ""
 "License (GFDL)), версии 1.1 или любой более поздней версии, опубликованной "
 "Ассоциацией Свободного Программного Обеспечения без изменения разделов, без "
 "текстов обложки. Вы можете найти копию GFDL по <ulink type=\"help\" "
-"url=\"ghelp:fdl\">этому адресу</ulink> или в файле COPYING-DOCS, "
+"url=\"help:fdl\">этому адресу</ulink> или в файле COPYING-DOCS, "
 "распространяемого вместе с данным руководством."
 
 #: C/mate-power-manager.xml:12(para)
diff --git a/help/sv/sv.po b/help/sv/sv.po
index 02d6fbd..3b530de 100644
--- a/help/sv/sv.po
+++ b/help/sv/sv.po
@@ -112,8 +112,8 @@ msgid "Richard Hughes"
 msgstr "Richard Hughes"
 
 #: C/mate-power-manager.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-power-manager.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."
diff --git a/help/zh_CN/zh_CN.po b/help/zh_CN/zh_CN.po
index 18fe8dd..5c14f53 100644
--- a/help/zh_CN/zh_CN.po
+++ b/help/zh_CN/zh_CN.po
@@ -156,12 +156,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\">link</ulink> 或在随本手册一起分发的 COPYING-DOCS 文件中找到 GFDL 的副"
 "本。"
 
@@ -274,7 +274,7 @@ msgid ""
 "\"><application>MATE Power Manager</application> Contact Page</ulink>."
 msgstr ""
 "报告一个错误或者一个关于 <application>Brasero</application> 程序以及本文档的"
-"建议，请看 <ulink url=\"ghelp:mate-feedback\" type=\"help\">MATE Feedback "
+"建议，请看 <ulink url=\"help:mate-feedback\" type=\"help\">MATE Feedback "
 "Page</ulink>。"
 
 #: C/mate-power-manager.xml:0(application)
diff --git a/src/gpm-common.c b/src/gpm-common.c
index e7d1d66..2c55d97 100644
--- a/src/gpm-common.c
+++ b/src/gpm-common.c
@@ -135,9 +135,9 @@ gpm_help_display (const gchar *link_id)
 	gchar *uri;
 
 	if (link_id != NULL)
-		uri = g_strconcat ("ghelp:mate-power-manager?", link_id, NULL);
+		uri = g_strconcat ("help:mate-power-manager?", link_id, NULL);
 	else
-		uri = g_strdup ("ghelp:mate-power-manager");
+		uri = g_strdup ("help:mate-power-manager");
 
 	gtk_show_uri (NULL, uri, GDK_CURRENT_TIME, &error);