From b4d5ec76a8d7caa70277c7c50294e64c882ce2a8 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 2 Jun 2016 14:53:22 -0400
Subject: [PATCH 1/2] Document the --oci option of flatpak build-bundle

---
 doc/flatpak-build-bundle.xml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/doc/flatpak-build-bundle.xml b/doc/flatpak-build-bundle.xml
index 248356d6..449ea9fa 100644
--- a/doc/flatpak-build-bundle.xml
+++ b/doc/flatpak-build-bundle.xml
@@ -25,7 +25,7 @@
 
     <refnamediv>
         <refname>flatpak-build-bundle</refname>
-        <refpurpose>Create a single file bundle from a local repository</refpurpose>
+        <refpurpose>Create a single-file bundle from a local repository</refpurpose>
     </refnamediv>
 
     <refsynopsisdiv>
@@ -43,7 +43,7 @@
         <title>Description</title>
 
         <para>
-            Creates a single file named <arg choice="plain">FILENAME</arg>
+            Creates a single-file named <arg choice="plain">FILENAME</arg>
             for the application (or runtime) named <arg choice="plain">NAME</arg>
             in the repository at <arg choice="plain">LOCATION</arg>. If
             a <arg choice="plain">BRANCH</arg> is specified, this branch of
@@ -114,6 +114,14 @@
                 </para></listitem>
             </varlistentry>
 
+            <varlistentry>
+                <term><option>--oci</option></term>
+
+                <listitem><para>
+                    Export to an OCI image instead of a Flatpak bundle.
+                </para></listitem>
+            </varlistentry>
+
             <varlistentry>
                 <term><option>-v</option></term>
                 <term><option>--verbose</option></term>

From db540a15e7132a54fd4d15dcdfdcc8e5f7c0d576 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 2 Jun 2016 15:02:49 -0400
Subject: [PATCH 2/2] Document the --oci option of flatpak build-import-bundle

---
 doc/flatpak-build-import-bundle.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/doc/flatpak-build-import-bundle.xml b/doc/flatpak-build-import-bundle.xml
index 02a8afeb..4c41fc59 100644
--- a/doc/flatpak-build-import-bundle.xml
+++ b/doc/flatpak-build-import-bundle.xml
@@ -81,6 +81,14 @@
                 </para></listitem>
             </varlistentry>
 
+            <varlistentry>
+                <term><option>--oci</option></term>
+
+                <listitem><para>
+                    Impport an OCI image instead of a Flatpak bundle.
+                </para></listitem>
+            </varlistentry>
+
             <varlistentry>
                 <term><option>--version</option></term>