Merge branch 'maint'

erlang · Jul 21, 2017 · 9d0993c · 9d0993c
2 parents ebc4057 + b7b8139
commit 9d0993c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git 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
@@ -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().