summaryrefslogtreecommitdiffstats
path: root/doc/man1/ts.pod
diff options
context:
space:
mode:
authorRich Salz <rsalz@openssl.org>2017-02-07 11:33:21 -0500
committerRich Salz <rsalz@openssl.org>2017-02-07 21:10:55 -0500
commite9681f8314c64c6802b11997c471bd763de38c8c (patch)
tree29cb37165e4455533d5c19037b158a0a1f729d91 /doc/man1/ts.pod
parent4bf73e9f86804cfe98b03accfc2dd7cb98e018d6 (diff)
Centralize documentation about config file location
Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/2569)
Diffstat (limited to 'doc/man1/ts.pod')
-rw-r--r--doc/man1/ts.pod22
1 files changed, 9 insertions, 13 deletions
diff --git a/doc/man1/ts.pod b/doc/man1/ts.pod
index 95fdfcf84d..d807394adb 100644
--- a/doc/man1/ts.pod
+++ b/doc/man1/ts.pod
@@ -139,9 +139,9 @@ MS-Windows, B<,> for VMS and B<:> for all other platforms. (Optional)
=item B<-config> configfile
-The configuration file to use, this option overrides the
-B<OPENSSL_CONF> environment variable. Only the OID section
-of the config file is used with the B<-query> command. (Optional)
+The configuration file to use.
+Optional; for a description of the default value,
+see L<openssl(1)/COMMAND SUMMARY>.
=item B<-data> file_to_hash
@@ -216,9 +216,10 @@ otherwise it is a time stamp token (ContentInfo).
=item B<-config> configfile
-The configuration file to use, this option overrides the
-B<OPENSSL_CONF> environment variable. See B<CONFIGURATION FILE
-OPTIONS> for configurable variables. (Optional)
+The configuration file to use.
+Optional; for a description of the default value,
+see L<openssl(1)/COMMAND SUMMARY>.
+See B<CONFIGURATION FILE OPTIONS> for configurable variables.
=item B<-section> tsa_section
@@ -386,8 +387,8 @@ verification. See L<verify(1)>.
=head1 CONFIGURATION FILE OPTIONS
-The B<-query> and B<-reply> commands make use of a configuration file
-defined by the B<OPENSSL_CONF> environment variable. See L<config(5)>
+The B<-query> and B<-reply> commands make use of a configuration file.
+See L<config(5)>
for a general description of the syntax of the config file. The
B<-query> command uses only the symbolic OID names section
and it can work without it. However, the B<-reply> command needs the
@@ -505,11 +506,6 @@ included. Default is no. (Optional)
=back
-=head1 ENVIRONMENT VARIABLES
-
-B<OPENSSL_CONF> contains the path of the configuration file and can be
-overridden by the B<-config> command line option.
-
=head1 EXAMPLES
All the examples below presume that B<OPENSSL_CONF> is set to a proper