New upstream version 2020.5

This commit is contained in:
Simon McVittie committed 2020-08-21 00:17:41 +01:00
commit deefe62fe4
28 files changed
+444 -255

No files matched your search

@@ -1806,8 +1806,8 @@ ostree_sysroot_deploy_tree (<em class="parameter"><code><a class="link" href="os
, performing a 3
way merge with <em class="parameter"><code>provided_merge_deployment</code></em>
for configuration.</p>
<p>While this API is not deprecated, you most likely want to use the
<a class="link" href="ostree-Root-partition-mount-point.html#ostree-sysroot-stage-tree" title="ostree_sysroot_stage_tree ()"><code class="function">ostree_sysroot_stage_tree()</code></a> API.</p>
<p>When booted into the sysroot, you should use the
<a class="link" href="ostree-Root-partition-mount-point.html#ostree-sysroot-stage-tree" title="ostree_sysroot_stage_tree ()"><code class="function">ostree_sysroot_stage_tree()</code></a> API instead.</p>
<div class="refsect3">
<a name="ostree-sysroot-deploy-tree.parameters"></a><h4>Parameters</h4>
<div class="informaltable"><table class="informaltable" width="100%" border="0">