Merge branch 'rickard/r16/port-optimizations/OTP-10336'

* rickard/r16/port-optimizations/OTP-10336:
  Bump reductions also for immediate driver calls
  Add 'port_count' and 'port_limit' to system_info/1 spec
  Fix documentation
  Replace use of deprecated functions in test cases
  Replace use of driver_send_term() with erl_drv_send_term()

Conflicts:
	erts/preloaded/ebin/erlang.beam

3 files changed, 14 insertions, 14 deletions

diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml
index b069b85be5..064030ad3e 100644
--- a/erts/doc/src/erl.xml
+++ b/erts/doc/src/erl.xml
@@ -582,7 +582,7 @@
           <seealso marker="erts_alloc">erts_alloc(3)</seealso> for
           further information.</p>
       </item>
-      <tag><c><![CDATA[+n Behavior]]></c></tag>
+      <tag><marker id="+n"/><c><![CDATA[+n Behavior]]></c></tag>
       <item>
 	<p>Control behavior of signals to ports.</p>
 	<p>As of OTP-R16 signals to ports are truly asynchronously
@@ -615,7 +615,7 @@
 	     debugging.</item>
 	   </taglist>
       </item>
-      <tag><marker id="max_processes"><c><![CDATA[+P Number]]></c></marker></tag>
+      <tag><marker id="+P"/><marker id="max_processes"><c><![CDATA[+P Number]]></c></marker></tag>
       <item>
 	<p>Sets the maximum number of simultaneously existing processes for this
           system. Valid range for <c>Number</c> is <c>[1024-134217727]</c></p>
@@ -627,7 +627,7 @@
 	<seealso marker="erlang#system_info_process_limit">erlang:system_info(process_limit)</seealso>.</p>
 	<p>The default value is <c>262144</c></p>
       </item>
-      <tag><marker id="max_ports"><c><![CDATA[+Q Number]]></c></marker></tag>
+      <tag><marker id="+Q"/><marker id="max_ports"><c><![CDATA[+Q Number]]></c></marker></tag>
       <item>
 	<p>Sets the maximum number of simultaneously existing ports for this
           system. Valid range for <c>Number</c> is <c>[1024-134217727]</c></p>
diff --git a/erts/doc/src/erl_driver.xml b/erts/doc/src/erl_driver.xml
index 13f42a74a7..1212c34586 100644
--- a/erts/doc/src/erl_driver.xml
+++ b/erts/doc/src/erl_driver.xml
@@ -317,9 +317,9 @@
           minor version used by the driver is greater than the one used
           by the runtime system.</p>
 	<p>The emulator will refuse to load a driver that does not use
-	  the extended driver interface since,
+	  the extended driver interface,
 	  to allow for 64-bit capable drivers,
-	  incompatible type changes for the callbacks
+	  since incompatible type changes for the callbacks
 	  <seealso marker="driver_entry#output">output</seealso>,
 	  <seealso marker="driver_entry#control">control</seealso> and
 	  <seealso marker="driver_entry#call">call</seealso>
@@ -1560,7 +1560,7 @@ typedef struct ErlIOVec {
 	<c>[ERL_DRV_BUSY_MSGQ_LIM_MIN, ERL_DRV_BUSY_MSGQ_LIM_MAX]</c>.
 	Limits will be automatically adjusted to be sane. That is,
 	the system will	adjust values so that the low limit used is
-	lower or equal to the high limit used. By default the high
+	lower than or equal to the high limit used. By default the high
 	limit will be 8 kB and the low limit will be 4 kB.</p>
 
 	<p>By passing a pointer to an integer variable containing
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index 1d67be2e52..ce59908036 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -5679,35 +5679,35 @@ ok
 	  For more information see the
 	  <seealso marker="erl#+spp">+spp</seealso> command line argument
 	  of <seealso marker="erl">erl(1)</seealso>.</p></item>
-          <tag><c>process_count</c></tag>
+          <tag><marker id="system_info_port_count"/><c>port_count</c></tag>
           <item>
             <p>Returns the number of ports currently existing at
               the local node as an integer. The same value as
-              <c>length(erlang:ports())</c> returns.</p>
+              <c>length(erlang:ports())</c> returns, but more efficient.</p>
           </item>
           <tag><marker id="system_info_port_limit"><c>port_limit</c></marker></tag>
           <item>
             <p>Returns the maximum number of simultaneously existing
               ports at the local node as an integer. This limit
               can be configured at startup by using the
-              <seealso marker="erl#max_ports"><c>+Q</c></seealso>
+              <seealso marker="erl#+Q">+Q</seealso>
 	      command line flag of
-	      <seealso marker="erl"><c>erl(1)</c></seealso>.</p>
+	      <seealso marker="erl">erl(1)</seealso>.</p>
           </item>
-          <tag><c>process_count</c></tag>
+          <tag><marker id="system_info_process_count"/><c>process_count</c></tag>
           <item>
             <p>Returns the number of processes currently existing at
               the local node as an integer. The same value as
-              <c>length(processes())</c> returns.</p>
+              <c>length(processes())</c> returns, but more efficient.</p>
           </item>
           <tag><marker id="system_info_process_limit"><c>process_limit</c></marker></tag>
           <item>
             <p>Returns the maximum number of simultaneously existing
               processes at the local node as an integer. This limit
               can be configured at startup by using the
-              <seealso marker="erl#max_processes"><c>+P</c></seealso>
+              <seealso marker="erl#+P">+P</seealso>
 	      command line flag of
-	      <seealso marker="erl"><c>erl(1)</c></seealso>.</p>
+	      <seealso marker="erl">erl(1)</seealso>.</p>
           </item>
           <tag><c>procs</c></tag>
           <item>