Use option/parameter consistently.

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/10135)

diff --git a/doc/man1/openssl.pod b/doc/man1/openssl.pod
index 7c61d125cb351fc804693845560ba80be656d6b9..4ff57841241a98c575db2ea8102b2f25f40776c6 100644 (file)
--- a/doc/man1/openssl.pod
+++ b/doc/man1/openssl.pod
@@ -8,8 +8,8 @@ openssl - OpenSSL command line tool
 
 B<openssl>
 I<command>
 
 B<openssl>
 I<command>

-[ I<command_opts> ... ]
-[ I<command_args> ... ]
+[ I<options> ... ]
+[ I<parameters> ... ]

 
 B<openssl>
 B<list>
 
 B<openssl>
 B<list>


@@ -21,7 +21,7 @@ B<-digest-algorithms> |
 B<-mac-algorithms> |
 B<-public-key-algorithms>
 
 B<-mac-algorithms> |
 B<-public-key-algorithms>
 

-B<openssl> B<no->I<XXX> [ I<arbitrary options> ]
+B<openssl> B<no->I<XXX> [ I<options> ]

 
 =head1 DESCRIPTION
 
 
 =head1 DESCRIPTION
 


@@ -45,8 +45,9 @@ It can be used for
 =head1 COMMAND SUMMARY
 
 The B<openssl> program provides a rich variety of commands (I<command> in
 =head1 COMMAND SUMMARY
 
 The B<openssl> program provides a rich variety of commands (I<command> in

-the SYNOPSIS above), each of which often has a wealth of options and arguments
-(I<command_opts> and I<command_args> in the SYNOPSIS).
+the L</SYNOPSIS> above).
+Each command can have many options and argument parameters, shown above as
+I<options> and I<parameters>.

 
 Detailed documentation and use cases for most standard subcommands are available
 (e.g., L<openssl-x509(1)>).
 
 Detailed documentation and use cases for most standard subcommands are available
 (e.g., L<openssl-x509(1)>).


@@ -398,8 +399,7 @@ The following aliases provide convenient access to the most used encodings
 and ciphers.
 
 Depending on how OpenSSL was configured and built, not all ciphers listed
 and ciphers.
 
 Depending on how OpenSSL was configured and built, not all ciphers listed

-here may be present. See L<openssl-enc(1)> for more information and command
-usage.
+here may be present. See L<openssl-enc(1)> for more information.

 
 =over 4
 
 
 =over 4
 

diff --git a/doc/man3/CTLOG_STORE_new.pod b/doc/man3/CTLOG_STORE_new.pod
index 5fe6775302c53bac82b3c47d8b6f531676ed0bbf..f4a21e4b56e407fa0021deccebcb53ea78b7c5d8 100644 (file)
--- a/doc/man3/CTLOG_STORE_new.pod
+++ b/doc/man3/CTLOG_STORE_new.pod
@@ -25,8 +25,8 @@ logs). The list can be loaded from one or more files and then searched by LogID
 CTLOG_STORE_new() creates an empty list of CT logs. This is then populated
 by CTLOG_STORE_load_default_file() or CTLOG_STORE_load_file().
 CTLOG_STORE_load_default_file() loads from the default file, which is named
 CTLOG_STORE_new() creates an empty list of CT logs. This is then populated
 by CTLOG_STORE_load_default_file() or CTLOG_STORE_load_file().
 CTLOG_STORE_load_default_file() loads from the default file, which is named

-F<ct_log_list.cnf> in OPENSSLDIR (see the output of L<version(1)>). This can be
-overridden using an environment variable named B<CTLOG_FILE>.
+F<ct_log_list.cnf> in OPENSSLDIR (see the output of L<openssl-version(1)>).
+This can be overridden using an environment variable named B<CTLOG_FILE>.

 CTLOG_STORE_load_file() loads from a caller-specified file path instead.
 Both of these functions append any loaded CT logs to the CTLOG_STORE.
 
 CTLOG_STORE_load_file() loads from a caller-specified file path instead.
 Both of these functions append any loaded CT logs to the CTLOG_STORE.