From 52a84b84a924a9f1cd8090b0a47b9f7d00ca69f3 Mon Sep 17 00:00:00 2001 From: Stef Walter Date: Wed, 17 Jul 2013 11:58:05 +0200 Subject: 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. --- doc/manual/pkcs11.conf.xml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'doc/manual/pkcs11.conf.xml') 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 @@ + "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" +[ + + +]> @@ -232,13 +236,13 @@ x-custom : text additional configuration or override the system configuration. The system global configuration file is usually in - /etc/pkcs11/pkcs11.conf and the user global - configuration file is in ~/.pkcs11/pkcs11.conf in the + &sysdir;/pkcs11.conf and the user global + configuration file is in &userdir;/pkcs11.conf in the user's home directory. The module config files are usually located in the - /etc/pkcs11/modules directory, with one configuration - file per module. In addition the ~/.pkcs11/modules directory + &sysdir;/modules directory, with one configuration + file per module. In addition the &userdir;/modules directory can be used for modules installed by the user. Note that user configuration files are not loaded from the home -- cgit v1.1