various cleanup;

4 files changed, 21 insertions, 29 deletions

diff --git a/lib/libcrypto/man/OCSP_REQUEST_new.3 b/lib/libcrypto/man/OCSP_REQUEST_new.3
index dd08b7c2cae..99240502e69 100644
--- a/lib/libcrypto/man/OCSP_REQUEST_new.3
+++ b/lib/libcrypto/man/OCSP_REQUEST_new.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: OCSP_REQUEST_new.3,v 1.1 2016/11/27 20:40:07 schwarze Exp $
+.\"	$OpenBSD: OCSP_REQUEST_new.3,v 1.2 2016/11/30 20:54:25 jmc Exp $
 .\"	OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100
 .\"
 .\" This file was written by Dr. Stephen Henson <steve@openssl.org>.
@@ -48,7 +48,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: November 27 2016 $
+.Dd $Mdocdate: November 30 2016 $
 .Dt OCSP_REQUEST_NEW 3
 .Os
 .Sh NAME
@@ -58,7 +58,7 @@
 .Nm OCSP_request_sign ,
 .Nm OCSP_request_add1_cert ,
 .Nm OCSP_request_onereq_count ,
-.Nm OCSP_request_onereq_get0 ,
+.Nm OCSP_request_onereq_get0
 .Nd OCSP request functions
 .Sh SYNOPSIS
 .In openssl/ocsp.h
@@ -206,8 +206,8 @@ returns a pointer to an
 .Vt OCSP_ONEREQ
 structure or
 .Dv NULL
-if the index value is out or range.
-.Sh EXAMPLE
+if the index value is out of range.
+.Sh EXAMPLES
 Create an
 .Vt OCSP_REQUEST
 structure for certificate
diff --git a/lib/libcrypto/man/OCSP_cert_to_id.3 b/lib/libcrypto/man/OCSP_cert_to_id.3
index 6742e454156..33b0e8adaa1 100644
--- a/lib/libcrypto/man/OCSP_cert_to_id.3
+++ b/lib/libcrypto/man/OCSP_cert_to_id.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: OCSP_cert_to_id.3,v 1.1 2016/11/27 20:40:07 schwarze Exp $
+.\"	$OpenBSD: OCSP_cert_to_id.3,v 1.2 2016/11/30 20:54:25 jmc Exp $
 .\"	OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100
 .\"
 .\" This file was written by Dr. Stephen Henson <steve@openssl.org>.
@@ -48,7 +48,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: November 27 2016 $
+.Dd $Mdocdate: November 30 2016 $
 .Dt OCSP_CERT_TO_ID 3
 .Os
 .Sh NAME
@@ -174,7 +174,7 @@ if an error occurred.
 .Fn OCSP_id_cmp
 and
 .Fn OCSP_id_issuer_cmp
-returns 0 for a match or non-zero otherwise.
+return 0 for a match or non-zero otherwise.
 .Pp
 .Fn OCSP_id_get0_info
 returns 1 for success or 0 for failure.
diff --git a/lib/libcrypto/man/OCSP_request_add1_nonce.3 b/lib/libcrypto/man/OCSP_request_add1_nonce.3
index 8de58d27311..7e9c1e878ce 100644
--- a/lib/libcrypto/man/OCSP_request_add1_nonce.3
+++ b/lib/libcrypto/man/OCSP_request_add1_nonce.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: OCSP_request_add1_nonce.3,v 1.1 2016/11/27 20:40:07 schwarze Exp $
+.\"	$OpenBSD: OCSP_request_add1_nonce.3,v 1.2 2016/11/30 20:54:25 jmc Exp $
 .\"	OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100
 .\"
 .\" This file was written by Dr. Stephen Henson <steve@openssl.org>.
@@ -48,7 +48,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: November 27 2016 $
+.Dd $Mdocdate: November 30 2016 $
 .Dt OCSP_REQUEST_ADD1_NONCE 3
 .Os
 .Sh NAME
@@ -72,14 +72,14 @@
 .Fa "int len"
 .Fc
 .Ft int
-.Fo OCSP_copy_nonce
-.Fa "OCSP_BASICRESP *resp"
+.Fo OCSP_check_nonce
 .Fa "OCSP_REQUEST *req"
+.Fa "OCSP_BASICRESP *resp"
 .Fc
 .Ft int
-.Fo OCSP_check_nonce
-.Fa "OCSP_REQUEST *req"
+.Fo OCSP_copy_nonce
 .Fa "OCSP_BASICRESP *resp"
+.Fa "OCSP_REQUEST *req"
 .Fc
 .Sh DESCRIPTION
 An OCSP nonce is typically added to an OCSP request to thwart replay
diff --git a/lib/libcrypto/man/OCSP_sendreq_new.3 b/lib/libcrypto/man/OCSP_sendreq_new.3
index 994ce9cc2ae..f24abef6b27 100644
--- a/lib/libcrypto/man/OCSP_sendreq_new.3
+++ b/lib/libcrypto/man/OCSP_sendreq_new.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: OCSP_sendreq_new.3,v 1.1 2016/11/27 20:40:07 schwarze Exp $
+.\"	$OpenBSD: OCSP_sendreq_new.3,v 1.2 2016/11/30 20:54:25 jmc Exp $
 .\"	OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100
 .\"
 .\" This file was written by Dr. Stephen Henson <steve@openssl.org>.
@@ -48,7 +48,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: November 27 2016 $
+.Dd $Mdocdate: November 30 2016 $
 .Dt OCSP_SENDREQ_NEW 3
 .Os
 .Sh NAME
@@ -202,22 +202,14 @@ structure or
 if an error occurred.
 .Pp
 .Fn OCSP_sendreq_nbio
-returns
-.Sy 1
-if the operation was completed successfully,
-.Sy -1
-if the operation should be retried, or
-.Sy 0
-if an error occurred.
+returns 1 if the operation was completed successfully,
+-1 if the operation should be retried,
+or 0 if an error occurred.
 .Pp
 .Fn OCSP_REQ_CTX_add1_header
 and
 .Fn OCSP_REQ_CTX_set1_req
-return
-.Sy 1
-for success or
-.Sy 0
-for failure.
+return 1 for success or 0 for failure.
 .Pp
 .Fn OCSP_sendreq_bio
 returns the
@@ -240,6 +232,6 @@ Add a Host header for
 .Sh CAVEATS
 These functions only perform a minimal HTTP query to a responder.
 If an application wishes to support more advanced features, it
-should use an alternative more complete HTTP library.
+should use an alternative, more complete, HTTP library.
 .Pp
 Currently only HTTP POST queries to responders are supported.