Merge tag 'OTP-20.0' into sverker/20/binary_to_atom-utf8-crash/ERL-474/OTP-14590

6 files changed, 177 insertions, 43 deletions

diff --git a/lib/tools/doc/src/erlang_mode.xml b/lib/tools/doc/src/erlang_mode.xml
index 00cf5196b4..7fef74813b 100644
--- a/lib/tools/doc/src/erlang_mode.xml
+++ b/lib/tools/doc/src/erlang_mode.xml
@@ -252,7 +252,14 @@
        behavior</item>
       <item>gen_event - skeleton for the OTP gen_event behavior</item>
       <item>gen_fsm - skeleton for the OTP gen_fsm behavior</item>
-      <item>gen_statem - skeleton for the OTP gen_statem behavior</item>
+      <item>
+	gen_statem (StateName/3) - skeleton for the OTP gen_statem behavior
+	using state name functions
+      </item>
+      <item>
+	gen_statem (handle_event/4) - skeleton for the OTP gen_statem behavior
+	using one state function
+      </item>
       <item>Library module - skeleton for a module that does not
        implement a process.</item>
       <item>Corba callback - skeleton for a Corba callback module.</item>
diff --git a/lib/tools/doc/src/lcnt.xml b/lib/tools/doc/src/lcnt.xml
index 9c8ce148e9..31e5c241e9 100644
--- a/lib/tools/doc/src/lcnt.xml
+++ b/lib/tools/doc/src/lcnt.xml
@@ -5,7 +5,7 @@
     <header>
 	<copyright>
 	    <year>2009</year>
-	    <year>2016</year>
+	    <year>2017</year>
 	    <holder>Ericsson AB, All Rights Reserved</holder>
 	</copyright>
 	<legalnotice>
@@ -38,7 +38,7 @@
     <modulesummary>A runtime system Lock Profiling tool.</modulesummary>
     <description>
 	<p>The <c>lcnt</c> module is used to profile the internal ethread locks in the
-	    Erlang Runtime System. With <c>lcnt</c> enabled, Internal counters in the
+	    Erlang Runtime System. With <c>lcnt</c> enabled, internal counters in the
 	    runtime system are updated each time a lock is taken. The counters stores
 	    information about the number of acquisition tries and the number of collisions
 	    that has occurred during the acquisition tries. The counters also record the
@@ -47,17 +47,17 @@
 	<p>
 	    The data produced by the lock counters will give an estimate on how well
 	    the runtime system will behave from a parallelizable view point for the
-	    scenarios tested. This tool was mainly developed to help erlang runtime
+	    scenarios tested. This tool was mainly developed to help Erlang runtime
 	    developers iron out potential and generic bottlenecks.
 	</p>
 	<p>Locks in the emulator are named after what type of resource they protect and where
 	    in the emulator they are initialized, those are lock 'classes'. Most of those
 	    locks are also instantiated several times, and given unique identifiers, to increase
 	    locking granularity. Typically an instantiated lock protects a disjunct set of
-	    the resource, i.e ets-tables, processes or ports. In other cases it protects a
-	    specific range of a resource, e.g. <c>pix_lock</c> which protects index to process
+	    the resource, for example ets tables, processes or ports. In other cases it protects a
+	    specific range of a resource, for example <c>pix_lock</c> which protects index to process
 	    mappings, and is given a unique number within the class. A unique lock in <c>lcnt</c>
-	    is referenced by a name (class) and an identifier, <c>{Name, Id}</c>.
+	    is referenced by a name (class) and an identifier: <c>{Name, Id}</c>.
 	</p>
 	<p>Some locks in the system are static and protects global resources, for example
 	    <c>bif_timers</c> and the <c>run_queue</c> locks. Other locks are dynamic and not
diff --git a/lib/tools/doc/src/lcnt_chapter.xml b/lib/tools/doc/src/lcnt_chapter.xml
index 6cfdb5cf1b..c73fcb31e0 100644
--- a/lib/tools/doc/src/lcnt_chapter.xml
+++ b/lib/tools/doc/src/lcnt_chapter.xml
@@ -4,7 +4,7 @@
 <chapter>
     <header>
 	<copyright>
-	    <year>2009</year><year>2016</year>
+	    <year>2009</year><year>2017</year>
 	    <holder>Ericsson AB. All Rights Reserved.</holder>
 	</copyright>
 	<legalnotice>
@@ -42,42 +42,32 @@
 	completed its access to the resource and unlocked it. The <c>lcnt</c> tool measures these lock conflicts.
     </p>
     <p>
-	Locks has an inherent cost in execution time and memory space. It takes time initialize, destroy, aquiring or releasing locks. To decrease lock contention it
+	Locks have an inherent cost in execution time and memory space. It takes time initialize, destroy, aquiring or releasing locks. To decrease lock contention it
 	some times necessary to use finer grained locking strategies. This will usually also increase the locking overhead and hence there is a tradeoff
 	between lock contention and overhead. In general, lock contention increases with the number of threads running concurrently. The <c>lcnt</c> tool does not measure locking overhead.
     </p>
     <section>
 	<title> Enabling lock-counting </title>
-	<p>For investigation of locks in the emulator we use an internal tool called <c>lcnt</c> (short for lock-count). The VM needs to be compiled with this option enabled. To enable this, use:</p>
+	<p>For investigation of locks in the emulator we use an internal tool called <c>lcnt</c> (short for lock-count). The VM needs to be compiled with this option enabled.
+	To compile a lock-counting VM along with a normal VM, use:</p>
 
 	<pre>
 cd $ERL_TOP
-./configure --enable-lock-counter
-	</pre>
-
-	<p>
-	    Another way to enable this alongside a normal VM is to compile it at emulator directory level, much like a debug build. To compile it this way do the following,
-	</p>
-	<pre>
-cd $ERL_TOP/erts/emulator
-make lcnt FLAVOR=smp
-	</pre>
-	<p> and then starting Erlang with,</p>
+./configure --enable-lock-counter</pre>
+	<p>Start the lock-counting VM like this:</p>
 	<pre>
-$ERL_TOP/bin/cerl -lcnt
-	</pre>
-	<p>To verify that you lock-counting enabled check that <c>[lock-counting]</c> appears in the status text when the VM is started.</p>
+$ERL_TOP/bin/erl -emu_type lcnt</pre>
+	<p>To verify that lock counting is enabled check that <c>[lock-counting]</c> appears in the status text when the VM is started.</p>
 	<pre>
-Erlang R13B03 (erts-5.7.4) [source] [64-bit] [smp:8:8] [rq:8] [async-threads:0] [hipe]
- [kernel-poll:false] [lock-counting]
-	</pre>
+Erlang/OTP 20 [erts-9.0] [64-bit] [smp:8:8] [ds:8:8:10] [async-threads:10] [hipe]
+ [kernel-poll:false] [lock-counting]</pre>
     </section>
     <section>
 	<title>Getting started</title>
 	<p>Once you have a lock counting enabled VM the module <c>lcnt</c> can be used. The module is intended to be used from the current running nodes shell. To access remote nodes use <c>lcnt:clear(Node)</c> and <c>lcnt:collect(Node)</c>. </p>
 
 	<p>All locks are continuously monitored and its statistics updated. Use <c>lcnt:clear/0</c> to initially clear all counters before running any specific tests. This command will also reset the duration timer internally.</p>
-	<p>To retrieve lock statistics information use, <c>lcnt:collect/0,1</c>. The collect operation will start a <c>lcnt</c> server if it not already started. All collected data will be built into an erlang term and uploaded to the server and a duration time will also be uploaded. This duration is the time between <c>lcnt:clear/0,1</c> and <c>lcnt:collect/0,1</c>.</p>
+	<p>To retrieve lock statistics information, use <c>lcnt:collect/0,1</c>. The collect operation will start a <c>lcnt</c> server if it not already started. All collected data will be built into an Erlang term and uploaded to the server and a duration time will also be uploaded. This duration is the time between <c>lcnt:clear/0,1</c> and <c>lcnt:collect/0,1</c>.</p>
 
 	<p>Once the data is collected to the server it can be filtered, sorted and printed in many different ways.</p>
 	<p>See the <seealso marker="lcnt">reference manual</seealso> for a description of each function.</p>
diff --git a/lib/tools/doc/src/make.xml b/lib/tools/doc/src/make.xml
index fddf5ebd7b..123fcd4afc 100644
--- a/lib/tools/doc/src/make.xml
+++ b/lib/tools/doc/src/make.xml
@@ -5,7 +5,7 @@
   <header>
     <copyright>
       <year>1996</year>
-      <year>2016</year>
+      <year>2017</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -43,15 +43,15 @@
       <fsummary>Compile a set of modules.</fsummary>
       <type>
         <v>Options = [Option]</v>
-        <v>&nbsp;Option = noexec | load | netload | &lt;compiler option&gt;</v>
+	<v>&nbsp;Option = noexec | load | netload | {emake, Emake} | &lt;compiler option&gt;</v>
       </type>
       <desc>
-        <p>This function first looks in the current working directory
-          for a file named <c>Emakefile</c> (see below) specifying the
-          set of modules to compile and the compile options to use. If
-          no such file is found, the set of modules to compile
-          defaults to all modules in the current working
-          directory.</p>
+      <p>This function determines the set of modules to compile and the
+          compile options to use, by first looking for the <c>emake</c> make
+          option, if not present reads the configuration from a file named
+          <c>Emakefile</c> (see below). If no such file is found, the
+          set of modules to compile defaults to all modules in the
+          current working directory.</p>
         <p>Traversing the set of modules, it then recompiles every module for
           which at least one of the following conditions apply:</p>
         <list type="bulleted">
@@ -77,6 +77,9 @@
           <item><c>netload</c>          <br></br>
 
            Net load mode. Loads all recompiled modules on all known nodes.</item>
+          <item><c>{emake, Emake}</c>          <br></br>
+
+           Rather than reading the <c>Emakefile</c> specify configuration explicitly.</item>
         </list>
         <p>All items in <c>Options</c> that are not make options are assumed
           to be compiler options and are passed as-is to
@@ -108,9 +111,10 @@
 
   <section>
     <title>Emakefile</title>
-    <p><c>make:all/0,1</c> and <c>make:files/1,2</c> looks in the
-      current working directory for a file named <c>Emakefile</c>. If
-      it exists, <c>Emakefile</c> should contain elements like this:</p>
+    <p><c>make:all/0,1</c> and <c>make:files/1,2</c> first looks for
+      <c>{emake, Emake}</c> in options, then in the current working directory
+      for a file named <c>Emakefile</c>. If present <c>Emake</c> should
+      contain elements like this:</p>
     <code type="none">
 Modules.
 {Modules,Options}.    </code>
diff --git a/lib/tools/doc/src/notes.xml b/lib/tools/doc/src/notes.xml
index 0b8a2be715..bdd5455354 100644
--- a/lib/tools/doc/src/notes.xml
+++ b/lib/tools/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2016</year>
+      <year>2004</year><year>2017</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -31,6 +31,139 @@
   </header>
   <p>This document describes the changes made to the Tools application.</p>
 
+<section><title>Tools 2.10</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    In some situations, <c>make:all()</c> and friends did not
+	    detect changes in include files located in the current
+	    directory. This is now corrected.</p>
+          <p>
+	    Own Id: OTP-14339 Aux Id: ERL-395 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p>The <c>make</c> module now accepts the
+	    <c>{emake,Emake}</c> option.</p>
+          <p>
+	    Own Id: OTP-14253</p>
+        </item>
+        <item>
+	    <p> Miscellaneous updates due to atoms containing
+	    arbitrary Unicode characters. </p>
+          <p>
+	    Own Id: OTP-14285</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Tools 2.9.1</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Improved edoc support in emacs mode.</p>
+          <p>
+	    Own Id: OTP-14217 Aux Id: PR-1282 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Tools 2.9</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix unhandled trace event send_to_non_existing_process in
+	    fprof.</p>
+          <p>
+	    Own Id: OTP-13998</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Improved edoc support in emacs erlang-mode.</p>
+          <p>
+	    Own Id: OTP-13945 Aux Id: PR-1157 </p>
+        </item>
+        <item>
+          <p>
+	    Added erldoc to emacs mode which opens html documentation
+	    in browser from emacs. For example <c>M-x erldoc-browse
+	    RET lists:foreach/2</c>.</p>
+          <p>
+	    Own Id: OTP-14018 Aux Id: PR-1197 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Tools 2.8.6</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Errors in type specification and Emacs template
+	    generation for <c>gen_statem:code_change/4</c> has been
+	    fixed from bugs.erlang.org's Jira cases ERL-172 and
+	    ERL-187.</p>
+          <p>
+	    Own Id: OTP-13746 Aux Id: ERL-172, ERL-187 </p>
+        </item>
+        <item>
+          <p>
+	    Fix gc_start/gc_end in fprof tags when parsing old trace
+	    logs.</p>
+          <p>
+	    Own Id: OTP-13778 Aux Id: PR-1136 </p>
+        </item>
+        <item>
+	    <p><c>make</c> (tools) and <c>ct_make</c> (common_test)
+	    would crash if an Erlang source file contained a
+	    <c>-warning()</c> directive.</p>
+          <p>
+	    Own Id: OTP-13855</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Tools 2.8.5</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>Correct a bug when adding multiple modules to an Xref
+	    server. The bug was introduced in OTP-19.0. </p>
+          <p>
+	    Own Id: OTP-13708 Aux Id: ERL-173 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Tools 2.8.4</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/tools/doc/src/xref_chapter.xml b/lib/tools/doc/src/xref_chapter.xml
index 8b14e03064..872793bdcb 100644
--- a/lib/tools/doc/src/xref_chapter.xml
+++ b/lib/tools/doc/src/xref_chapter.xml
@@ -234,7 +234,7 @@
        operand of the intersection operator <c>*</c> is implicitly
        converted to the more special type of the second operand.</item>
       <tag><c>xref:q(s, "(Mod) tools").</c></tag>
-      <item>All modules of the <c>tools</c> application.</item>
+      <item>All modules of the Tools application.</item>
       <tag><c>xref:q(s, '"xref_.*" : Mod').</c></tag>
       <item>All modules with a name beginning with <c>xref_</c>.</item>
       <tag><c>xref:q(s, "# E&nbsp;|&nbsp;X&nbsp;").</c></tag>
@@ -252,9 +252,9 @@
       <tag><c>xref:q(s, "XC * (ME - strict ME)").</c></tag>
       <item>External calls within some module.</item>
       <tag><c>xref:q(s, "E&nbsp;|||&nbsp;kernel").</c></tag>
-      <item>All calls within the <c>kernel</c> application. </item>
+      <item>All calls within the Kernel application. </item>
       <tag><c>xref:q(s, "closure&nbsp;E&nbsp;|&nbsp;kernel&nbsp;||&nbsp;kernel").</c></tag>
-      <item>All direct and indirect calls within the <c>kernel</c>
+      <item>All direct and indirect calls within the Kernel
        application. Both the calling and the used functions of
        indirect calls are defined in modules of the kernel
        application, but it is possible that some functions outside