summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/p11-kit-config.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/p11-kit-config.xml b/doc/p11-kit-config.xml
index a10cb7e..b6fb480 100644
--- a/doc/p11-kit-config.xml
+++ b/doc/p11-kit-config.xml
@@ -32,8 +32,8 @@
<programlisting>
# This setting controls whether to load user configuration from the
# ~/.pkcs11 directory. Possible values:
-# none: No user configuration (default)
-# merge: Merge the user configuration over the system configuration
+# none: No user configuration
+# merge: Merge the user config over the system configuration (default)
# only: Only user configuration, ignore system configuration
user-config: merge
</programlisting>