From c963f9eec8d72d6e17099d456330cd988294c0af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Mi=C4=85sko?= <tomasz.miasko@gmail.com>
Date: Sat, 9 Feb 2019 00:00:00 +0000
Subject: bin: Add an option to ignore changes to locked keys during load

If load command attempts to change one of non-writable keys, the whole
operation fails with an error and no changes are made. Add an `-f`
option to the load command that skips non-writable keys and proceeds
with remaining changes.

Closes issue #1.
---
 docs/dconf-tool.xml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'docs/dconf-tool.xml')

diff --git a/docs/dconf-tool.xml b/docs/dconf-tool.xml
index 7093da6..e5f8c24 100644
--- a/docs/dconf-tool.xml
+++ b/docs/dconf-tool.xml
@@ -77,6 +77,7 @@
     <cmdsynopsis>
       <command>dconf</command>
       <arg choice="plain">load</arg>
+      <arg choice="opt">-f</arg>
       <arg choice="plain"><replaceable>DIR</replaceable></arg>
     </cmdsynopsis>
     <cmdsynopsis>
@@ -180,7 +181,13 @@
       <varlistentry>
         <term><option>load</option></term>
 
-        <listitem><para>Populate a subpath from stdin. The expected format is the same as produced by <option>dump</option>.</para></listitem>
+        <listitem>
+          <para>
+            Populate a subpath from stdin. The expected format is the same as produced by <option>dump</option>.
+            Attempting to change non-writable keys cancels the load command.
+            To ignore changes to non-writable keys instead, use <option>-f</option>.
+          </para>
+        </listitem>
       </varlistentry>
 
       <varlistentry>
-- 
cgit v1.2.1