Merge branch 'sverker/ets-count/OTP-14987'

* sverker/ets-count/OTP-14987:
  erts,stdlib: Improve docs about obsolete ets_limit
  erts: Reduce test log noise from ets_SUITE
  erts: Increase scalability of ets name lookup
  erts: Rename one of delete_trap to select_delete_trap
  erts: Refactor usage of am_atom_put to ERTS_MAKE_AM
  erts: Add system_info(ets_count)
  erts: Fix narrow race between ets:new and ets:delete

2 files changed, 13 insertions, 9 deletions

diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml
index 74654a295d..4cf0066999 100644
--- a/erts/doc/src/erl.xml
+++ b/erts/doc/src/erl.xml
@@ -631,14 +631,16 @@
           of process heaps is destroyed by the crash dump generation.</p>
         <p>Option <c>+d</c> instructs the emulator to produce only a
           core dump and no crash dump if an internal error is detected.</p>
-        <p>Calling <seealso marker="erlang:halt/1">
+        <p>Calling <seealso marker="erlang#halt/1">
           <c>erlang:halt/1</c></seealso> with a string argument still
           produces a crash dump. On Unix systems, sending an emulator process
           a <c>SIGUSR1</c> signal also forces a crash dump.</p>
       </item>
       <tag><marker id="+e"/><c><![CDATA[+e Number]]></c></tag>
       <item>
-        <p>Sets the maximum number of ETS tables.</p>
+        <p>Sets the maximum number of ETS tables. This limit is
+	<seealso marker="stdlib:ets#max_ets_tables">partially obsolete</seealso>.
+	</p>
       </item>
       <tag><c><![CDATA[+ec]]></c></tag>
       <item>
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index 80d40b285a..15bd80e72f 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -8166,16 +8166,18 @@ ok
             <c>erl(1)</c>.
             </p>
           </item>
+	  <tag><marker id="system_info_ets_count"/>
+            <c>ets_count</c></tag>
+          <item>
+            <p>Returns the number of ETS tables currently existing at the
+            local node.</p>
+          </item>
           <tag><marker id="system_info_ets_limit"/>
             <c>ets_limit</c></tag>
           <item>
-            <p>Returns the maximum number of ETS tables allowed. This
-              limit can be increased at startup by passing
-              command-line flag
-              <seealso marker="erts:erl#+e"><c>+e</c></seealso> to
-              <c>erl(1)</c> or by setting environment variable
-              <c>ERL_MAX_ETS_TABLES</c> before starting the Erlang
-              runtime system.</p>
+            <p>Returns the limit for number of ETS tables. This limit is
+	    <seealso marker="stdlib:ets#max_ets_tables">partially obsolete</seealso>
+	    and number of tables are only limited by available memory.</p>
           </item>
           <tag><marker id="system_info_port_count"/><c>port_count</c></tag>
           <item>