From: schwarze Date: Tue, 13 Feb 2018 01:34:34 +0000 (+0000) Subject: Delete duplicate .Nm entry in the NAME section, X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=ab35b4aa41127cb826d497a30988fdc095d00572;p=openbsd Delete duplicate .Nm entry in the NAME section, from Rich Salz via OpenSSL commit 8162f6f5 Jun 9 17:02:59 2016 -0400. Merging the RETURN VALUES section really wouldn't make much sense here, it contains no additional information and i don't see any way to reorganize the content and make it better. --- diff --git a/lib/libcrypto/man/BIO_should_retry.3 b/lib/libcrypto/man/BIO_should_retry.3 index 601bb997a7c..e9b57803650 100644 --- a/lib/libcrypto/man/BIO_should_retry.3 +++ b/lib/libcrypto/man/BIO_should_retry.3 @@ -1,5 +1,6 @@ -.\" $OpenBSD: BIO_should_retry.3,v 1.5 2016/12/06 14:45:08 schwarze Exp $ -.\" OpenSSL 60e24554 Apr 6 14:45:18 2010 +0000 +.\" $OpenBSD: BIO_should_retry.3,v 1.6 2018/02/13 01:34:34 schwarze Exp $ +.\" full merge up to: OpenSSL 60e24554 Apr 6 14:45:18 2010 +0000 +.\" selective merge up to: OpenSSL 61f805c1 Jan 16 01:01:46 2018 +0800 .\" .\" This file was written by Dr. Stephen Henson . .\" Copyright (c) 2000, 2010, 2016 The OpenSSL Project. All rights reserved. @@ -48,11 +49,10 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED .\" OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: December 6 2016 $ +.Dd $Mdocdate: February 13 2018 $ .Dt BIO_SHOULD_RETRY 3 .Os .Sh NAME -.Nm BIO_should_retry , .Nm BIO_should_read , .Nm BIO_should_write , .Nm BIO_should_io_special ,