diff options
author | Stef Walter <stef@thewalter.net> | 2013-07-17 11:58:05 +0200 |
---|---|---|
committer | Stef Walter <stef@thewalter.net> | 2013-07-18 13:04:35 +0200 |
commit | 52a84b84a924a9f1cd8090b0a47b9f7d00ca69f3 (patch) | |
tree | 32428cc8b83eaa360b8b53e92f769cac1cf8a17e /doc/manual/pkcs11.conf.xml | |
parent | 936e4c229a4ed205e9981fc4f31acea063701b69 (diff) |
Support expanding $XDG_CONFIG_HOME in user config paths
If ~/.config is specified as a prefix to a configured path,
then it is expanded to the $XDG_CONFIG_HOME if that exists
Add --with-user-config ./configure option to configure a
different user config directory.
Interpolate the right directories into documentation.
Diffstat (limited to 'doc/manual/pkcs11.conf.xml')
-rw-r--r-- | doc/manual/pkcs11.conf.xml | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/doc/manual/pkcs11.conf.xml b/doc/manual/pkcs11.conf.xml index cda02ee..14b1783 100644 --- a/doc/manual/pkcs11.conf.xml +++ b/doc/manual/pkcs11.conf.xml @@ -1,6 +1,10 @@ <?xml version='1.0'?> <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" - "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"> + "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" +[ + <!ENTITY sysdir SYSTEM "sysdir.xml"> + <!ENTITY userdir SYSTEM "userdir.xml"> +]> <refentry id="pkcs11.conf"> @@ -232,13 +236,13 @@ x-custom : text additional configuration or override the system configuration.</para> <para>The system global configuration file is usually in - <literal>/etc/pkcs11/pkcs11.conf</literal> and the user global - configuration file is in <literal>~/.pkcs11/pkcs11.conf</literal> in the + <literal>&sysdir;/pkcs11.conf</literal> and the user global + configuration file is in <literal>&userdir;/pkcs11.conf</literal> in the user's home directory.</para> <para>The module config files are usually located in the - <literal>/etc/pkcs11/modules</literal> directory, with one configuration - file per module. In addition the <literal>~/.pkcs11/modules</literal> directory + <literal>&sysdir;/modules</literal> directory, with one configuration + file per module. In addition the <literal>&userdir;/modules</literal> directory can be used for modules installed by the user.</para> <para>Note that user configuration files are not loaded from the home |