From fcf137f25def338c39835f9b2c86bcc963f5599f Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@redhat.com>
Date: Wed, 11 May 2016 15:39:11 +0200
Subject: [PATCH] Remove references to --gpg-key= as it never worked

---
 app/flatpak-builtins-add-remote.c |  1 -
 doc/flatpak-remote-add.xml        | 12 +-----------
 doc/flatpak-remote-modify.xml     | 12 +-----------
 3 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/app/flatpak-builtins-add-remote.c b/app/flatpak-builtins-add-remote.c
index ad7dabdb..fe6b7b8f 100644
--- a/app/flatpak-builtins-add-remote.c
+++ b/app/flatpak-builtins-add-remote.c
@@ -66,7 +66,6 @@ static GOptionEntry common_options[] = {
   { "prio", 0, 0, G_OPTION_ARG_INT, &opt_prio, "Set priority (default 1, higher is more prioritized)", NULL },
   { "title", 0, 0, G_OPTION_ARG_STRING, &opt_title, "A nice name to use for this remote", "TITLE" },
   { "gpg-import", 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &opt_gpg_import, "Import GPG key from FILE (- for stdin)", "FILE" },
-  { "gpg-key", 0, 0, G_OPTION_ARG_STRING_ARRAY, &opt_gpg_import, "Optionally only import the named key(s) from the keyring files", "KEY" },
   { "disable", 0, 0, G_OPTION_ARG_NONE, &opt_disable, "Disable the remote",  },
   { NULL }
 };
diff --git a/doc/flatpak-remote-add.xml b/doc/flatpak-remote-add.xml
index f0a1c47d..30293411 100644
--- a/doc/flatpak-remote-add.xml
+++ b/doc/flatpak-remote-add.xml
@@ -140,17 +140,7 @@
                 <listitem><para>
                      Import gpg keys from the specified keyring file as
                      trusted for the new remote. If the file is - the
-                     keyring is read from standard input.  The set of keys
-                     imported from the keyring can optionally be limited by
-                     using --gpg-key.
-                </para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>--gpg-key=KEY</option></term>
-
-                <listitem><para>
-                  Only import the named keys from the specified gpg keyrings.
+                     keyring is read from standard input.
                 </para></listitem>
             </varlistentry>
 
diff --git a/doc/flatpak-remote-modify.xml b/doc/flatpak-remote-modify.xml
index 2462b1c5..d9f55fcd 100644
--- a/doc/flatpak-remote-modify.xml
+++ b/doc/flatpak-remote-modify.xml
@@ -156,17 +156,7 @@
                 <listitem><para>
                      Import gpg keys from the specified keyring file as
                      trusted for the new remote. If the file is - the
-                     keyring is read from standard input.  The set of keys
-                     imported from the keyring can optionally be limited by
-                     using --gpg-key.
-                </para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>--gpg-key=KEY</option></term>
-
-                <listitem><para>
-                  Only import the named keys from the specified gpg keyrings.
+                     keyring is read from standard input.
                 </para></listitem>
             </varlistentry>