Mercurial > hg > bitcoin
changeset 405:aa7ff8175152 draft
Merge branch 'issue34' of https://github.com/dooglus/bitcoin into FIXES
author | Gavin Andresen <gavinandresen@gmail.com> |
---|---|
date | Thu, 20 Jan 2011 14:18:51 -0500 |
parents | 68fcf2f3c152 (current diff) 24d3b040cfa8 (diff) |
children | ace99b7f10f6 |
files | init.cpp |
diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/init.cpp +++ b/init.cpp @@ -188,10 +188,10 @@ #ifdef USE_SSL strUsage += string() + _("\nSSL options: (see the Bitcoin Wiki for SSL setup instructions)\n") + - " -rpcssl=1 \t " + _("Use OpenSSL (https) for JSON-RPC connections\n") + - " -rpcsslcertificatchainfile=<file.cert>\t " + _("Server certificate file (default: server.cert)\n") + - " -rpcsslprivatekeyfile=<file.pem> \t " + _("Server private key (default: server.pem)\n") + - " -rpcsslciphers=<ciphers> \t " + _("Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)\n"); + " -rpcssl=1 \t " + _("Use OpenSSL (https) for JSON-RPC connections\n") + + " -rpcsslcertificatechainfile=<file.cert>\t " + _("Server certificate file (default: server.cert)\n") + + " -rpcsslprivatekeyfile=<file.pem> \t " + _("Server private key (default: server.pem)\n") + + " -rpcsslciphers=<ciphers> \t " + _("Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)\n"); #endif strUsage += string() +