From 5d27b8742a28ae30f484958cd2daf082058f6229 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 13 Apr 2016 17:36:40 -0400
Subject: [PATCH 1/4] Document the --bundle option

I was looking for information on how to install bundles, and found
nothing, since the --bundle option wasn't documented.
---
 doc/xdg-app-install.xml | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/doc/xdg-app-install.xml b/doc/xdg-app-install.xml
index 0803a9c1a..bb8c6d6a7 100644
--- a/doc/xdg-app-install.xml
+++ b/doc/xdg-app-install.xml
@@ -36,6 +36,12 @@
                 <arg choice="plain">NAME</arg>
                 <arg choice="opt">BRANCH</arg>
             </cmdsynopsis>
+            <cmdsynopsis>
+                <command>xdg-app install</command>
+                <arg choice="opt" rep="repeat">OPTION</arg>
+                <arg choice="plain">--bundle</arg>
+                <arg choice="plain">FILENAME</arg>
+            </cmdsynopsis>
     </refsynopsisdiv>
 
     <refsect1>
@@ -62,6 +68,11 @@
             Unless overridden with the --user option, this command creates a
             system-wide installation.
         </para>
+        <para>
+            The alternative form of the command installs an application from a
+            single-file bundle instead of a configured remote. Such bundles can
+            be created with the xdg-app build-bundle command.
+        </para>
 
     </refsect1>
 
@@ -80,6 +91,22 @@
                 </para></listitem>
             </varlistentry>
 
+            <varlistentry>
+                <term><option>--bundle</option></term>
+
+                <listitem><para>
+                    Install from a bundle file instead
+                    of a configured remote.
+                </para></listitem>
+            </varlistentry>
+
+            <varlistentry>
+                <term><option>--user</option></term>
+
+                <listitem><para>
+                    Create a per-user installation.
+                </para></listitem>
+            </varlistentry>
             <varlistentry>
                 <term><option>--user</option></term>
 
@@ -179,7 +206,8 @@
         <para>
             <citerefentry><refentrytitle>xdg-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
             <citerefentry><refentrytitle>xdg-app-update-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-            <citerefentry><refentrytitle>xdg-app-list-apps</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+            <citerefentry><refentrytitle>xdg-app-list-apps</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+            <citerefentry><refentrytitle>xdg-app-build-bundle</refentrytitle><manvolnum>1</manvolnum></citerefentry>
         </para>
 
     </refsect1>

From 0e2d8ec8867776c918bf3b6df801fe6a11e8c86d Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 13 Apr 2016 17:39:31 -0400
Subject: [PATCH 2/4] Trivial doc fixes

Just add some punctuation.
---
 doc/xdg-app-build-bundle.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/xdg-app-build-bundle.xml b/doc/xdg-app-build-bundle.xml
index aa104273e..1663afa8d 100644
--- a/doc/xdg-app-build-bundle.xml
+++ b/doc/xdg-app-build-bundle.xml
@@ -107,7 +107,7 @@
                 <term><option>--gpg-homedir=PATH</option></term>
 
                 <listitem><para>
-                    GPG Homedir to use when looking for keyrings
+                    GPG Homedir to use when looking for keyrings.
                 </para></listitem>
             </varlistentry>
 
@@ -138,7 +138,7 @@
             <citerefentry><refentrytitle>xdg-app</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
             <citerefentry><refentrytitle>xdg-app-build-init</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
             <citerefentry><refentrytitle>xdg-app-build</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-            <citerefentry><refentrytitle>xdg-app-build-finish</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+            <citerefentry><refentrytitle>xdg-app-build-finish</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
             <citerefentry><refentrytitle>xdg-app-repo-update</refentrytitle><manvolnum>1</manvolnum></citerefentry>
         </para>
 

From ef02059906b29fc1bd1d331bb61671e0c7986cc6 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 13 Apr 2016 17:42:12 -0400
Subject: [PATCH 3/4] docs: Mention bundle installation in overview

---
 doc/xdg-app.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/xdg-app.xml b/doc/xdg-app.xml
index d48613fc6..033b8b91c 100644
--- a/doc/xdg-app.xml
+++ b/doc/xdg-app.xml
@@ -110,7 +110,7 @@
                 <term><citerefentry><refentrytitle>xdg-app-install</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
 
                 <listitem><para>
-                    Install an application or a runtime from a remote.
+                    Install an application or a runtime from a remote or bundle.
                 </para></listitem>
             </varlistentry>
             <varlistentry>

From 74074facaf4f1b5f3848fd5309cf91b1fb6b1daa Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 13 Apr 2016 18:23:26 -0400
Subject: [PATCH 4/4] Explain --repo-url a bit better

Make it clearer that this must be accessible from the systems
where the bundle is installed, it is not useful to specify
your local repository here.
---
 doc/xdg-app-build-bundle.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/doc/xdg-app-build-bundle.xml b/doc/xdg-app-build-bundle.xml
index 1663afa8d..435d2935a 100644
--- a/doc/xdg-app-build-bundle.xml
+++ b/doc/xdg-app-build-bundle.xml
@@ -91,7 +91,10 @@
                 <term><option>--repo-url=URL</option></term>
 
                 <listitem><para>
-                    The URL for the repository.
+                    The URL for the repository from which the
+                    application can be updated. Installing the
+                    bundle will automatically configure a remote
+                    for this URL.
                 </para></listitem>
             </varlistentry>