[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  df7858989350e600b81aeb7178a55ea3ac3ead41 (commit)
      from  ba0a6d1deb20d81bbf89b365c5c73879cbe0fae7 (commit)


- Log -----------------------------------------------------------------
commit df7858989350e600b81aeb7178a55ea3ac3ead41
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Jan 25 14:16:05 2021 +0100

    DOC: Fix a few minor issues in OSSL_ENCODER / OSSL_DECODER docs
    
    Partially fixes #13949
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/13954)

-----------------------------------------------------------------------

Summary of changes:
 doc/man3/OSSL_DECODER.pod | 6 +++---
 doc/man3/OSSL_ENCODER.pod | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/man3/OSSL_DECODER.pod b/doc/man3/OSSL_DECODER.pod
index b951d8d0b9..347df85e1b 100644
--- a/doc/man3/OSSL_DECODER.pod
+++ b/doc/man3/OSSL_DECODER.pod
@@ -73,12 +73,12 @@ OSSL_DECODER_number() returns the internal dynamic number assigned
 to the given I<decoder>.
 
 OSSL_DECODER_names_do_all() traverses all names for the given
-I<decoder>, and calls I<fn> with each name and I<data>.
+I<decoder>, and calls I<fn> with each name and I<data> as arguments.
 
-OSSL_DECODER_do_all_provided() traverses all encoder
+OSSL_DECODER_do_all_provided() traverses all decoder
 implementations by all activated providers in the library context
 I<libctx>, and for each of the implementations, calls I<fn> with the
-implementation method and I<data> as arguments.
+implementation method and I<arg> as arguments.
 
 OSSL_DECODER_gettable_params() returns an L<OSSL_PARAM(3)>
 array of parameter descriptors.
diff --git a/doc/man3/OSSL_ENCODER.pod b/doc/man3/OSSL_ENCODER.pod
index 46e3717276..15f2a5f935 100644
--- a/doc/man3/OSSL_ENCODER.pod
+++ b/doc/man3/OSSL_ENCODER.pod
@@ -73,12 +73,12 @@ OSSL_ENCODER_number() returns the internal dynamic number assigned to
 the given I<encoder>.
 
 OSSL_ENCODER_names_do_all() traverses all names for the given
-I<encoder>, and calls I<fn> with each name and I<data>.
+I<encoder>, and calls I<fn> with each name and I<data> as arguments.
 
 OSSL_ENCODER_do_all_provided() traverses all encoder
 implementations by all activated providers in the library context
 I<libctx>, and for each of the implementations, calls I<fn> with the
-implementation method and I<data> as arguments.
+implementation method and I<arg> as arguments.
 
 OSSL_ENCODER_gettable_params() returns an L<OSSL_PARAM(3)>
 array of parameter descriptors.