Merge remote-tracking branch 'origin/master'

# Conflicts:
#	README.md

doc/apps/errstr.pod

@@ -6,15 +6,19 @@ errstr - lookup error codes
 
 =head1 SYNOPSIS
 
-B<gmssl errstr error_code>
+B<openssl errstr error_code>
 
 =head1 DESCRIPTION
 
 Sometimes an application will not load error message and only
-numerical forms will be available. The B<errstr> utility can be used to 
+numerical forms will be available. The B<errstr> utility can be used to
 display the meaning of the hex code. The hex code is the hex digits after the
 second colon.
 
+=head1 OPTIONS
+
+None.
+
 =head1 EXAMPLE
 
 The error code:
@@ -22,18 +26,20 @@ The error code:
  27594:error:2006D080:lib(32):func(109):reason(128):bss_file.c:107:
 
 can be displayed with:
- 
- gmssl errstr 2006D080
+
+ openssl errstr 2006D080
 
 to produce the error message:
 
  error:2006D080:BIO routines:BIO_new_file:no such file
 
-=head1 SEE ALSO
+=head1 COPYRIGHT
 
-L<err(3)|err(3)>,
-L<ERR_load_crypto_strings(3)|ERR_load_crypto_strings(3)>,
-L<SSL_load_error_strings(3)|SSL_load_error_strings(3)>
+Copyright 2004-2016 The OpenSSL Project Authors. All Rights Reserved.
 
+Licensed under the OpenSSL license (the "License").  You may not use
+this file except in compliance with the License.  You can obtain a copy
+in the file LICENSE in the source distribution or at
+L<https://www.openssl.org/source/license.html>.
 
 =cut