diff options
| author | marha <marha@users.sourceforge.net> | 2014-04-14 23:45:39 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-04-14 23:45:39 +0200 |
| commit | 7c21629fbeb51b65fd0625bb36d888587d62fd89 (patch) | |
| tree | 425433df36d64f529d2222de2d1680e0b0abca3f /openssl/doc/apps/ts.pod | |
| parent | 0bd141efd4832e01c8b269b8566dd5749e30ed55 (diff) | |
| parent | 242d48135a12fc9167430f391ba0d27d9ad44c6b (diff) | |
| download | vcxsrv-7c21629fbeb51b65fd0625bb36d888587d62fd89.tar.gz vcxsrv-7c21629fbeb51b65fd0625bb36d888587d62fd89.tar.bz2 vcxsrv-7c21629fbeb51b65fd0625bb36d888587d62fd89.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
openssl/Configure
openssl/Makefile
openssl/util/pl/VC-32.pl
Diffstat (limited to 'openssl/doc/apps/ts.pod')
| -rw-r--r-- | openssl/doc/apps/ts.pod | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/openssl/doc/apps/ts.pod b/openssl/doc/apps/ts.pod index 7fb6caa96..d6aa47d31 100644 --- a/openssl/doc/apps/ts.pod +++ b/openssl/doc/apps/ts.pod @@ -352,7 +352,7 @@ switch always overrides the settings in the config file. This is the main section and it specifies the name of another section that contains all the options for the B<-reply> command. This default -section can be overriden with the B<-section> command line switch. (Optional) +section can be overridden with the B<-section> command line switch. (Optional) =item B<oid_file> @@ -453,7 +453,7 @@ included. Default is no. (Optional) =head1 ENVIRONMENT VARIABLES B<OPENSSL_CONF> contains the path of the configuration file and can be -overriden by the B<-config> command line option. +overridden by the B<-config> command line option. =head1 EXAMPLES |