From fbaa0becc787e73fa539e0d497b0d74be27c9534 Mon Sep 17 00:00:00 2001
From: Rickard Green <rickard@erlang.org>
Date: Wed, 17 Dec 2014 22:18:27 +0100
Subject: Replace usage of erlang:now() with usage of new API

---
 lib/stdlib/doc/src/timer.xml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'lib/stdlib/doc/src/timer.xml')

diff --git a/lib/stdlib/doc/src/timer.xml b/lib/stdlib/doc/src/timer.xml
index eca9a72d36..791a29689e 100644
--- a/lib/stdlib/doc/src/timer.xml
+++ b/lib/stdlib/doc/src/timer.xml
@@ -217,12 +217,14 @@
     </func>
     <func>
       <name name="now_diff" arity="2"/>
-      <fsummary>Calculate time difference between <c>now/0</c>timestamps</fsummary>
+      <fsummary>Calculate time difference between timestamps</fsummary>
       <type_desc variable="Tdiff">In microseconds</type_desc>
       <desc>
         <p>Calculates the time difference <c><anno>Tdiff</anno> = <anno>T2</anno> - <anno>T1</anno></c> in
-          <em>microseconds</em>, where <c><anno>T1</anno></c> and <c><anno>T2</anno></c> probably
-          are timestamp tuples returned from <c>erlang:now/0</c>.</p>
+        <em>microseconds</em>, where <c><anno>T1</anno></c> and <c><anno>T2</anno></c>
+        are timestamp tuples on the same format as returned from
+	<seealso marker="erts:erlang#timestamp/0"><c>erlang:timestamp/0</c></seealso>,
+	or <seealso marker="kernel:os#timestamp/0"><c>os:timestamp/0</c></seealso>.</p>
       </desc>
     </func>
     <func>
@@ -234,7 +236,7 @@
     </func>
     <func>
       <name name="minutes" arity="1"/>
-      <fsummary>Converts <c>Minutes</c>to <c>Milliseconds</c>.</fsummary>
+      <fsummary>Converts <c>Minutes</c> to <c>Milliseconds</c>.</fsummary>
       <desc>
         <p>Return the number of milliseconds in <c><anno>Minutes</anno></c>.</p>
       </desc>
-- 
cgit v1.2.3


From 738c34d4bb8f1a3811acd00af8c6c12107f8315b Mon Sep 17 00:00:00 2001
From: Bruce Yinhe <bruce@erlang.org>
Date: Thu, 18 Jun 2015 11:31:02 +0200
Subject: Change license text to APLv2

---
 lib/stdlib/doc/src/timer.xml | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'lib/stdlib/doc/src/timer.xml')

diff --git a/lib/stdlib/doc/src/timer.xml b/lib/stdlib/doc/src/timer.xml
index 791a29689e..e002f519b9 100644
--- a/lib/stdlib/doc/src/timer.xml
+++ b/lib/stdlib/doc/src/timer.xml
@@ -8,16 +8,17 @@
       <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>
 
-- 
cgit v1.2.3