diff options
| author | Raimo Niskanen <[email protected]> | 2017-07-21 09:33:39 +0200 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2017-07-21 09:33:39 +0200 |
| commit | 9d0993c31bee0d83a22e8f5854de775bde16a8d1 (patch) | |
| tree | 67a14ee392aa8ecde7781da3e17a2843a2aaca03 | |
| parent | ebc4057ba8c14754f97b2ab5f78c48573b71ef25 (diff) | |
| parent | b7b813998b13af831289687a3c7c324b6c42460c (diff) | |
| download | otp-9d0993c31bee0d83a22e8f5854de775bde16a8d1.tar.gz otp-9d0993c31bee0d83a22e8f5854de775bde16a8d1.tar.bz2 otp-9d0993c31bee0d83a22e8f5854de775bde16a8d1.zip | |
Merge branch 'maint'
| -rw-r--r-- | lib/kernel/doc/src/inet.xml | 11 | ||||
| -rw-r--r-- | lib/kernel/src/inet.erl | 3 |
2 files changed, 11 insertions, 3 deletions
diff --git a/lib/kernel/doc/src/inet.xml b/lib/kernel/doc/src/inet.xml index b71e8a1e5d..169a76463b 100644 --- a/lib/kernel/doc/src/inet.xml +++ b/lib/kernel/doc/src/inet.xml @@ -222,11 +222,18 @@ fe80::204:acff:fe17:bf38 <name name="get_rc" arity="0"/> <fsummary>Return a list of IP configuration parameters.</fsummary> <desc> - <p>Returns the state of the <c>Inet</c> configuration database in + <p> + Returns the state of the <c>Inet</c> configuration database in form of a list of recorded configuration parameters. For more information, see <seealso marker="erts:inet_cfg">ERTS User's Guide: Inet Configuration</seealso>. - Only parameters with other than default values are returned.</p> + </p> + <p> + Only actual parameters with other than default values + are returned, for example not directives that specify + other sources for configuration parameters nor + directives that clear parameters. + </p> </desc> </func> diff --git a/lib/kernel/src/inet.erl b/lib/kernel/src/inet.erl index 6aef5476f1..dc20c21c77 100644 --- a/lib/kernel/src/inet.erl +++ b/lib/kernel/src/inet.erl @@ -151,7 +151,8 @@ %%% --------------------------------- --spec get_rc() -> [{Par :: any(), Val :: any()}]. +-spec get_rc() -> [{Par :: atom(), Val :: any()} | + {Par :: atom(), Val1 :: any(), Val2 :: any()}]. get_rc() -> inet_db:get_rc(). |