5 files changed, 12 insertions, 19 deletions

diff --git a/lib/stdlib/doc/src/binary.xml b/lib/stdlib/doc/src/binary.xml
index 88ce77e0d0..7ce2defb72 100644
--- a/lib/stdlib/doc/src/binary.xml
+++ b/lib/stdlib/doc/src/binary.xml
@@ -505,7 +505,7 @@
       <type>
         <v>Subject = binary()</v>
         <v>Pos = integer() >= 0</v>
-        <v>Len = integer() >= 0</v>
+        <v>Len = integer()</v>
       </type>
       <desc>
       <p>The same as <c>part(Subject, {Pos, Len})</c>.</p>
diff --git a/lib/stdlib/doc/src/io.xml b/lib/stdlib/doc/src/io.xml
index 667d758e29..e6d262466c 100644
--- a/lib/stdlib/doc/src/io.xml
+++ b/lib/stdlib/doc/src/io.xml
@@ -70,7 +70,7 @@
       <desc>
         <p>Either <c>standard_io</c>, <c>standard_error</c>, a
           registered name, or a pid handling IO protocols (returned from
-            <seealso marker="file#open/2">file:open/2</seealso>).</p>
+            <seealso marker="kernel:file#open/2">file:open/2</seealso>).</p>
       </desc>
     </datatype>
     <datatype>
diff --git a/lib/stdlib/doc/src/ms_transform.xml b/lib/stdlib/doc/src/ms_transform.xml
index f81f8bda96..ad5f8bd5ac 100644
--- a/lib/stdlib/doc/src/ms_transform.xml
+++ b/lib/stdlib/doc/src/ms_transform.xml
@@ -308,7 +308,7 @@ ets:select(emp_tab, ets:fun2ms(
       Erlang code. Also arithmetics is allowed, as well as ordinary guard
       bif's. Here's a list of bif's and expressions:</p>
     <list type="bulleted">
-      <item>The type tests: is_atom, is_constant, is_float, is_integer,
+      <item>The type tests: is_atom, is_float, is_integer,
        is_list, is_number, is_pid, is_port, is_reference, is_tuple,
        is_binary, is_function, is_record</item>
       <item>The boolean operators: not, and, or, andalso, orelse </item>
@@ -318,7 +318,7 @@ ets:select(emp_tab, ets:fun2ms(
       <item>The guard bif's: abs, element, hd, length, node, round, size, tl, 
        trunc, self</item>
       <item>The obsolete type test (only in guards):
-       atom, constant, float, integer,
+       atom, float, integer,
        list, number, pid, port, reference, tuple,
        binary, function, record</item>
     </list>
diff --git a/lib/stdlib/doc/src/sofs.xml b/lib/stdlib/doc/src/sofs.xml
index 2e7768a1df..37c41501ae 100644
--- a/lib/stdlib/doc/src/sofs.xml
+++ b/lib/stdlib/doc/src/sofs.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2001</year><year>2011</year>
+      <year>2001</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -317,7 +317,7 @@
       but is to be preferred since it makes it possible to handle this
       case even more efficiently. Examples of SetFuns:</p>
     <pre>
-{sofs, union}
+fun sofs:union/1
 fun(S) -> sofs:partition(1, S) end
 {external, fun(A) -> A end}
 {external, fun({A,_,C}) -> {C,A} end}
@@ -711,7 +711,7 @@ fun(S) -> sofs:partition(1, S) end
           argument.</p>
         <pre>
 1> <input>F1 = sofs:from_term([{a,[[1,2],[2,3]]},{b,[[]]}]),</input>
-<input>F2 = sofs:family_projection({sofs, union}, F1),</input>
+<input>F2 = sofs:family_projection(fun sofs:union/1, F1),</input>
 <input>sofs:to_external(F2).</input>
 [{a,[1,2,3]},{b,[]}]</pre>
       </desc>
@@ -821,7 +821,7 @@ fun(S) -> sofs:partition(1, S) end
 <input>sofs:to_external(F2).</input>
 [{a,[1,2,3]},{b,[]}]</pre>
         <p><c>family_union(F)</c> is equivalent to
-          <c>family_projection({sofs,union},&nbsp;F)</c>.</p>
+          <c>family_projection(fun sofs:union/1,&nbsp;F)</c>.</p>
       </desc>
     </func>
     <func>
@@ -1438,7 +1438,7 @@ true</pre>
 1> <input>R1 = sofs:relation([{a,1},{b,2}]),</input>
 <input>R2 = sofs:relation([{x,1},{x,2},{y,3}]),</input>
 <input>S1 = sofs:from_sets([R1,R2]),</input>
-<input>S2 = sofs:specification({sofs,is_a_function}, S1),</input>
+<input>S2 = sofs:specification(fun sofs:is_a_function/1, S1),</input>
 <input>sofs:to_external(S2).</input>
 [[{a,1},{b,2}]]</pre>
       </desc>
diff --git a/lib/stdlib/doc/src/supervisor.xml b/lib/stdlib/doc/src/supervisor.xml
index cddb55e5c5..33a7f5bb6a 100644
--- a/lib/stdlib/doc/src/supervisor.xml
+++ b/lib/stdlib/doc/src/supervisor.xml
@@ -127,25 +127,18 @@ child_spec() = {Id,StartFunc,Restart,Shutdown,Type,Modules}
         <p><c>StartFunc</c> defines the function call used to start
           the child process. It should be a module-function-arguments
           tuple <c>{M,F,A}</c> used as <c>apply(M,F,A)</c>.</p>
-        <p>          <br></br>
-</p>
         <p>The start function <em>must create and link to</em> the child
           process, and should return <c>{ok,Child}</c> or
           <c>{ok,Child,Info}</c> where <c>Child</c> is the pid of
           the child process and <c>Info</c> an arbitrary term which is
           ignored by the supervisor.</p>
-        <p>          <br></br>
-</p>
         <p>The start function can also return <c>ignore</c> if the child
           process for some reason cannot be started, in which case
-          the child specification will be kept by the supervisor but
-          the non-existing child process will be ignored.</p>
-        <p>          <br></br>
-</p>
+          the child specification will be kept by the supervisor
+	  (unless it is a temporary child) but the non-existing child
+	  process will be ignored.</p>
         <p>If something goes wrong, the function may also return an
           error tuple <c>{error,Error}</c>.</p>
-        <p>          <br></br>
-</p>
         <p>Note that the <c>start_link</c> functions of the different
           behaviour modules fulfill the above requirements.</p>
       </item>