[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  e5a82bfd68f2de9b9b19ba37d59ef73a9b1fe193 (commit)
      from  0fd2d5fa3c58e0a11f059becd1fcf063c05ea292 (commit)


- Log -----------------------------------------------------------------
commit e5a82bfd68f2de9b9b19ba37d59ef73a9b1fe193
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Feb 8 21:42:00 2016 +0100

    Small fixes
    
    - One typo fixed in crypto/bio/b_addr.c
    - Add a comment in doc/crypto/BIO_parse_hostserv.pod to explain the
      blank lines with one lonely space each.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

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

Summary of changes:
 crypto/bio/b_addr.c               | 2 +-
 doc/crypto/BIO_parse_hostserv.pod | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/crypto/bio/b_addr.c b/crypto/bio/b_addr.c
index 39597b8..b60d6ac 100644
--- a/crypto/bio/b_addr.c
+++ b/crypto/bio/b_addr.c
@@ -341,7 +341,7 @@ socklen_t BIO_ADDR_sockaddr_size(const BIO_ADDR *ap)
 
 /**********************************************************************
  *
- * Address into database
+ * Address info database
  *
  */
 
diff --git a/doc/crypto/BIO_parse_hostserv.pod b/doc/crypto/BIO_parse_hostserv.pod
index 0c9cfbe..56b7144 100644
--- a/doc/crypto/BIO_parse_hostserv.pod
+++ b/doc/crypto/BIO_parse_hostserv.pod
@@ -42,6 +42,11 @@ The service part can  be a service name or its port number.
 The returned values will depend on the given B<hostserv> string
 and B<hostserv_prio>, as follows:
 
+=for comment
+The following is ONE verbatim block.  To make sure it's rendered as
+one block and not several, the blank lines in between have one space.
+They should be left as is.
+
  host + ':' + service  => *host = "host", *service = "service"
  host + ':' + '*'      => *host = "host", *service = NULL
  host + ':'            => *host = "host", *service = NULL