Merge branch 'dev' into bmk/snmp/snmpc/OTP-9004

4 files changed, 58 insertions, 8 deletions

diff --git a/lib/stdlib/doc/src/calendar.xml b/lib/stdlib/doc/src/calendar.xml
index 36f0c03162..f90d8308b6 100644
--- a/lib/stdlib/doc/src/calendar.xml
+++ b/lib/stdlib/doc/src/calendar.xml
@@ -63,6 +63,14 @@
       given as local time, they must be converted to universal time, in
       order to get the correct value of the elapsed time between epochs.
       Use of the function <c>time_difference/2</c> is discouraged.</p>
+    <p>There exists different definitions for the week of the year.
+      The calendar module contains a week of the year implementation
+      which conforms to the ISO 8601 standard. Since the week number for
+      a given date can fall on the previous, the current or on the next
+      year it is important to provide the information which year is it
+      together with the week number. The function <c>iso_week_number/0</c>
+      and <c>iso_week_number/1</c> returns a tuple of the year and the
+      week number.</p>
   </description>
 
   <section>
@@ -154,6 +162,30 @@ time() = {Hour, Minute, Second}
       </desc>
     </func>
     <func>
+      <name>iso_week_number() -> IsoWeekNumber</name>
+      <fsummary>Compute the iso week number for the actual date</fsummary>
+      <type>
+        <v>IsoWeekNumber = {int(), int()}</v>
+      </type>
+      <desc>
+        <p>This function returns the tuple {Year, WeekNum} representing
+          the iso week number for the actual date. For determining the
+          actual date, the function <c>local_time/0</c> is used.</p>
+      </desc>
+    </func>
+    <func>
+      <name>iso_week_number(Date) -> IsoWeekNumber</name>
+      <fsummary>Compute the iso week number for the given date</fsummary>
+      <type>
+        <v>Date = date()</v>
+        <v>IsoWeekNumber = {int(), int()}</v>
+      </type>
+      <desc>
+        <p>This function returns the tuple {Year, WeekNum} representing
+          the iso week number for the given date.</p>
+      </desc>
+    </func>
+    <func>
       <name>last_day_of_the_month(Year, Month) -> int()</name>
       <fsummary>Compute the number of days in a month</fsummary>
       <desc>
diff --git a/lib/stdlib/doc/src/dict.xml b/lib/stdlib/doc/src/dict.xml
index ebcd2eed09..1695e9d14f 100644
--- a/lib/stdlib/doc/src/dict.xml
+++ b/lib/stdlib/doc/src/dict.xml
@@ -165,8 +165,8 @@ dictionary()
         <v>Dict = dictionary()</v>
       </type>
       <desc>
-        <p>This function converts the key/value list <c>List</c> to a 
-          dictionary.</p>
+        <p>This function converts the <c>Key</c> - <c>Value</c> list
+          <c>List</c> to a dictionary.</p>
       </desc>
     </func>
     <func>
@@ -270,7 +270,7 @@ merge(Fun, D1, D2) ->
         <v>Dict1 = Dict2 = dictionary()</v>
       </type>
       <desc>
-        <p>Update the a value in a dictionary by calling <c>Fun</c> on
+        <p>Update a value in a dictionary by calling <c>Fun</c> on
           the value to get a new value.  An exception is generated if
           <c>Key</c> is not present in the dictionary.</p>
       </desc>
@@ -285,7 +285,7 @@ merge(Fun, D1, D2) ->
         <v>Dict1 = Dict2 = dictionary()</v>
       </type>
       <desc>
-        <p>Update the a value in a dictionary by calling <c>Fun</c> on
+        <p>Update a value in a dictionary by calling <c>Fun</c> on
           the value to get a new value.  If <c>Key</c> is not present
           in the dictionary then <c>Initial</c> will be stored as
           the first value. For example <c>append/3</c> could be defined
diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml
index 940044d0a8..a8fe41f000 100644
--- a/lib/stdlib/doc/src/notes.xml
+++ b/lib/stdlib/doc/src/notes.xml
@@ -30,6 +30,24 @@
   </header>
   <p>This document describes the changes made to the STDLIB application.</p>
 
+<section><title>STDLIB 1.17.2.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Several type specifications for standard libraries were
+	    wrong in the R14B01 release. This is now corrected. The
+	    corrections concern types in re,io,filename and the
+	    module erlang itself.</p>
+          <p>
+	    Own Id: OTP-9008</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>STDLIB 1.17.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/stdlib/doc/src/orddict.xml b/lib/stdlib/doc/src/orddict.xml
index 08c808f822..9d036f0725 100644
--- a/lib/stdlib/doc/src/orddict.xml
+++ b/lib/stdlib/doc/src/orddict.xml
@@ -172,8 +172,8 @@ ordered_dictionary()
         <v>Orddict = ordered_dictionary()</v>
       </type>
       <desc>
-        <p>This function converts the key/value list <c>List</c> to a 
-          dictionary.</p>
+        <p>This function converts the <c>Key</c> - <c>Value</c> list
+          <c>List</c> to a dictionary.</p>
       </desc>
     </func>
     <func>
@@ -277,7 +277,7 @@ merge(Fun, D1, D2) ->
         <v>Orddict1 = Orddict2 = ordered_dictionary()</v>
       </type>
       <desc>
-        <p>Update the a value in a dictionary by calling <c>Fun</c> on
+        <p>Update a value in a dictionary by calling <c>Fun</c> on
           the value to get a new value.  An exception is generated if
           <c>Key</c> is not present in the dictionary.</p>
       </desc>
@@ -292,7 +292,7 @@ merge(Fun, D1, D2) ->
         <v>Orddict1 = Orddict2 = ordered_dictionary()</v>
       </type>
       <desc>
-        <p>Update the a value in a dictionary by calling <c>Fun</c> on
+        <p>Update a value in a dictionary by calling <c>Fun</c> on
           the value to get a new value.  If <c>Key</c> is not present
           in the dictionary then <c>Initial</c> will be stored as
           the first value. For example <c>append/3</c> could be defined