tMerge pull request #319 from rofl0r/server_prots - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 86bc9067cd8bcc6fbf4d37fcd1c45f72e716f39e
DIR parent 79f2042e05103a3fa8f5780244ad23b1e44c6e95
HTML Author: ThomasV <thomasv1@gmx.de>
Date: Mon, 23 Sep 2013 01:17:38 -0700
Merge pull request #319 from rofl0r/server_prots
update help text for --server with available protocols
Diffstat:
M electrum | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
DIR diff --git a/electrum b/electrum
t@@ -77,7 +77,7 @@ def arg_parser():
parser.add_option("-f", "--fee", dest="tx_fee", default=None, help="set tx fee")
parser.add_option("-F", "--fromaddr", dest="from_addr", default=None, help="set source address for payto/mktx. if it isn't in the wallet, it will ask for the private key unless supplied in the format public_key:private_key. It's not saved in the wallet.")
parser.add_option("-c", "--changeaddr", dest="change_addr", default=None, help="set the change address for payto/mktx. default is a spare address, or the source address if it's not in the wallet")
- parser.add_option("-s", "--server", dest="server", default=None, help="set server host:port:protocol, where protocol is t or h")
+ parser.add_option("-s", "--server", dest="server", default=None, help="set server host:port:protocol, where protocol is either t (tcp), h (http), s (tcp+ssl), or g (https)")
parser.add_option("-p", "--proxy", dest="proxy", default=None, help="set proxy [type:]host[:port], where type is socks4,socks5 or http")
parser.add_option("-v", "--verbose", action="store_true", dest="verbose", default=False, help="show debugging information")
parser.add_option("-P", "--portable", action="store_true", dest="portable", default=False, help="portable wallet")