Merge tag 'OTP-19.0' into sverker/19/binary_to_atom-utf8-crash/ERL-474/OTP-14590

14 files changed, 434 insertions, 350 deletions

diff --git a/lib/et/doc/src/Makefile b/lib/et/doc/src/Makefile
index 249d45fa52..0257a8f817 100644
--- a/lib/et/doc/src/Makefile
+++ b/lib/et/doc/src/Makefile
@@ -1,18 +1,19 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2002-2012. All Rights Reserved.
+# Copyright Ericsson AB 2002-2016. All Rights Reserved.
 #
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 # %CopyrightEnd%
 #
diff --git a/lib/et/doc/src/book.xml b/lib/et/doc/src/book.xml
index 222fbda046..5dddb44454 100644
--- a/lib/et/doc/src/book.xml
+++ b/lib/et/doc/src/book.xml
@@ -1,23 +1,24 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE book SYSTEM "book.dtd">
 
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <header titlestyle="normal">
     <copyright>
-      <year>2002</year><year>2009</year>
+      <year>2002</year><year>2016</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
-      The contents of this file are subject to the Erlang Public License,
-      Version 1.1, (the "License"); you may not use this file except in
-      compliance with the License. You should have received a copy of the
-      Erlang Public License along with this software. If not, it can be
-      retrieved online at http://www.erlang.org/.
-    
-      Software distributed under the License is distributed on an "AS IS"
-      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-      the License for the specific language governing rights and limitations
-      under the License.
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+ 
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
     
     </legalnotice>
 
diff --git a/lib/et/doc/src/et.xml b/lib/et/doc/src/et.xml
index 5e3453c348..3009b559e1 100644
--- a/lib/et/doc/src/et.xml
+++ b/lib/et/doc/src/et.xml
@@ -1,23 +1,24 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2002</year><year>2010</year>
+      <year>2002</year><year>2016</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
-      The contents of this file are subject to the Erlang Public License,
-      Version 1.1, (the "License"); you may not use this file except in
-      compliance with the License. You should have received a copy of the
-      Erlang Public License along with this software. If not, it can be
-      retrieved online at http://www.erlang.org/.
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+ 
+          http://www.apache.org/licenses/LICENSE-2.0
 
-      Software distributed under the License is distributed on an "AS IS"
-      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-      the License for the specific language governing rights and limitations
-      under the License.
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
 
     </legalnotice>
 
diff --git a/lib/et/doc/src/et_collector.xml b/lib/et/doc/src/et_collector.xml
index e9885dcbb3..6a85b81ec2 100644
--- a/lib/et/doc/src/et_collector.xml
+++ b/lib/et/doc/src/et_collector.xml
@@ -1,23 +1,24 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2002</year><year>2010</year>
+      <year>2002</year><year>2016</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
-      The contents of this file are subject to the Erlang Public License,
-      Version 1.1, (the "License"); you may not use this file except in
-      compliance with the License. You should have received a copy of the
-      Erlang Public License along with this software. If not, it can be
-      retrieved online at http://www.erlang.org/.
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+ 
+          http://www.apache.org/licenses/LICENSE-2.0
 
-      Software distributed under the License is distributed on an "AS IS"
-      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-      the License for the specific language governing rights and limitations
-      under the License.
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
 
     </legalnotice>
 
diff --git a/lib/et/doc/src/et_desc.xmlsrc b/lib/et/doc/src/et_desc.xmlsrc
index 68017b972e..29e0ab1fe3 100644
--- a/lib/et/doc/src/et_desc.xmlsrc
+++ b/lib/et/doc/src/et_desc.xmlsrc
@@ -1,23 +1,24 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2002</year><year>2013</year>
+      <year>2002</year><year>2016</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
-      The contents of this file are subject to the Erlang Public License,
-      Version 1.1, (the "License"); you may not use this file except in
-      compliance with the License. You should have received a copy of the
-      Erlang Public License along with this software. If not, it can be
-      retrieved online at http://www.erlang.org/.
-
-      Software distributed under the License is distributed on an "AS IS"
-      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-      the License for the specific language governing rights and limitations
-      under the License.
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+ 
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
 
     </legalnotice>
 
@@ -54,13 +55,12 @@
     <p></p>
 
     <code type="none"><![CDATA[
-         % erl -pa et/examples
-         Erlang R13B03 (erts-5.7.4) [64-bit] [smp:4:4] [rq:4]
-                                    [async-threads:0] [kernel-poll:false]
+% erl -pa et/examples
+Erlang R13B03 (erts-5.7.4) [64-bit] [smp:4:4] [rq:4] [async-threads:0] [kernel-poll:false]
 
-         Eshell V5.7.4  (abort with ^G)
-         1> {ok, Viewer} = et_viewer:start([]).
-         {ok,<0.40.0>}]]></code>
+Eshell V5.7.4  (abort with ^G)
+1> {ok, Viewer} = et_viewer:start([]).
+{ok,<0.40.0>}]]></code>
 
     <p>A <c>Viewer</c> gets trace <c>Events</c> from its
     <c>Collector</c> by polling it regularly for more <c>Events</c> to
@@ -68,40 +68,38 @@
     <c>Collector</c> with <c>et_collector:report_event/6</c>:</p>
 
     <code type="none"><![CDATA[
-         2> Collector = et_viewer:get_collector_pid(Viewer).
-         <0.39.0>
-         3> et_collector:report_event(Collector, 60, my_shell, mnesia_tm, start_outer,
-         3>                           "Start outer transaction"),
-         3> et_collector:report_event(Collector, 40, mnesia_tm, my_shell, new_tid,
-         3>                           "New transaction id is 4711"),
-         3> et_collector:report_event(Collector, 20, my_shell, mnesia_locker, try_write_lock,
-         3>                           "Acquire write lock for {my_tab, key}"),
-         3> et_collector:report_event(Collector, 10, mnesia_locker, my_shell, granted,
-         3>                           "You got the write lock for {my_tab, key}"),
-         3> et_collector:report_event(Collector, 60, my_shell, do_commit,
-         3>                           "Perform  transaction commit"),
-         3> et_collector:report_event(Collector, 40, my_shell, mnesia_locker, release_tid,
-         3>                           "Release all locks for transaction 4711"),
-         3> et_collector:report_event(Collector, 60, my_shell, mnesia_tm, delete_transaction,
-         3>                           "End of outer transaction"),
-         3> et_collector:report_event(Collector, 20, my_shell, end_outer,
-         3>                           "Transaction returned {atomic, ok}").
-         {ok,{table_handle,<0.39.0>,16402,trace_ts,
-              #Fun<et_collector.0.62831470>}}]]></code>
+2> Collector = et_viewer:get_collector_pid(Viewer).
+<0.39.0>
+3> et_collector:report_event(Collector, 60, my_shell, mnesia_tm, start_outer,
+3>                           "Start outer transaction"),
+3> et_collector:report_event(Collector, 40, mnesia_tm, my_shell, new_tid,
+3>                           "New transaction id is 4711"),
+3> et_collector:report_event(Collector, 20, my_shell, mnesia_locker, try_write_lock,
+3>                           "Acquire write lock for {my_tab, key}"),
+3> et_collector:report_event(Collector, 10, mnesia_locker, my_shell, granted,
+3>                           "You got the write lock for {my_tab, key}"),
+3> et_collector:report_event(Collector, 60, my_shell, do_commit,
+3>                           "Perform  transaction commit"),
+3> et_collector:report_event(Collector, 40, my_shell, mnesia_locker, release_tid,
+3>                           "Release all locks for transaction 4711"),
+3> et_collector:report_event(Collector, 60, my_shell, mnesia_tm, delete_transaction,
+3>                           "End of outer transaction"),
+3> et_collector:report_event(Collector, 20, my_shell, end_outer,
+3>                           "Transaction returned {atomic, ok}").
+{ok,{table_handle,<0.39.0>,16402,trace_ts,
+     #Fun<et_collector.0.62831470>}}]]></code>
 
     <p>This actually is a simulation of the process <c>Events</c>
     caused by a <c>Mnesia</c> transaction that writes a record in a local
     table:</p>
 
     <code type="none"><![CDATA[
-         mnesia:transaction(fun() -> mnesia:write({my_tab, key, val}) end).]]></code>
+mnesia:transaction(fun() -> mnesia:write({my_tab, key, val}) end).]]></code>
 
     <p>At this stage when we have a couple of <c>Events</c>, it is time to
       show how it looks like in the graphical interface of
       <c>et_viewer</c>:</p>
 
-    <p></p>
-
     <image file="sim_trans.png">
       <icaption>A simulated Mnesia transaction which writes one record</icaption>
     </image>
@@ -143,11 +141,11 @@
     <p></p>
 
     <code type="none"><![CDATA[
-         filter(TraceData) -> false | true | {true, NewEvent}
+filter(TraceData) -> false | true | {true, NewEvent}
 
-         TraceData = Event | erlang_trace_data()
-         Event = #event{}
-         NewEvent = #event{}]]></code>
+TraceData = Event | erlang_trace_data()
+Event = #event{}
+NewEvent = #event{}]]></code>
 
     <p>The interface of the filter function is the same as the the
     filter functions for the good old <c>lists:filtermap/2</c>. If the filter
@@ -203,10 +201,10 @@
     <p></p>
 
     <code type="none"><![CDATA[
-         4> Fun = fun(E) -> et_demo:mgr_actors(E) end.
-         #Fun<erl_eval.6.13229925>
-         5> et_collector:dict_insert(Collector, {filter, mgr_actors}, Fun).
-         ok]]></code>
+4> Fun = fun(E) -> et_demo:mgr_actors(E) end.
+#Fun<erl_eval.6.13229925>
+5> et_collector:dict_insert(Collector, {filter, mgr_actors}, Fun).
+ok]]></code>
 
     <p>you will see that the <c>Filter</c> menu in all viewers have
     got a new entry called <c>mgr_actors</c>. Select it, and a new
@@ -227,21 +225,16 @@
     <c>Contents Viewer</c> window to pop up, showing the <c>Event</c>
     in the <c>mgr_actors</c> view:</p>
 
-    <p></p>
-
     <image file="sim_trans_contents_viewer_mgr_actors.png">
-      <icaption>The trace <c>Event</c> in the mgr_actors view</icaption>
+      <icaption>The trace Event in the mgr_actors view</icaption>
     </image>
 
     <p>Select the <c>all</c> entry in the <c>Filters</c> menu
     and a new <c>Contents Viewer window</c> will pop up showing the
     same trace <c>Event</c> in the collectors view:</p>
 
-    <p></p>
-
     <image file="sim_trans_contents_viewer_collector.png">
-      <icaption>The same trace <c>Event</c> in the collectors
-      view</icaption>
+      <icaption>The same trace Event in the collectors view</icaption>
     </image>
   </section>
 
@@ -310,7 +303,7 @@
     <c>et_collector</c> or <c>et_viewer</c> in order to activate the
     global tracing. There is no restriction on how many concurrent
     (anonymous) collectors you can have, but you can only have one
-    <b>global</b> <c>Collector</c> as its name is registered in
+    <em>global</em> <c>Collector</c> as its name is registered in
     <c>global</c>.</p>
 
     <p>In order to further simplify the tracing, you can make use of
diff --git a/lib/et/doc/src/et_examples.xmlsrc b/lib/et/doc/src/et_examples.xmlsrc
index 7678184515..f4d94f7cb0 100644
--- a/lib/et/doc/src/et_examples.xmlsrc
+++ b/lib/et/doc/src/et_examples.xmlsrc
@@ -1,23 +1,24 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2002</year><year>2010</year>
+      <year>2002</year><year>2016</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
-      The contents of this file are subject to the Erlang Public License,
-      Version 1.1, (the "License"); you may not use this file except in
-      compliance with the License. You should have received a copy of the
-      Erlang Public License along with this software. If not, it can be
-      retrieved online at http://www.erlang.org/.
-
-      Software distributed under the License is distributed on an "AS IS"
-      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-      the License for the specific language governing rights and limitations
-      under the License.
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+ 
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
 
     </legalnotice>
 
@@ -54,34 +55,32 @@
     <p></p>
 
     <code type="none"><![CDATA[
-         mnesia:transaction(fun() -> mnesia:write({my_tab, key, val}) end).]]></code>
+mnesia:transaction(fun() -> mnesia:write({my_tab, key, val}) end).]]></code>
 
     <p>And the viewer window will look like:</p>
 
     <p></p>
 
     <code type="none"><![CDATA[
-         Erlang R13B03 (erts-5.7.4) [64-bit] [smp:4:4] [rq:4]
-                                    [async-threads:0] [kernel-poll:false]
+Erlang R13B03 (erts-5.7.4) [64-bit] [smp:4:4] [rq:4] [async-threads:0] [kernel-poll:false]
 
-         Eshell V5.7.4  (abort with ^G)
-         1> {ok, Viewer} = et_viewer:start([]).
-         {ok,<0.40.0>;}
-         2> et_demo:sim_trans().
-         {ok,{table_handle,<0.45.0>,24596,trace_ts,
-              #Fun<et_collector.0.62831470>}}]]></code>
+Eshell V5.7.4  (abort with ^G)
+1> {ok, Viewer} = et_viewer:start([]).
+{ok,<0.40.0>;}
+2> et_demo:sim_trans().
+{ok,{table_handle,<0.45.0>,24596,trace_ts,
+     #Fun<et_collector.0.62831470>}}]]></code>
 
     <p></p>
 
     <image file="sim_trans.png">
-      <icaption>A simulated <c>Mnesia</c> transaction which writes one
-      record</icaption>
+      <icaption>A simulated Mnesia transaction which writes one record</icaption>
     </image>
 
   </section>
 
   <section>
-    <title>Some convenient functions used in the <c>Mnesia</c> transaction
+    <title>Some convenient functions used in the Mnesia transaction
     example</title>
 
     <p>The <c>module_as_actor</c> filter converts the <c>Event
@@ -172,21 +171,19 @@
     <p></p>
 
     <code type="none"><![CDATA[
-       erl -pa ../examples
-       Erlang R13B03 (erts-5.7.4) [64-bit] [smp:4:4] [rq:4]
-                                  [async-threads:0] [kernel-poll:false]
+erl -pa ../examples
+Erlang R13B03 (erts-5.7.4) [64-bit] [smp:4:4] [rq:4]
+                           [async-threads:0] [kernel-poll:false]
 
-       Eshell V5.7.4  (abort with ^G)
-       1> et_demo:live_trans().
-       {atomic,ok}]]></code>
+Eshell V5.7.4  (abort with ^G)
+1> et_demo:live_trans().
+{atomic,ok}]]></code>
 
     <p>Please, explore the different filters in order to see how the traced
       transaction can be seen from different point of views:</p>
 
-    <p></p>
-
     <image file="live_trans.png">
-      <icaption>A real <c>Mnesia</c> transaction which writes one record</icaption>
+      <icaption>A real Mnesia transaction which writes one record</icaption>
     </image>
 
   </section>
@@ -214,20 +211,20 @@
     <p></p>
 
     <code type="none"><![CDATA[
-       -module(megaco_filter).
-       -export([start/0]).
-
-       start() ->
-           Options =
-               [{event_order, event_ts},
-                {scale, 3},
-                {max_actors, infinity},
-                {trace_pattern, {megaco, max}},
-                {trace_global, true},
-                {dict_insert, {filter, megaco_filter}, fun filter/1},
-                {active_filter, megaco_filter},
-                {title, "Megaco tracer - Erlang/OTP"}],
-           et_viewer:start(Options).]]></code>
+-module(megaco_filter).
+-export([start/0]).
+
+start() ->
+    Options =
+        [{event_order, event_ts},
+         {scale, 3},
+         {max_actors, infinity},
+         {trace_pattern, {megaco, max}},
+         {trace_global, true},
+         {dict_insert, {filter, megaco_filter}, fun filter/1},
+         {active_filter, megaco_filter},
+         {title, "Megaco tracer - Erlang/OTP"}],
+    et_viewer:start(Options).]]></code>
 
     <p>First we start an Erlang node with a global <c>Collector</c>
     and its <c>Viewer</c>.</p>
@@ -235,13 +232,12 @@
     <p></p>
 
     <code type="none"><![CDATA[
-          erl -sname observer
-          Erlang R13B03 (erts-5.7.4) [64-bit] [smp:4:4] [rq:4]
-                                     [async-threads:0] [kernel-poll:false]
+erl -sname observer
+Erlang R13B03 (erts-5.7.4) [64-bit] [smp:4:4] [rq:4] [async-threads:0] [kernel-poll:false]
 
-          Eshell V5.7.4  (abort with ^G)
-          (observer@falco)1> megaco_filter:start().
-          {ok,<0.48.0>}]]></code>
+Eshell V5.7.4  (abort with ^G)
+(observer@falco)1> megaco_filter:start().
+{ok,<0.48.0>}]]></code>
 
     <p>Secondly we start another Erlang node which we connect the
     observer node, before we start the application that we want to
@@ -252,28 +248,27 @@
     <p></p>
 
     <code type="none"><![CDATA[
-          erl -sname mgc -pa ../../megaco/examples/simple
-          Erlang R13B03 (erts-5.7.4) [64-bit] [smp:4:4] [rq:4]
-                                     [async-threads:0] [kernel-poll:false]
-
-          Eshell V5.7.4  (abort with ^G)
-          (mgc@falco)1> net:ping(observer@falco).
-          pong
-          (mgc@falco)2> megaco:start().
-          ok
-          (mgc@falco)3> megaco_simple_mgc:start().
-          {ok,[{ok,2944,
-                   {megaco_receive_handle,{deviceName,"controller"},
-                                          megaco_pretty_text_encoder,[],megaco_tcp,dynamic}},
-               {ok,2944,
-                   {megaco_receive_handle,{deviceName,"controller"},
-                                          megaco_pretty_text_encoder,[],megaco_udp,dynamic}},
-               {ok,2945,
-                   {megaco_receive_handle,{deviceName,"controller"},
-                                          megaco_binary_encoder,[],megaco_tcp,dynamic}},
-               {ok,2945,
-                   {megaco_receive_handle,{deviceName,"controller"},
-                                          megaco_binary_encoder,[],megaco_udp,dynamic}}]}]]></code>
+erl -sname mgc -pa ../../megaco/examples/simple
+Erlang R13B03 (erts-5.7.4) [64-bit] [smp:4:4] [rq:4] [async-threads:0] [kernel-poll:false]
+
+Eshell V5.7.4  (abort with ^G)
+(mgc@falco)1> net:ping(observer@falco).
+pong
+(mgc@falco)2> megaco:start().
+ok
+(mgc@falco)3> megaco_simple_mgc:start().
+{ok,[{ok,2944,
+         {megaco_receive_handle,{deviceName,"controller"},
+                                megaco_pretty_text_encoder,[],megaco_tcp,dynamic}},
+     {ok,2944,
+         {megaco_receive_handle,{deviceName,"controller"},
+                                megaco_pretty_text_encoder,[],megaco_udp,dynamic}},
+     {ok,2945,
+         {megaco_receive_handle,{deviceName,"controller"},
+                                megaco_binary_encoder,[],megaco_tcp,dynamic}},
+     {ok,2945,
+         {megaco_receive_handle,{deviceName,"controller"},
+                                megaco_binary_encoder,[],megaco_udp,dynamic}}]}]]></code>
 
     <p>And finally we start an Erlang node for the Media Gateways and
     connect to the observer node. Each Media Gateway connects to the
@@ -287,94 +282,87 @@
     <p></p>
 
     <code type="none"><![CDATA[
-         Erlang R13B03 (erts-5.7.4) [64-bit] [smp:4:4] [rq:4]
-                                    [async-threads:0] [kernel-poll:false]
-
-         Eshell V5.7.4  (abort with ^G)
-         (mg@falco)1> net:ping(observer@falco).
-         pong
-         (mg@falco)2> megaco_simple_mg:start().
-         [{{deviceName,"gateway_tt"},
-           {error,{start_user,megaco_not_started}}},
-          {{deviceName,"gateway_tb"},
-           {error,{start_user,megaco_not_started}}},
-          {{deviceName,"gateway_ut"},
-           {error,{start_user,megaco_not_started}}},
-          {{deviceName,"gateway_ub"},
-           {error,{start_user,megaco_not_started}}}]
-         (mg@falco)3> megaco:start().
-         ok
-         (mg@falco)4> megaco_simple_mg:start().
-         [{{deviceName,"gateway_tt"},
-           {1,
-            {ok,[{'ActionReply',0,asn1_NOVALUE,asn1_NOVALUE,
-                     [{serviceChangeReply,
-                          {'ServiceChangeReply',
-                              [{megaco_term_id,false,["root"]}],
-                              {serviceChangeResParms,
-                                  {'ServiceChangeResParm',
-                                      {deviceName,"controller"},
-                                      asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE,
-                                      asn1_NOVALUE}}}}]}]}}},
-          {{deviceName,"gateway_tb"},
-           {1,
-            {ok,[{'ActionReply',0,asn1_NOVALUE,asn1_NOVALUE,
-                     [{serviceChangeReply,
-                          {'ServiceChangeReply',
-                              [{megaco_term_id,false,["root"]}],
-                              {serviceChangeResParms,
-                                  {'ServiceChangeResParm',
-                                      {deviceName,"controller"},
-                                      asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE,
-                                      asn1_NOVALUE}}}}]}]}}},
-          {{deviceName,"gateway_ut"},
-           {1,
-            {ok,[{'ActionReply',0,asn1_NOVALUE,asn1_NOVALUE,
-                     [{serviceChangeReply,
-                          {'ServiceChangeReply',
-                              [{megaco_term_id,false,["root"]}],
-                              {serviceChangeResParms,
-                                  {'ServiceChangeResParm',
-                                      {deviceName,"controller"},
-                                      asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE,
-                                      asn1_NOVALUE}}}}]}]}}},
-          {{deviceName,"gateway_ub"},
-           {1,
-            {ok,[{'ActionReply',0,asn1_NOVALUE,asn1_NOVALUE,
-                     [{serviceChangeReply,
-                          {'ServiceChangeReply',
-                              [{megaco_term_id,false,["root"]}],
-                              {serviceChangeResParms,
-                                  {'ServiceChangeResParm',
-                                      {deviceName,"controller"},
-                                      asn1_NOVALUE,asn1_NOVALUE,
-                                      asn1_NOVALUE,...}}}}]}]}}}]]]></code>
+Erlang R13B03 (erts-5.7.4) [64-bit] [smp:4:4] [rq:4] [async-threads:0] [kernel-poll:false]
+
+Eshell V5.7.4  (abort with ^G)
+(mg@falco)1> net:ping(observer@falco).
+pong
+(mg@falco)2> megaco_simple_mg:start().
+[{{deviceName,"gateway_tt"},
+  {error,{start_user,megaco_not_started}}},
+ {{deviceName,"gateway_tb"},
+  {error,{start_user,megaco_not_started}}},
+ {{deviceName,"gateway_ut"},
+  {error,{start_user,megaco_not_started}}},
+ {{deviceName,"gateway_ub"},
+  {error,{start_user,megaco_not_started}}}]
+(mg@falco)3> megaco:start().
+ok
+(mg@falco)4> megaco_simple_mg:start().
+[{{deviceName,"gateway_tt"},
+  {1,
+   {ok,[{'ActionReply',0,asn1_NOVALUE,asn1_NOVALUE,
+            [{serviceChangeReply,
+                 {'ServiceChangeReply',
+                     [{megaco_term_id,false,["root"]}],
+                     {serviceChangeResParms,
+                         {'ServiceChangeResParm',
+                             {deviceName,"controller"},
+                             asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE,
+                             asn1_NOVALUE}}}}]}]}}},
+ {{deviceName,"gateway_tb"},
+  {1,
+   {ok,[{'ActionReply',0,asn1_NOVALUE,asn1_NOVALUE,
+            [{serviceChangeReply,
+                 {'ServiceChangeReply',
+                     [{megaco_term_id,false,["root"]}],
+                     {serviceChangeResParms,
+                         {'ServiceChangeResParm',
+                             {deviceName,"controller"},
+                             asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE,
+                             asn1_NOVALUE}}}}]}]}}},
+ {{deviceName,"gateway_ut"},
+  {1,
+   {ok,[{'ActionReply',0,asn1_NOVALUE,asn1_NOVALUE,
+            [{serviceChangeReply,
+                 {'ServiceChangeReply',
+                     [{megaco_term_id,false,["root"]}],
+                     {serviceChangeResParms,
+                         {'ServiceChangeResParm',
+                             {deviceName,"controller"},
+                             asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE,
+                             asn1_NOVALUE}}}}]}]}}},
+ {{deviceName,"gateway_ub"},
+  {1,
+   {ok,[{'ActionReply',0,asn1_NOVALUE,asn1_NOVALUE,
+            [{serviceChangeReply,
+                 {'ServiceChangeReply',
+                     [{megaco_term_id,false,["root"]}],
+                     {serviceChangeResParms,
+                         {'ServiceChangeResParm',
+                             {deviceName,"controller"},
+                             asn1_NOVALUE,asn1_NOVALUE,
+                             asn1_NOVALUE,...}}}}]}]}}}]]]></code>
 
     <p>The <c>Megaco</c> adopted viewer looks like this, when we have clicked
-    on the <b>[gateway_tt]</b> actor name in order to only display the events
+    on the <em>[gateway_tt]</em> actor name in order to only display the events
     regarding that actor:</p>
     
-    <p></p>
-
     <image file="megaco_tracer.png">
       <icaption>The viewer adopted for Megaco</icaption>
     </image>
 
     <p>A pretty printed <c>Megaco</c> message looks like this:</p>
 
-    <p></p>
-
     <image file="megaco_filter.png">
-      <icaption>A textual <c>Megaco</c> message</icaption>
+      <icaption>A textual Megaco message</icaption>
     </image>
 
     <p>And the corresponding internal form for the same <c>Megaco</c> message
     looks like this:</p>
 
-    <p></p>
-
     <image file="megaco_collector.png">
-      <icaption>The internal form of a <c>Megaco</c> message</icaption>
+      <icaption>The internal form of a Megaco message</icaption>
     </image>
 
   </section>
diff --git a/lib/et/doc/src/et_intro.xml b/lib/et/doc/src/et_intro.xml
index f90a6d2b5c..729f95647d 100644
--- a/lib/et/doc/src/et_intro.xml
+++ b/lib/et/doc/src/et_intro.xml
@@ -1,23 +1,24 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2002</year><year>2012</year>
+      <year>2002</year><year>2016</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
-      The contents of this file are subject to the Erlang Public License,
-      Version 1.1, (the "License"); you may not use this file except in
-      compliance with the License. You should have received a copy of the
-      Erlang Public License along with this software. If not, it can be
-      retrieved online at http://www.erlang.org/.
-
-      Software distributed under the License is distributed on an "AS IS"
-      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-      the License for the specific language governing rights and limitations
-      under the License.
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+ 
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
 
     </legalnotice>
 
diff --git a/lib/et/doc/src/et_selector.xml b/lib/et/doc/src/et_selector.xml
index 34203306bb..441a4dd278 100644
--- a/lib/et/doc/src/et_selector.xml
+++ b/lib/et/doc/src/et_selector.xml
@@ -1,23 +1,24 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2002</year><year>2010</year>
+      <year>2002</year><year>2016</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
-      The contents of this file are subject to the Erlang Public License,
-      Version 1.1, (the "License"); you may not use this file except in
-      compliance with the License. You should have received a copy of the
-      Erlang Public License along with this software. If not, it can be
-      retrieved online at http://www.erlang.org/.
-
-      Software distributed under the License is distributed on an "AS IS"
-      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-      the License for the specific language governing rights and limitations
-      under the License.
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+ 
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
 
     </legalnotice>
 
diff --git a/lib/et/doc/src/et_tutorial.xmlsrc b/lib/et/doc/src/et_tutorial.xmlsrc
index 1337af76d1..b6e1ca141c 100644
--- a/lib/et/doc/src/et_tutorial.xmlsrc
+++ b/lib/et/doc/src/et_tutorial.xmlsrc
@@ -1,23 +1,24 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2009</year><year>2011</year>
+      <year>2009</year><year>2016</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
-      The contents of this file are subject to the Erlang Public License,
-      Version 1.1, (the "License"); you may not use this file except in
-      compliance with the License. You should have received a copy of the
-      Erlang Public License along with this software. If not, it can be
-      retrieved online at http://www.erlang.org/.
-    
-      Software distributed under the License is distributed on an "AS IS"
-      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-      the License for the specific language governing rights and limitations
-      under the License.
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+ 
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
     
     </legalnotice>
 
@@ -74,12 +75,10 @@
     <codeinclude file="../../examples/et_display_demo.erl" tag="%module" type="erl"></codeinclude>
     
     <p>When you run the <c>et_display_demo:test().</c> function in the
-    example above, the <c>Viewer</c> window will look like this:</p>.
-    
-    <p></p>
+    example above, the <c>Viewer</c> window will look like this:</p>
     
     <image file="coffee_order.png">
-      <icaption>Screenshot of the <c>Viewer</c> window</icaption>
+      <icaption>Screenshot of the Viewer window</icaption>
     </image>
 
  </section>
@@ -261,14 +260,11 @@
     </list>
 
     <p>When you run the <c>et_trace_demo:test()</c> function above, the
-    <c>Viewer</c> window will look like this screenshot:</p>.
+    <c>Viewer</c> window will look like this screenshot:</p>
 
-    <p></p>
-    
     <image file="coffee_order.png">
-      <icaption>Screenshot of the <c>Viewer</c> window</icaption>
+      <icaption>Screenshot of the Viewer window</icaption>
     </image>
     
   </section>
-    
 </chapter>
diff --git a/lib/et/doc/src/et_viewer.xml b/lib/et/doc/src/et_viewer.xml
index d4cfbdfa31..e0b39636e9 100644
--- a/lib/et/doc/src/et_viewer.xml
+++ b/lib/et/doc/src/et_viewer.xml
@@ -1,23 +1,24 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2002</year><year>2010</year>
+      <year>2002</year><year>2016</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
-      The contents of this file are subject to the Erlang Public License,
-      Version 1.1, (the "License"); you may not use this file except in
-      compliance with the License. You should have received a copy of the
-      Erlang Public License along with this software. If not, it can be
-      retrieved online at http://www.erlang.org/.
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+ 
+          http://www.apache.org/licenses/LICENSE-2.0
 
-      Software distributed under the License is distributed on an "AS IS"
-      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-      the License for the specific language governing rights and limitations
-      under the License.
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
 
     </legalnotice>
 
diff --git a/lib/et/doc/src/files.mk b/lib/et/doc/src/files.mk
index 41fffb83f1..e0ea9b0b76 100644
--- a/lib/et/doc/src/files.mk
+++ b/lib/et/doc/src/files.mk
@@ -1,18 +1,19 @@
 #-*-makefile-*-   ; force emacs to enter makefile-mode
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2002-2010. All Rights Reserved.
+# Copyright Ericsson AB 2002-2016. All Rights Reserved.
 #
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 # %CopyrightEnd%
 
diff --git a/lib/et/doc/src/notes.xml b/lib/et/doc/src/notes.xml
index d45d0a89bf..5300d2e4ef 100644
--- a/lib/et/doc/src/notes.xml
+++ b/lib/et/doc/src/notes.xml
@@ -1,23 +1,24 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2002</year><year>2013</year>
+      <year>2002</year><year>2016</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
-      The contents of this file are subject to the Erlang Public License,
-      Version 1.1, (the "License"); you may not use this file except in
-      compliance with the License. You should have received a copy of the
-      Erlang Public License along with this software. If not, it can be
-      retrieved online at http://www.erlang.org/.
-
-      Software distributed under the License is distributed on an "AS IS"
-      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-      the License for the specific language governing rights and limitations
-      under the License.
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+ 
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
 
     </legalnotice>
 
@@ -36,6 +37,102 @@
   one section in this document. The title of each section is the
   version number of <c>Event Tracer (ET)</c>.</p>
 
+<section><title>ET 1.6</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Update selector to utilize new garbage collection trace
+	    tags.</p>
+          <p>
+	    Own Id: OTP-13545</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>ET 1.5.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>The <c>et</c> application must continue to use
+	    <c>erlang:now/0</c> in order to obtain timestamps that
+	    are consistent with timestamps obtained from tracing. The
+	    application has been updated to suppress the warning for
+	    <c>erlang:now/0</c>.</p>
+          <p>
+	    Own Id: OTP-12780</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>ET 1.5</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Application upgrade (appup) files are corrected for the
+	    following applications: </p>
+          <p>
+	    <c>asn1, common_test, compiler, crypto, debugger,
+	    dialyzer, edoc, eldap, erl_docgen, et, eunit, gs, hipe,
+	    inets, observer, odbc, os_mon, otp_mibs, parsetools,
+	    percept, public_key, reltool, runtime_tools, ssh,
+	    syntax_tools, test_server, tools, typer, webtool, wx,
+	    xmerl</c></p>
+          <p>
+	    A new test utility for testing appup files is added to
+	    test_server. This is now used by most applications in
+	    OTP.</p>
+          <p>
+	    (Thanks to Tobias Schlager)</p>
+          <p>
+	    Own Id: OTP-11744</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Removed gs based applications and gs based backends. The
+	    <c>observer</c> application replaces the removed
+	    applications.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-10915</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>ET 1.4.4.5</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    The encoding of the <c>notes.xml</c> file has been
+	    changed from latin1 to utf-8 to avoid future merge
+	    problems.</p>
+          <p>
+	    Own Id: OTP-11310</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>ET 1.4.4.4</title>
 
     <section><title>Improvements and New Features</title>
@@ -43,7 +140,7 @@
         <item>
           <p>
 	    Use erlang:demonitor(Ref, [flush]) where applicable.
-	    Thanks to Lo�c Hoguin.</p>
+	    Thanks to Loïc Hoguin.</p>
           <p>
 	    Own Id: OTP-11039</p>
         </item>
@@ -82,7 +179,7 @@
       <list>
         <item>
           <p>
-	    Fix typo in ET doc (Thanks to Ricardo Catalinas Jim�nez)</p>
+	    Fix typo in ET doc (Thanks to Ricardo Catalinas Jiménez)</p>
           <p>
 	    Own Id: OTP-10119</p>
         </item>
diff --git a/lib/et/doc/src/part.xml b/lib/et/doc/src/part.xml
index 627aee866d..a282dc2c16 100644
--- a/lib/et/doc/src/part.xml
+++ b/lib/et/doc/src/part.xml
@@ -1,23 +1,24 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2002</year><year>2010</year>
+      <year>2002</year><year>2016</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
-      The contents of this file are subject to the Erlang Public License,
-      Version 1.1, (the "License"); you may not use this file except in
-      compliance with the License. You should have received a copy of the
-      Erlang Public License along with this software. If not, it can be
-      retrieved online at http://www.erlang.org/.
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+ 
+          http://www.apache.org/licenses/LICENSE-2.0
 
-      Software distributed under the License is distributed on an "AS IS"
-      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-      the License for the specific language governing rights and limitations
-      under the License.
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
 
     </legalnotice>
 
diff --git a/lib/et/doc/src/ref_man.xml b/lib/et/doc/src/ref_man.xml
index 344b4fabed..bf131bef85 100644
--- a/lib/et/doc/src/ref_man.xml
+++ b/lib/et/doc/src/ref_man.xml
@@ -1,23 +1,24 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE application SYSTEM "application.dtd">
 
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2002</year><year>2009</year>
+      <year>2002</year><year>2016</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
-      The contents of this file are subject to the Erlang Public License,
-      Version 1.1, (the "License"); you may not use this file except in
-      compliance with the License. You should have received a copy of the
-      Erlang Public License along with this software. If not, it can be
-      retrieved online at http://www.erlang.org/.
-    
-      Software distributed under the License is distributed on an "AS IS"
-      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-      the License for the specific language governing rights and limitations
-      under the License.
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+ 
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
     
     </legalnotice>