summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Leeds <matthew.leeds@endlessm.com>2020-06-18 13:51:16 -0700
committerMatthew Leeds <matthew.leeds@endlessm.com>2020-06-18 13:51:16 -0700
commit639720024725b6fa80a6ba1f5bd7c5ccab4af418 (patch)
tree2d39b2bb039f4952effe53883846ee009db4ba49
parent2d2a05621a24a4c923087abe1b108cc6382aa1a4 (diff)
downloadflatpak-639720024725b6fa80a6ba1f5bd7c5ccab4af418.tar.gz
Update documentation for sideload-repossideload-docs
It is no longer a config option; it was changed to be a directory.
-rw-r--r--common/flatpak-transaction.c7
-rw-r--r--doc/flatpak-install.xml5
-rw-r--r--doc/flatpak-update.xml5
3 files changed, 10 insertions, 7 deletions
diff --git a/common/flatpak-transaction.c b/common/flatpak-transaction.c
index ac89dc5d..44a8a83a 100644
--- a/common/flatpak-transaction.c
+++ b/common/flatpak-transaction.c
@@ -470,9 +470,10 @@ flatpak_transaction_add_dependency_source (FlatpakTransaction *self,
* @self: a #FlatpakTransaction
* @path: a path to a local flatpak repository
*
- * Adds an extra local ostree repo as source for installation. This is equivalent
- * with setting the xa.sideload-repos global option, but can be done dynamically.
- * If the option is set both sources are used.
+ * Adds an extra local ostree repo as source for installation. This is
+ * equivalent to using the sideload-repos directories (see flatpak(1)), but can
+ * be done dynamically. Any path added here is used in addition to ones in
+ * those directories.
*
* Since: 1.7.1
*/
diff --git a/doc/flatpak-install.xml b/doc/flatpak-install.xml
index bcccc180..089cc4b1 100644
--- a/doc/flatpak-install.xml
+++ b/doc/flatpak-install.xml
@@ -262,8 +262,9 @@
<listitem><para>
Adds an extra local ostree repo as source for installation. This is equivalent
- with setting the xa.sideload-repos global option, but can be done without modifying the configuration.
- If the option is already set both sources are used.
+ to using the sideload-repos directories (see flatpak(1)), but can be done on a
+ per-command basis. Any path added here is used in addition to ones in those
+ directories.
</para></listitem>
</varlistentry>
diff --git a/doc/flatpak-update.xml b/doc/flatpak-update.xml
index 78959747..f07e385f 100644
--- a/doc/flatpak-update.xml
+++ b/doc/flatpak-update.xml
@@ -220,8 +220,9 @@
<listitem><para>
Adds an extra local ostree repo as source for installation. This is equivalent
- with setting the xa.sideload-repos global option, but can be done without modifying the configuration.
- If the option is already set both sources are used.
+ to using the sideload-repos directories (see flatpak(1)), but can be done on a
+ per-command basis. Any path added here is used in addition to ones in those
+ directories.
</para></listitem>
</varlistentry>