From 3c77a41b3097eb9255be834e94152b8f7625241f Mon Sep 17 00:00:00 2001 From: Rich Salz Date: Fri, 18 Oct 2019 09:52:17 -0400 Subject: [PATCH] Fix some wording and markup Reviewed-by: Tomas Mraz Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/10214) --- doc/man3/OpenSSL_version.pod | 57 ++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/doc/man3/OpenSSL_version.pod b/doc/man3/OpenSSL_version.pod index 7e9c36eb76..0c835b77d8 100644 --- a/doc/man3/OpenSSL_version.pod +++ b/doc/man3/OpenSSL_version.pod @@ -52,25 +52,25 @@ Deprecated: =head2 Macros The three macros B, B and -B represent the three parts of a 3 numbered version -number, MAJOR.MINOR.PATCH. +B represent the three parts of a version +identifier, B.I.I>. The macro B is an added bit of text that, when defined, indicates that this is a pre-release version, such as -C<"-dev"> for an ongoing development snapshot, C<"-alpha3"> for an -alpha release, etc... +C<"-dev"> for an ongoing development snapshot or C<"-alpha3"> for an +alpha release. The value must be a string. -The macro B is extra metadata, reserved -for other parties (examples: C<"+fips">, C<"+vendor.1">). +The macro B is extra information, reserved +for other parties, such as C<"+fips">, or C<"+vendor.1">. The OpenSSL project will not touch this macro. The value must be a string. B is a convenience macro to get the short version -number string, "MAJOR.MINOR.PATCH". +identifier string, C<"I.I.I">. B is a convenience macro to get the longer -version number string, which combines B, +version identifier string, which combines B, B and B. B is a convenience macro to get a full descriptive @@ -83,7 +83,7 @@ OPENSSL_version_major(), OPENSSL_version_minor(), OPENSSL_version_patch(), OPENSSL_version_pre_release(), and OPENSSL_version_build_metadata() return the values of the macros above for the build of the library, respectively. -OpenSSL_version() returns different strings depending on B: +OpenSSL_version() returns different strings depending on I: =over 4 @@ -102,33 +102,34 @@ The value of B =item OPENSSL_CFLAGS The compiler flags set for the compilation process in the form -"compiler: ..." if available or "compiler: information not available" +C if available, or C otherwise. =item OPENSSL_BUILT_ON -The date of the build process in the form "built on: ..." if available -or "built on: date not available" otherwise. +The date of the build process in the form C if available +or C otherwise. +The date would not be available in a reproducible build, for example. =item OPENSSL_PLATFORM -The "Configure" target of the library build in the form "platform: ..." -if available or "platform: information not available" otherwise. +The "Configure" target of the library build in the form C +if available, or C otherwise. =item OPENSSL_DIR -The "OPENSSLDIR" setting of the library build in the form "OPENSSLDIR: "..."" -if available or "OPENSSLDIR: N/A" otherwise. +The B setting of the library build in the form C +if available, or C otherwise. =item OPENSSL_ENGINES_DIR -The "ENGINESDIR" setting of the library build in the form "ENGINESDIR: "..."" -if available or "ENGINESDIR: N/A" otherwise. +The B setting of the library build in the form C +if available, or C otherwise. =item OPENSSL_MODULES_DIR -The "MODULESDIR" setting of the library build in the form "MODULESDIR: "..."" -if available or "MODULESDIR: N/A" otherwise. +The B setting of the library build in the form C +if available, or C otherwise. =item OPENSSL_CPU_INFO @@ -136,14 +137,14 @@ The current OpenSSL cpu settings. This is the current setting of the cpu capability flags. It is usually automatically configured but may be set via an environment variable. The value has the same syntax as the environment variable. -For x86 the string looks like "CPUINFO: OPENSSL_ia32cap=0x123:0x456". -Or "CPUINFO: N/A" if not available, e.g. no-asm build. +For x86 the string looks like C. +Or C if not available, such as when configured with B. =back -For an unknown B, the text "not available" is returned. +For an unknown I, the text C is returned. -OPENSSL_info() also returns different strings depending on B: +OPENSSL_info() also returns different strings depending on I: =over 4 @@ -177,8 +178,8 @@ separator between directory elements. The OpenSSL list separator. This is typically used in strings that are lists of items, such as the value of the environment variable C<$PATH> on Unix (where the -separator is ":") or C<%PATH%> on Windows (where the separator is -";"). +separator is C<:>) or C<%PATH%> on Windows (where the separator is +C<;>). =item OPENSSL_INFO_CPU_SETTINGS @@ -186,11 +187,11 @@ The current OpenSSL cpu settings. This is the current setting of the cpu capability flags. It is usually automatically configured but may be set via an environment variable. The value has the same syntax as the environment variable. -For x86 the string looks like "OPENSSL_ia32cap=0x123:0x456". +For x86 the string looks like C. =back -For an unknown B, NULL is returned. +For an unknown I, NULL is returned. =head1 BACKWARD COMPATIBILITY -- 2.25.1