From b8631ef58c94507d876155ac92335fd9606b259f Mon Sep 17 00:00:00 2001
From: Sverker Eriksson <sverker@erlang.org>
Date: Mon, 21 May 2018 17:49:52 +0200
Subject: erts,stdlib: Improve docs about obsolete ets_limit

---
 erts/doc/src/erl.xml                     |  6 ++++--
 erts/doc/src/erlang.xml                  | 10 +++-------
 lib/stdlib/doc/src/ets.xml               |  6 ++++--
 system/doc/efficiency_guide/advanced.xml |  5 -----
 4 files changed, 11 insertions(+), 16 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 5e0d30ebb7..b1fc4ec450 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -8175,13 +8175,9 @@ ok
           <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>
diff --git a/lib/stdlib/doc/src/ets.xml b/lib/stdlib/doc/src/ets.xml
index 305376a425..1995262145 100644
--- a/lib/stdlib/doc/src/ets.xml
+++ b/lib/stdlib/doc/src/ets.xml
@@ -49,14 +49,16 @@
       associated with each key. A <c>bag</c> or <c>duplicate_bag</c> table can
       have many objects associated with each key.</p>
 
+   <marker id="max_ets_tables"></marker>
    <note>
      <p>
        The number of tables stored at one Erlang node <em>used</em> to
        be limited. This is no longer the case (except by memory usage).
        The previous default limit was about 1400 tables and
        could be increased by setting the environment variable
-       <c>ERL_MAX_ETS_TABLES</c> before starting the Erlang runtime
-       system. This hard limit has been removed, but it is currently
+       <c>ERL_MAX_ETS_TABLES</c> or the command line option
+       <seealso marker="erts:erl#+e"><c>+e</c></seealso> before starting the
+       Erlang runtime system. This hard limit has been removed, but it is currently
        useful to set the <c>ERL_MAX_ETS_TABLES</c> anyway. It should be
        set to an approximate of the maximum amount of tables used. This since
        an internal table for named tables is sized using this value. If
diff --git a/system/doc/efficiency_guide/advanced.xml b/system/doc/efficiency_guide/advanced.xml
index 21d4a66d77..b303fd47ed 100644
--- a/system/doc/efficiency_guide/advanced.xml
+++ b/system/doc/efficiency_guide/advanced.xml
@@ -187,11 +187,6 @@
 	<cell>By default, the maximum number of atoms is 1,048,576. This
 	limit can be raised or lowered using the <c>+t</c> option.</cell>
       </row>
-      <row>
-	<cell>Ets tables</cell>
-	<cell>Default is 1400. It can be changed with the environment
-	variable <c>ERL_MAX_ETS_TABLES</c>.</cell>
-      </row>
       <row>
 	<cell>Elements in a tuple</cell>
 	<cell>The maximum number of elements in a tuple is 16,777,215
-- 
cgit v1.2.3