diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2016-11-29 15:17:57 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2016-11-29 15:49:35 +0000 |
| commit | c1093e2d2adc0963a6853b84dc8c34c3333c6f6e (patch) | |
| tree | 051484a16067afa703eb885a53f64c969a4b0c0e /src | |
| parent | 94b83ae14201e9c28b9f4817ee020814300860aa (diff) | |
Tweak wording of QNetworkProxy doc for SOCKS5
It was phrased for an out-of-date version of Qt.
Adapt phrasing to be future-proof. Reflow text.
Change-Id: Ic026a7719ba6fb1de2830358a75cd6f30c5f8897
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/network/kernel/qnetworkproxy.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/network/kernel/qnetworkproxy.cpp b/src/network/kernel/qnetworkproxy.cpp index 94719e9c2d..ce491e0fcb 100644 --- a/src/network/kernel/qnetworkproxy.cpp +++ b/src/network/kernel/qnetworkproxy.cpp @@ -82,7 +82,9 @@ \section1 SOCKS5 - The SOCKS5 support in Qt 4 is based on \l{http://www.rfc-editor.org/rfc/rfc1928.txt}{RFC 1928} and \l{http://www.rfc-editor.org/rfc/rfc1929.txt}{RFC 1929}. + The SOCKS5 support since Qt 4 is based on + \l{http://www.rfc-editor.org/rfc/rfc1928.txt}{RFC 1928} and + \l{http://www.rfc-editor.org/rfc/rfc1929.txt}{RFC 1929}. The supported authentication methods are no authentication and username/password authentication. Both IPv4 and IPv6 are supported. Domain names are resolved through the SOCKS5 server if |