man: Update pages for deprecated gvfs utils

Commit 2f28fa4 replaced various gvfs- utils in favour of new gio cmd
tool. Update also relevant man pages with mention that they have been
deprecated.

https://bugzilla.gnome.org/show_bug.cgi?id=769378

19 files changed, 87 insertions, 1852 deletions

diff --git a/man/Makefile.am b/man/Makefile.am
index 22d7ef23..fa3a5638 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -12,6 +12,57 @@ XSLTPROC_FLAGS = \
 %.7: %.xml
 	$(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
 
+gvfs-mount.xml: deprecated.xml.in Makefile
+	$(AM_V_GEN) $(SED) -e "s|\@original\@|gvfs-mount|" -e "s|\@replacement\@|gio mount|" $< > $@
+
+gvfs-cat.xml: deprecated.xml.in Makefile
+	$(AM_V_GEN) $(SED) -e "s|\@original\@|gvfs-cat|" -e "s|\@replacement\@|gio cat|" $< > $@
+
+gvfs-open.xml: deprecated.xml.in Makefile
+	$(AM_V_GEN) $(SED) -e "s|\@original\@|gvfs-open|" -e "s|\@replacement\@|gio open|" $< > $@
+
+gvfs-save.xml: deprecated.xml.in Makefile
+	$(AM_V_GEN) $(SED) -e "s|\@original\@|gvfs-save|" -e "s|\@replacement\@|gio save|" $< > $@
+
+gvfs-ls.xml: deprecated.xml.in Makefile
+	$(AM_V_GEN) $(SED) -e "s|\@original\@|gvfs-ls|" -e "s|\@replacement\@|gio list|" $< > $@
+
+gvfs-tree.xml: deprecated.xml.in Makefile
+	$(AM_V_GEN) $(SED) -e "s|\@original\@|gvfs-tree|" -e "s|\@replacement\@|gio tree|" $< > $@
+
+gvfs-info.xml: deprecated.xml.in Makefile
+	$(AM_V_GEN) $(SED) -e "s|\@original\@|gvfs-info|" -e "s|\@replacement\@|gio info|" $< > $@
+
+gvfs-set-attribute.xml: deprecated.xml.in Makefile
+	$(AM_V_GEN) $(SED) -e "s|\@original\@|gvfs-set-attribute|" -e "s|\@replacement\@|gio set|" $< > $@
+
+gvfs-trash.xml: deprecated.xml.in Makefile
+	$(AM_V_GEN) $(SED) -e "s|\@original\@|gvfs-trash|" -e "s|\@replacement\@|gio trash|" $< > $@
+
+gvfs-rename.xml: deprecated.xml.in Makefile
+	$(AM_V_GEN) $(SED) -e "s|\@original\@|gvfs-rename|" -e "s|\@replacement\@|gio rename|" $< > $@
+
+gvfs-rm.xml: deprecated.xml.in Makefile
+	$(AM_V_GEN) $(SED) -e "s|\@original\@|gvfs-rm|" -e "s|\@replacement\@|gio remove|" $< > $@
+
+gvfs-copy.xml: deprecated.xml.in Makefile
+	$(AM_V_GEN) $(SED) -e "s|\@original\@|gvfs-copy|" -e "s|\@replacement\@|gio copy|" $< > $@
+
+gvfs-move.xml: deprecated.xml.in Makefile
+	$(AM_V_GEN) $(SED) -e "s|\@original\@|gvfs-move|" -e "s|\@replacement\@|gio move|" $< > $@
+
+gvfs-monitor-file.xml: deprecated.xml.in Makefile
+	$(AM_V_GEN) $(SED) -e "s|\@original\@|gvfs-monitor-file|" -e "s|\@replacement\@|gio monitor|" $< > $@
+
+gvfs-monitor-dir.xml: deprecated.xml.in Makefile
+	$(AM_V_GEN) $(SED) -e "s|\@original\@|gvfs-monitor-dir|" -e "s|\@replacement\@|gio monitor|" $< > $@
+
+gvfs-mkdir.xml: deprecated.xml.in Makefile
+	$(AM_V_GEN) $(SED) -e "s|\@original\@|gvfs-mkdir|" -e "s|\@replacement\@|gio mkdir|" $< > $@
+
+gvfs-mime.xml: deprecated.xml.in Makefile
+	$(AM_V_GEN) $(SED) -e "s|\@original\@|gvfs-mime|" -e "s|\@replacement\@|gio mime|" $< > $@
+
 man_MANS = \
 	gvfs-cat.1 \
 	gvfs-copy.1 \
diff --git a/man/deprecated.xml.in b/man/deprecated.xml.in
new file mode 100644
index 00000000..c8d32e85
--- /dev/null
+++ b/man/deprecated.xml.in
@@ -0,0 +1,36 @@
+<?xml version='1.0'?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+        "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+
+<refentry id="@original@">
+
+        <refentryinfo>
+                <title>@original@</title>
+                <productname>gvfs</productname>
+        </refentryinfo>
+
+        <refmeta>
+                <refentrytitle>@original@</refentrytitle>
+                <manvolnum>1</manvolnum>
+                <refmiscinfo class="manual">User Commands</refmiscinfo>
+        </refmeta>
+
+        <refnamediv>
+                <refname>@original@</refname>
+        </refnamediv>
+
+        <refsect1>
+                <title>Description</title>
+
+                <para><command>@original@</command> has been deprecated and it is redirected to <command>@replacement@</command>.</para>
+        </refsect1>
+
+        <refsect1>
+                <title>See Also</title>
+                <para>
+                        <citerefentry><refentrytitle>gio</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <ulink url="https://developer.gnome.org/gio/stable/gio.html">GIO commandline tool</ulink>
+                </para>
+        </refsect1>
+
+</refentry>
diff --git a/man/gvfs-cat.xml b/man/gvfs-cat.xml
deleted file mode 100644
index 6e0800e6..00000000
--- a/man/gvfs-cat.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-        "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<refentry id="gvfs-cat">
-
-        <refentryinfo>
-                <title>gvfs-cat</title>
-                <productname>gvfs</productname>
-
-                <authorgroup>
-                        <author>
-                                <contrib>Developer</contrib>
-                                <firstname>Alexander</firstname>
-                                <surname>Larsson</surname>
-                                <email>alexl@redhat.com</email>
-                        </author>
-                </authorgroup>
-
-        </refentryinfo>
-
-        <refmeta>
-                <refentrytitle>gvfs-cat</refentrytitle>
-                <manvolnum>1</manvolnum>
-                <refmiscinfo class="manual">User Commands</refmiscinfo>
-        </refmeta>
-
-        <refnamediv>
-                <refname>gvfs-cat</refname>
-                <refpurpose>Concatenate files</refpurpose>
-        </refnamediv>
-
-        <refsynopsisdiv>
-                <cmdsynopsis>
-                        <command>gvfs-cat <arg choice="opt" rep="repeat">OPTION</arg> <arg rep="repeat">LOCATION</arg></command>
-                </cmdsynopsis>
-        </refsynopsisdiv>
-
-        <refsect1>
-                <title>Description</title>
-
-                <para><command>gvfs-cat</command> concatenates the given
-                files and prints them to the standard output.</para>
-
-                <para><command>gvfs-cat</command> works just like the
-                traditional cat utility, but using gvfs locations instead
-                of local files: for example you can use something like
-                smb://server/resource/file.txt as location.</para>
-
-                <para>Note: just pipe through cat if you need its formatting
-                options like -n, -T or other.</para>
-        </refsect1>
-
-        <refsect1>
-                <title>Options</title>
-
-                <para>The following options are understood:</para>
-
-                <variablelist>
-                        <varlistentry>
-                                <term><option>-?</option>, <option>--help</option></term>
-
-                                <listitem><para>Prints a short help
-                                text and exits.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>--version</option></term>
-
-                                <listitem><para>Shows the version number and
-                                exits.</para></listitem>
-                        </varlistentry>
-
-                </variablelist>
-        </refsect1>
-
-        <refsect1>
-                <title>Exit status</title>
-
-                <para>On success 0 is returned, a non-zero failure
-                code otherwise.</para>
-        </refsect1>
-
-        <refsect1>
-                <title>See Also</title>
-                <para>
-                        <citerefentry><refentrytitle>cat</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-                </para>
-        </refsect1>
-
-</refentry>
diff --git a/man/gvfs-copy.xml b/man/gvfs-copy.xml
deleted file mode 100644
index 426fc0dc..00000000
--- a/man/gvfs-copy.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-        "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<refentry id="gvfs-copy">
-
-        <refentryinfo>
-                <title>gvfs-copy</title>
-                <productname>gvfs</productname>
-
-                <authorgroup>
-                        <author>
-                                <contrib>Developer</contrib>
-                                <firstname>Alexander</firstname>
-                                <surname>Larsson</surname>
-                                <email>alexl@redhat.com</email>
-                        </author>
-                </authorgroup>
-
-        </refentryinfo>
-
-        <refmeta>
-                <refentrytitle>gvfs-copy</refentrytitle>
-                <manvolnum>1</manvolnum>
-                <refmiscinfo class="manual">User Commands</refmiscinfo>
-        </refmeta>
-
-        <refnamediv>
-                <refname>gvfs-copy</refname>
-                <refpurpose>Copy files</refpurpose>
-        </refnamediv>
-
-        <refsynopsisdiv>
-                <cmdsynopsis>
-                        <command>gvfs-copy <arg choice="opt" rep="repeat">OPTION</arg> <arg>SOURCE</arg> <arg>DEST</arg></command>
-                </cmdsynopsis>
-                <cmdsynopsis>
-                        <command>gvfs-copy <arg choice="opt" rep="repeat">OPTION</arg> <arg rep="repeat">SOURCE</arg> <arg>DIRECTORY</arg></command>
-                </cmdsynopsis>
-        </refsynopsisdiv>
-
-        <refsect1>
-                <title>Description</title>
-
-                <para><command>gvfs-copy</command> copies a file from SOURCE to
-                DEST, or multiple SOURCEs to DIRECTORY.</para>
-                <para><command>gvfs-copy</command> is similar to the traditional
-                cp utility, but using gvfs locations instead of local files:
-                for example you can use something like
-                smb://server/resource/file.txt as location.</para>
-        </refsect1>
-
-        <refsect1>
-                <title>Options</title>
-
-                <para>The following options are understood:</para>
-
-                <variablelist>
-                        <varlistentry>
-                                <term><option>-h</option>, <option>--help</option></term>
-
-                                <listitem><para>Prints a short help
-                                text and exits.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>--version</option></term>
-
-                                <listitem><para>Shows the version number and
-                                exits.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-T</option>, <option>--no-target-directory</option></term>
-
-                                <listitem><para>Don't copy into DEST even if it is a directory.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-p</option>, <option>--progress</option></term>
-
-                                <listitem><para>Show progress.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-i</option>, <option>--interactive</option></term>
-
-                                <listitem><para>Prompt before overwriting files.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>--preserve</option></term>
-
-                                <listitem><para>Preserve all attributes.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-b</option>, <option>--backup</option></term>
-
-                                <listitem><para>Backup existing destination files.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-P</option>, <option>--no-dereference</option></term>
-
-                                <listitem><para>Never follow symlinks.</para></listitem>
-                        </varlistentry>
-                </variablelist>
-        </refsect1>
-
-        <refsect1>
-                <title>Exit status</title>
-
-                <para>On success 0 is returned, a non-zero failure
-                code otherwise.</para>
-        </refsect1>
-
-        <refsect1>
-                <title>See Also</title>
-                <para>
-                        <citerefentry><refentrytitle>cp</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-                </para>
-        </refsect1>
-
-</refentry>
diff --git a/man/gvfs-info.xml b/man/gvfs-info.xml
deleted file mode 100644
index a56ea89e..00000000
--- a/man/gvfs-info.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-        "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<refentry id="gvfs-info">
-
-        <refentryinfo>
-                <title>gvfs-info</title>
-                <productname>gvfs</productname>
-
-                <authorgroup>
-                        <author>
-                                <contrib>Developer</contrib>
-                                <firstname>Alexander</firstname>
-                                <surname>Larsson</surname>
-                                <email>alexl@redhat.com</email>
-                        </author>
-                </authorgroup>
-
-        </refentryinfo>
-
-        <refmeta>
-                <refentrytitle>gvfs-info</refentrytitle>
-                <manvolnum>1</manvolnum>
-                <refmiscinfo class="manual">User Commands</refmiscinfo>
-        </refmeta>
-
-        <refnamediv>
-                <refname>gvfs-info</refname>
-                <refpurpose>Show information about files</refpurpose>
-        </refnamediv>
-
-        <refsynopsisdiv>
-                <cmdsynopsis>
-                        <command>gvfs-info <arg choice="opt" rep="repeat">OPTION</arg> <arg choice="opt" rep="repeat">LOCATION</arg></command>
-                </cmdsynopsis>
-        </refsynopsisdiv>
-
-        <refsect1>
-                <title>Description</title>
-
-                <para><command>gvfs-info</command> shows information about
-                the given locations.</para>
-
-                <para><command>gvfs-info</command> is similar to the traditional
-                ls utility, but using gvfs locations instead of local files:
-                for example you can use something like
-                smb://server/resource/file.txt as location.</para>
-
-                <para>File attributes can be specified with their gvfs name,
-                e.g. standard::icon, or just by namespace, e.g. unix, or by
-                '*' which matches all attributes. Several attributes or groups
-                can be specified, separated by comma.</para>
-
-                <para>By default, <command>gvfs-info</command> shows all
-                attributes.</para>
-
-        </refsect1>
-
-        <refsect1>
-                <title>Options</title>
-
-                <para>The following options are understood:</para>
-
-                <variablelist>
-                        <varlistentry>
-                                <term><option>-h</option>, <option>--help</option></term>
-
-                                <listitem><para>Prints a short help
-                                text and exits.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>--version</option></term>
-
-                                <listitem><para>Shows the version number and
-                                exits.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-w</option>, <option>--query-writable</option></term>
-
-                                <listitem><para>Show writable attributes and their types.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-f</option>, <option>--filesystem</option></term>
-
-                                <listitem><para>Show information about the filesystem on which the files reside.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-a</option>, <option>--attributes=ATTRIBUTES</option></term>
-
-                                <listitem><para>The attributes to get, specified
-                                as a comma-separated list of gvfs file attribute
-                                names.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-n</option>, <option>--nofollow-symlinks</option></term>
-
-                                <listitem><para>Don't follow symlinks.</para></listitem>
-                        </varlistentry>
-                </variablelist>
-        </refsect1>
-
-        <refsect1>
-                <title>Exit status</title>
-
-                <para>On success 0 is returned, a non-zero failure
-                code otherwise.</para>
-        </refsect1>
-
-        <refsect1>
-                <title>See Also</title>
-                <para>
-                        <citerefentry><refentrytitle>ls</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>gvfs-ls</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                        <ulink url="http://developer.gnome.org/gio/2.32/gio-GFileAttribute.html">GIO file attributes</ulink>
-                </para>
-        </refsect1>
-
-</refentry>
diff --git a/man/gvfs-ls.xml b/man/gvfs-ls.xml
deleted file mode 100644
index da12e91a..00000000
--- a/man/gvfs-ls.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-        "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<refentry id="gvfs-ls">
-
-        <refentryinfo>
-                <title>gvfs-ls</title>
-                <productname>gvfs</productname>
-
-                <authorgroup>
-                        <author>
-                                <contrib>Developer</contrib>
-                                <firstname>Alexander</firstname>
-                                <surname>Larsson</surname>
-                                <email>alexl@redhat.com</email>
-                        </author>
-                </authorgroup>
-
-        </refentryinfo>
-
-        <refmeta>
-                <refentrytitle>gvfs-ls</refentrytitle>
-                <manvolnum>1</manvolnum>
-                <refmiscinfo class="manual">User Commands</refmiscinfo>
-        </refmeta>
-
-        <refnamediv>
-                <refname>gvfs-ls</refname>
-                <refpurpose>List files</refpurpose>
-        </refnamediv>
-
-        <refsynopsisdiv>
-                <cmdsynopsis>
-                        <command>gvfs-ls <arg choice="opt" rep="repeat">OPTION</arg> <arg choice="opt" rep="repeat">LOCATION</arg></command>
-                </cmdsynopsis>
-        </refsynopsisdiv>
-
-        <refsect1>
-                <title>Description</title>
-
-                <para><command>gvfs-ls</command> lists information about
-                the given locations. If no location is given, it defaults
-                to the current directory.</para>
-
-                <para><command>gvfs-ls</command> is similar to the traditional
-                ls utility, but using gvfs locations instead of local files:
-                for example you can use something like
-                smb://server/resource/file.txt as location.</para>
-
-                <para>File attributes can be specified with their gvfs name,
-                e.g. standard::icon, or just by namespace, e.g. unix, or by
-                '*' which matches all attributes. Several attributes or groups
-                can be specified, separated by comma.</para>
-
-        </refsect1>
-
-        <refsect1>
-                <title>Options</title>
-
-                <para>The following options are understood:</para>
-
-                <variablelist>
-                        <varlistentry>
-                                <term><option>-?</option>, <option>--help</option></term>
-
-                                <listitem><para>Prints a short help
-                                text and exits.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>--version</option></term>
-
-                                <listitem><para>Shows the version number and
-                                exits.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-a</option>, <option>--attributes=ATTRIBUTES</option></term>
-
-                                <listitem><para>The attributes to get, specified
-                                as a comma-separated list of gvfs file attribute
-                                names.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-h</option>, <option>--hidden</option></term>
-
-                                <listitem><para>Show hidden files.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-l</option>, <option>--long</option></term>
-
-                                <listitem><para>Use a long listing format.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-c</option>, <option>--show-completions=PREFIX</option></term>
-
-                                <listitem><para>Show only filenames starting with PREFIX.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-n</option>, <option>--nofollow-symlinks</option></term>
-
-                                <listitem><para>Don't follow symlinks.</para></listitem>
-                        </varlistentry>
-                </variablelist>
-        </refsect1>
-
-        <refsect1>
-                <title>Exit status</title>
-
-                <para>On success 0 is returned, a non-zero failure
-                code otherwise.</para>
-        </refsect1>
-
-        <refsect1>
-                <title>See Also</title>
-                <para>
-                        <citerefentry><refentrytitle>ls</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>gvfs-info</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-                </para>
-        </refsect1>
-
-</refentry>
diff --git a/man/gvfs-mime.xml b/man/gvfs-mime.xml
deleted file mode 100644
index 5cff3bd3..00000000
--- a/man/gvfs-mime.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-        "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<refentry id="gvfs-mime">
-
-        <refentryinfo>
-                <title>gvfs-mime</title>
-                <productname>gvfs</productname>
-
-                <authorgroup>
-                        <author>
-                                <contrib>Developer</contrib>
-                                <firstname>Bastien</firstname>
-                                <surname>Nocera</surname>
-                                <email>hadess@hadess.net</email>
-                        </author>
-                </authorgroup>
-
-        </refentryinfo>
-
-        <refmeta>
-                <refentrytitle>gvfs-mime</refentrytitle>
-                <manvolnum>1</manvolnum>
-                <refmiscinfo class="manual">User Commands</refmiscinfo>
-        </refmeta>
-
-        <refnamediv>
-                <refname>gvfs-mime</refname>
-                <refpurpose>Get or set mime handlers</refpurpose>
-        </refnamediv>
-
-        <refsynopsisdiv>
-                <cmdsynopsis>
-                        <command>gvfs-mime --query <arg choice="req">MIMETYPE</arg></command>
-                </cmdsynopsis>
-                <cmdsynopsis>
-                        <command>gvfs-mime --set <arg choice="req">MIMETYPE</arg> <arg choice="req">HANDLER</arg></command>
-                </cmdsynopsis>
-        </refsynopsisdiv>
-
-        <refsect1>
-                <title>Description</title>
-
-                <para><command>gvfs-mime</command> can query information
-                about applications that are registered to handle a mime-type,
-                or set the default handler for a mime-type.</para>
-
-                <para>Gvfs obtains this information from the shared-mime-info
-                database. The default handler is stored per-user, in the file
-                <filename><envar>$XDG_DATA_HOME</envar>/applications/mimeapps.list</filename>.</para>
-
-                <para>MIMETYPE should be a mime-type such as text/plain or
-                application/mbox. HANDLER should be the name of an existing
-                desktop file such as gedit.desktop.</para>
-
-        </refsect1>
-
-        <refsect1>
-                <title>Options</title>
-
-                <para>The following options are understood:</para>
-
-                <variablelist>
-                        <varlistentry>
-                                <term><option>-h</option>, <option>--help</option></term>
-
-                                <listitem><para>Prints a short help
-                                text and exits.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>--version</option></term>
-
-                                <listitem><para>Shows the version number and
-                                exits.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>--query</option></term>
-
-                                <listitem><para>Query the handler for MIMETYPE.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>--set</option></term>
-
-                                <listitem><para>Set the default handler for MIMETYPE to HANDLER.</para></listitem>
-                        </varlistentry>
-
-                </variablelist>
-        </refsect1>
-
-        <refsect1>
-                <title>Exit status</title>
-
-                <para>On success 0 is returned, a non-zero failure
-                code otherwise.</para>
-        </refsect1>
-
-        <refsect1>
-                <title>See Also</title>
-                <para>
-                        <citerefentry><refentrytitle>gvfs-open</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                        <ulink url="http://freedesktop.org/wiki/Specifications/shared-mime-info-spec">Shared MIME-Info specification</ulink>
-                </para>
-        </refsect1>
-
-</refentry>
diff --git a/man/gvfs-mkdir.xml b/man/gvfs-mkdir.xml
deleted file mode 100644
index 36ae3d94..00000000
--- a/man/gvfs-mkdir.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-        "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<refentry id="gvfs-mkdir">
-
-        <refentryinfo>
-                <title>gvfs-mkdir</title>
-                <productname>gvfs</productname>
-
-                <authorgroup>
-                        <author>
-                                <contrib>Developer</contrib>
-                                <firstname>Alexander</firstname>
-                                <surname>Larsson</surname>
-                                <email>alexl@redhat.com></email>
-                        </author>
-                </authorgroup>
-
-        </refentryinfo>
-
-        <refmeta>
-                <refentrytitle>gvfs-mkdir</refentrytitle>
-                <manvolnum>1</manvolnum>
-                <refmiscinfo class="manual">User Commands</refmiscinfo>
-        </refmeta>
-
-        <refnamediv>
-                <refname>gvfs-mkdir</refname>
-                <refpurpose>Create directories</refpurpose>
-        </refnamediv>
-
-        <refsynopsisdiv>
-                <cmdsynopsis>
-                        <command>gvfs-mkdir <arg choice="opt" rep="repeat">OPTION</arg> <arg choice="opt" rep="repeat">LOCATION</arg></command>
-                </cmdsynopsis>
-        </refsynopsisdiv>
-
-        <refsect1>
-                <title>Description</title>
-
-                <para><command>gvfs-mkdir</command> creates directories.</para>
-
-                <para><command>gvfs-mkdir</command> is similar to the traditional
-                mkdir utility, but using gvfs locations instead of local files:
-                for example you can use something like
-                smb://server/resource/mydir as location.</para>
-
-        </refsect1>
-
-        <refsect1>
-                <title>Options</title>
-
-                <para>The following options are understood:</para>
-
-                <variablelist>
-                        <varlistentry>
-                                <term><option>-h</option>, <option>--help</option></term>
-
-                                <listitem><para>Prints a short help
-                                text and exits.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>--version</option></term>
-
-                                <listitem><para>Shows the version number and
-                                exits.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-p</option>, <option>--parent</option></term>
-
-                                <listitem><para>Create parent directories when necessary.</para></listitem>
-                        </varlistentry>
-                </variablelist>
-        </refsect1>
-
-        <refsect1>
-                <title>Exit status</title>
-
-                <para>On success 0 is returned, a non-zero failure
-                code otherwise.</para>
-        </refsect1>
-
-        <refsect1>
-                <title>See Also</title>
-                <para>
-                        <citerefentry><refentrytitle>mkdir</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-                </para>
-        </refsect1>
-
-</refentry>
diff --git a/man/gvfs-monitor-dir.xml b/man/gvfs-monitor-dir.xml
deleted file mode 100644
index b2506cb0..00000000
--- a/man/gvfs-monitor-dir.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-        "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<refentry id="gvfs-monitor-dir">
-
-        <refentryinfo>
-                <title>gvfs-monitor-dir</title>
-                <productname>gvfs</productname>
-
-                <authorgroup>
-                        <author>
-                                <contrib>Developer</contrib>
-                                <firstname>Alexander</firstname>
-                                <surname>Larsson</surname>
-                                <email>alexl@redhat.com</email>
-                        </author>
-                </authorgroup>
-
-        </refentryinfo>
-
-        <refmeta>
-                <refentrytitle>gvfs-monitor-dir</refentrytitle>
-                <manvolnum>1</manvolnum>
-                <refmiscinfo class="manual">User Commands</refmiscinfo>
-        </refmeta>
-
-        <refnamediv>
-                <refname>gvfs-monitor-dir</refname>
-                <refpurpose>Monitor directories for changes</refpurpose>
-        </refnamediv>
-
-        <refsynopsisdiv>
-                <cmdsynopsis>
-                        <command>gvfs-monitor-dir <arg choice="opt" rep="repeat">OPTION</arg> <arg choice="opt" rep="repeat">LOCATION</arg></command>
-                </cmdsynopsis>
-        </refsynopsisdiv>
-
-        <refsect1>
-                <title>Description</title>
-
-                <para>As long as <command>gvfs-monitor-dir</command> is running,
-                it will print information about file creation, deletion, file
-                content and attribute changes and mount and unmount operations
-                inside the specified directories.</para>
-
-                <para><command>gvfs-monitor-dir</command> uses the GIOs
-                directory monitoring APIs to monitor the given directories.
-                GIO uses different implementations depending on the platform.
-                The most common implementation Linux uses inotify.
-                </para>
-        </refsect1>
-
-        <refsect1>
-                <title>Options</title>
-
-                <para>The following options are understood:</para>
-
-                <variablelist>
-                        <varlistentry>
-                                <term><option>-h</option>, <option>--help</option></term>
-
-                                <listitem><para>Prints a short help
-                                text and exits.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>--version</option></term>
-
-                                <listitem><para>Shows the version number and
-                                exits.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-N</option>, <option>--no-pair</option></term>
-
-                                <listitem><para>Don't send single MOVED events.</para></listitem>
-                        </varlistentry>
-                </variablelist>
-        </refsect1>
-
-        <refsect1>
-                <title>Exit status</title>
-
-                <para>On success 0 is returned, a non-zero failure
-                code otherwise.</para>
-        </refsect1>
-
-</refentry>
diff --git a/man/gvfs-monitor-file.xml b/man/gvfs-monitor-file.xml
deleted file mode 100644
index 41a80451..00000000
--- a/man/gvfs-monitor-file.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-        "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<refentry id="gvfs-monitor-file">
-
-        <refentryinfo>
-                <title>gvfs-monitor-file</title>
-                <productname>gvfs</productname>
-
-                <authorgroup>
-                        <author>
-                                <contrib>Developer</contrib>
-                                <firstname>Alexander</firstname>
-                                <surname>Larsson</surname>
-                                <email>alexl@redhat.com</email>
-                        </author>
-                </authorgroup>
-
-        </refentryinfo>
-
-        <refmeta>
-                <refentrytitle>gvfs-monitor-file</refentrytitle>
-                <manvolnum>1</manvolnum>
-                <refmiscinfo class="manual">User Commands</refmiscinfo>
-        </refmeta>
-
-        <refnamediv>
-                <refname>gvfs-monitor-file</refname>
-                <refpurpose>Monitor files for changes</refpurpose>
-        </refnamediv>
-
-        <refsynopsisdiv>
-                <cmdsynopsis>
-                        <command>gvfs-monitor-file <arg choice="opt" rep="repeat">OPTION</arg> <arg choice="opt" rep="repeat">LOCATION</arg></command>
-                </cmdsynopsis>
-        </refsynopsisdiv>
-
-        <refsect1>
-                <title>Description</title>
-
-                <para>As long as <command>gvfs-monitor-file</command> is running,
-                it will print information about creation, deletion, content and
-                attribute changes and mount and unmount operations affecting
-                the monitored files.</para>
-
-                <para><command>gvfs-monitor-file</command> uses the GIOs
-                file monitoring APIs to monitor the given files.
-                GIO uses different implementations depending on the platform.
-                The most common implementation Linux uses inotify.
-                </para>
-        </refsect1>
-
-        <refsect1>
-                <title>Options</title>
-
-                <para>The following options are understood:</para>
-
-                <variablelist>
-                        <varlistentry>
-                                <term><option>-h</option>, <option>--help</option></term>
-
-                                <listitem><para>Prints a short help
-                                text and exits.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>--version</option></term>
-
-                                <listitem><para>Shows the version number and
-                                exits.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-N</option>, <option>--no-pair</option></term>
-
-                                <listitem><para>Don't send single MOVED events.</para></listitem>
-                        </varlistentry>
-                </variablelist>
-        </refsect1>
-
-        <refsect1>
-                <title>Exit status</title>
-
-                <para>On success 0 is returned, a non-zero failure
-                code otherwise.</para>
-        </refsect1>
-
-</refentry>
diff --git a/man/gvfs-mount.xml b/man/gvfs-mount.xml
deleted file mode 100644
index a0c4738b..00000000
--- a/man/gvfs-mount.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-        "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<refentry id="gvfs-mount">
-
-        <refentryinfo>
-                <title>gvfs-mount</title>
-                <productname>gvfs</productname>
-
-                <authorgroup>
-                        <author>
-                                <contrib>Developer</contrib>
-                                <firstname>Alexander</firstname>
-                                <surname>Larsson</surname>
-                                <email>alexl@redhat.com</email>
-                        </author>
-                </authorgroup>
-
-        </refentryinfo>
-
-        <refmeta>
-                <refentrytitle>gvfs-mount</refentrytitle>
-                <manvolnum>1</manvolnum>
-                <refmiscinfo class="manual">User Commands</refmiscinfo>
-        </refmeta>
-
-        <refnamediv>
-                <refname>gvfs-mount</refname>
-                <refpurpose>Mounts the locations</refpurpose>
-        </refnamediv>
-
-        <refsynopsisdiv>
-                <cmdsynopsis>
-                        <command>gvfs-mount <arg choice="opt" rep="repeat">OPTION</arg> <arg choice="opt" rep="repeat">LOCATION</arg></command>
-                </cmdsynopsis>
-                <cmdsynopsis>
-                        <command>gvfs-mount --unmount-scheme=SCHEME</command>
-                </cmdsynopsis>
-                <cmdsynopsis>
-                        <command>gvfs-mount --list <arg choice="opt" rep="repeat">OPTION</arg></command>
-                </cmdsynopsis>
-                <cmdsynopsis>
-                        <command>gvfs-mount --monitor <arg choice="opt" rep="repeat">OPTION</arg></command>
-                </cmdsynopsis>
-        </refsynopsisdiv>
-
-        <refsect1>
-                <title>Description</title>
-
-                <para><command>gvfs-mount</command> provides commandline
-                access to various aspects of GIOs mounting functionality.</para>
-
-                <para>Mounting refers to the traditional concept of arranging
-                multiple file systems and devices in a single tree, rooted at /.
-                Classical mounting happens in the kernel and is controlled
-                by the <command>mount</command> utility. GIO expands this
-                concept by introducing mount daemons that can make file
-                systems available to GIO applications without kernel
-                involvement.</para>
-
-        </refsect1>
-
-        <refsect1>
-                <title>Options</title>
-
-                <para>The following options are understood:</para>
-
-                <variablelist>
-                        <varlistentry>
-                                <term><option>-h</option>, <option>--help</option></term>
-
-                                <listitem><para>Prints a short help
-                                text and exits.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>--version</option></term>
-
-                                <listitem><para>Shows the version number and
-                                exits.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-m</option>, <option>--mountable</option></term>
-
-                                <listitem><para>Mount as a mountable.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-d</option>, <option>--device=DEVICE</option></term>
-
-                                <listitem><para>Mount the volume with the given device file.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-u</option>, <option>--unmount</option></term>
-
-                                <listitem><para>Unmount the locations.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-e</option>, <option>--eject</option></term>
-
-                                <listitem><para>Eject the locations.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-s</option>, <option>--unmount-scheme=SCHEME</option></term>
-
-                                <listitem><para>Unmount all mounts with the given scheme.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-f</option>, <option>--force</option></term>
-
-                                <listitem><para>Ignore outstanding file operations when unmounting or ejecting.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-a</option>, <option>--anonymous</option></term>
-
-                                <listitem><para>Use an anonymous user when authenticating</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-l</option>, <option>--list</option></term>
-
-                                <listitem><para>List all known mounts.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-o</option>, <option>--monitor</option></term>
-
-                                <listitem><para>Monitor mount and unmount events.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-i</option>, <option>--detail</option></term>
-
-                                <listitem><para>Show extra information for --list and --monitor.</para></listitem>
-                        </varlistentry>
-
-                </variablelist>
-        </refsect1>
-
-        <refsect1>
-                <title>Exit status</title>
-
-                <para>On success 0 is returned, a non-zero failure
-                code otherwise.</para>
-        </refsect1>
-
-        <refsect1>
-                <title>See Also</title>
-                <para>
-                        <citerefentry><refentrytitle>ls</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>gvfs-info</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-                </para>
-        </refsect1>
-
-</refentry>
diff --git a/man/gvfs-move.xml b/man/gvfs-move.xml
deleted file mode 100644
index 07aa2343..00000000
--- a/man/gvfs-move.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-        "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<refentry id="gvfs-move">
-
-        <refentryinfo>
-                <title>gvfs-move</title>
-                <productname>gvfs</productname>
-
-                <authorgroup>
-                        <author>
-                                <contrib>Developer</contrib>
-                                <firstname>Alexander</firstname>
-                                <surname>Larsson</surname>
-                                <email>alexl@redhat.com</email>
-                        </author>
-                </authorgroup>
-
-        </refentryinfo>
-
-        <refmeta>
-                <refentrytitle>gvfs-move</refentrytitle>
-                <manvolnum>1</manvolnum>
-                <refmiscinfo class="manual">User Commands</refmiscinfo>
-        </refmeta>
-
-        <refnamediv>
-                <refname>gvfs-move</refname>
-                <refpurpose>Copy files</refpurpose>
-        </refnamediv>
-
-        <refsynopsisdiv>
-                <cmdsynopsis>
-                        <command>gvfs-move <arg choice="opt" rep="repeat">OPTION</arg> <arg>SOURCE</arg> <arg>DEST</arg></command>
-                </cmdsynopsis>
-                <cmdsynopsis>
-                        <command>gvfs-move <arg choice="opt" rep="repeat">OPTION</arg> <arg rep="repeat">SOURCE</arg> <arg>DIRECTORY</arg></command>
-                </cmdsynopsis>
-        </refsynopsisdiv>
-
-        <refsect1>
-                <title>Description</title>
-
-                <para><command>gvfs-move</command> moves a file from SOURCE to
-                DEST, or multiple SOURCEs to DIRECTORY.</para>
-                <para><command>gvfs-move</command> is similar to the traditional
-                mv utility, but using gvfs locations instead of local files:
-                for example you can use something like
-                smb://server/resource/file.txt as location.</para>
-        </refsect1>
-
-        <refsect1>
-                <title>Options</title>
-
-                <para>The following options are understood:</para>
-
-                <variablelist>
-                        <varlistentry>
-                                <term><option>-h</option>, <option>--help</option></term>
-
-                                <listitem><para>Prints a short help
-                                text and exits.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>--version</option></term>
-
-                                <listitem><para>Shows the version number and
-                                exits.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-T</option>, <option>--no-target-directory</option></term>
-
-                                <listitem><para>Don't move into DEST even if it is a directory.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-p</option>, <option>--progress</option></term>
-
-                                <listitem><para>Show progress.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-i</option>, <option>--interactive</option></term>
-
-                                <listitem><para>Prompt before overwriting files.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-b</option>, <option>--backup</option></term>
-
-                                <listitem><para>Backup existing destination files.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-C</option>, <option>--no-copy-fallback</option></term>
-
-                                <listitem><para>Don't use copy and delete fallback.</para></listitem>
-                        </varlistentry>
-                </variablelist>
-        </refsect1>
-
-        <refsect1>
-                <title>Exit status</title>
-
-                <para>On success 0 is returned, a non-zero failure
-                code otherwise.</para>
-        </refsect1>
-
-        <refsect1>
-                <title>See Also</title>
-                <para>
-                        <citerefentry><refentrytitle>mv</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-                </para>
-        </refsect1>
-
-</refentry>
diff --git a/man/gvfs-open.xml b/man/gvfs-open.xml
deleted file mode 100644
index ae84e86b..00000000
--- a/man/gvfs-open.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-        "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<refentry id="gvfs-open">
-
-        <refentryinfo>
-                <title>gvfs-open</title>
-                <productname>gvfs</productname>
-
-                <authorgroup>
-                        <author>
-                                <contrib>Developer</contrib>
-                                <firstname>Alexander</firstname>
-                                <surname>Larsson</surname>
-                                <email>alexl@redhat.com</email>
-                        </author>
-                </authorgroup>
-
-        </refentryinfo>
-
-        <refmeta>
-                <refentrytitle>gvfs-open</refentrytitle>
-                <manvolnum>1</manvolnum>
-                <refmiscinfo class="manual">User Commands</refmiscinfo>
-        </refmeta>
-
-        <refnamediv>
-                <refname>gvfs-open</refname>
-                <refpurpose>Open files with the default handler</refpurpose>
-        </refnamediv>
-
-        <refsynopsisdiv>
-                <cmdsynopsis>
-                        <command>gvfs-open <arg choice="opt" rep="repeat">OPTION</arg> <arg rep="repeat">FILE</arg></command>
-                </cmdsynopsis>
-        </refsynopsisdiv>
-
-        <refsect1>
-                <title>Description</title>
-
-                <para><command>gvfs-open</command> opens files with the default
-                application that is registered to handle files of this type.</para>
-
-                <para>Gvfs obtains this information from the shared-mime-info
-                database. The default handler is stored per-user, in the file
-                <filename><envar>$XDG_DATA_HOME</envar>/applications/mimeapps.list</filename>.</para>
-
-        </refsect1>
-
-        <refsect1>
-                <title>Options</title>
-
-                <para>The following options are understood:</para>
-
-                <variablelist>
-                        <varlistentry>
-                                <term><option>-h</option>, <option>--help</option></term>
-
-                                <listitem><para>Prints a short help
-                                text and exits.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>--version</option></term>
-
-                                <listitem><para>Shows the version number and
-                                exits.</para></listitem>
-                        </varlistentry>
-
-                </variablelist>
-        </refsect1>
-
-        <refsect1>
-                <title>Exit status</title>
-
-                <para>On success 0 is returned, a non-zero failure
-                code otherwise.</para>
-        </refsect1>
-
-        <refsect1>
-                <title>See Also</title>
-                <para>
-                        <citerefentry><refentrytitle>gvfs-mime</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-                </para>
-        </refsect1>
-
-</refentry>
diff --git a/man/gvfs-rename.xml b/man/gvfs-rename.xml
deleted file mode 100644
index b82a36ac..00000000
--- a/man/gvfs-rename.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-        "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<refentry id="gvfs-rename">
-
-        <refentryinfo>
-                <title>gvfs-rename</title>
-                <productname>gvfs</productname>
-
-                <authorgroup>
-                        <author>
-                                <contrib>Developer</contrib>
-                                <firstname>Christian</firstname>
-                                <surname>Kellner</surname>
-                                <email>gicmo@gnome.org</email>
-                        </author>
-                </authorgroup>
-
-        </refentryinfo>
-
-        <refmeta>
-                <refentrytitle>gvfs-rename</refentrytitle>
-                <manvolnum>1</manvolnum>
-                <refmiscinfo class="manual">User Commands</refmiscinfo>
-        </refmeta>
-
-        <refnamediv>
-                <refname>gvfs-rename</refname>
-                <refpurpose>Rename a file</refpurpose>
-        </refnamediv>
-
-        <refsynopsisdiv>
-                <cmdsynopsis>
-                        <command>gvfs-rename <arg choice="opt" rep="repeat">OPTION</arg> <arg choice="req">LOCATION</arg> <arg choice="req">NEW-NAME</arg></command>
-                </cmdsynopsis>
-        </refsynopsisdiv>
-
-        <refsect1>
-                <title>Description</title>
-
-                <para><command>gvfs-rename</command> renames a file.</para>
-
-                <para><command>gvfs-rename</command> is similar to the traditional
-                rename utility, but using gvfs locations instead of local files:
-                for example you can use something like
-                smb://server/resource/file.txt as location.</para>
-
-        </refsect1>
-
-        <refsect1>
-                <title>Options</title>
-
-                <para>The following options are understood:</para>
-
-                <variablelist>
-                        <varlistentry>
-                                <term><option>-h</option>, <option>--help</option></term>
-
-                                <listitem><para>Prints a short help
-                                text and exits.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>--version</option></term>
-
-                                <listitem><para>Shows the version number and
-                                exits.</para></listitem>
-                        </varlistentry>
-
-                </variablelist>
-        </refsect1>
-
-        <refsect1>
-                <title>Exit status</title>
-
-                <para>On success 0 is returned, a non-zero failure
-                code otherwise.</para>
-        </refsect1>
-
-        <refsect1>
-                <title>See Also</title>
-                <para>
-                        <citerefentry><refentrytitle>rename</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>gvfs-move</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-                </para>
-        </refsect1>
-
-</refentry>
diff --git a/man/gvfs-rm.xml b/man/gvfs-rm.xml
deleted file mode 100644
index 81746b33..00000000
--- a/man/gvfs-rm.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-        "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<refentry id="gvfs-rm">
-
-        <refentryinfo>
-                <title>gvfs-rm</title>
-                <productname>gvfs</productname>
-
-                <authorgroup>
-                        <author>
-                                <contrib>Developer</contrib>
-                                <firstname>Alexander</firstname>
-                                <surname>Larsson</surname>
-                        </author>
-                </authorgroup>
-
-        </refentryinfo>
-
-        <refmeta>
-                <refentrytitle>gvfs-rm</refentrytitle>
-                <manvolnum>1</manvolnum>
-                <refmiscinfo class="manual">User Commands</refmiscinfo>
-        </refmeta>
-
-        <refnamediv>
-                <refname>gvfs-rm</refname>
-                <refpurpose>Delete files</refpurpose>
-        </refnamediv>
-
-        <refsynopsisdiv>
-                <cmdsynopsis>
-                        <command>gvfs-rm <arg choice="opt" rep="repeat">OPTION</arg> <arg choice="opt" rep="repeat">FILE</arg></command>
-                </cmdsynopsis>
-        </refsynopsisdiv>
-
-        <refsect1>
-                <title>Description</title>
-
-                <para><command>gvfs-rm</command> deletes each given
-                file.</para>
-
-                <para>The files can be specified as paths or as URIs
-                with a scheme that is understood by gvfs. Note that
-                not all URI schemes may allow deletion of files.</para>
-
-                <para><command>gvfs-rm</command> deletes files irreversibly.
-                If you want a reversible way to trash files, see
-                <command>gvfs-trash</command>.</para>
-
-        </refsect1>
-
-        <refsect1>
-                <title>Options</title>
-
-                <para>The following options are understood:</para>
-
-                <variablelist>
-                        <varlistentry>
-                                <term><option>-?</option>, <option>--help</option></term>
-
-                                <listitem><para>Prints a short help
-                                text and exits.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>--version</option></term>
-
-                                <listitem><para>Shows the version number and
-                                exits.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-f</option>, <option>--force</option></term>
-
-                                <listitem><para>Ignore nonexistent and
-                                non-deletable files.</para></listitem>
-                        </varlistentry>
-
-                </variablelist>
-        </refsect1>
-
-        <refsect1>
-                <title>Exit status</title>
-
-                <para>On success 0 is returned, a non-zero failure
-                code otherwise.</para>
-        </refsect1>
-
-        <refsect1>
-                <title>See Also</title>
-                <para>
-                        <citerefentry><refentrytitle>rm</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>gvfs-trash</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-                </para>
-        </refsect1>
-
-</refentry>
diff --git a/man/gvfs-save.xml b/man/gvfs-save.xml
deleted file mode 100644
index 822e6a44..00000000
--- a/man/gvfs-save.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-        "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<refentry id="gvfs-save">
-
-        <refentryinfo>
-                <title>gvfs-save</title>
-                <productname>gvfs</productname>
-
-                <authorgroup>
-                        <author>
-                                <contrib>Developer</contrib>
-                                <firstname>Alexander</firstname>
-                                <surname>Larsson</surname>
-                                <email>alexl@redhat.com</email>
-                        </author>
-                </authorgroup>
-
-        </refentryinfo>
-
-        <refmeta>
-                <refentrytitle>gvfs-save</refentrytitle>
-                <manvolnum>1</manvolnum>
-                <refmiscinfo class="manual">User Commands</refmiscinfo>
-        </refmeta>
-
-        <refnamediv>
-                <refname>gvfs-save</refname>
-                <refpurpose>Save standard input</refpurpose>
-        </refnamediv>
-
-        <refsynopsisdiv>
-                <cmdsynopsis>
-                        <command>gvfs-save <arg choice="opt" rep="repeat">OPTION</arg> <arg choice="req">DEST</arg></command>
-                </cmdsynopsis>
-        </refsynopsisdiv>
-
-        <refsect1>
-                <title>Description</title>
-
-                <para><command>gvfs-save</command> reads from the standard
-                input and saves the data to the given location.</para>
-
-                <para>This is similar to just redirecting output to a file
-                using traditional shell syntax, but <command>gvfs-save</command>
-                allows using gvfs locations instead of local files:
-                for example you can use something like
-                smb://server/resource/file.txt as location.</para>
-
-        </refsect1>
-
-        <refsect1>
-                <title>Options</title>
-
-                <para>The following options are understood:</para>
-
-                <variablelist>
-                        <varlistentry>
-                                <term><option>-h</option>, <option>--help</option></term>
-
-                                <listitem><para>Prints a short help
-                                text and exits.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>--version</option></term>
-
-                                <listitem><para>Shows the version number and
-                                exits.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-b</option>, <option>--backup</option></term>
-
-                                <listitem><para>If the destination file already exists, save a backup.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-c</option>, <option>--create</option></term>
-
-                                <listitem><para>Only create the destination file if it does not exist yet.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-a</option>, <option>--append</option></term>
-
-                                <listitem><para>Append to the end of the destination file, if it already exists.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-p</option>, <option>--private</option></term>
-
-                                <listitem><para>When creating a new file, restrict access to the current user only.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-u</option>, <option>--unlink</option></term>
-
-                                <listitem>
-                                    <para>When replacing an existing file,
-                                        replace the destination as if it does
-                                        not exist.  Think of it as unlinking
-                                        the destination before writing.</para>
-                                </listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-v</option>, <option>--print-etag</option></term>
-
-                                <listitem><para>Print the new etag at the end.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-e</option>, <option>--etag=ETAG</option></term>
-
-                                <listitem><para>The etag of the file being overwritten.</para></listitem>
-                        </varlistentry>
-
-                </variablelist>
-        </refsect1>
-
-        <refsect1>
-                <title>Exit status</title>
-
-                <para>On success 0 is returned, a non-zero failure
-                code otherwise.</para>
-        </refsect1>
-
-</refentry>
diff --git a/man/gvfs-set-attribute.xml b/man/gvfs-set-attribute.xml
deleted file mode 100644
index 80de0f05..00000000
--- a/man/gvfs-set-attribute.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-        "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<refentry id="gvfs-set-attribute">
-
-        <refentryinfo>
-                <title>gvfs-set-attribute</title>
-                <productname>gvfs</productname>
-
-                <authorgroup>
-                        <author>
-                                <contrib>Developer</contrib>
-                                <firstname>Alexander</firstname>
-                                <surname>Larsson</surname>
-                                <email>alexl@redhat.com</email>
-                        </author>
-                </authorgroup>
-
-        </refentryinfo>
-
-        <refmeta>
-                <refentrytitle>gvfs-set-attribute</refentrytitle>
-                <manvolnum>1</manvolnum>
-                <refmiscinfo class="manual">User Commands</refmiscinfo>
-        </refmeta>
-
-        <refnamediv>
-                <refname>gvfs-set-attribute</refname>
-                <refpurpose>Set file attributes</refpurpose>
-        </refnamediv>
-
-        <refsynopsisdiv>
-                <cmdsynopsis>
-                        <command>gvfs-set-attribute <arg choice="opt" rep="repeat">OPTION</arg> <arg choice="req">LOCATION</arg> <arg choice="req">ATTRIBUTE</arg> <arg choice="req" rep="repeat">VALUE</arg></command>
-                </cmdsynopsis>
-        </refsynopsisdiv>
-
-        <refsect1>
-                <title>Description</title>
-
-                <para><command>gvfs-set-attribute</command> allows to set
-                a file attribute on a file.</para>
-
-                <para>File attributes can be specified with their gvfs name,
-                e.g. standard::icon. Note that not all file attributes that
-                are supported by gvfs are writable.
-                <command>gvfs-info --query-writable</command> lists writable
-                file attributes.</para>
-
-        </refsect1>
-
-        <refsect1>
-                <title>Options</title>
-
-                <para>The following options are understood:</para>
-
-                <variablelist>
-                        <varlistentry>
-                                <term><option>-h</option>, <option>--help</option></term>
-
-                                <listitem><para>Prints a short help
-                                text and exits.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>--version</option></term>
-
-                                <listitem><para>Shows the version number and
-                                exits.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-t</option>, <option>--type=TYPE</option></term>
-
-                                <listitem><para>Specifies the type of the attribute. Supported types are string, stringv, bytestring, boolean, uint32, int32, uint64, int64, object and unset.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-n</option>, <option>--nofollow-symlinks</option></term>
-
-                                <listitem><para>Don't follow symlinks.</para></listitem>
-                        </varlistentry>
-                </variablelist>
-        </refsect1>
-
-        <refsect1>
-                <title>Exit status</title>
-
-                <para>On success 0 is returned, a non-zero failure
-                code otherwise.</para>
-        </refsect1>
-
-        <refsect1>
-                <title>See Also</title>
-                <para>
-                        <citerefentry><refentrytitle>gvfs-info</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                        <ulink url="http://developer.gnome.org/gio/2.32/gio-GFileAttribute.html">GIO file attributes</ulink>
-
-                </para>
-        </refsect1>
-
-</refentry>
diff --git a/man/gvfs-trash.xml b/man/gvfs-trash.xml
deleted file mode 100644
index dc53398e..00000000
--- a/man/gvfs-trash.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-        "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<refentry id="gvfs-trash">
-
-        <refentryinfo>
-                <title>gvfs-trash</title>
-                <productname>gvfs</productname>
-
-                <authorgroup>
-                        <author>
-                                <contrib>Developer</contrib>
-                                <firstname>Alexander</firstname>
-                                <surname>Larsson</surname>
-                                <email>alexl@redhat.com</email>
-                        </author>
-                </authorgroup>
-
-        </refentryinfo>
-
-        <refmeta>
-                <refentrytitle>gvfs-trash</refentrytitle>
-                <manvolnum>1</manvolnum>
-                <refmiscinfo class="manual">User Commands</refmiscinfo>
-        </refmeta>
-
-        <refnamediv>
-                <refname>gvfs-trash</refname>
-                <refpurpose>Move files or directories to the trash</refpurpose>
-        </refnamediv>
-
-        <refsynopsisdiv>
-                <cmdsynopsis>
-                        <command>gvfs-trash <arg choice="opt" rep="repeat">OPTION</arg> <arg choice="opt" rep="repeat">LOCATION</arg></command>
-                </cmdsynopsis>
-        </refsynopsisdiv>
-
-        <refsect1>
-                <title>Description</title>
-
-                <para><command>gvfs-trash</command> sends files or directories
-                to the "Trashcan". This can be a different folder depending
-                on where the file is located, and not all file systems support
-                this concept. In the common case that the file lives inside a
-                users home directory, the trash folder is
-                <filename><envar>$XDG_DATA_HOME</envar>/Trash</filename>.</para>
-
-                <para>Note that moving files to the trash does not free up
-                space on the file system until the "Trashcan" is emptied.
-                If you are interested in deleting a file irreversibly,
-                see <command>gvfs-rm</command>.</para>
-
-                <para>Inspecting and emptying the "Trashcan" is normally
-                supported by graphical file managers such as nautilus,
-                but you can also see the trash with the command
-                <command>gvfs-ls trash://</command>.</para>
-
-        </refsect1>
-
-        <refsect1>
-                <title>Options</title>
-
-                <para>The following options are understood:</para>
-
-                <variablelist>
-                        <varlistentry>
-                                <term><option>-h</option>, <option>--help</option></term>
-
-                                <listitem><para>Prints a short help
-                                text and exits.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>--version</option></term>
-
-                                <listitem><para>Shows the version number and
-                                exits.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-f</option>, <option>--force</option></term>
-
-                                <listitem><para>Ignore nonexistent and
-                                non-deletable files.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>--empty</option></term>
-
-                                <listitem><para>Empty the trash.</para></listitem>
-                        </varlistentry>
-
-                </variablelist>
-        </refsect1>
-
-        <refsect1>
-                <title>Exit status</title>
-
-                <para>On success 0 is returned, a non-zero failure
-                code otherwise.</para>
-        </refsect1>
-
-        <refsect1>
-                <title>See Also</title>
-                <para>
-                        <citerefentry><refentrytitle>ls</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>gvfs-rm</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                        <ulink url="http://freedesktop.org/wiki/Specifications/trash-spec">Desktop Trash Can specification</ulink>
-                </para>
-        </refsect1>
-
-</refentry>
diff --git a/man/gvfs-tree.xml b/man/gvfs-tree.xml
deleted file mode 100644
index 25d4fafa..00000000
--- a/man/gvfs-tree.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-        "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<refentry id="gvfs-tree">
-
-        <refentryinfo>
-                <title>gvfs-tree</title>
-                <productname>gvfs</productname>
-
-                <authorgroup>
-                        <author>
-                                <contrib>Developer</contrib>
-                                <firstname>David</firstname>
-                                <surname>Zeuthen</surname>
-                                <email>davidz@redhat.com</email>
-                        </author>
-                </authorgroup>
-
-        </refentryinfo>
-
-        <refmeta>
-                <refentrytitle>gvfs-tree</refentrytitle>
-                <manvolnum>1</manvolnum>
-                <refmiscinfo class="manual">User Commands</refmiscinfo>
-        </refmeta>
-
-        <refnamediv>
-                <refname>gvfs-tree</refname>
-                <refpurpose>List contents of directories in a tree-like format</refpurpose>
-        </refnamediv>
-
-        <refsynopsisdiv>
-                <cmdsynopsis>
-                        <command>gvfs-tree <arg choice="opt" rep="repeat">OPTION</arg> <arg choice="opt" rep="repeat">LOCATION</arg></command>
-                </cmdsynopsis>
-        </refsynopsisdiv>
-
-        <refsect1>
-                <title>Description</title>
-
-                <para><command>gvfs-tree</command> lists the contents
-                of the given directories recursively, in a tree-like format.
-                If no location is given, it defaults to the current directory.</para>
-
-                <para><command>gvfs-tree</command> is similar to the traditional
-                tree utility, but using gvfs locations instead of local files:
-                for example you can use something like
-                smb://server/resource/mydir as location.</para>
-
-        </refsect1>
-
-        <refsect1>
-                <title>Options</title>
-
-                <para>The following options are understood:</para>
-
-                <variablelist>
-                        <varlistentry>
-                                <term><option>-?</option>, <option>--help</option></term>
-
-                                <listitem><para>Prints a short help
-                                text and exits.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>--version</option></term>
-
-                                <listitem><para>Shows the version number and
-                                exits.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-h</option>, <option>--hidden</option></term>
-
-                                <listitem><para>Show hidden files.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-l</option>, <option>--follow-symlinks</option></term>
-
-                                <listitem><para>Follow symbolic links, mounts and shortcuts.</para></listitem>
-                        </varlistentry>
-                </variablelist>
-        </refsect1>
-
-        <refsect1>
-                <title>Exit status</title>
-
-                <para>On success 0 is returned, a non-zero failure
-                code otherwise.</para>
-        </refsect1>
-
-        <refsect1>
-                <title>See Also</title>
-                <para>
-                        <citerefentry><refentrytitle>tree</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>gvfs-ls</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-                </para>
-        </refsect1>
-
-</refentry>