Add more specs and types

An incorrect spec, rpc:yield/1, has been fixed.

1 files changed, 202 insertions, 330 deletions

diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index f98e15cb52..7cfab0785d 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -48,22 +48,24 @@
       "Allowed in guard tests".</p>
   </description>
 
-  <section>
-    <title>DATA TYPES</title>
-    <marker id="iolist_definition"></marker>
-    <code type="none">
-ext_binary()
-  a binary data object,
-  structured according to the Erlang external term format
-
-iodata() = iolist() | binary()
+  <datatypes>
+    <datatype>
+      <name><marker id="type-ext_binary">ext_binary()</marker></name>
+      <desc>
+        <p>A binary data object, structured according to
+           the Erlang external term format.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="timestamp"></name>
+      <desc><p>See <seealso marker="#now/0">now/0</seealso>.</p>
+      </desc>
+    </datatype>
+  </datatypes>
 
-iolist() = [char() | binary() | iolist()]
-  a binary is allowed as the tail of the list</code>
-  </section>
   <funcs>
     <func>
-      <name>abs(Number) ->  int() | float()</name>
+      <name>abs(Number) -> integer() | float()</name>
       <fsummary>Arithmetical absolute value</fsummary>
       <type>
         <v>Number = number()</v>
@@ -80,7 +82,7 @@ iolist() = [char() | binary() | iolist()]
       </desc>
     </func>
     <func>
-      <name>erlang:adler32(Data) -> int()</name>
+      <name>erlang:adler32(Data) -> integer()</name>
       <fsummary>Compute adler32 checksum</fsummary>
       <type>
         <v>Data = iodata()</v>
@@ -90,10 +92,10 @@ iolist() = [char() | binary() | iolist()]
       </desc>
     </func>
     <func>
-      <name>erlang:adler32(OldAdler, Data) -> int()</name>
+      <name>erlang:adler32(OldAdler, Data) -> integer()</name>
       <fsummary>Compute adler32 checksum</fsummary>
       <type>
-        <v>OldAdler = int()</v>
+        <v>OldAdler = integer()</v>
         <v>Data = iodata()</v>
       </type>
       <desc>
@@ -112,11 +114,11 @@ iolist() = [char() | binary() | iolist()]
       </desc>
     </func>
     <func>
-      <name>erlang:adler32_combine(FirstAdler, SecondAdler, SecondSize) -> int()</name>
+      <name>erlang:adler32_combine(FirstAdler, SecondAdler, SecondSize) -> integer()</name>
       <fsummary>Combine two adler32 checksums</fsummary>
       <type>
-        <v>FirstAdler = SecondAdler = int()</v>
-        <v>SecondSize = int()</v>
+        <v>FirstAdler = SecondAdler = integer()</v>
+        <v>SecondSize = integer()</v>
       </type>
       <desc>
         <p>Combines two previously computed adler32 checksums. 
@@ -155,20 +157,16 @@ iolist() = [char() | binary() | iolist()]
       </desc>
     </func>
     <func>
-      <name>apply(Fun, Args) -> term() | empty()</name>
+      <name name="apply" arity="2"/>
       <fsummary>Apply a function to an argument list</fsummary>
-      <type>
-        <v>Fun = fun()</v>
-        <v>Args = [term()]</v>
-      </type>
       <desc>
-        <p>Call a fun, passing the elements in <c>Args</c> as
+        <p>Call a fun, passing the elements in <c><anno>Args</anno></c> as
           arguments.</p>
         <p>Note: If the number of elements in the arguments are known at
           compile-time, the call is better written as
-          <c>Fun(Arg1, Arg2, ... ArgN)</c>.</p>
+          <c><anno>Fun</anno>(Arg1, Arg2, ... ArgN)</c>.</p>
         <warning>
-          <p>Earlier, <c>Fun</c> could also be given as
+          <p>Earlier, <c><anno>Fun</anno></c> could also be given as
             <c>{Module, Function}</c>, equivalent to
             <c>apply(Module, Function, Args)</c>. This usage is
             deprecated and will stop working in a future release of
@@ -177,15 +175,11 @@ iolist() = [char() | binary() | iolist()]
       </desc>
     </func>
     <func>
-      <name>apply(Module, Function, Args) -> term() | empty()</name>
+      <name name="apply" arity="3"/>
       <fsummary>Apply a function to an argument list</fsummary>
-      <type>
-        <v>Module = Function = atom()</v>
-        <v>Args = [term()]</v>
-      </type>
       <desc>
         <p>Returns the result of applying <c>Function</c> in
-          <c>Module</c> to <c>Args</c>. The applied function must
+          <c><anno>Module</anno></c> to <c><anno>Args</anno></c>. The applied function must
           be exported from <c>Module</c>. The arity of the function is
           the length of <c>Args</c>.</p>
         <pre>
@@ -198,7 +192,7 @@ iolist() = [char() | binary() | iolist()]
 "Erlang"</pre>
         <p>Note: If the number of arguments are known at compile-time,
           the call is better written as
-          <c>Module:Function(Arg1, Arg2, ..., ArgN)</c>.</p>
+          <c><anno>Module</anno>:<anno>Function</anno>(Arg1, Arg2, ..., ArgN)</c>.</p>
         <p>Failure: <c>error_handler:undefined_function/3</c> is called
           if the applied function is not exported. The error handler
           can be redefined (see
@@ -258,8 +252,8 @@ iolist() = [char() | binary() | iolist()]
       <type>
         <v>Subject = binary()</v>
 	<v>PosLen = {Start,Length}</v>
-	<v>Start = int()</v>
-	<v>Length = int()</v>
+	<v>Start = integer() >= 0</v>
+	<v>Length = integer() >= 0</v>
       </type>
       <desc>
       <p>Extracts the part of the binary described by <c>PosLen</c>.</p>
@@ -291,8 +285,8 @@ iolist() = [char() | binary() | iolist()]
       <fsummary>Extracts a part of a binary</fsummary>
       <type>
         <v>Subject = binary()</v>
-	<v>Start = int()</v>
-	<v>Length = int()</v>
+	<v>Start = integer() >= 0</v>
+	<v>Length = integer() >= 0</v>
       </type>
       <desc>
       <p>The same as <c>binary_part(Subject, {Pos, Len})</c>.</p>
@@ -390,7 +384,7 @@ iolist() = [char() | binary() | iolist()]
       <name>binary_to_term(Binary) -> term()</name>
       <fsummary>Decode an Erlang external term format binary</fsummary>
       <type>
-        <v>Binary = ext_binary()</v>
+        <v>Binary = <seealso marker="#type-ext_binary">ext_binary()</seealso></v>
       </type>
       <desc>
         <p>Returns an Erlang term which is the result of decoding
@@ -411,7 +405,7 @@ iolist() = [char() | binary() | iolist()]
       <fsummary>Decode an Erlang external term format binary</fsummary>
       <type>
         <v>Opts = [safe]</v>
-        <v>Binary = ext_binary()</v>
+        <v>Binary = <seealso marker="#type-ext_binary">ext_binary()</seealso></v>
       </type>
       <desc>
         <p>As <c>binary_to_term/1</c>, but takes options that affect decoding
@@ -442,7 +436,7 @@ iolist() = [char() | binary() | iolist()]
       </desc>
     </func>
     <func>
-      <name>bit_size(Bitstring) -> int()</name>
+      <name>bit_size(Bitstring) -> integer() >= 0</name>
       <fsummary>Return the size of a bitstring</fsummary>
       <type>
         <v>Bitstring = bitstring()</v>
@@ -461,7 +455,7 @@ iolist() = [char() | binary() | iolist()]
       <name>erlang:bump_reductions(Reductions) -> void()</name>
       <fsummary>Increment the reduction counter</fsummary>
       <type>
-        <v>Reductions = int()</v>
+        <v>Reductions = integer() >= 0</v>
       </type>
       <desc>
         <p>This implementation-dependent function increments
@@ -478,7 +472,7 @@ iolist() = [char() | binary() | iolist()]
       </desc>
     </func>
     <func>
-      <name>byte_size(Bitstring) -> int()</name>
+      <name>byte_size(Bitstring) -> integer() >= 0</name>
       <fsummary>Return the size of a bitstring (or binary)</fsummary>
       <type>
         <v>Bitstring = bitstring()</v>
@@ -500,7 +494,7 @@ iolist() = [char() | binary() | iolist()]
       <fsummary>Cancel a timer</fsummary>
       <type>
         <v>TimerRef = reference()</v>
-        <v>Time = int()</v>
+        <v>Time = integer() >= 0</v>
       </type>
       <desc>
         <p>Cancels a timer, where <c>TimerRef</c> was returned by
@@ -524,7 +518,7 @@ iolist() = [char() | binary() | iolist()]
     </func>
 
     <func>
-      <name>check_process_code(Pid, Module) -> bool()</name>
+      <name>check_process_code(Pid, Module) -> boolean()</name>
       <fsummary>Check if a process is executing old code for a module</fsummary>
       <type>
         <v>Pid = pid()</v>
@@ -544,7 +538,7 @@ false</pre>
       </desc>
     </func>
     <func>
-      <name>concat_binary(ListOfBinaries)</name>
+      <name name="concat_binary" arity="1"/>
       <fsummary>Concatenate a list of binaries (deprecated)</fsummary>
       <desc>
         <p>Do not use; use
@@ -553,7 +547,7 @@ false</pre>
       </desc>
     </func>
     <func>
-      <name>erlang:crc32(Data) -> int()</name>
+      <name>erlang:crc32(Data) -> integer() >= 0</name>
       <fsummary>Compute crc32 (IEEE 802.3) checksum</fsummary>
       <type>
         <v>Data = iodata()</v>
@@ -563,10 +557,10 @@ false</pre>
       </desc>
     </func>
     <func>
-      <name>erlang:crc32(OldCrc, Data) -> int()</name>
+      <name>erlang:crc32(OldCrc, Data) -> integer() >= 0</name>
       <fsummary>Compute crc32 (IEEE 802.3) checksum</fsummary>
       <type>
-        <v>OldCrc = int()</v>
+        <v>OldCrc = integer() >= 0</v>
         <v>Data = iodata()</v>
       </type>
       <desc>
@@ -585,11 +579,11 @@ false</pre>
       </desc>
     </func>
     <func>
-      <name>erlang:crc32_combine(FirstCrc, SecondCrc, SecondSize) -> int()</name>
+      <name>erlang:crc32_combine(FirstCrc, SecondCrc, SecondSize) -> integer() >= 0</name>
       <fsummary>Combine two crc32 (IEEE 802.3) checksums</fsummary>
       <type>
-        <v>FirstCrc = SecondCrc = int()</v>
-        <v>SecondSize = int()</v>
+        <v>FirstCrc = SecondCrc = integer() >= 0</v>
+        <v>SecondSize = integer() >= 0</v>
       </type>
       <desc>
         <p>Combines two previously computed crc32 checksums. 
@@ -609,10 +603,10 @@ false</pre>
       </desc>
     </func>
     <func>
-      <name>date() -> {Year, Month, Day}</name>
+      <name>date() -> Date</name>
       <fsummary>Current date</fsummary>
       <type>
-        <v>Year = Month = Day = int()</v>
+        <v>Date = <seealso marker="calendar#type-date">calendar:date()</seealso></v>
       </type>
       <desc>
         <p>Returns the current date as <c>{Year, Month, Day}</c>.</p>
@@ -631,20 +625,20 @@ false</pre>
         <v>Options = [Opt]</v>
         <v>Packet = binary() | HttpPacket</v>
         <v>Rest = binary()</v>
-        <v>Length = int() | undefined</v>
+        <v>Length = integer() > 0 | undefined</v>
         <v>Reason = term()</v>
         <v>&nbsp;Type, Opt -- see below</v>
         <v></v>
         <v>HttpPacket = HttpRequest | HttpResponse | HttpHeader | http_eoh | HttpError</v>
         <v>HttpRequest = {http_request, HttpMethod, HttpUri, HttpVersion}</v>
         <v>HttpResponse = {http_response, HttpVersion, integer(), HttpString}</v>
-        <v>HttpHeader = {http_header, int(), HttpField, Reserved=term(), Value=HttpString}</v>
+        <v>HttpHeader = {http_header, integer(), HttpField, Reserved=term(), Value=HttpString}</v>
         <v>HttpError = {http_error, HttpString}</v>
         <v>HttpMethod = HttpMethodAtom | HttpString</v>
         <v>HttpMethodAtom = 'OPTIONS' | 'GET' | 'HEAD' | 'POST' | 'PUT' | 'DELETE' | 'TRACE'</v>
-        <v>HttpUri = '*' | {absoluteURI, http|https, Host=HttpString, Port=int()|undefined, Path=HttpString} | 
+        <v>HttpUri = '*' | {absoluteURI, http|https, Host=HttpString, Port=integer()|undefined, Path=HttpString} |
                      {scheme, Scheme=HttpString, HttpString} | {abs_path, HttpString} | HttpString</v>
-        <v>HttpVersion = {Major=int(), Minor=int()}</v>
+        <v>HttpVersion = {Major=integer(), Minor=integer()}</v>
         <v>HttpString = string() | binary()</v>
         <v>HttpField = HttpFieldAtom | HttpString</v>
         <v>HttpFieldAtom = 'Cache-Control' | 'Connection' | 'Date' | 'Pragma' | 'Transfer-Encoding' | 'Upgrade' | 'Via' | 'Accept' | 'Accept-Charset' | 'Accept-Encoding' | 'Accept-Language' | 'Authorization' | 'From' | 'Host' | 'If-Modified-Since' | 'If-Match' | 'If-None-Match' | 'If-Range' | 'If-Unmodified-Since' | 'Max-Forwards' | 'Proxy-Authorization' | 'Range' | 'Referer' | 'User-Agent' | 'Age' | 'Location' | 'Proxy-Authenticate' | 'Public' | 'Retry-After' | 'Server' | 'Vary' | 'Warning' | 'Www-Authenticate' | 'Allow' | 'Content-Base' | 'Content-Encoding' | 'Content-Language' | 'Content-Length' | 'Content-Location' | 'Content-Md5' | 'Content-Range' | 'Content-Type' | 'Etag' | 'Expires' | 'Last-Modified' | 'Accept-Ranges' | 'Set-Cookie' | 'Set-Cookie2' | 'X-Forwarded-For' | 'Cookie' | 'Keep-Alive' | 'Proxy-Connection'</v>
@@ -719,14 +713,14 @@ false</pre>
         </taglist>
         <p>The following options are available:</p>
             <taglist>
-              <tag><c>{packet_size, int()}</c></tag>
+              <tag><c>{packet_size, integer()}</c></tag>
               <item><p>Sets the max allowed size of the packet body. If
                 the packet header indicates that the length of the
                 packet is longer than the max allowed length, the packet
                 is considered invalid. Default is 0 which means no
                 size limit.</p>
               </item>
-              <tag><c>{line_length, int()}</c></tag>
+              <tag><c>{line_length, integer()}</c></tag>
               <item><p>Applies only to line oriented protocols
                 (<c>line</c>, <c>http</c>). Lines longer than this
                 will be truncated.</p>
@@ -800,7 +794,7 @@ false</pre>
       </desc>
     </func>
     <func>
-      <name>demonitor(MonitorRef, OptionList) -> true|false</name>
+      <name>demonitor(MonitorRef, OptionList) -> boolean()</name>
       <fsummary>Stop monitoring</fsummary>
       <type>
         <v>MonitorRef = reference()</v>
@@ -867,14 +861,11 @@ false</pre>
       </desc>
     </func>
     <func>
-      <name>disconnect_node(Node) -> bool() | ignored</name>
+      <name name="disconnect_node" arity="1"/>
       <fsummary>Force the disconnection of a node</fsummary>
-      <type>
-        <v>Node = atom()</v>
-      </type>
       <desc>
         <p>Forces the disconnection of a node. This will appear to
-          the node <c>Node</c> as if the local node has crashed. This
+          the node <c><anno>Node</anno></c> as if the local node has crashed. This
           BIF is mainly used in the Erlang network authentication
           protocols. Returns <c>true</c> if disconnection succeeds,
           otherwise <c>false</c>. If the local node is not alive,
@@ -1069,15 +1060,11 @@ b</pre>
       </desc>
     </func>
     <func>
-      <name>erlang:fun_info(Fun) -> [{Item, Info}]</name>
+      <name name="fun_info" arity="1"/>
       <fsummary>Information about a fun</fsummary>
-      <type>
-        <v>Fun = fun()</v>
-        <v>Item, Info -- see below</v>
-      </type>
       <desc>
         <p>Returns a list containing information about the fun
-          <c>Fun</c>. Each element of the list is a tuple. The order of
+          <c><anno>Fun</anno></c>. Each element of the list is a tuple. The order of
           the tuples is not defined, and more tuples may be added in a
           future release.</p>
         <warning>
@@ -1176,7 +1163,7 @@ b</pre>
         <p>Returns information about <c>Fun</c> as specified by
           <c>Item</c>, in the form <c>{Item,Info}</c>.</p>
         <p>For any fun, <c>Item</c> can be any of the atoms
-          <c>module</c>, <c>name</c>, <c>arity</c>, or <c>env</c>.</p>
+          <c>module</c>, <c>name</c>, <c>arity</c>, <c>env</c>, or <c>type</c>.</p>
         <p>For a local fun, <c>Item</c> can also be any of the atoms
           <c>index</c>, <c>new_index</c>, <c>new_uniq</c>,
           <c>uniq</c>, and <c>pid</c>. For an external fun, the value
@@ -1197,11 +1184,11 @@ b</pre>
       </desc>
     </func>
     <func>
-      <name>erlang:function_exported(Module, Function, Arity) -> bool()</name>
+      <name>erlang:function_exported(Module, Function, Arity) -> boolean()</name>
       <fsummary>Check if a function is exported and loaded</fsummary>
       <type>
         <v>Module = Function = atom()</v>
-        <v>Arity = int()</v>
+        <v>Arity = arity()</v>
       </type>
       <desc>
         <p>Returns <c>true</c> if the module <c>Module</c> is loaded
@@ -1229,7 +1216,7 @@ b</pre>
       </desc>
     </func>
     <func>
-      <name>garbage_collect(Pid) -> bool()</name>
+      <name>garbage_collect(Pid) -> boolean()</name>
       <fsummary>Force an immediate garbage collection of a process</fsummary>
       <type>
         <v>Pid = pid()</v>
@@ -1276,11 +1263,8 @@ b</pre>
       </desc>
     </func>
     <func>
-      <name>erlang:get_cookie() -> Cookie | nocookie</name>
+      <name name="get_cookie" arity="0"/>
       <fsummary>Get the magic cookie of the local node</fsummary>
-      <type>
-        <v>Cookie = atom()</v>
-      </type>
       <desc>
         <p>Returns the magic cookie of the local node, if the node is
           alive; otherwise the atom <c>nocookie</c>.</p>
@@ -1311,7 +1295,7 @@ b</pre>
       <fsummary>Get the call stack back-trace of the last exception</fsummary>
       <type>
         <v>Module = Function = atom()</v>
-        <v>Arity = int()</v>
+        <v>Arity = arity()</v>
         <v>Args = [term()]</v>
       </type>
       <desc>
@@ -1379,7 +1363,7 @@ os_prompt%</pre>
       <name>halt(Status)</name>
       <fsummary>Halt the Erlang runtime system</fsummary>
       <type>
-        <v>Status = int()>=0 | string()</v>
+        <v>Status = integer() >= 0 | string()</v>
       </type>
       <desc>
         <p><c>Status</c> must be a non-negative integer, or a string.
@@ -1472,7 +1456,7 @@ os_prompt%</pre>
       <name>integer_to_list(Integer) -> string()</name>
       <fsummary>Text representation of an integer</fsummary>
       <type>
-        <v>Integer = int()</v>
+        <v>Integer = integer()</v>
       </type>
       <desc>
         <p>Returns a string which corresponds to the text
@@ -1483,15 +1467,11 @@ os_prompt%</pre>
       </desc>
     </func>
     <func>
-      <name>integer_to_list(Integer, Base) -> string()</name>
+      <name name="integer_to_list" arity="2"/>
       <fsummary>Text representation of an integer</fsummary>
-      <type>
-        <v>Integer = int()</v>
-        <v>Base = 2..36</v>
-      </type>
       <desc>
         <p>Returns a string which corresponds to the text
-          representation of <c>Integer</c> in base <c>Base</c>.</p>
+          representation of <c><anno>Integer</anno></c> in base <c><anno>Base</anno></c>.</p>
         <pre>
 > <input>integer_to_list(1023, 16).</input>
 "3FF"</pre>
@@ -1518,7 +1498,7 @@ os_prompt%</pre>
       </desc>
     </func>
     <func>
-      <name>iolist_size(Item) -> int()</name>
+      <name>iolist_size(Item) -> integer() >= 0</name>
       <fsummary>Size of an iolist</fsummary>
       <type>
         <v>Item = iolist() | binary()</v>
@@ -1533,7 +1513,7 @@ os_prompt%</pre>
       </desc>
     </func>
     <func>
-      <name>is_alive() -> bool()</name>
+      <name>is_alive() -> boolean()</name>
       <fsummary>Check whether the local node is alive</fsummary>
       <desc>
         <p>Returns <c>true</c> if the local node is alive; that is, if
@@ -1542,7 +1522,7 @@ os_prompt%</pre>
       </desc>
     </func>
     <func>
-      <name>is_atom(Term) -> bool()</name>
+      <name>is_atom(Term) -> boolean()</name>
       <fsummary>Check whether a term is an atom</fsummary>
       <type>
         <v>Term = term()</v>
@@ -1554,7 +1534,7 @@ os_prompt%</pre>
       </desc>
     </func>
     <func>
-      <name>is_binary(Term) -> bool()</name>
+      <name>is_binary(Term) -> boolean()</name>
       <fsummary>Check whether a term is a binary</fsummary>
       <type>
         <v>Term = term()</v>
@@ -1569,7 +1549,7 @@ os_prompt%</pre>
       </desc>
     </func>
     <func>
-      <name>is_bitstring(Term) -> bool()</name>
+      <name>is_bitstring(Term) -> boolean()</name>
       <fsummary>Check whether a term is a bitstring</fsummary>
       <type>
         <v>Term = term()</v>
@@ -1582,7 +1562,7 @@ os_prompt%</pre>
       </desc>
     </func>
     <func>
-      <name>is_boolean(Term) -> bool()</name>
+      <name>is_boolean(Term) -> boolean()</name>
       <fsummary>Check whether a term is a boolean</fsummary>
       <type>
         <v>Term = term()</v>
@@ -1595,11 +1575,11 @@ os_prompt%</pre>
       </desc>
     </func>
     <func>
-      <name>erlang:is_builtin(Module, Function, Arity) -> bool()</name>
+      <name>erlang:is_builtin(Module, Function, Arity) -> boolean()</name>
       <fsummary>Check if a function is a BIF implemented in C</fsummary>
       <type>
         <v>Module = Function = atom()</v>
-        <v>Arity = int()</v>
+        <v>Arity = arity()</v>
       </type>
       <desc>
         <p>Returns <c>true</c> if <c>Module:Function/Arity</c> is
@@ -1608,7 +1588,7 @@ os_prompt%</pre>
       </desc>
     </func>
     <func>
-      <name>is_float(Term) -> bool()</name>
+      <name>is_float(Term) -> boolean()</name>
       <fsummary>Check whether a term is a float</fsummary>
       <type>
         <v>Term = term()</v>
@@ -1620,7 +1600,7 @@ os_prompt%</pre>
       </desc>
     </func>
     <func>
-      <name>is_function(Term) -> bool()</name>
+      <name>is_function(Term) -> boolean()</name>
       <fsummary>Check whether a term is a fun</fsummary>
       <type>
         <v>Term = term()</v>
@@ -1632,11 +1612,11 @@ os_prompt%</pre>
       </desc>
     </func>
     <func>
-      <name>is_function(Term, Arity) -> bool()</name>
+      <name>is_function(Term, Arity) -> boolean()</name>
       <fsummary>Check whether a term is a fun with a given arity</fsummary>
       <type>
         <v>Term = term()</v>
-        <v>Arity = int()</v>
+        <v>Arity = arity()</v>
       </type>
       <desc>
         <p>Returns <c>true</c> if <c>Term</c> is a fun that can be
@@ -1653,7 +1633,7 @@ os_prompt%</pre>
       </desc>
     </func>
     <func>
-      <name>is_integer(Term) -> bool()</name>
+      <name>is_integer(Term) -> boolean()</name>
       <fsummary>Check whether a term is an integer</fsummary>
       <type>
         <v>Term = term()</v>
@@ -1665,7 +1645,7 @@ os_prompt%</pre>
       </desc>
     </func>
     <func>
-      <name>is_list(Term) -> bool()</name>
+      <name>is_list(Term) -> boolean()</name>
       <fsummary>Check whether a term is a list</fsummary>
       <type>
         <v>Term = term()</v>
@@ -1677,7 +1657,7 @@ os_prompt%</pre>
       </desc>
     </func>
     <func>
-      <name>is_number(Term) -> bool()</name>
+      <name>is_number(Term) -> boolean()</name>
       <fsummary>Check whether a term is a number</fsummary>
       <type>
         <v>Term = term()</v>
@@ -1689,7 +1669,7 @@ os_prompt%</pre>
       </desc>
     </func>
     <func>
-      <name>is_pid(Term) -> bool()</name>
+      <name>is_pid(Term) -> boolean()</name>
       <fsummary>Check whether a term is a pid</fsummary>
       <type>
         <v>Term = term()</v>
@@ -1701,7 +1681,7 @@ os_prompt%</pre>
       </desc>
     </func>
     <func>
-      <name>is_port(Term) -> bool()</name>
+      <name>is_port(Term) -> boolean()</name>
       <fsummary>Check whether a term is a port</fsummary>
       <type>
         <v>Term = term()</v>
@@ -1713,7 +1693,7 @@ os_prompt%</pre>
       </desc>
     </func>
     <func>
-      <name>is_process_alive(Pid) -> bool()</name>
+      <name>is_process_alive(Pid) -> boolean()</name>
       <fsummary>Check whether a process is alive</fsummary>
       <type>
         <v>Pid = pid()</v>
@@ -1728,7 +1708,7 @@ os_prompt%</pre>
       </desc>
     </func>
     <func>
-      <name>is_record(Term, RecordTag) -> bool()</name>
+      <name>is_record(Term, RecordTag) -> boolean()</name>
       <fsummary>Check whether a term appears to be a record</fsummary>
       <type>
         <v>Term = term()</v>
@@ -1751,12 +1731,12 @@ os_prompt%</pre>
       </desc>
     </func>
     <func>
-      <name>is_record(Term, RecordTag, Size) -> bool()</name>
+      <name>is_record(Term, RecordTag, Size) -> boolean()</name>
       <fsummary>Check whether a term appears to be a record</fsummary>
       <type>
         <v>Term = term()</v>
         <v>RecordTag = atom()</v>
-        <v>Size = int()</v>
+        <v>Size = integer()</v>
       </type>
       <desc>
         <p><c>RecordTag</c> must be an atom. Returns <c>true</c> if
@@ -1771,7 +1751,7 @@ os_prompt%</pre>
       </desc>
     </func>
     <func>
-      <name>is_reference(Term) -> bool()</name>
+      <name>is_reference(Term) -> boolean()</name>
       <fsummary>Check whether a term is a reference</fsummary>
       <type>
         <v>Term = term()</v>
@@ -1783,7 +1763,7 @@ os_prompt%</pre>
       </desc>
     </func>
     <func>
-      <name>is_tuple(Term) -> bool()</name>
+      <name>is_tuple(Term) -> boolean()</name>
       <fsummary>Check whether a term is a tuple</fsummary>
       <type>
         <v>Term = term()</v>
@@ -1795,7 +1775,7 @@ os_prompt%</pre>
       </desc>
     </func>
     <func>
-      <name>length(List) -> int()</name>
+      <name>length(List) -> integer() >= 0</name>
       <fsummary>Length of a list</fsummary>
       <type>
         <v>List = [term()]</v>
@@ -1916,7 +1896,7 @@ os_prompt%</pre>
       </desc>
     </func>
     <func>
-      <name>list_to_integer(String) -> int()</name>
+      <name>list_to_integer(String) -> integer()</name>
       <fsummary>Convert from text representation to an integer</fsummary>
       <type>
         <v>String = string()</v>
@@ -1932,19 +1912,15 @@ os_prompt%</pre>
       </desc>
     </func>
     <func>
-      <name>list_to_integer(String, Base) -> int()</name>
+      <name name="list_to_integer" arity="2"/>
       <fsummary>Convert from text representation to an integer</fsummary>
-      <type>
-        <v>String = string()</v>
-        <v>Base = 2..36</v>
-      </type>
       <desc>
         <p>Returns an integer whose text representation in base
-          <c>Base</c> is <c>String</c>.</p>
+          <c><anno>Base</anno></c> is <c><anno>String</anno></c>.</p>
         <pre>
 > <input>list_to_integer("3FF", 16).</input>
 1023</pre>
-        <p>Failure: <c>badarg</c> if <c>String</c> contains a bad
+        <p>Failure: <c>badarg</c> if <c><anno>String</anno></c> contains a bad
           representation of an integer.</p>
       </desc>
     </func>
@@ -2095,12 +2071,10 @@ os_prompt%</pre>
       </desc>
     </func>
     <func>
-      <name>erlang:localtime() -> {Date, Time}</name>
+      <name>erlang:localtime() -> DateTime</name>
       <fsummary>Current local date and time</fsummary>
       <type>
-        <v>Date = {Year, Month, Day}</v>
-        <v>Time = {Hour, Minute, Second}</v>
-        <v>&nbsp;Year = Month = Day = Hour = Minute = Second = int()</v>
+        <v>DateTime = <seealso marker="calendar#type-datetime">calendar:datetime()</seealso></v>
       </type>
       <desc>
         <p>Returns the current local date and time
@@ -2113,17 +2087,12 @@ os_prompt%</pre>
       </desc>
     </func>
     <func>
-      <name>erlang:localtime_to_universaltime({Date1, Time1}) -> {Date2, Time2}</name>
+      <name name="localtime_to_universaltime" arity="1"/>
       <fsummary>Convert from local to Universal Time Coordinated (UTC) date and time</fsummary>
-      <type>
-        <v>Date1 = Date2 = {Year, Month, Day}</v>
-        <v>Time1 = Time2 = {Hour, Minute, Second}</v>
-        <v>&nbsp;Year = Month = Day = Hour = Minute = Second = int()</v>
-      </type>
       <desc>
         <p>Converts local date and time to Universal Time Coordinated
           (UTC), if this is supported by the underlying OS. Otherwise,
-          no conversion is done and <c>{Date1, Time1}</c> is returned.</p>
+          no conversion is done and <c>{<anno>Date1</anno>, <anno>Time1</anno>}</c> is returned.</p>
         <pre>
 > <input>erlang:localtime_to_universaltime({{1996,11,6},{14,45,17}}).</input>
 {{1996,11,6},{13,45,17}}</pre>
@@ -2135,9 +2104,8 @@ os_prompt%</pre>
       <name>erlang:localtime_to_universaltime({Date1, Time1}, IsDst) -> {Date2, Time2}</name>
       <fsummary>Convert from local to Universal Time Coordinated (UTC) date and time</fsummary>
       <type>
-        <v>Date1 = Date2 = {Year, Month, Day}</v>
-        <v>Time1 = Time2 = {Hour, Minute, Second}</v>
-        <v>&nbsp;Year = Month = Day = Hour = Minute = Second = int()</v>
+        <v>Date1 = Date2 = <seealso marker="calendar#type-date">calendar:date()</seealso></v>
+        <v>Time1 = Time2 = <seealso marker="calendar#type-time">calendar:time()</seealso></v>
         <v>IsDst = true | false | undefined</v>
       </type>
       <desc>
@@ -2177,7 +2145,7 @@ os_prompt%</pre>
       <name>erlang:make_tuple(Arity, InitialValue) -> tuple()</name>
       <fsummary>Create a new tuple of a given arity</fsummary>
       <type>
-        <v>Arity = int()</v>
+        <v>Arity = arity()</v>
         <v>InitialValue = term()</v>
       </type>
       <desc>
@@ -2192,7 +2160,7 @@ os_prompt%</pre>
       <name>erlang:make_tuple(Arity, Default, InitList) -> tuple()</name>
       <fsummary>Create a new tuple with given arity and contents</fsummary>
       <type>
-        <v>Arity = int()</v>
+        <v>Arity = arity()</v>
         <v>Default = term()</v>
         <v>InitList = [{Position,term()}]</v>
         <v>Position = integer()</v>
@@ -2211,14 +2179,11 @@ os_prompt%</pre>
       </desc>
     </func>
     <func>
-      <name>max(Term1, Term2) -> Maximum</name>
+      <name name="max" arity="2"/>
       <fsummary>Return the largest of two term</fsummary>
-      <type>
-        <v>Term1 = Term2 = Maximum = term()</v>
-      </type>
       <desc>
-        <p>Return the largest of <c>Term1</c> and <c>Term2</c>;
-	if the terms compares equal, <c>Term1</c> will be returned.</p>
+        <p>Return the largest of <c><anno>Term1</anno></c> and <c><anno>Term2</anno></c>;
+	if the terms compare equal, <c><anno>Term1</anno></c> will be returned.</p>
       </desc>
     </func>
     <func>
@@ -2468,18 +2433,15 @@ os_prompt%</pre>
       </desc>
     </func>
     <func>
-      <name>min(Term1, Term2) -> Minimum</name>
+      <name name="min" arity="2"/>
       <fsummary>Return the smallest of two term</fsummary>
-      <type>
-        <v>Term1 = Term2 = Minimum = term()</v>
-      </type>
       <desc>
-        <p>Return the smallest of <c>Term1</c> and <c>Term2</c>;
-	if the terms compare equal, <c>Term1</c> will be returned.</p>
+        <p>Return the smallest of <c><anno>Term1</anno></c> and <c><anno>Term2</anno></c>;
+	if the terms compare equal, <c><anno>Term1</anno></c> will be returned.</p>
       </desc>
     </func>
     <func>
-      <name>module_loaded(Module) -> bool()</name>
+      <name>module_loaded(Module) -> boolean()</name>
       <fsummary>Check if a module is loaded</fsummary>
       <type>
         <v>Module = atom()</v>
@@ -2602,7 +2564,7 @@ os_prompt%</pre>
       <fsummary>Monitor the status of a node</fsummary>
       <type>
         <v>Node = node()</v>
-        <v>Flag = bool()</v>
+        <v>Flag = boolean()</v>
       </type>
       <desc>
         <p>Monitors the status of the node <c>Node</c>. If <c>Flag</c>
@@ -2628,7 +2590,7 @@ os_prompt%</pre>
       <fsummary>Monitor the status of a node</fsummary>
       <type>
         <v>Node = node()</v>
-        <v>Flag = bool()</v>
+        <v>Flag = boolean()</v>
         <v>Options = [Option]</v>
         <v>Option = allow_passive_connect</v>
       </type>
@@ -2711,11 +2673,8 @@ os_prompt%</pre>
       </desc>
     </func>
     <func>
-      <name>nodes() -> Nodes</name>
+      <name name="nodes" arity="0"/>
       <fsummary>All visible nodes in the system</fsummary>
-      <type>
-        <v>Nodes = [node()]</v>
-      </type>
       <desc>
         <p>Returns a list of all visible nodes in the system, excluding
           the local node. Same as <c>nodes(visible)</c>.</p>
@@ -2765,11 +2724,12 @@ os_prompt%</pre>
       </desc>
     </func>
     <func>
-      <name>now() -> {MegaSecs, Secs, MicroSecs}</name>
-      <fsummary>Elapsed time since 00:00 GMT</fsummary>
+      <name>now() -> timestamp()</name>
       <type>
-        <v>MegaSecs = Secs = MicroSecs = int()</v>
+        <v>timestamp() = {MegaSecs, Secs, MicroSecs}</v>
+        <v>MegaSecs = Secs = MicroSecs = integer() >= 0</v>
       </type>
+      <fsummary>Elapsed time since 00:00 GMT</fsummary>
       <desc>
         <p>Returns the tuple <c>{MegaSecs, Secs, MicroSecs}</c> which is
           the elapsed time since 00:00 GMT, January 1, 1970 (zero hour)
@@ -2792,12 +2752,12 @@ os_prompt%</pre>
         <v>PortName = {spawn, Command} | {spawn_driver, Command} | {spawn_executable, FileName} | {fd, In, Out}</v>
         <v>&nbsp;Command = string()</v>
 	<v>&nbsp;FileName = [ FileNameChar ] | binary()</v>
-	<v>&nbsp;FileNameChar = int() (1..255 or any Unicode codepoint, see description)</v> 
-        <v>&nbsp;In = Out = int()</v>
+	<v>&nbsp;FileNameChar = integer() (1..255 or any Unicode codepoint, see description)</v>
+        <v>&nbsp;In = Out = integer()</v>
         <v>PortSettings = [Opt]</v>
         <v>&nbsp;Opt = {packet, N} | stream | {line, L} | {cd, Dir} | {env, Env} | {args, [ ArgString ]} | {arg0, ArgString} | exit_status | use_stdio | nouse_stdio | stderr_to_stdout | in | out | binary | eof</v>
         <v>&nbsp;&nbsp;N = 1 | 2 | 4</v>
-        <v>&nbsp;&nbsp;L = int()</v>
+        <v>&nbsp;&nbsp;L = integer()</v>
         <v>&nbsp;&nbsp;Dir = string()</v>
 	<v>&nbsp;&nbsp;ArgString = [ FileNameChar ] | binary()</v>
         <v>&nbsp;&nbsp;Env = [{Name, Val}]</v>
@@ -3283,7 +3243,7 @@ os_prompt%</pre>
       </desc>
     </func>
     <func>
-      <name>port_command(Port, Data, OptionList) -> true|false</name>
+      <name>port_command(Port, Data, OptionList) -> boolean()</name>
       <fsummary>Send data to a port</fsummary>
       <type>
         <v>Port = port() | atom()</v>
@@ -3399,7 +3359,7 @@ os_prompt%</pre>
       <fsummary>Perform a synchronous control operation on a port</fsummary>
       <type>
         <v>Port = port() | atom()</v>
-        <v>Operation = int()</v>
+        <v>Operation = integer()</v>
         <v>Data = Res = iodata()</v>
       </type>
       <desc>
@@ -3423,7 +3383,7 @@ os_prompt%</pre>
       <fsummary>Synchronous call to a port with term data</fsummary>
       <type>
         <v>Port = port() | atom()</v>
-        <v>Operation = int()</v>
+        <v>Operation = integer()</v>
         <v>Data = term()</v>
       </type>
       <desc>
@@ -4109,7 +4069,7 @@ os_prompt%</pre>
         <v>Reason = term()</v>
         <v>Stacktrace = [{Module, Function, Arity | Args} | {Fun, Args}]</v>
         <v>&nbsp;Module = Function = atom()</v>
-        <v>&nbsp;Arity = int()</v>
+        <v>&nbsp;Arity = arity()</v>
         <v>&nbsp;Args = [term()]</v>
         <v>&nbsp;Fun = [fun()]</v>
       </type>
@@ -4146,7 +4106,7 @@ os_prompt%</pre>
       </desc>
     </func>
     <func>
-      <name>erlang:read_timer(TimerRef) -> int() | false</name>
+      <name>erlang:read_timer(TimerRef) -> integer() >= 0 | false</name>
       <fsummary>Number of milliseconds remaining for a timer</fsummary>
       <type>
         <v>TimerRef = reference()</v>
@@ -4262,7 +4222,7 @@ true</pre>
       </desc>
     </func>
     <func>
-      <name>round(Number) -> int()</name>
+      <name>round(Number) -> integer()</name>
       <fsummary>Return an integer by rounding a number</fsummary>
       <type>
         <v>Number = number()</v>
@@ -4346,7 +4306,7 @@ true</pre>
       <name>erlang:send_after(Time, Dest, Msg) -> TimerRef</name>
       <fsummary>Start a timer</fsummary>
       <type>
-        <v>Time = int()</v>
+        <v>Time = integer() >= 0</v>
         <v>&nbsp;0 &lt;= Time &lt;= 4294967295</v>
         <v>Dest = pid() | RegName </v>
         <v>&nbsp;LocalPid = pid() (of a process, alive or dead, on the local node)</v>
@@ -4375,17 +4335,12 @@ true</pre>
       </desc>
     </func>
     <func>
-      <name>erlang:send_nosuspend(Dest, Msg) -> bool()</name>
+      <name name="send_nosuspend" arity="2"/>
       <fsummary>Try to send a message without ever blocking</fsummary>
-      <type>
-        <v>Dest = pid() | port() | RegName | {RegName, Node}</v>
-        <v>&nbsp;RegName = atom()</v>
-        <v>&nbsp;Node = node()</v>
-        <v>Msg = term()</v>
-      </type>
+      <type name="dst"/>
       <desc>
         <p>The same as
-          <seealso marker="#send/3">erlang:send(Dest, Msg, [nosuspend])</seealso>, but returns <c>true</c> if
+          <seealso marker="#send/3">erlang:send(<anno>Dest</anno>, <anno>Msg</anno>, [nosuspend])</seealso>, but returns <c>true</c> if
           the message was sent and <c>false</c> if the message was not
           sent because the sender would have had to be suspended.</p>
         <p>This function is intended for send operations towards an
@@ -4393,7 +4348,7 @@ true</pre>
           (Erlang) process. If the connection to the remote node
           (usually not a real Erlang node, but a node written in C or
           Java) is overloaded, this function <em>will not send the message</em> but return <c>false</c> instead.</p>
-        <p>The same happens, if <c>Dest</c> refers to a local port that
+        <p>The same happens, if <c><anno>Dest</anno></c> refers to a local port that
           is busy. For all other destinations (allowed for the ordinary
           send operator <c>'!'</c>) this function sends the message and
           returns <c>true</c>.</p>
@@ -4426,18 +4381,12 @@ true</pre>
       </desc>
     </func>
     <func>
-      <name>erlang:send_nosuspend(Dest, Msg, Options) -> bool()</name>
+      <name name="send_nosuspend" arity="3"/>
       <fsummary>Try to send a message without ever blocking</fsummary>
-      <type>
-        <v>Dest = pid() | port() | RegName | {RegName, Node}</v>
-        <v>&nbsp;RegName = atom()</v>
-        <v>&nbsp;Node = node()</v>
-        <v>Msg = term()</v>
-        <v>Option = noconnect</v>
-      </type>
+      <type name="dst"/>
       <desc>
         <p>The same as
-          <seealso marker="#send/3">erlang:send(Dest, Msg, [nosuspend | Options])</seealso>,
+          <seealso marker="#send/3">erlang:send(<anno>Dest</anno>, <anno>Msg</anno>, [nosuspend | <anno>Options</anno>])</seealso>,
           but with boolean return value.</p>
         <p>This function behaves like
           <seealso marker="#send_nosuspend/2">erlang:send_nosuspend/2)</seealso>,
@@ -4462,17 +4411,13 @@ true</pre>
       </desc>
     </func>
     <func>
-      <name>erlang:set_cookie(Node, Cookie) -> true</name>
+      <name name="set_cookie" arity="2"/>
       <fsummary>Set the magic cookie of a node</fsummary>
-      <type>
-        <v>Node = node()</v>
-        <v>Cookie = atom()</v>
-      </type>
       <desc>
-        <p>Sets the magic cookie of <c>Node</c> to the atom
-          <c>Cookie</c>. If <c>Node</c> is the local node, the function
+        <p>Sets the magic cookie of <c><anno>Node</anno></c> to the atom
+          <c><anno>Cookie</anno></c>. If <c><anno>Node</anno></c> is the local node, the function
           also sets the cookie of all other unknown nodes to
-          <c>Cookie</c> (see
+          <c><anno>Cookie</anno></c> (see
           <seealso marker="doc/reference_manual:distributed">Distributed Erlang</seealso> in the Erlang Reference Manual).</p>
         <p>Failure: <c>function_clause</c> if the local node is not
           alive.</p>
@@ -4497,7 +4442,7 @@ true</pre>
       </desc>
     </func>
     <func>
-      <name>size(Item) -> int()</name>
+      <name>size(Item) -> integer() >= 0</name>
       <fsummary>Size of a tuple or binary</fsummary>
       <type>
         <v>Item = tuple() | binary()</v>
@@ -4512,28 +4457,21 @@ true</pre>
       </desc>
     </func>
     <func>
-      <name>spawn(Fun) -> pid()</name>
+      <name name="spawn" arity="1"/>
       <fsummary>Create a new process with a fun as entry point</fsummary>
-      <type>
-        <v>Fun = fun()</v>
-      </type>
       <desc>
         <p>Returns the pid of a new process started by the application
-          of <c>Fun</c> to the empty list <c>[]</c>. Otherwise works
+          of <c><anno>Fun</anno></c> to the empty list <c>[]</c>. Otherwise works
           like <seealso marker="#spawn/3">spawn/3</seealso>.</p>
       </desc>
     </func>
     <func>
-      <name>spawn(Node, Fun) -> pid()</name>
+      <name name="spawn" arity="2"/>
       <fsummary>Create a new process with a fun as entry point on a given node</fsummary>
-      <type>
-        <v>Node = node()</v>
-        <v>Fun = fun()</v>
-      </type>
       <desc>
         <p>Returns the pid of a new process started by the application
-          of <c>Fun</c> to the empty list <c>[]</c> on <c>Node</c>. If
-          <c>Node</c> does not exist, a useless pid is returned.
+          of <c><anno>Fun</anno></c> to the empty list <c>[]</c> on <c><anno>Node</anno></c>. If
+          <c><anno>Node</anno></c> does not exist, a useless pid is returned.
           Otherwise works like
           <seealso marker="#spawn/3">spawn/3</seealso>.</p>
       </desc>
@@ -4564,47 +4502,35 @@ true</pre>
       </desc>
     </func>
     <func>
-      <name>spawn(Node, Module, Function, Args) -> pid()</name>
+      <name name="spawn" arity="4"/>
       <fsummary>Create a new process with a function as entry point on a given node</fsummary>
-      <type>
-        <v>Node = node()</v>
-        <v>Module = Function = atom()</v>
-        <v>Args = [term()]</v>
-      </type>
       <desc>
         <p>Returns the pid of a new process started by the application
-          of <c>Module:Function</c> to <c>Args</c> on <c>Node</c>. If
-          <c>Node</c> does not exists, a useless pid is returned.
+          of <c><anno>Module</anno>:<anno>Function</anno></c> to <c><anno>Args</anno></c> on <c>Node</c>. If
+          <c><anno>Node</anno></c> does not exists, a useless pid is returned.
           Otherwise works like
           <seealso marker="#spawn/3">spawn/3</seealso>.</p>
       </desc>
     </func>
     <func>
-      <name>spawn_link(Fun) -> pid()</name>
+      <name name="spawn_link" arity="1"/>
       <fsummary>Create and link to a new process with a fun as entry point</fsummary>
-      <type>
-        <v>Fun = fun()</v>
-      </type>
       <desc>
         <p>Returns the pid of a new process started by the application
-          of <c>Fun</c> to the empty list []. A link is created between
+          of <c><anno>Fun</anno></c> to the empty list []. A link is created between
           the calling process and the new process, atomically.
           Otherwise works like
           <seealso marker="#spawn/3">spawn/3</seealso>.</p>
       </desc>
     </func>
     <func>
-      <name>spawn_link(Node, Fun) -> pid()</name>
+      <name name="spawn_link" arity="2"/>
       <fsummary>Create and link to a new process with a fun as entry point on a specified node</fsummary>
-      <type>
-        <v>Node = node()</v>
-        <v>Fun = fun()</v>
-      </type>
       <desc>
         <p>Returns the pid of a new process started by the application
-          of <c>Fun</c> to the empty list [] on <c>Node</c>. A link is
+          of <c><anno>Fun</anno></c> to the empty list [] on <c><anno>Node</anno></c>. A link is
           created between the calling process and the new process,
-          atomically. If <c>Node</c> does not exist, a useless pid is
+          atomically. If <c><anno>Node</anno></c> does not exist, a useless pid is
           returned (and due to the link, an exit signal with exit
           reason <c>noconnection</c> will be received). Otherwise works
           like <seealso marker="#spawn/3">spawn/3</seealso>.</p>
@@ -4626,47 +4552,35 @@ true</pre>
       </desc>
     </func>
     <func>
-      <name>spawn_link(Node, Module, Function, Args) -> pid()</name>
+      <name name="spawn_link" arity="4"/>
       <fsummary>Create and link to a new process with a function as entry point on a given node</fsummary>
-      <type>
-        <v>Node = node()</v>
-        <v>Module = Function = atom()</v>
-        <v>Args = [term()]</v>
-      </type>
       <desc>
         <p>Returns the pid of a new process started by the application
-          of <c>Module:Function</c> to <c>Args</c> on <c>Node</c>. A
+          of <c><anno>Module</anno>:<anno>Function</anno></c> to <c><anno>Args</anno></c> on <c>Node</c>. A
           link is created between the calling process and the new
-          process, atomically. If <c>Node</c> does not exist, a useless
+          process, atomically. If <c><anno>Node</anno></c> does not exist, a useless
           pid is returned (and due to the link, an exit signal with exit
           reason <c>noconnection</c> will be received). Otherwise works
           like <seealso marker="#spawn/3">spawn/3</seealso>.</p>
       </desc>
     </func>
     <func>
-      <name>spawn_monitor(Fun) -> {pid(),reference()}</name>
+      <name name="spawn_monitor" arity="1"/>
       <fsummary>Create and monitor a new process with a fun as entry point</fsummary>
-      <type>
-        <v>Fun = fun()</v>
-      </type>
       <desc>
         <p>Returns the pid of a new process started by the application
-          of <c>Fun</c> to the empty list [] and reference for a monitor
+          of <c><anno>Fun</anno></c> to the empty list [] and reference for a monitor
           created to the new process.
           Otherwise works like
           <seealso marker="#spawn/3">spawn/3</seealso>.</p>
       </desc>
     </func>
     <func>
-      <name>spawn_monitor(Module, Function, Args) -> {pid(),reference()}</name>
+      <name name="spawn_monitor" arity="3"/>
       <fsummary>Create and monitor a new process with a function as entry point</fsummary>
-      <type>
-        <v>Module = Function = atom()</v>
-        <v>Args = [term()]</v>
-      </type>
       <desc>
         <p>A new process is started by the application
-          of <c>Module:Function</c> to <c>Args</c>, and the process is
+          of <c><anno>Module</anno>:<anno>Function</anno></c> to <c><anno>Args</anno></c>, and the process is
           monitored at the same time. Returns the pid and a reference
           for the monitor.
           Otherwise works like
@@ -4674,19 +4588,11 @@ true</pre>
       </desc>
     </func>
     <func>
-      <name>spawn_opt(Fun, [Option]) -> pid() | {pid(),reference()}</name>
+      <name name="spawn_opt" arity="2"/>
       <fsummary>Create a new process with a fun as entry point</fsummary>
-      <type>
-        <v>Fun = fun()</v>
-        <v>Option = link | monitor | {priority, Level} | {fullsweep_after, Number} | {min_heap_size, Size} | {min_bin_vheap_size, VSize}</v>
-        <v>&nbsp;Level = low | normal | high</v>
-        <v>&nbsp;Number = int()</v>
-        <v>&nbsp;Size = int()</v>
-        <v>&nbsp;VSize = int()</v>
-      </type>
       <desc>
         <p>Returns the pid of a new process started by the application
-          of <c>Fun</c> to the empty list <c>[]</c>. Otherwise
+          of <c><anno>Fun</anno></c> to the empty list <c>[]</c>. Otherwise
           works like
           <seealso marker="#spawn_opt/4">spawn_opt/4</seealso>.</p>
         <p>If the option <c>monitor</c> is given, the newly created
@@ -4695,37 +4601,19 @@ true</pre>
       </desc>
     </func>
     <func>
-      <name>spawn_opt(Node, Fun, [Option]) -> pid()</name>
+      <name name="spawn_opt" arity="3"/>
       <fsummary>Create a new process with a fun as entry point on a given node</fsummary>
-      <type>
-        <v>Node = node()</v>
-        <v>Fun = fun()</v>
-        <v>Option = link | {priority, Level} | {fullsweep_after, Number} | {min_heap_size, Size} | {min_bin_vheap_size, VSize}</v>
-        <v>&nbsp;Level = low | normal | high</v>
-        <v>&nbsp;Number = int()</v>
-        <v>&nbsp;Size = int()</v>
-        <v>&nbsp;VSize = int()</v>
-      </type>
       <desc>
         <p>Returns the pid of a new process started by the application
-          of <c>Fun</c> to the empty list <c>[]</c> on <c>Node</c>. If
-          <c>Node</c> does not exist, a useless pid is returned.
+          of <c><anno>Fun</anno></c> to the empty list <c>[]</c> on <c><anno>Node</anno></c>. If
+          <c><anno>Node</anno></c> does not exist, a useless pid is returned.
           Otherwise works like
           <seealso marker="#spawn_opt/4">spawn_opt/4</seealso>.</p>
       </desc>
     </func>
     <func>
-      <name>spawn_opt(Module, Function, Args, [Option]) -> pid() | {pid(),reference()}</name>
+      <name name="spawn_opt" arity="4"/>
       <fsummary>Create a new process with a function as entry point</fsummary>
-      <type>
-        <v>Module = Function = atom()</v>
-        <v>Args = [term()]</v>
-        <v>Option = link | monitor | {priority, Level} | {fullsweep_after, Number} | {min_heap_size, Size} | {min_bin_vheap_size, VSize}</v>
-        <v>&nbsp;Level = low | normal | high</v>
-        <v>&nbsp;Number = int()</v>
-        <v>&nbsp;Size = int()</v>
-        <v>&nbsp;VSize = int()</v>
-      </type>
       <desc>
         <p>Works exactly like
           <seealso marker="#spawn/3">spawn/3</seealso>, except that an
@@ -4744,17 +4632,17 @@ true</pre>
             <p>Monitor the new process (just like
               <seealso marker="#monitor/2">monitor/2</seealso> does).</p>
           </item>
-          <tag><c>{priority, Level}</c></tag>
+          <tag><c>{priority, <anno>Level</anno>}</c></tag>
           <item>
             <p>Sets the priority of the new process. Equivalent to
               executing
-              <seealso marker="#process_flag_priority">process_flag(priority, Level)</seealso> in the start function of the new process,
+              <seealso marker="#process_flag_priority">process_flag(priority, <anno>Level</anno>)</seealso> in the start function of the new process,
               except that the priority will be set before the process is
               selected for execution for the first time. For more information
               on priorities see
               <seealso marker="#process_flag_priority">process_flag(priority, Level)</seealso>.</p>
           </item>
-          <tag><c>{fullsweep_after, Number}</c></tag>
+          <tag><c>{fullsweep_after, <anno>Number</anno>}</c></tag>
           <item>
             <p>This option is only useful for performance tuning.
               In general, you should not use this option unless you
@@ -4776,18 +4664,18 @@ true</pre>
             <p>Here are a few cases when it could be useful to change
               <c>fullsweep_after</c>. Firstly, if binaries that are no
               longer used should be thrown away as soon as possible.
-              (Set <c>Number</c> to zero.) Secondly, a process that
+              (Set <c><anno>Number</anno></c> to zero.) Secondly, a process that
               mostly have short-lived data will be fullsweeped seldom
               or never, meaning that the old heap will contain mostly
               garbage. To ensure a fullsweep once in a while, set
-              <c>Number</c> to a suitable value such as 10 or 20.
+              <c><anno>Number</anno></c> to a suitable value such as 10 or 20.
               Thirdly, in embedded systems with limited amount of RAM
               and no virtual memory, one might want to preserve memory
-              by setting <c>Number</c> to zero. (The value may be set
+              by setting <c><anno>Number</anno></c> to zero. (The value may be set
               globally, see
               <seealso marker="#system_flag/2">erlang:system_flag/2</seealso>.)</p>
           </item>
-          <tag><c>{min_heap_size, Size}</c></tag>
+          <tag><c>{min_heap_size, <anno>Size</anno>}</c></tag>
           <item>
             <p>This option is only useful for performance tuning.
               In general, you should not use this option unless you
@@ -4802,9 +4690,9 @@ true</pre>
               slow down the system due to worse data locality.
               Therefore, it is recommended to use this option only for
               fine-tuning an application and to measure the execution
-              time with various <c>Size</c> values.</p>
+              time with various <c><anno>Size</anno></c> values.</p>
           </item>
-          <tag><c>{min_bin_vheap_size, VSize}</c></tag>
+          <tag><c>{min_bin_vheap_size, <anno>VSize</anno>}</c></tag>
           <item>
             <p>This option is only useful for performance tuning.
               In general, you should not use this option unless you
@@ -4818,29 +4706,19 @@ true</pre>
               Setting too high value, however, might waste memory.
               Therefore, it is recommended to use this option only for
               fine-tuning an application and to measure the execution
-              time with various <c>VSize</c> values.</p>
+              time with various <c><anno>VSize</anno></c> values.</p>
           </item>
 
         </taglist>
       </desc>
     </func>
     <func>
-      <name>spawn_opt(Node, Module, Function, Args, [Option]) -> pid()</name>
+      <name name="spawn_opt" arity="5"/>
       <fsummary>Create a new process with a function as entry point on a given node</fsummary>
-      <type>
-        <v>Node = node()</v>
-        <v>Module = Function = atom()</v>
-        <v>Args = [term()]</v>
-        <v>Option = link | {priority, Level} | {fullsweep_after, Number} | {min_heap_size, Size} | {min_bin_vheap_size, VSize}</v>
-        <v>&nbsp;Level = low | normal | high</v>
-        <v>&nbsp;Number = int()</v>
-        <v>&nbsp;Size = int()</v>
-        <v>&nbsp;VSize = int()</v>
-      </type>
       <desc>
         <p>Returns the pid of a new process started by the application
-          of <c>Module:Function</c> to <c>Args</c> on <c>Node</c>. If
-          <c>Node</c> does not exist, a useless pid is returned.
+          of <c><anno>Module</anno>:<anno>Function</anno></c> to <c><anno>Args</anno></c> on <c>Node</c>. If
+          <c><anno>Node</anno></c> does not exist, a useless pid is returned.
           Otherwise works like
           <seealso marker="#spawn_opt/4">spawn_opt/4</seealso>.</p>
       </desc>
@@ -4874,7 +4752,7 @@ true</pre>
       <name>erlang:start_timer(Time, Dest, Msg) -> TimerRef</name>
       <fsummary>Start a timer</fsummary>
       <type>
-        <v>Time = int()</v>
+        <v>Time = integer() >= 0</v>
         <v>&nbsp;0 &lt;= Time &lt;= 4294967295</v>
         <v>Dest = LocalPid | RegName </v>
         <v>&nbsp;LocalPid = pid() (of a process, alive or dead, on the local node)</v>
@@ -4983,7 +4861,7 @@ true</pre>
       </desc>
     </func>
     <func>
-      <name>erlang:suspend_process(Suspendee, OptList) -> true | false</name>
+      <name>erlang:suspend_process(Suspendee, OptList) -> boolean()</name>
       <fsummary>Suspend a process</fsummary>
       <type>
         <v>Suspendee = pid()</v>
@@ -5083,15 +4961,12 @@ true</pre>
       </desc>
     </func>
     <func>
-      <name>erlang:suspend_process(Suspendee) -> true</name>
+      <name name="suspend_process" arity="1"/>
       <fsummary>Suspend a process</fsummary>
-      <type>
-        <v>Suspendee = pid()</v>
-      </type>
       <desc>
-        <p>Suspends the process identified by <c>Suspendee</c>. The
+        <p>Suspends the process identified by <c><anno>Suspendee</anno></c>. The
 	same as calling
-	<seealso marker="#suspend_process/2">erlang:suspend_process(Suspendee, [])</seealso>. For more information see the documentation of <seealso marker="#suspend_process/2">erlang:suspend_process/2</seealso>.
+	<seealso marker="#suspend_process/2">erlang:suspend_process(<anno>Suspendee</anno>, [])</seealso>. For more information see the documentation of <seealso marker="#suspend_process/2">erlang:suspend_process/2</seealso>.
 	</p>
         <warning>
           <p>This BIF is intended for debugging only.</p>
@@ -5416,7 +5291,7 @@ true</pre>
             <p>Types:</p>
             <list type="bulleted">
               <item><c>Allocator = undefined | glibc</c></item>
-              <item><c>Version = [int()]</c></item>
+              <item><c>Version = [integer()]</c></item>
               <item><c>Features = [atom()]</c></item>
               <item><c>Settings = [{Subsystem, [{Parameter, Value}]}]</c></item>
               <item><c>Subsystem = atom()</c></item>
@@ -5682,7 +5557,7 @@ true</pre>
           </item>
           <tag><c>fullsweep_after</c></tag>
           <item>
-            <p>Returns <c>{fullsweep_after, int()}</c> which is the
+            <p>Returns <c>{fullsweep_after, integer()}</c> which is the
               <c>fullsweep_after</c> garbage collection setting used
               by default. For more information see
               <c>garbage_collection</c> described below.</p>
@@ -6050,7 +5925,7 @@ true</pre>
         <v>&nbsp;MonitorPid = pid()</v>
         <v>&nbsp;Options = [Option]</v>
         <v>&nbsp;&nbsp;Option = {long_gc, Time} | {large_heap, Size} | busy_port | busy_dist_port</v>
-        <v>&nbsp;&nbsp;&nbsp;Time = Size = int()</v>
+        <v>&nbsp;&nbsp;&nbsp;Time = Size = integer()</v>
       </type>
       <desc>
         <p>Returns the current system monitoring settings set by
@@ -6084,7 +5959,7 @@ true</pre>
       <type>
         <v>MonitorPid = pid()</v>
         <v>Option = {long_gc, Time} | {large_heap, Size} | busy_port | busy_dist_port</v>
-        <v>&nbsp;Time = Size = int()</v>
+        <v>&nbsp;Time = Size = integer()</v>
         <v>MonSettings = {OldMonitorPid, [Option]}</v>
         <v>&nbsp;OldMonitorPid = pid()</v>
       </type>
@@ -6314,7 +6189,7 @@ true</pre>
       <name>time() -> {Hour, Minute, Second}</name>
       <fsummary>Current time</fsummary>
       <type>
-        <v>Hour = Minute = Second = int()</v>
+        <v>Hour = Minute = Second = integer() >= 0</v>
       </type>
       <desc>
         <p>Returns the current time as <c>{Hour, Minute, Second}</c>.</p>
@@ -6342,11 +6217,11 @@ true</pre>
       </desc>
     </func>
     <func>
-      <name>erlang:trace(PidSpec, How, FlagList) -> int()</name>
+      <name>erlang:trace(PidSpec, How, FlagList) -> integer() >= 0</name>
       <fsummary>Set trace flags for a process or processes</fsummary>
       <type>
         <v>PidSpec = pid() | existing | new | all</v>
-        <v>How = bool()</v>
+        <v>How = boolean()</v>
         <v>FlagList = [Flag]</v>
         <v>&nbsp;Flag -- see below</v>
       </type>
@@ -6747,7 +6622,7 @@ true</pre>
       <type>
         <v>PidOrFunc = pid() | new | {Module, Function, Arity} | on_load</v>
         <v>&nbsp;Module = Function = atom()</v>
-        <v>&nbsp;Arity = int()</v>
+        <v>&nbsp;Arity = arity()</v>
         <v>Item, Res -- see below</v>
       </type>
       <desc>
@@ -6850,7 +6725,7 @@ true</pre>
       </desc>
     </func>
     <func>
-      <name>erlang:trace_pattern(MFA, MatchSpec) -> int()</name>
+      <name>erlang:trace_pattern(MFA, MatchSpec) -> integer() >= 0</name>
       <fsummary>Set trace patterns for global call tracing</fsummary>
       <desc>
         <p>The same as
@@ -6859,7 +6734,7 @@ true</pre>
       </desc>
     </func>
     <func>
-      <name>erlang:trace_pattern(MFA, MatchSpec, FlagList) -> int()</name>
+      <name>erlang:trace_pattern(MFA, MatchSpec, FlagList) -> integer() >= 0</name>
       <fsummary>Set trace patterns for tracing of function calls</fsummary>
       <type>
         <v>MFA, MatchSpec, FlagList -- see below</v>
@@ -7039,7 +6914,7 @@ true</pre>
       </desc>
     </func>
     <func>
-      <name>trunc(Number) -> int()</name>
+      <name>trunc(Number) -> integer()</name>
       <fsummary>Return an integer by the truncating a number</fsummary>
       <type>
         <v>Number = number()</v>
@@ -7053,7 +6928,7 @@ true</pre>
       </desc>
     </func>
     <func>
-      <name>tuple_size(Tuple) -> int()</name>
+      <name>tuple_size(Tuple) -> integer() >= 0</name>
       <fsummary>Return the size of a tuple</fsummary>
       <type>
         <v>Tuple = tuple()</v>
@@ -7081,12 +6956,10 @@ true</pre>
       </desc>
     </func>
     <func>
-      <name>erlang:universaltime() -> {Date, Time}</name>
+      <name>erlang:universaltime() -> DateTime</name>
       <fsummary>Current date and time according to Universal Time Coordinated (UTC)</fsummary>
       <type>
-        <v>Date = {Year, Month, Day}</v>
-        <v>Time = {Hour, Minute, Second}</v>
-        <v>&nbsp;Year = Month = Day = Hour = Minute = Second = int()</v>
+        <v>DateTime = <seealso marker="calendar#type-datetime">calendar:datetime()</seealso></v>
       </type>
       <desc>
         <p>Returns the current date and time according to Universal
@@ -7104,9 +6977,8 @@ true</pre>
       <name>erlang:universaltime_to_localtime({Date1, Time1}) -> {Date2, Time2}</name>
       <fsummary>Convert from Universal Time Coordinated (UTC) to local date and time</fsummary>
       <type>
-        <v>Date1 = Date2 = {Year, Month, Day}</v>
-        <v>Time1 = Time2 = {Hour, Minute, Second}</v>
-        <v>&nbsp;Year = Month = Day = Hour = Minute = Second = int()</v>
+        <v>Date1 = Date2 = <seealso marker="calendar#type-date">calendar:date()</seealso></v>
+        <v>Time1 = Time2 = <seealso marker="calendar#type-time">calendar:time()</seealso></v>
       </type>
       <desc>
         <p>Converts Universal Time Coordinated (UTC) date and time to
@@ -7193,7 +7065,7 @@ true</pre>
       </desc>
     </func>
     <func>
-      <name>erlang:yield() -> true</name>
+      <name name="yield" arity="0"/>
       <fsummary>Let other processes get a chance to execute</fsummary>
       <desc>
         <p>Voluntarily let other processes (if any) get a chance to