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

4 files changed, 68 insertions, 7 deletions

diff --git a/lib/debugger/doc/src/Makefile b/lib/debugger/doc/src/Makefile
index 6c9617ca69..0f724b6f17 100644
--- a/lib/debugger/doc/src/Makefile
+++ b/lib/debugger/doc/src/Makefile
@@ -114,7 +114,7 @@ release_docs_spec: docs
 	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
 	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
 	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
-	(/bin/cp -rf  $(HTMLDIR) "$(RELSYSDIR)/doc")
+	($(CP) -rf  $(HTMLDIR) "$(RELSYSDIR)/doc")
 	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
 	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
 	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
diff --git a/lib/debugger/doc/src/debugger_chapter.xml b/lib/debugger/doc/src/debugger_chapter.xml
index 45dfdb3776..3c37d4b924 100644
--- a/lib/debugger/doc/src/debugger_chapter.xml
+++ b/lib/debugger/doc/src/debugger_chapter.xml
@@ -4,7 +4,7 @@
 <chapter>
 <header>
     <copyright>
-      <year>1997</year><year>2016</year>
+      <year>1997</year><year>2017</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -652,8 +652,10 @@ c_break(Bindings) ->
       <item><p>The Bindings area, displaying all variables bindings. If you
         click a variable name, the value is displayed in the Evaluator area.
 	Double-click a variable name to open a window where
-        the variable value can be edited. Notice however that pid,
-        reference, binary, or port values cannot be edited.</p>
+        the variable value can be edited. Notice however that pid, port,
+	reference, or fun
+        values cannot be edited unless they can be represented in the
+        running system.</p>
       </item>
 
       <item><p>The Trace area, which displays a trace output for the
diff --git a/lib/debugger/doc/src/i.xml b/lib/debugger/doc/src/i.xml
index db89f23494..628b91e9e4 100644
--- a/lib/debugger/doc/src/i.xml
+++ b/lib/debugger/doc/src/i.xml
@@ -45,7 +45,7 @@
       attached manually or automatically.</p>
 
     <p>By preference, these functions can be included in module
-      <seealso marker="stdlib:shell_default"><c>stdlib:shell_default</c></seealso>.
+      <seealso marker="stdlib:shell_default"><c>shell_default</c></seealso>.
       By default, they are included in that module.</p>
   </description>
 
@@ -372,7 +372,7 @@
       </fsummary>
       <desc>
 	<p>Returns the current version number of the interpreter.
-	  Same as the version number of the <c>Debugger</c> application.</p>
+	  Same as the version number of the Debugger application.</p>
       </desc>
     </func>
 
diff --git a/lib/debugger/doc/src/notes.xml b/lib/debugger/doc/src/notes.xml
index 2e0d834269..fa85567a84 100644
--- a/lib/debugger/doc/src/notes.xml
+++ b/lib/debugger/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>
@@ -33,6 +33,65 @@
   <p>This document describes the changes made to the Debugger
     application.</p>
 
+<section><title>Debugger 4.2.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> The Erlang shell, <c>qlc:string_to_handle()</c>, and
+	    the Debugger (the Evaluator area and Edit variable window
+	    of the Bindings area) can parse pids, ports, references,
+	    and external funs, as long as they can be created in the
+	    running system. </p>
+          <p>
+	    Own Id: OTP-14296</p>
+        </item>
+        <item>
+	    <p> Fix editing of simple binary values in the Bindings
+	    area of the Debugger's Attach Process Window. </p>
+          <p>
+	    Own Id: OTP-14318</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p> Miscellaneous updates due to atoms containing
+	    arbitrary Unicode characters. </p>
+          <p>
+	    Own Id: OTP-14285</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Debugger 4.2.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Update build scripts to not make assumtions about where
+	    env, cp and perl are located.</p>
+          <p>
+	    Own Id: OTP-13800</p>
+        </item>
+	<item>
+          <p>
+	    A bug causing non-interpreted code to crash the debugger
+	    has been fixed.</p>
+          <p>
+	    Own Id: OTP-13756</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Debugger 4.2</title>
 
     <section><title>Improvements and New Features</title>