diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-07-24 15:55:49 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-07-24 15:57:24 +0200 |
| commit | 59abcefc2eec7ede6f098dbcf7323aef6e746a4a (patch) | |
| tree | 27d458468c40494bc5505a8366b7e144dd26b446 /contrib | |
| parent | 7bf8ab9dd3efb7ebc685e4ac02b05e6d5eba107d (diff) | |
| download | bitcoin-59abcefc2eec7ede6f098dbcf7323aef6e746a4a.tar.xz | |
doc: remove any mention of SOCKS4
SOCKS4 support was removed in 0127a9b, as well as the `-socks=` option.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/debian/examples/bitcoin.conf | 2 | ||||
| -rw-r--r-- | contrib/debian/manpages/bitcoin-qt.1 | 5 | ||||
| -rw-r--r-- | contrib/debian/manpages/bitcoind.1 | 2 |
3 files changed, 3 insertions, 6 deletions
diff --git a/contrib/debian/examples/bitcoin.conf b/contrib/debian/examples/bitcoin.conf index 0aa8674af9..31cca981e0 100644 --- a/contrib/debian/examples/bitcoin.conf +++ b/contrib/debian/examples/bitcoin.conf @@ -10,7 +10,7 @@ # Run a regression test network #regtest=0 -# Connect via a socks4 proxy +# Connect via a SOCKS5 proxy #proxy=127.0.0.1:9050 ############################################################## diff --git a/contrib/debian/manpages/bitcoin-qt.1 b/contrib/debian/manpages/bitcoin-qt.1 index cd478b1875..a023582bc0 100644 --- a/contrib/debian/manpages/bitcoin-qt.1 +++ b/contrib/debian/manpages/bitcoin-qt.1 @@ -32,10 +32,7 @@ Set database cache size in megabytes (default: 25) Specify connection timeout in milliseconds (default: 5000) .TP \fB\-proxy=\fR<ip:port> -Connect through socks proxy -.TP -\fB\-socks=\fR<n> -Select the version of socks proxy to use (4\-5, default: 5) +Connect through SOCKS5 proxy .TP \fB\-tor=\fR<ip:port> Use proxy to reach tor hidden services (default: same as \fB\-proxy\fR) diff --git a/contrib/debian/manpages/bitcoind.1 b/contrib/debian/manpages/bitcoind.1 index 0c191b6043..a1b17d6077 100644 --- a/contrib/debian/manpages/bitcoind.1 +++ b/contrib/debian/manpages/bitcoind.1 @@ -28,7 +28,7 @@ Start minimized Specify data directory .TP \fB\-proxy=\fR<ip:port> -Connect through socks4 proxy +Connect through SOCKS5 proxy .TP \fB\-addnode=\fR<ip> Add a node to connect to |