summaryrefslogtreecommitdiff
path: root/help/fish
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2013-07-26 15:35:47 +0200
committerStefano Karapetsas <[email protected]>2013-07-26 15:35:47 +0200
commit88fbc42c5872c4bca0c3cb71133cda1e66584cee (patch)
tree37cb3248337a60f19cfb44e927a53e71f11accb8 /help/fish
parent95cd1b57f9cd1e84bca22a0d9ff6046e11344b71 (diff)
parent2ced54ba17c63fda9f5da417f4dd0d5380db8b59 (diff)
downloadmate-panel-88fbc42c5872c4bca0c3cb71133cda1e66584cee.tar.bz2
mate-panel-88fbc42c5872c4bca0c3cb71133cda1e66584cee.tar.xz
Merge branch 'dev-yelp-tools'
Diffstat (limited to 'help/fish')
-rw-r--r--help/fish/C/index.docbook (renamed from help/fish/C/mate-applet-fish.xml)2
-rw-r--r--help/fish/C/legal.xml4
-rw-r--r--help/fish/Makefile.am14
-rw-r--r--help/fish/mate-applet-fish.omf.in11
4 files changed, 12 insertions, 19 deletions
diff --git a/help/fish/C/mate-applet-fish.xml b/help/fish/C/index.docbook
index 0760a6f8..4d340e0d 100644
--- a/help/fish/C/mate-applet-fish.xml
+++ b/help/fish/C/index.docbook
@@ -150,7 +150,7 @@
<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>
+ <ulink url="help:mate-feedback" type="help">MATE Feedback Page</ulink>. </para>
</legalnotice>
<abstract role="description">
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/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>