diff options
| author | Lars Thorsen <[email protected]> | 2015-12-11 10:07:21 +0100 |
|---|---|---|
| committer | Lars Thorsen <[email protected]> | 2015-12-11 10:07:21 +0100 |
| commit | fae6b9385f3d0d1c725ca6cdb588b8bf1e473721 (patch) | |
| tree | 9b0b87cea4fd11a46bf64b9a04d4fbeca7875da3 /lib/inets/doc/src/httpc.xml | |
| parent | 8c276c8c804e8cefb9f88d6bc6449916c3ec3a82 (diff) | |
| parent | 545b938fb12396c9e1313a4bacf68f5307941be5 (diff) | |
| download | otp-fae6b9385f3d0d1c725ca6cdb588b8bf1e473721.tar.gz otp-fae6b9385f3d0d1c725ca6cdb588b8bf1e473721.tar.bz2 otp-fae6b9385f3d0d1c725ca6cdb588b8bf1e473721.zip | |
Merge branch 'lars/correct-doc-bugs' into maint
Diffstat (limited to 'lib/inets/doc/src/httpc.xml')
| -rw-r--r-- | lib/inets/doc/src/httpc.xml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/inets/doc/src/httpc.xml b/lib/inets/doc/src/httpc.xml index 31e44f405c..ca9b268a03 100644 --- a/lib/inets/doc/src/httpc.xml +++ b/lib/inets/doc/src/httpc.xml @@ -4,7 +4,7 @@ <erlref> <header> <copyright> - <year>2004</year><year>2013</year> + <year>2004</year><year>2015</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> @@ -554,8 +554,8 @@ <v>IpDesc = string()</v> <d>Example: "134.138" or "[FEDC:BA98" (all IP addresses starting with 134.138 or FEDC:BA98), - "66.35.250.150" or "[2010:836B:4179::836B:4179]" (a complete IP address).</d> - <d><c>proxy</c> defaults to <c>{undefined, []}</c>, + "66.35.250.150" or "[2010:836B:4179::836B:4179]" (a complete IP address). + <c>proxy</c> defaults to <c>{undefined, []}</c>, that is, no proxy is configured and <c>https_proxy</c> defaults to the value of <c>proxy</c>.</d> <v>MaxSessions = integer()</v> @@ -597,8 +597,8 @@ for details.</d> <v>socket_opts() = [socket_opt()]</v> <d>The options are appended to the socket options used by the - client.</d> - <d>These are the default values when a new request handler + client. + These are the default values when a new request handler is started (for the initial connect). They are passed directly to the underlying transport (<c>gen_tcp</c> or <c>SSL</c>) <em>without</em> verification.</d> |