minor cleanup;

6 files changed, 33 insertions, 32 deletions

diff --git a/lib/libcrypto/man/RSA_get_ex_new_index.3 b/lib/libcrypto/man/RSA_get_ex_new_index.3
index 559d3ee110c..34767516309 100644
--- a/lib/libcrypto/man/RSA_get_ex_new_index.3
+++ b/lib/libcrypto/man/RSA_get_ex_new_index.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: RSA_get_ex_new_index.3,v 1.3 2016/11/29 16:46:41 schwarze Exp $
+.\"	$OpenBSD: RSA_get_ex_new_index.3,v 1.4 2016/12/02 19:28:41 jmc Exp $
 .\"	OpenSSL 35cb565a Nov 19 15:49:30 2015 -0500
 .\"
 .\" This file was written by Ulf Moeller <ulf@openssl.org> and
@@ -49,7 +49,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: November 29 2016 $
+.Dd $Mdocdate: December 2 2016 $
 .Dt RSA_GET_EX_NEW_INDEX 3
 .Os
 .Sh NAME
@@ -108,7 +108,7 @@
 .Sh DESCRIPTION
 Several OpenSSL structures can have application specific data attached
 to them.
-This has several potential uses, it can be used to cache data associated
+This has several potential uses: it can be used to cache data associated
 with a structure (for example the hash of some part of the structure) or
 some additional data (for example a handle to the data in an external
 library).
@@ -145,13 +145,14 @@ important because the optional functions are called in order of
 increasing index value.
 .Pp
 .Fn RSA_set_ex_data
-is used to set application specific data, the data is supplied in the
+is used to set application specific data.
+The data is supplied in the
 .Fa arg
 parameter and its precise meaning is up to the application.
 .Pp
 .Fn RSA_get_ex_data
 is used to retrieve application specific data.
-The data is returned to the application, this will be the same value as
+The data is returned to the application, which will be the same value as
 supplied to a previous
 .Fn RSA_set_ex_data
 call.
diff --git a/lib/libcrypto/man/RSA_private_encrypt.3 b/lib/libcrypto/man/RSA_private_encrypt.3
index 2144d4f365c..4c83cc2ceee 100644
--- a/lib/libcrypto/man/RSA_private_encrypt.3
+++ b/lib/libcrypto/man/RSA_private_encrypt.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: RSA_private_encrypt.3,v 1.3 2016/11/29 16:46:41 schwarze Exp $
+.\"	$OpenBSD: RSA_private_encrypt.3,v 1.4 2016/12/02 19:28:41 jmc Exp $
 .\"	OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400
 .\"
 .\" This file was written by Ulf Moeller <ulf@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 29 2016 $
+.Dd $Mdocdate: December 2 2016 $
 .Dt RSA_PRIVATE_ENCRYPT 3
 .Os
 .Sh NAME
@@ -127,7 +127,7 @@ must point to a memory section large enough to hold the message digest
 is the padding mode that was used to sign the data.
 .Sh RETURN VALUES
 .Fn RSA_private_encrypt
-returns the size of the signature (i.e.,
+returns the size of the signature (i.e.\&
 .Fn RSA_size rsa ) .
 .Fn RSA_public_decrypt
 returns the size of the recovered message digest.
diff --git a/lib/libcrypto/man/RSA_public_encrypt.3 b/lib/libcrypto/man/RSA_public_encrypt.3
index 7162bf0a7d7..f1c7737eb42 100644
--- a/lib/libcrypto/man/RSA_public_encrypt.3
+++ b/lib/libcrypto/man/RSA_public_encrypt.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: RSA_public_encrypt.3,v 1.3 2016/11/29 16:46:41 schwarze Exp $
+.\"	$OpenBSD: RSA_public_encrypt.3,v 1.4 2016/12/02 19:28:41 jmc Exp $
 .\"	OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100
 .\"
 .\" This file was written by Ulf Moeller <ulf@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 29 2016 $
+.Dd $Mdocdate: December 2 2016 $
 .Dt RSA_PUBLIC_ENCRYPT 3
 .Os
 .Sh NAME
@@ -137,7 +137,7 @@ must point to a memory section large enough to hold the decrypted data
 is the padding mode that was used to encrypt the data.
 .Sh RETURN VALUES
 .Fn RSA_public_encrypt
-returns the size of the encrypted data (i.e.,
+returns the size of the encrypted data (i.e.\&
 .Fn RSA_size rsa ) .
 .Fn RSA_private_decrypt
 returns the size of the recovered plaintext.
diff --git a/lib/libcrypto/man/RSA_set_method.3 b/lib/libcrypto/man/RSA_set_method.3
index beb9f25a307..5b6cf8442e3 100644
--- a/lib/libcrypto/man/RSA_set_method.3
+++ b/lib/libcrypto/man/RSA_set_method.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: RSA_set_method.3,v 1.3 2016/11/29 16:46:41 schwarze Exp $
+.\"	$OpenBSD: RSA_set_method.3,v 1.4 2016/12/02 19:28:41 jmc Exp $
 .\"	OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400
 .\"
 .\" This file was written by Ulf Moeller <ulf@openssl.org>
@@ -50,7 +50,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: November 29 2016 $
+.Dd $Mdocdate: December 2 2016 $
 .Dt RSA_SET_METHOD 3
 .Os
 .Sh NAME
@@ -159,13 +159,13 @@ being used by
 .Fa rsa .
 This method may or may not be supplied by an
 .Vt ENGINE
-implementation, but if it is, the return value can only be guaranteed
+implementation but if it is, the return value can only be guaranteed
 to be valid as long as the RSA key itself is valid and does not
 have its implementation changed by
 .Fn RSA_set_method .
 .Pp
 .Fn RSA_flags
-returns the flags that are set for  the current
+returns the flags that are set for the current
 .Vt RSA_METHOD
 of
 .Fa rsa .
@@ -181,7 +181,7 @@ structure so that
 will be used for the RSA operations.
 If
 .Sy engine
-is NULL, the default ENGINE for RSA operations is used, and if no
+is NULL, the default ENGINE for RSA operations is used and, if no
 default ENGINE is set, the RSA_METHOD controlled by
 .Fn RSA_set_default_method
 is used.
@@ -349,9 +349,10 @@ RSA API without requiring changing these function prototypes.
 As of version 0.9.7,
 .Vt RSA_METHOD
 implementations are grouped together with other algorithmic APIs (e.g.\&
-.Vt DSA_METHOD ,
-.Vt EVP_CIPHER ,
-etc.) into
+.Vt DSA_METHOD
+or
+.Vt EVP_CIPHER )
+into
 .Vt ENGINE
 modules.
 If a default
@@ -368,7 +369,7 @@ use in RSA and other cryptographic algorithms.
 .Sh BUGS
 The behaviour of
 .Fn RSA_flags
-is a mis-feature that is left as-is for now to avoid creating
+is a misfeature that is left as-is for now to avoid creating
 compatibility problems.
 RSA functionality, such as the encryption functions, are controlled by
 the
diff --git a/lib/libcrypto/man/SHA1.3 b/lib/libcrypto/man/SHA1.3
index 97f6b55438a..48676aa89fe 100644
--- a/lib/libcrypto/man/SHA1.3
+++ b/lib/libcrypto/man/SHA1.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: SHA1.3,v 1.3 2016/11/29 17:33:49 schwarze Exp $
+.\"	$OpenBSD: SHA1.3,v 1.4 2016/12/02 19:28:41 jmc Exp $
 .\"	OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400
 .\"
 .\" This file was written by Ulf Moeller <ulf@openssl.org> and
@@ -49,7 +49,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: November 29 2016 $
+.Dd $Mdocdate: December 2 2016 $
 .Dt SHA1 3
 .Os
 .Sh NAME
@@ -183,7 +183,7 @@
 .Fc
 .Sh DESCRIPTION
 SHA-1 (Secure Hash Algorithm) is a cryptographic hash function with a
-160 bit output.
+160-bit output.
 .Pp
 .Fn SHA1
 computes the SHA-1 message digest of the
diff --git a/lib/libcrypto/man/UI_new.3 b/lib/libcrypto/man/UI_new.3
index 79078eb24cc..a04254632be 100644
--- a/lib/libcrypto/man/UI_new.3
+++ b/lib/libcrypto/man/UI_new.3
@@ -1,6 +1,6 @@
-.\"	$OpenBSD: UI_new.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"	$OpenBSD: UI_new.3,v 1.3 2016/12/02 19:28:41 jmc Exp $
 .\"
-.Dd $Mdocdate: November 6 2016 $
+.Dd $Mdocdate: December 2 2016 $
 .Dt UI_NEW 3
 .Os
 .Sh NAME
@@ -27,8 +27,7 @@
 .Nm UI_get_default_method ,
 .Nm UI_get_method ,
 .Nm UI_set_method ,
-.Nm UI_OpenSSL ,
-.Nm ERR_load_UI_strings
+.Nm UI_OpenSSL
 .Nd New User Interface
 .Sh SYNOPSIS
 .In openssl/ui.h
@@ -181,7 +180,7 @@
 .Fa void
 .Fc
 .Sh DESCRIPTION
-UI stands for User Interface, and is general purpose set of routines
+UI stands for User Interface, and is a general purpose set of routines
 to prompt the user for text-based information.
 Through user-written methods (see
 .Xr ui_create 3 ) ,
@@ -269,7 +268,7 @@ The given information is used to prompt for information, for example
 a password, and to verify a password (i.e. having the user enter
 it twice and check that the same string was entered twice).
 .Fn UI_add_verify_string
-takes and extra argument that should be a pointer to the result buffer
+takes an extra argument that should be a pointer to the result buffer
 of the input string that it's supposed to verify, or verification will
 fail.
 .Pp
@@ -318,7 +317,7 @@ counterparts, except that they make their own copies of all strings.
 .Pp
 .Fn UI_construct_prompt
 is a helper function that can be used to create a prompt from two pieces
-of information: an description and a name.
+of information: a description and a name.
 The default constructor (if there is none provided by the method used)
 creates a string "Enter
 .Em description
@@ -332,8 +331,8 @@ other method functions.
 .Fn UI_add_user_data
 adds a piece of memory for the method to use at any time.
 The builtin UI method doesn't care about this info.
-Note that several calls to this function doesn't add data, it replaces
-the previous blob with the one given as argument.
+Note that several calls to this function doesn't add data -
+the previous blob is replaced with the one given as argument.
 .Pp
 .Fn UI_get0_user_data
 retrieves the data that has last been given to the