diff options
author | marha <marha@users.sourceforge.net> | 2014-09-02 18:48:52 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2014-09-02 18:48:52 +0200 |
commit | dea8f13d8104872dec9243abe06f3d9e4c807ccd (patch) | |
tree | b01e5b901eaca45f1e3aa2b6fddfd45ca271ee75 /openssl/doc/crypto/ui.pod | |
parent | 3293021e6f582c7348667e7638941620134525e1 (diff) | |
parent | 04168ae281bfbd714ddf6b90d98eac892508dde8 (diff) | |
download | vcxsrv-dea8f13d8104872dec9243abe06f3d9e4c807ccd.tar.gz vcxsrv-dea8f13d8104872dec9243abe06f3d9e4c807ccd.tar.bz2 vcxsrv-dea8f13d8104872dec9243abe06f3d9e4c807ccd.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
openssl/Makefile
openssl/crypto/opensslconf.h
Diffstat (limited to 'openssl/doc/crypto/ui.pod')
-rw-r--r-- | openssl/doc/crypto/ui.pod | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/openssl/doc/crypto/ui.pod b/openssl/doc/crypto/ui.pod index 6df68d604..04f8e9c36 100644 --- a/openssl/doc/crypto/ui.pod +++ b/openssl/doc/crypto/ui.pod @@ -119,7 +119,7 @@ verification will fail. UI_add_input_boolean() adds a prompt to the UI that's supposed to be answered in a boolean way, with a single character for yes and a different character for no. A set of characters that can be used to cancel the prompt is given -as well. The prompt itself is really divided in two, one part being the +as well. The prompt itself is divided in two, one part being the descriptive text (given through the I<prompt> argument) and one describing the possible answers (given through the I<action_desc> argument). |