Use yelp-tools instead of mate-doc-utils

Makefile.am

@@ -10,7 +10,6 @@ EXTRA_DIST = \
 	intltool-update.in \
 	omf.make \
 	xmldocs.make \
-	mate-doc-utils.make \
 	mate-system-tools.pc.in \
 	org.mate.system-tools.gschema.xml.in
 
@@ -28,7 +27,6 @@ DISTCLEANFILES = \
 	backends/intltool-extract \
 	backends/intltool-merge \
 	backends/intltool-update \
-	mate-doc-utils.make \
 	mate-system-tools.pc \
 	org.mate.system-tools.gschema.xml
 

autogen.sh

@@ -13,7 +13,12 @@ PKG_NAME="mate-system-tools"
 }
 
 which mate-autogen || {
-    echo "You need to install mate-common from the MATE CVS"
+    echo "You need to install mate-common"
+    exit 1
+}
+
+which yelp-build || {
+    echo "You need to install yelp-tools"
     exit 1
 }
 

configure.ac

@@ -9,7 +9,7 @@ IT_PROG_INTLTOOL([0.35.0])
 
 AM_CONFIG_HEADER(config.h)
 
-MATE_DOC_INIT
+YELP_HELP_INIT
 
 AM_MAINTAINER_MODE
 

doc/network/C/mate-network-admin.xml → doc/network/C/index.docbook

@@ -83,7 +83,7 @@
 
     <legalnotice> 
 	 <title>Feedback</title> 
-	 <para> To report a bug or make a suggestion regarding the &tool; or this manual, follow the directions in the <ulink url="ghelp:mate-feedback" type="help">MATE Feedback Page</ulink>. </para>
+	 <para> To report a bug or make a suggestion regarding the &tool; 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 &tool; allows you to specify the way your system connects to other computers and to internet.</para>

doc/network/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

doc/network/Makefile.am

@@ -1,12 +1,10 @@
-include $(top_srcdir)/mate-doc-utils.make
-dist-hook: doc-dist-hook
+@YELP_HELP_RULES@
 
-DOC_MODULE = mate-network-admin
-DOC_ENTITIES = legal.xml
-DOC_INCLUDES =
-DOC_FIGURES = figures/network-tool.png
+HELP_ID = mate-network-admin
+HELP_FILES = index.docbook legal.xml
+HELP_MEDIA = figures/network-tool.png
 
-DOC_LINGUAS = ca cs de el en_GB es fr oc sv it zh_CN
+HELP_LINGUAS = ca cs de el en_GB es fr oc sv it zh_CN
 
 
 -include $(top_srcdir)/git.mk

doc/network/ca/ca.po

@@ -29,8 +29,8 @@ msgid "Carlos Garnacho Parro"
 msgstr "Carlos Garnacho Parro"
 
 #: C/network-admin.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 "Teniu permís per a copiar, distribuir i/o modificar aquest document, sota els termes de la Llicència de documentació lliure GNU (GFDL), versió 1.1 o 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 amb aquest 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 "Teniu permís per a copiar, distribuir i/o modificar aquest document, sota els termes de la Llicència de documentació lliure GNU (GFDL), versió 1.1 o 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=\"help:fdl\">enllaç</ulink> o en el fitxer COPYING-DOCS distribuït amb aquest manual."
 
 #: C/network-admin.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."
@@ -89,8 +89,8 @@ msgid "Feedback"
 msgstr "Comentaris"
 
 #: C/network-admin.xml:86(para) 
-msgid "To report a bug or make a suggestion regarding the Network Administration Tool or this manual, follow the directions in the <ulink url=\"ghelp:mate-feedback\" type=\"help\">MATE Feedback Page</ulink>."
-msgstr "Per a informar d'un error o fer algun suggeriment quant a l'<application>eina d'administració de la xarxa</application> o aquest manual, seguiu les indicacions a la <ulink url=\"ghelp:mate-feedback\" type=\"help\">Pàgina de comentaris del MATE</ulink>."
+msgid "To report a bug or make a suggestion regarding the Network Administration Tool 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 a l'<application>eina d'administració de la xarxa</application> o aquest manual, seguiu les indicacions a la <ulink url=\"help:mate-feedback\" type=\"help\">Pàgina de comentaris del MATE</ulink>."
 
 #: C/network-admin.xml:89(para) 
 msgid "The Network Administration Tool allows you to specify the way your system connects to other computers and to internet."

doc/network/cs/cs.po

@@ -41,14 +41,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 ""
 "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 "
+"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/network-admin.xml:12(para)
@@ -174,12 +174,12 @@ msgstr "Ohlasy"
 #: C/network-admin.xml:86(para)
 msgid ""
 "To report a bug or make a suggestion regarding the Network Administration "
-"Tool or this manual, follow the directions in the <ulink url=\"ghelp:mate-"
+"Tool 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 Nástroji "
 "pro správu sítě 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 url=\"help:mate-feedback\" type=\"help\">Stránka s ohlasy na MATE</"
 "ulink>."
 
 #: C/network-admin.xml:89(para)

doc/network/de/de.po

@@ -36,15 +36,15 @@ 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 "
 "Documentation License (GFDL), Version 1.1 oder jeder späteren, von der Free "
 "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/network-admin.xml:12(para)
@@ -180,12 +180,12 @@ msgstr "Rückmeldungen"
 #: C/network-admin.xml:86(para)
 msgid ""
 "To report a bug or make a suggestion regarding the Network Administration "
-"Tool or this manual, follow the directions in the <ulink url=\"ghelp:mate-"
+"Tool or this manual, follow the directions in the <ulink url=\"help:mate-"
 "feedback\" type=\"help\">MATE Feedback Page</ulink>."
 msgstr ""
 "Um einen Fehler zu melden oder einen Vorschlag zum Netzwerk-"
 "Verwaltungswerkzeug oder zu diesem Handbuch zu machen, folgen Sie den "
-"Anweisungen auf der <ulink url=\"ghelp:mate-feedback\" type=\"help\">MATE-"
+"Anweisungen auf der <ulink url=\"help:mate-feedback\" type=\"help\">MATE-"
 "Seite für Rückmeldungen</ulink>."
 
 #: C/network-admin.xml:89(para)

doc/network/el/el.po

@@ -31,8 +31,8 @@ msgid "Carlos Garnacho Parro"
 msgstr "Carlos Garnacho Parro"
 
 #: C/network-admin.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 "Χορηγείται άδεια αντιγραφής, διανομής και/ή τροποποίησης του παρόντος εγγράφου υπό τους όρους της έκδοσης 1.1 της Ελεύθερης Άδειας Τεκμηρίωσης GNU (GFDL), ή οποιασδήποτε μεταγενέστερης έκδοσής της από το Ίδρυμα Ελεύθερου Λογισμικού (FSF), χωρίς αμετάβλητα τμήματα, κείμενα εξώφυλλου και κείμενα οπισθόφυλλου. Αντίγραφο της άδειας GFDL είναι διαθέσιμο στον ακόλουθο <ulink type=\"help\" url=\"ghelp:fdl\">σύνδεσμο</ulink>, ή στο αρχείο COPYING-DOCS που διανέμεται μαζί με το παρόν εγχειρίδιο."
+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 "Χορηγείται άδεια αντιγραφής, διανομής και/ή τροποποίησης του παρόντος εγγράφου υπό τους όρους της έκδοσης 1.1 της Ελεύθερης Άδειας Τεκμηρίωσης GNU (GFDL), ή οποιασδήποτε μεταγενέστερης έκδοσής της από το Ίδρυμα Ελεύθερου Λογισμικού (FSF), χωρίς αμετάβλητα τμήματα, κείμενα εξώφυλλου και κείμενα οπισθόφυλλου. Αντίγραφο της άδειας GFDL είναι διαθέσιμο στον ακόλουθο <ulink type=\"help\" url=\"help:fdl\">σύνδεσμο</ulink>, ή στο αρχείο COPYING-DOCS που διανέμεται μαζί με το παρόν εγχειρίδιο."
 
 #: C/network-admin.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."
@@ -94,8 +94,8 @@ msgid "Feedback"
 msgstr "Ανάδραση"
 
 #: C/network-admin.xml:86(para)
-msgid "To report a bug or make a suggestion regarding the Network Administration Tool 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 Network Administration Tool 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/network-admin.xml:89(para)
 msgid "The Network Administration Tool allows you to specify the way your system connects to other computers and to internet."

doc/network/en_GB/en_GB.po

@@ -35,14 +35,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/network-admin.xml:12(para)
@@ -171,12 +171,12 @@ msgstr "Feedback"
 #: C/network-admin.xml:86(para)
 msgid ""
 "To report a bug or make a suggestion regarding the Network Administration "
-"Tool or this manual, follow the directions in the <ulink url=\"ghelp:mate-"
+"Tool or this manual, follow the directions in the <ulink url=\"help:mate-"
 "feedback\" type=\"help\">MATE Feedback Page</ulink>."
 msgstr ""
 "To report a bug or make a suggestion regarding the <application>Network "
 "Administration Tool</application> or this manual, follow the directions in "
-"the <ulink url=\"ghelp:mate-feedback\" type=\"help\">MATE Feedback Page</"
+"the <ulink url=\"help:mate-feedback\" type=\"help\">MATE Feedback Page</"
 "ulink>."
 
 #: C/network-admin.xml:89(para)

doc/network/es/es.po

@@ -42,15 +42,15 @@ 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 autorización para copiar, distribuir o modificar este documento "
 "según los términos de la GFDL (GNU Free Documentation License), Versión 1.1, "
 "o cualquier otra versión posterior publicada por Free Software Foundation "
 "sin secciones invariables, textos de portada ni textos de contraportada. "
 "Podrá encontrar una copia de la GFDL en este <ulink type=\"help\" url="
-"\"ghelp:fdl\">enlace</ulink> o en el archivo COPYING-DOCS distribuido con "
+"\"help:fdl\">enlace</ulink> o en el archivo COPYING-DOCS distribuido con "
 "este manual."
 
 #: C/network-admin.xml:12(para)
@@ -186,12 +186,12 @@ msgstr "Sugerencias e informe de errores"
 #: C/network-admin.xml:86(para)
 msgid ""
 "To report a bug or make a suggestion regarding the Network Administration "
-"Tool or this manual, follow the directions in the <ulink url=\"ghelp:mate-"
+"Tool or this manual, follow the directions in the <ulink url=\"help:mate-"
 "feedback\" type=\"help\">MATE Feedback Page</ulink>."
 msgstr ""
 "Para informar de un error o hacer sugerencias sobre la Herramienta de "
 "Administración de red o sobre este manual, sigue las indicaciones en la "
-"<ulink url=\"ghelp:mate-feedback\" type=\"help\">Página de sugerencias e "
+"<ulink url=\"help:mate-feedback\" type=\"help\">Página de sugerencias e "
 "informe de errores de Mate</ulink>."
 
 #: C/network-admin.xml:89(para)

doc/network/fr/fr.po

@@ -44,15 +44,15 @@ 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 "
 "selon les termes de la Licence GNU Free Documentation License, Version 1.1 "
 "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/network-admin.xml:12(para)
@@ -184,12 +184,12 @@ msgstr "Votre avis"
 #: ../C/network-admin.xml:86(para)
 msgid ""
 "To report a bug or make a suggestion regarding the Network Administration "
-"Tool or this manual, follow the directions in the <ulink url=\"ghelp:mate-"
+"Tool 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 l'outil "
 "d'administration réseau ou ce manuel, procédez comme indiqué sur la <ulink "
-"url=\"ghelp:mate-feedback\" type=\"help\">page de réactions sur MATE</"
+"url=\"help:mate-feedback\" type=\"help\">page de réactions sur MATE</"
 "ulink>."
 
 #: ../C/network-admin.xml:89(para)