New upstream version 2018.5

man/ostree-init.xml

@@ -69,13 +69,24 @@ Boston, MA 02111-1307, USA.
         <variablelist>
             <varlistentry>
                 <term><option>--mode</option>="MODE"</term>
-                <listitem><para> Initialize repository in given mode
-                (<literal>bare</literal>, <literal>bare-user</literal>,
-                <literal>archive</literal>). The default is
-                <literal>bare</literal>. Note that for
-                <literal>archive</literal> the repository configuration file
-                will actually have <literal>archive-z2</literal>, as that's the
-                historical name.</para></listitem>
+                <listitem><para>
+                    Initialize repository in given mode
+                    (<literal>bare</literal>, <literal>bare-user</literal>,
+                    <literal>bare-user-only</literal>, <literal>archive</literal>).
+                    The default is <literal>bare</literal>. Note that for
+                    <literal>archive</literal> the repository configuration file
+                    will actually have <literal>archive-z2</literal>, as that's
+                    the historical name.</para>
+
+                    <para>See the manual for differences between these modes.
+                    Briefly, <literal>bare</literal> mode stores files as they
+                    are, so they can be directly hardlinked,
+                    <literal>bare-user</literal> uses extended attributes to
+                    store ownership and xattr information, allowing non-root
+                    operations, <literal>bare-user-only</literal> does not store
+                    ownership information, and <literal>archive</literal> stores
+                    files compressed, to be served over the network.
+                </para></listitem>
             </varlistentry>
 
             <varlistentry>

man/ostree.xml

@@ -111,14 +111,14 @@ Boston, MA 02111-1307, USA.
                 <term><option>--repo</option></term>
 
                 <listitem><para>
-                    For most commands,
-                    when run as non-root, repository is
-                    required.  If
-                    <command>ostree</command> is run as
-                    root, it is assumed operations will be
-                    performed on the
-                    <filename>/sysroot/ostree/repo</filename>
-                    repository.
+                    For most commands, a repository is
+                    required.  If unspecified, the current
+                    directory is used if it appears to be an
+                    OSTree repository. If it isn't, either
+                    the <envar>OSTREE_REPO</envar>
+                    environment variable is used, or the
+                    system repository located at
+                    <filename>/sysroot/ostree/repo</filename>.
                 </para></listitem>
             </varlistentry>
 
@@ -283,6 +283,15 @@ Boston, MA 02111-1307, USA.
                 </para></listitem>
             </varlistentry>
 
+            <!-- FIXME: Uncomment this when it's no longer experimental
+            <varlistentry>
+                <term><citerefentry><refentrytitle>ostree-create-usb</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
+
+                <listitem><para>
+                    &nbsp;Put the given refs on an external drive for P2P distribution.
+                </para></listitem>
+            </varlistentry>-->
+
             <varlistentry>
                 <term><citerefentry><refentrytitle>ostree-diff</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>