diff options
author | Raimo Niskanen <[email protected]> | 2018-03-06 14:57:08 +0100 |
---|---|---|
committer | Raimo Niskanen <[email protected]> | 2018-03-06 14:57:08 +0100 |
commit | f59026a57ccdfe4e462cbab9b97e9cd377dd5bdb (patch) | |
tree | bcb8c3e1f96b995797a0c5282117f35f8f9d09e4 /lib/kernel/doc/src/inet_res.xml | |
parent | f529c3a4d5add57c2d65114781d1f3c4f96d2a7c (diff) | |
parent | 6a4fb088b97a118bd1dcc1a544578f9fabc10c25 (diff) | |
download | otp-f59026a57ccdfe4e462cbab9b97e9cd377dd5bdb.tar.gz otp-f59026a57ccdfe4e462cbab9b97e9cd377dd5bdb.tar.bz2 otp-f59026a57ccdfe4e462cbab9b97e9cd377dd5bdb.zip |
Merge branch 'raimo/stop-encouraging-v4-mapped/ERL-503/OTP-13716'
* raimo/stop-encouraging-v4-mapped/ERL-503/OTP-13716:
Stop translating V4MAPPED addresses
Stop returning V4MAPPED addresses
Implement function for IPv4-mapped IPv6 addresses
Diffstat (limited to 'lib/kernel/doc/src/inet_res.xml')
-rw-r--r-- | lib/kernel/doc/src/inet_res.xml | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/kernel/doc/src/inet_res.xml b/lib/kernel/doc/src/inet_res.xml index 3454e3c6f9..351d86a93a 100644 --- a/lib/kernel/doc/src/inet_res.xml +++ b/lib/kernel/doc/src/inet_res.xml @@ -4,7 +4,7 @@ <erlref> <header> <copyright> - <year>2009</year><year>2015</year> + <year>2009</year><year>2018</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> @@ -230,9 +230,7 @@ inet_dns:record_type(_) -> undefined.</pre> <seealso marker="#getbyname/2"><c>getbyname/2,3</c></seealso>. </p> <p>If resolver option <c>inet6</c> is <c>true</c>, - an IPv6 address is looked up. If that fails, - the IPv4 address is looked up and returned on - IPv6-mapped IPv4 format.</p> + an IPv6 address is looked up.</p> </desc> </func> |