Merge branch 'gsantomaggio/erts/system_info_atoms/PR-1198/OTP-13976'

* gsantomaggio/erts/system_info_atoms/PR-1198/OTP-13976:
  erts: Fix some system_info docs inconsistencies
  Add system_info(atom_limit)

1 files changed, 21 insertions, 16 deletions

diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index 7c4edb319e..3d1775e973 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -7220,8 +7220,8 @@ ok
     </func>
 
     <func>
-      <name name="system_info" arity="1" clause_i="10"/>
       <name name="system_info" arity="1" clause_i="11"/>
+      <name name="system_info" arity="1" clause_i="12"/>
       <fsummary>Information about the CPU topology of the system.</fsummary>
       <type name="cpu_topology"/>
       <type name="level_entry"/>
@@ -7321,12 +7321,12 @@ ok
     </func>
 
     <func>
-      <name name="system_info" arity="1" clause_i="27"/>
       <name name="system_info" arity="1" clause_i="28"/>
-      <name name="system_info" arity="1" clause_i="36"/>
+      <name name="system_info" arity="1" clause_i="29"/>
       <name name="system_info" arity="1" clause_i="37"/>
       <name name="system_info" arity="1" clause_i="38"/>
       <name name="system_info" arity="1" clause_i="39"/>
+      <name name="system_info" arity="1" clause_i="40"/>
       <fsummary>Information about the default process heap settings.</fsummary>
       <type name="message_queue_data"/>
       <type name="max_heap_size"/>
@@ -7369,12 +7369,6 @@ ok
               see <seealso marker="#process_flag_max_heap_size">
               <c>process_flag(max_heap_size, MaxHeapSize)</c></seealso>.</p>
           </item>
-          <tag><c>min_heap_size</c></tag>
-          <item>
-            <p>Returns <c>{min_heap_size, <anno>MinHeapSize</anno>}</c>,
-              where <c><anno>MinHeapSize</anno></c> is the current
-              system-wide minimum heap size for spawned processes.</p>
-          </item>
           <tag><marker id="system_info_message_queue_data"/>
             <c>message_queue_data</c></tag>
           <item>
@@ -7387,6 +7381,12 @@ ok
               <seealso marker="#process_flag_message_queue_data">
               <c>process_flag(message_queue_data, MQD)</c></seealso>.</p>
           </item>
+          <tag><c>min_heap_size</c></tag>
+          <item>
+            <p>Returns <c>{min_heap_size, <anno>MinHeapSize</anno>}</c>,
+              where <c><anno>MinHeapSize</anno></c> is the current
+              system-wide minimum heap size for spawned processes.</p>
+          </item>
           <tag><c>min_bin_vheap_size</c></tag>
           <item>
             <p>Returns <c>{min_bin_vheap_size,
@@ -7403,7 +7403,7 @@ ok
       <name name="system_info" arity="1" clause_i="7"/>
       <name name="system_info" arity="1" clause_i="8"/>
       <name name="system_info" arity="1" clause_i="9"/>
-      <name name="system_info" arity="1" clause_i="12"/>
+      <name name="system_info" arity="1" clause_i="10"/>
       <name name="system_info" arity="1" clause_i="13"/>
       <name name="system_info" arity="1" clause_i="14"/>
       <name name="system_info" arity="1" clause_i="15"/>
@@ -7418,14 +7418,14 @@ ok
       <name name="system_info" arity="1" clause_i="24"/>
       <name name="system_info" arity="1" clause_i="25"/>
       <name name="system_info" arity="1" clause_i="26"/>
-      <name name="system_info" arity="1" clause_i="29"/>
+      <name name="system_info" arity="1" clause_i="27"/>
       <name name="system_info" arity="1" clause_i="30"/>
       <name name="system_info" arity="1" clause_i="31"/>
       <name name="system_info" arity="1" clause_i="32"/>
       <name name="system_info" arity="1" clause_i="33"/>
       <name name="system_info" arity="1" clause_i="34"/>
       <name name="system_info" arity="1" clause_i="35"/>
-      <name name="system_info" arity="1" clause_i="40"/>
+      <name name="system_info" arity="1" clause_i="36"/>
       <name name="system_info" arity="1" clause_i="41"/>
       <name name="system_info" arity="1" clause_i="42"/>
       <name name="system_info" arity="1" clause_i="43"/>
@@ -7455,16 +7455,21 @@ ok
       <name name="system_info" arity="1" clause_i="67"/>
       <name name="system_info" arity="1" clause_i="68"/>
       <name name="system_info" arity="1" clause_i="69"/>
+      <name name="system_info" arity="1" clause_i="70"/>
       <fsummary>Information about the system.</fsummary>
       <desc>
         <p>Returns various information about the current system
           (emulator) as specified by <c><anno>Item</anno></c>:</p>
         <taglist>
-          <tag><c>allocated_areas</c>, <c>allocator</c>,
-            <c>alloc_util_allocators</c>, <c>allocator_sizes</c></tag>
+          <tag><c>atom_limit</c></tag>
           <item>
-            <p>See <seealso marker="#system_info_allocator_tags">
-              above</seealso>.</p>
+            <marker id="system_info_atom_limit"></marker>
+            <p>Returns the maximum number of atoms allowed.
+              This limit can be increased at startup by passing
+              command-line flag
+              <seealso marker="erts:erl#+t"><c>+t</c></seealso> to
+              <c>erl(1)</c>.
+            </p>
           </item>
           <tag><c>build_type</c></tag>
           <item>