From 98a66ce6d84486bce53608c19006f6b3b4eeed19 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Fri, 10 Jun 2016 11:16:22 -0400
Subject: [PATCH] Rename export-file to document-export

This fits better with the naming scheme for commands in general, and
will let us add more document portal related commands in the future.
---
 ...document.c => flatpak-builtins-document-export.c} |  8 ++++----
 app/flatpak-builtins.h                               |  2 +-
 app/flatpak-main.c                                   |  2 +-
 doc/Makefile.am                                      |  2 +-
 ...k-export-file.xml => flatpak-document-export.xml} | 12 ++++++------
 doc/flatpak.xml                                      |  2 +-
 6 files changed, 14 insertions(+), 14 deletions(-)
 rename app/{flatpak-builtins-document.c => flatpak-builtins-document-export.c} (97%)
 rename doc/{flatpak-export-file.xml => flatpak-document-export.xml} (92%)

diff --git a/app/flatpak-builtins-document.c b/app/flatpak-builtins-document-export.c
similarity index 97%
rename from app/flatpak-builtins-document.c
rename to app/flatpak-builtins-document-export.c
index 3cee8c5e..673a7e0f 100644
--- a/app/flatpak-builtins-document.c
+++ b/app/flatpak-builtins-document-export.c
@@ -56,9 +56,9 @@ static GOptionEntry options[] = {
 };
 
 gboolean
-flatpak_builtin_export_file (int argc, char **argv,
-                             GCancellable *cancellable,
-                             GError **error)
+flatpak_builtin_document_export (int argc, char **argv,
+                                 GCancellable *cancellable,
+                                 GError **error)
 {
   g_autoptr(GOptionContext) context = NULL;
   g_autoptr(GVariant) reply = NULL;
@@ -186,7 +186,7 @@ flatpak_builtin_export_file (int argc, char **argv,
 }
 
 gboolean
-flatpak_complete_export_file (FlatpakCompletion *completion)
+flatpak_complete_document_export (FlatpakCompletion *completion)
 {
   g_autoptr(GOptionContext) context = NULL;
 
diff --git a/app/flatpak-builtins.h b/app/flatpak-builtins.h
index 133a57c7..d5d181b7 100644
--- a/app/flatpak-builtins.h
+++ b/app/flatpak-builtins.h
@@ -77,7 +77,7 @@ BUILTINPROTO (build_export)
 BUILTINPROTO (build_bundle)
 BUILTINPROTO (build_import)
 BUILTINPROTO (build_update_repo)
-BUILTINPROTO (export_file)
+BUILTINPROTO (document_export)
 BUILTINPROTO (override)
 
 #undef BUILTINPROTO
diff --git a/app/flatpak-main.c b/app/flatpak-main.c
index 02b80163..1e67e39a 100644
--- a/app/flatpak-main.c
+++ b/app/flatpak-main.c
@@ -61,7 +61,7 @@ static FlatpakCommand commands[] = {
   { "\n Running applications" },
   { "run", "Run an application", flatpak_builtin_run, flatpak_complete_run },
   { "override", "Override permissions for an application", flatpak_builtin_override, flatpak_complete_override },
-  { "export-file", "Grant an application access to a specific file", flatpak_builtin_export_file, flatpak_complete_export_file },
+  { "document-export", "Grant an application access to a specific file", flatpak_builtin_document_export, flatpak_complete_document_export },
   { "make-current", "Specify default version to run", flatpak_builtin_make_current_app, flatpak_complete_make_current_app },
   { "enter", "Enter the namespace of a running application", flatpak_builtin_enter, flatpak_complete_enter },
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 6d6f8c25..ce889e62 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -30,7 +30,7 @@ man_MANS = \
 	flatpak-run.1			\
 	flatpak-override.1		\
 	flatpak-enter.1			\
-	flatpak-export-file.1		\
+	flatpak-document-export.1	\
 	flatpak-build-init.1		\
 	flatpak-build.1			\
 	flatpak-build-bundle.1		\
diff --git a/doc/flatpak-export-file.xml b/doc/flatpak-document-export.xml
similarity index 92%
rename from doc/flatpak-export-file.xml
rename to doc/flatpak-document-export.xml
index 7815ecf8..da0881f7 100644
--- a/doc/flatpak-export-file.xml
+++ b/doc/flatpak-document-export.xml
@@ -2,10 +2,10 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
     "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
-<refentry id="flatpak-export-file">
+<refentry id="flatpak-document-export">
 
     <refentryinfo>
-        <title>flatpak export-file</title>
+        <title>flatpak document-export</title>
         <productname>flatpak</productname>
 
         <authorgroup>
@@ -19,18 +19,18 @@
     </refentryinfo>
 
     <refmeta>
-        <refentrytitle>flatpak export-file</refentrytitle>
+        <refentrytitle>flatpak document-export</refentrytitle>
         <manvolnum>1</manvolnum>
     </refmeta>
 
     <refnamediv>
-        <refname>flatpak-export-file</refname>
+        <refname>flatpak-document-export</refname>
         <refpurpose>Export a file to a sandboxed application</refpurpose>
     </refnamediv>
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>flatpak export-file</command>
+                <command>flatpak document-export</command>
                 <arg choice="opt" rep="repeat">OPTION</arg>
                 <arg choice="plain">FILE</arg>
             </cmdsynopsis>
@@ -141,7 +141,7 @@
         <title>Examples</title>
 
         <para>
-            <command>$ flatpak export-file --app=org.gnome.GEdit ~/test.txt</command>
+            <command>$ flatpak document-export --app=org.gnome.GEdit ~/test.txt</command>
         </para>
 <programlisting>
 /run/user/1000/doc/e52f9c6a/test.txt
diff --git a/doc/flatpak.xml b/doc/flatpak.xml
index d2bf8126..1274c3fb 100644
--- a/doc/flatpak.xml
+++ b/doc/flatpak.xml
@@ -162,7 +162,7 @@
                 </para></listitem>
             </varlistentry>
             <varlistentry>
-                <term><citerefentry><refentrytitle>flatpak-export-file</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
+                <term><citerefentry><refentrytitle>flatpak-document-export</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
 
                 <listitem><para>
                     Grant an application access to a specific file.