Skip to content

Commit

Permalink
Merge branch 'hb/stdlib/fix_orddict_doc/OTP-12651'
Browse files Browse the repository at this point in the history
* hb/stdlib/fix_orddict_doc/OTP-12651:
  stdlib: Correct orddict(3)
  • Loading branch information
uabboli committed Apr 14, 2015
2 parents 85db2e1 + ddb8dd5 commit c6542f0
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
8 changes: 3 additions & 5 deletions lib/stdlib/doc/src/orddict.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<erlref>
<header>
<copyright>
<year>2000</year><year>2013</year>
<year>2000</year><year>2015</year>
<holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>
Expand Down Expand Up @@ -125,8 +125,7 @@
<c><anno>Orddict</anno></c> together with an extra argument <c>Acc</c>
(short for accumulator). <c><anno>Fun</anno></c> must return a new
accumulator which is passed to the next call. <c><anno>Acc0</anno></c> is
returned if the list is empty. The evaluation order is
undefined.</p>
returned if the list is empty.</p>
</desc>
</func>
<func>
Expand All @@ -150,8 +149,7 @@
<fsummary>Map a function over a dictionary</fsummary>
<desc>
<p><c>map</c> calls <c><anno>Fun</anno></c> on successive keys and values
of <c><anno>Orddict1</anno></c> to return a new value for each key.
The evaluation order is undefined.</p>
of <c><anno>Orddict1</anno></c> to return a new value for each key.</p>
</desc>
</func>
<func>
Expand Down
22 changes: 12 additions & 10 deletions lib/stdlib/doc/src/sets.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<erlref>
<header>
<copyright>
<year>2000</year><year>2014</year>
<year>2000</year><year>2015</year>
<holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>
Expand Down Expand Up @@ -65,7 +65,7 @@
</func>
<func>
<name name="is_set" arity="1"/>
<fsummary>Test for an <c>Set</c></fsummary>
<fsummary>Test for a <c>Set</c></fsummary>
<desc>
<p>Returns <c>true</c> if <c><anno>Set</anno></c> is a set of
elements, otherwise <c>false</c>.</p>
Expand All @@ -80,37 +80,38 @@
</func>
<func>
<name name="to_list" arity="1"/>
<fsummary>Convert an <c>Set</c>into a list</fsummary>
<fsummary>Convert a <c>Set</c>into a list</fsummary>
<desc>
<p>Returns the elements of <c><anno>Set</anno></c> as a list.</p>
<p>Returns the elements of <c><anno>Set</anno></c> as a list.
The order of the returned elements is undefined.</p>
</desc>
</func>
<func>
<name name="from_list" arity="1"/>
<fsummary>Convert a list into an <c>Set</c></fsummary>
<fsummary>Convert a list into a <c>Set</c></fsummary>
<desc>
<p>Returns an set of the elements in <c><anno>List</anno></c>.</p>
<p>Returns a set of the elements in <c><anno>List</anno></c>.</p>
</desc>
</func>
<func>
<name name="is_element" arity="2"/>
<fsummary>Test for membership of an <c>Set</c></fsummary>
<fsummary>Test for membership of a <c>Set</c></fsummary>
<desc>
<p>Returns <c>true</c> if <c><anno>Element</anno></c> is an element of
<c><anno>Set</anno></c>, otherwise <c>false</c>.</p>
</desc>
</func>
<func>
<name name="add_element" arity="2"/>
<fsummary>Add an element to an <c>Set</c></fsummary>
<fsummary>Add an element to a <c>Set</c></fsummary>
<desc>
<p>Returns a new set formed from <c><anno>Set1</anno></c> with
<c><anno>Element</anno></c> inserted.</p>
</desc>
</func>
<func>
<name name="del_element" arity="2"/>
<fsummary>Remove an element from an <c>Set</c></fsummary>
<fsummary>Remove an element from a <c>Set</c></fsummary>
<desc>
<p>Returns <c><anno>Set1</anno></c>, but with <c><anno>Element</anno></c> removed.</p>
</desc>
Expand Down Expand Up @@ -175,7 +176,8 @@
<fsummary>Fold over set elements</fsummary>
<desc>
<p>Fold <c><anno>Function</anno></c> over every element in <c><anno>Set</anno></c>
returning the final value of the accumulator.</p>
returning the final value of the accumulator.
The evaluation order is undefined.</p>
</desc>
</func>
<func>
Expand Down

0 comments on commit c6542f0

Please sign in to comment.