Merge branch 'death_of_mimedb'

5 files changed, 4 insertions, 34 deletions

diff --git a/doc_src/faq.hdr b/doc_src/faq.hdr
index 75e4bb74..03d1983f 100644
--- a/doc_src/faq.hdr
+++ b/doc_src/faq.hdr
@@ -212,7 +212,7 @@ Next, do the following (assuming fish was installed to /usr/local):
 rm -Rf /usr/local/etc/fish /usr/local/share/fish ~/.config/fish
 rm /usr/local/share/man/man1/fish*.1
 cd /usr/local/bin
-rm -f fish mimedb fish_indent
+rm -f fish fish_indent
 \endfish
 
 \htmlonly[block]
diff --git a/doc_src/index.hdr.in b/doc_src/index.hdr.in
index b0ddb50f..55a26260 100644
--- a/doc_src/index.hdr.in
+++ b/doc_src/index.hdr.in
@@ -362,7 +362,7 @@ Functions beginning with the string `__fish_print_` print a newline separated li
 
 - `__fish_complete_pids` prints a list of all processes IDs with the command name as description.
 
-- `__fish_complete_suffix SUFFIX` performs file completion allowing only files ending in SUFFIX. The mimetype database is used to find a suitable description.
+- `__fish_complete_suffix SUFFIX` performs file completion allowing only files ending in SUFFIX, with an optional description.
 
 - `__fish_complete_users` prints a list of all users with their full name as description.
 
diff --git a/doc_src/license.hdr b/doc_src/license.hdr
index fff8084e..b9d5fc8c 100644
--- a/doc_src/license.hdr
+++ b/doc_src/license.hdr
@@ -129,9 +129,7 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH RE
 ----
 
 
-## License for xdgmime and glibc
-
-The xdgmime library, written and copyrighted by Red Hat, Inc, is used by the mimedb command, which is a part of fish. It is released under the LGPL, version 2 or later, or under the Academic Free License, version 2. Version 2 of the LGPL license agreement is included below.
+## License for glibc
 
 Fish contains code from the glibc library, namely the wcstok function. This code is licensed under the LGPL, version 2 or later. Version 2 of the LPGL license agreement is included below.
 
diff --git a/doc_src/mimedb.txt b/doc_src/mimedb.txt
deleted file mode 100644
index 19747444..00000000
--- a/doc_src/mimedb.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-\section mimedb mimedb - lookup file information via the mime database
-
-\subsection mimedb-synopsis Synopsis
-\fish{synopsis}
-mimedb [OPTIONS] FILES...
-\endfish
-
-\subsection mimedb-description Description
-
-`mimedb` queries the MIME type database and the `.desktop` files installed on the system in order to find information on the files listed in `FILES`. The information that `mimedb` can retrieve includes the MIME type for a file, a description of the type, and the default action that can be performed on the file. `mimedb` can also be used to launch the default action for this file.
-
-The following options are available:
-
-- `-t`, `--input-file-data` determines the files' type both by their filename and by their contents (default behaviour).
-
-- `-f`, `--input-filename` determines the files' type by their filename.
-
-- `-i`, `--input-mime` specifies that the arguments are not files, but MIME types.
-
-- `-m`, `--output-mime` outputs the MIME type of each file (default behaviour).
-
-- `-f`, `--output-description` outputs the description of each MIME type.
-
-- `-a`, `--output-action` outputs the default action of each MIME type.
-
-- `-l`, `--launch` launches the default action for the specified files.
-
-- `-v`, `--version` displays the version number and exits.
diff --git a/doc_src/open.txt b/doc_src/open.txt
index 85e91e72..c81c3c9a 100644
--- a/doc_src/open.txt
+++ b/doc_src/open.txt
@@ -7,7 +7,7 @@ open FILES...
 
 \subsection open-description Description
 
-`open` opens a file in its default application, using the `xdg-open` command if it exists, or else the <a href="commands.html#mimedb">mimedb</a> command.
+`open` opens a file in its default application, using the appropriate tool for the operating system. On GNU/Linux, this requires the common but optional `xdg-open` utility, from the `xdg-utils` package.
 
 
 \subsection open-example Example