diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | scripts/desc/xdg-mime.xml | 10 | ||||
| -rw-r--r-- | scripts/html/xdg-mime.html | 10 | ||||
| -rw-r--r-- | scripts/man/xdg-mime.1 | 4 | ||||
| -rwxr-xr-x | scripts/xdg-mime | 9 |
5 files changed, 21 insertions, 16 deletions
@@ -1,5 +1,9 @@ === xdg-utils 1.x.x === +2010-12-31 Fathi Boudra <fabo@freedesktop.org> + * xdg-mime: correct install text to use type/subtype. + Thanks to Christopher Yeleighton. (BR31441) + 2010-11-18 Rex Dieter <rdieter@fedoraproject.org> * fixup kfmclient_fix_exit_code() for newer kde-config output * fix typo in xdg-mime manpage diff --git a/scripts/desc/xdg-mime.xml b/scripts/desc/xdg-mime.xml index 38d394b..529e38c 100644 --- a/scripts/desc/xdg-mime.xml +++ b/scripts/desc/xdg-mime.xml @@ -144,16 +144,16 @@ and adding descriptions for new file types</refpurpose> <simpara> Adds the file type descriptions provided in <replaceable>mimetypes-file</replaceable> to the desktop environment. <replaceable>mimetypes-file</replaceable> - must be a XML file that follows the freedesktop.org + must be a XML file that follows the freedesktop.org Shared MIME-info Database specification and that has a mime-info element as its document root. For each new file type one or more icons with name - <replaceable>major</replaceable>-<replaceable>minor</replaceable> + <replaceable>type</replaceable>-<replaceable>subtype</replaceable> must be installed with the <command>xdg-icon-resource</command> command in the <emphasis>mimetypes</emphasis> context. For example the - application/vnd.oasis.opendocument.text filetype requires an - icon by the name of application-vnd.oasis.opendocument.text - to be installed. + filetype application/vnd.oasis.opendocument.text requires an + icon named application-vnd.oasis.opendocument.text + to be installed (unless the file type recommends another icon name). </simpara> </listitem> </varlistentry> diff --git a/scripts/html/xdg-mime.html b/scripts/html/xdg-mime.html index 65967a6..53bb99c 100644 --- a/scripts/html/xdg-mime.html +++ b/scripts/html/xdg-mime.html @@ -39,16 +39,16 @@ and adding descriptions for new file types</p></div><div class="refsynopsisdiv" </p></dd><dt><span class="term">install</span></dt><dd> Adds the file type descriptions provided in <em class="replaceable"><code>mimetypes-file</code></em> to the desktop environment. <em class="replaceable"><code>mimetypes-file</code></em> - must be a XML file that follows the freedesktop.org + must be a XML file that follows the freedesktop.org Shared MIME-info Database specification and that has a mime-info element as its document root. For each new file type one or more icons with name - <em class="replaceable"><code>major</code></em>-<em class="replaceable"><code>minor</code></em> + <em class="replaceable"><code>type</code></em>-<em class="replaceable"><code>subtype</code></em> must be installed with the <span class="command"><strong>xdg-icon-resource</strong></span> command in the <span class="emphasis"><em>mimetypes</em></span> context. For example the - application/vnd.oasis.opendocument.text filetype requires an - icon by the name of application-vnd.oasis.opendocument.text - to be installed. + filetype application/vnd.oasis.opendocument.text requires an + icon named application-vnd.oasis.opendocument.text + to be installed (unless the file type recommends another icon name). </dd><dt><span class="term">uninstall</span></dt><dd> Removes the file type descriptions provided in <em class="replaceable"><code>mimetypes-file</code></em> and previously added with <span class="command"><strong>xdg-mime install</strong></span> from the diff --git a/scripts/man/xdg-mime.1 b/scripts/man/xdg-mime.1 index cb06c26..50811e4 100644 --- a/scripts/man/xdg-mime.1 +++ b/scripts/man/xdg-mime.1 @@ -92,12 +92,12 @@ Adds the file type descriptions provided in to the desktop environment\&. \fImimetypes\-file\fR must be a XML file that follows the freedesktop\&.org Shared MIME\-info Database specification and that has a mime\-info element as its document root\&. For each new file type one or more icons with name -\fImajor\fR\-\fIminor\fR +\fItype\fR\-\fIsubtype\fR must be installed with the \fBxdg\-icon\-resource\fR command in the \fImimetypes\fR -context\&. For example the application/vnd\&.oasis\&.opendocument\&.text filetype requires an icon by the name of application\-vnd\&.oasis\&.opendocument\&.text to be installed\&. +context\&. For example the filetype application/vnd\&.oasis\&.opendocument\&.text requires an icon named application\-vnd\&.oasis\&.opendocument\&.text to be installed (unless the file type recommends another icon name)\&. .RE .PP uninstall diff --git a/scripts/xdg-mime b/scripts/xdg-mime index 04ed915..915cf0d 100755 --- a/scripts/xdg-mime +++ b/scripts/xdg-mime @@ -102,10 +102,11 @@ install environment. mimetypes-file must be a XML file that follows the freedesktop.org Shared MIME-info Database specification and that has a mime-info element as its document root. For each new file type one or more - icons with name major-minor must be installed with the xdg-icon-resource - command in the mimetypes context. For example the application/ - vnd.oasis.opendocument.text filetype requires an icon by the name of - application-vnd.oasis.opendocument.text to be installed. + icons with name type-subtype must be installed with the xdg-icon-resource + command in the mimetypes context. For example the filetype application/ + vnd.oasis.opendocument.text requires an icon named + application-vnd.oasis.opendocument.text to be installed (unless the file + type recommends another icon name). uninstall Removes the file type descriptions provided in mimetypes-file and previously added with xdg-mime install from the desktop environment. |