Merge branch 'dev' into major

34 files changed, 977 insertions, 1136 deletions

diff --git a/erts/doc/specs/.gitignore b/erts/doc/specs/.gitignore
new file mode 100644
index 0000000000..322eebcb06
--- /dev/null
+++ b/erts/doc/specs/.gitignore
@@ -0,0 +1 @@
+specs_*.xml
diff --git a/erts/doc/src/Makefile b/erts/doc/src/Makefile
index 6578923fe1..cfa5527474 100644
--- a/erts/doc/src/Makefile
+++ b/erts/doc/src/Makefile
@@ -1,7 +1,7 @@
 # 
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1997-2010. All Rights Reserved.
+# Copyright Ericsson AB 1997-2011. All Rights Reserved.
 #
 # 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
@@ -16,6 +16,9 @@
 #
 # %CopyrightEnd%
 # 
+
+SPECS_ESRC = ../../preloaded/src/
+
 include $(ERL_TOP)/make/target.mk
 include $(ERL_TOP)/make/$(TARGET)/otp.mk
 
@@ -43,6 +46,12 @@ XML_REF1_FILES = epmd.xml \
 	run_erl.xml \
 	start.xml
 
+XML_REF3_EFILES = \
+	erl_prim_loader.xml \
+	erlang.xml \
+	init.xml \
+	zlib.xml
+
 XML_REF3_FILES = \
 	driver_entry.xml \
 	erl_nif.xml \
@@ -98,18 +107,26 @@ HTML_REF_MAN_FILE = $(HTMLDIR)/index.html
 
 TOP_PDF_FILE = $(PDFDIR)/$(APPLICATION)-$(VSN).pdf
 
+SPECS_FILES = $(XML_REF3_EFILES:%.xml=$(SPECDIR)/specs_%.xml)
+
+TOP_SPECS_FILE = specs.xml
+
 # ----------------------------------------------------
 # FLAGS 
 # ----------------------------------------------------
 XML_FLAGS += 
 
+KERNEL_SRC=$(ERL_TOP)/lib/kernel/src
+KERNEL_INCLUDE=$(ERL_TOP)/lib/kernel/include
+SPECS_FLAGS = -I$(KERNEL_SRC) -I$(KERNEL_INCLUDE)
+
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
 $(HTMLDIR)/%.gif: %.gif
 	$(INSTALL_DATA) $< $@
 
-docs: pdf html man $(INFO_FILE) 
+docs: man pdf html $(INFO_FILE)
 
 $(TOP_PDF_FILE): $(XML_FILES)
 
@@ -132,8 +149,25 @@ clean:
 	rm -f $(MAN1DIR)/*
 	rm -f $(MAN3DIR)/*
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
+	rm -f $(SPECDIR)/*
 	rm -f errs core *~ 
 
+$(SPECDIR)/specs_driver_entry.xml:
+	escript $(SPECS_EXTRACTOR) $(SPECS_FLAGS) \
+                -o$(dir $@) -module driver_entry
+$(SPECDIR)/specs_erl_nif.xml:
+	escript $(SPECS_EXTRACTOR) $(SPECS_FLAGS) \
+                -o$(dir $@) -module erl_nif
+$(SPECDIR)/specs_erl_set_memory_block.xml:
+	escript $(SPECS_EXTRACTOR) $(SPECS_FLAGS) \
+                -o$(dir $@) -module erl_set_memory_block
+$(SPECDIR)/specs_erl_driver.xml:
+	escript $(SPECS_EXTRACTOR) $(SPECS_FLAGS) \
+                -o$(dir $@) -module erl_driver
+$(SPECDIR)/specs_erts_alloc.xml:
+	escript $(SPECS_EXTRACTOR) $(SPECS_FLAGS) \
+                -o$(dir $@) -module erts_alloc
+
 # ----------------------------------------------------
 # Release Target
 # ---------------------------------------------------- 
diff --git a/erts/doc/src/erl_prim_loader.xml b/erts/doc/src/erl_prim_loader.xml
index ccaa9b725f..fa3daaeecc 100644
--- a/erts/doc/src/erl_prim_loader.xml
+++ b/erts/doc/src/erl_prim_loader.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -55,33 +55,31 @@
      <c>-loader_debug</c> are also experimental</p></warning>
 
   </description>
+  <datatypes>
+    <datatype>
+      <name name="host"/>
+    </datatype>
+  </datatypes>
+
   <funcs>
     <func>
-      <name>start(Id, Loader, Hosts) -> {ok, Pid} | {error, What}</name>
+      <name name="start" arity="3"/>
       <fsummary>Start the Erlang low level loader</fsummary>
-      <type>
-        <v>Id = term()</v>
-        <v>Loader = atom() | string()</v>
-        <v>Hosts = [Host]</v>
-        <v>Host = atom()</v>
-        <v>Pid = pid()</v>
-        <v>What = term()</v>
-      </type>
       <desc>
         <p>Starts the Erlang low level loader. This function is called
           by the <c>init</c> process (and module). The <c>init</c>
-          process reads the command line flags <c>-id Id</c>,
-          <c>-loader Loader</c>, and <c>-hosts Hosts</c>. These are
+          process reads the command line flags <c>-id <anno>Id</anno></c>,
+          <c>-loader <anno>Loader</anno></c>, and <c>-hosts <anno>Hosts</anno></c>. These are
           the arguments supplied to the <c>start/3</c> function.</p>
         <p>If <c>-loader</c> is not given, the default loader is
           <c>efile</c> which tells the system to read from the file
           system.</p>
-        <p>If <c>-loader</c> is <c>inet</c>, the <c>-id Id</c>,
-          <c>-hosts Hosts</c>, and <c>-setcookie Cookie</c> flags must
-          also be supplied. <c>Hosts</c> identifies hosts which this
+        <p>If <c>-loader</c> is <c>inet</c>, the <c>-id <anno>Id</anno></c>,
+          <c>-hosts <anno>Hosts</anno></c>, and <c>-setcookie Cookie</c> flags must
+          also be supplied. <c><anno>Hosts</anno></c> identifies hosts which this
           node can contact in order to load modules. One Erlang
           runtime system with a <c>erl_boot_server</c> process must be
-          started on each of hosts given in <c>Hosts</c> in order to
+          started on each of hosts given in <c><anno>Hosts</anno></c> in order to
           answer the requests. See <seealso
           marker="kernel:erl_boot_server">erl_boot_server(3)</seealso>.</p>
         <p>If <c>-loader</c> is something else, the given port program
@@ -90,35 +88,26 @@
       </desc>
     </func>
     <func>
-      <name>get_file(Filename) -> {ok, Bin, FullName} | error</name>
+      <name name="get_file" arity="1"/>
       <fsummary>Get a file</fsummary>
-      <type>
-        <v>Filename = string()</v>
-        <v>Bin = binary()</v>
-        <v>FullName = string()</v>
-      </type>
       <desc>
         <p>This function fetches a file using the low level loader.
-          <c>Filename</c> is either an absolute file name or just the name
+          <c><anno>Filename</anno></c> is either an absolute file name or just the name
           of the file, for example <c>"lists.beam"</c>. If an internal
           path is set to the loader, this path is used to find the file.
           If a user supplied loader is used, the path can be stripped
           off if it is obsolete, and the loader does not use a path.
-          <c>FullName</c> is the complete name of the fetched file.
-          <c>Bin</c> is the contents of the file as a binary.</p>
+          <c><anno>FullName</anno></c> is the complete name of the fetched file.
+          <c><anno>Bin</anno></c> is the contents of the file as a binary.</p>
 
-	  <p>The <c>Filename</c> can also be a file in an archive. For example
-          <c>/otp/root/lib/mnesia-4.4.7.ez/mnesia-4.4.7/ebin/mnesia_backup.beam</c>
+	  <p>The <c><anno>Filename</anno></c> can also be a file in an archive. For example
+          <c>/otp/root/lib/mnesia-4.4.7.ez/mnesia-4.4.7/ebin/mnesia_backup.beam</c>.
           See <seealso marker="kernel:code">code(3)</seealso> about archive files.</p>
       </desc>
     </func>
     <func>
-      <name>get_path() -> {ok, Path}</name>
+      <name name="get_path" arity="0"/>
       <fsummary>Get the path set in the loader</fsummary>
-      <type>
-        <v>Path = [Dir]</v>
-        <v>Dir = string()</v>
-      </type>
       <desc>
         <p>This function gets the path set in the loader. The path is
           set by the <c>init</c> process according to information found
@@ -126,35 +115,26 @@
       </desc>
     </func>
     <func>
-      <name>list_dir(Dir) -> {ok, Filenames} | error</name>
+      <name name="list_dir" arity="1"/>
       <fsummary>List files in a directory</fsummary>
-      <type>
-        <v>Dir = name()</v>
-        <v>Filenames = [Filename]</v>
-        <v>Filename = string()</v>
-      </type>
       <desc>
         <p>Lists all the files in a directory. Returns
-          <c>{ok, Filenames}</c> if successful. Otherwise, it returns
-          <c>error</c>. <c>Filenames</c> is a list of
+          <c>{ok, <anno>Filenames</anno>}</c> if successful. Otherwise, it returns
+          <c>error</c>. <c><anno>Filenames</anno></c> is a list of
           the names of all the files in the directory. The names are
           not sorted.</p>
-	  <p>The <c>Dir</c> can also be a directory in an archive. For example
-          <c>/otp/root/lib/mnesia-4.4.7.ez/mnesia-4.4.7/ebin</c>
+	  <p>The <c><anno>Dir</anno></c> can also be a directory in an archive. For example
+          <c>/otp/root/lib/mnesia-4.4.7.ez/mnesia-4.4.7/ebin</c>.
            See <seealso marker="kernel:code">code(3)</seealso> about archive files.</p>
       </desc>
     </func>
     <func>
-      <name>read_file_info(Filename) -> {ok, FileInfo} | error</name>
+      <name name="read_file_info" arity="1"/>
       <fsummary>Get information about a file</fsummary>
-      <type>
-        <v>Filename = name()</v>
-        <v>FileInfo = #file_info{}</v>
-      </type>
       <desc>
         <p>Retrieves information about a file. Returns
-          <c>{ok, FileInfo}</c> if successful, otherwise
-          <c>error</c>. <c>FileInfo</c> is a record
+          <c>{ok, <anno>FileInfo</anno>}</c> if successful, otherwise
+          <c>error</c>. <c><anno>FileInfo</anno></c> is a record
           <c>file_info</c>, defined in the Kernel include file
           <c>file.hrl</c>. Include the following directive in the module
           from which the function is called:</p>
@@ -162,18 +142,14 @@
 -include_lib("kernel/include/file.hrl").</code>
         <p>See <seealso marker="kernel:file">file(3)</seealso> for more info about
           the record <c>file_info</c>.</p>
-	<p>The <c>Filename</c> can also be a file in an archive. For example
-          <c>/otp/root/lib/mnesia-4.4.7.ez/mnesia-4.4.7/ebin/mnesia_backup.beam</c>
+	<p>The <c><anno>Filename</anno></c> can also be a file in an archive. For example
+          <c>/otp/root/lib/mnesia-4.4.7.ez/mnesia-4.4.7/ebin/mnesia_backup.beam</c>.
           See <seealso marker="kernel:code">code(3)</seealso> about archive files.</p>
       </desc>
     </func>
     <func>
-      <name>set_path(Path) -> ok</name>
+      <name name="set_path" arity="1"/>
       <fsummary>Set the path of the loader</fsummary>
-      <type>
-        <v>Path = [Dir]</v>
-        <v>Dir = string()</v>
-      </type>
       <desc>
         <p>This function sets the path of the loader if <c>init</c>
           interprets a <c>path</c> command in the start script.</p>
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
diff --git a/erts/doc/src/init.xml b/erts/doc/src/init.xml
index b0d0cda4fa..d5c43f6e57 100644
--- a/erts/doc/src/init.xml
+++ b/erts/doc/src/init.xml
@@ -47,15 +47,12 @@
   </description>
   <funcs>
     <func>
-      <name>boot(BootArgs) -> void()</name>
+      <name name="boot" arity="1"/>
       <fsummary>Start the Erlang runtime system</fsummary>
-      <type>
-        <v>BootArgs = [binary()]</v>
-      </type>
       <desc>
         <p>Starts the Erlang runtime system. This function is called
           when the emulator is started and coordinates system start-up.</p>
-        <p><c>BootArgs</c> are all command line arguments except
+        <p><c><anno>BootArgs</anno></c> are all command line arguments except
           the emulator flags, that is, flags and plain arguments. See
           <seealso marker="erts:erl">erl(1)</seealso>.</p>
         <p><c>init</c> itself interprets some of the flags, see
@@ -67,17 +64,12 @@
       </desc>
     </func>
     <func>
-      <name>get_argument(Flag) -> {ok, Arg} | error</name>
+      <name name="get_argument" arity="1"/>
       <fsummary>Get the values associated with a command line user flag</fsummary>
-      <type>
-        <v>Flag = atom()</v>
-        <v>Arg = [Values]</v>
-        <v>&nbsp;Values = [string()]</v>
-      </type>
       <desc>
         <p>Returns all values associated with the command line user flag
-          <c>Flag</c>. If <c>Flag</c> is provided several times, each
-          <c>Values</c> is returned in preserved order.</p>
+          <c><anno>Flag</anno></c>. If <c><anno>Flag</anno></c> is provided several times, each
+          <c><anno>Values</anno></c> is returned in preserved order.</p>
         <pre>
 % <input>erl -a b c -a d</input>
 ...
@@ -113,48 +105,37 @@
       </desc>
     </func>
     <func>
-      <name>get_arguments() -> Flags</name>
+      <name name="get_arguments" arity="0"/>
       <fsummary>Get all command line user flags</fsummary>
-      <type>
-        <v>Flags = [{Flag, Values}]</v>
-        <v>&nbsp;Flag = atom()</v>
-        <v>&nbsp;Values = [string()]</v>
-      </type>
       <desc>
         <p>Returns all command line flags, as well as the system
           defined flags, see <c>get_argument/1</c>.</p>
       </desc>
     </func>
     <func>
-      <name>get_plain_arguments() -> [Arg]</name>
+      <name name="get_plain_arguments" arity="0"/>
       <fsummary>Get all non-flag command line arguments</fsummary>
-      <type>
-        <v>Arg = string()</v>
-      </type>
       <desc>
         <p>Returns any plain command line arguments as a list of strings
           (possibly empty).</p>
       </desc>
     </func>
     <func>
-      <name>get_status() -> {InternalStatus, ProvidedStatus}</name>
+      <name name="get_status" arity="0"/>
       <fsummary>Get system status information</fsummary>
-      <type>
-        <v>InternalStatus = starting | started | stopping</v>
-        <v>ProvidedStatus = term()</v>
-      </type>
+      <type name="internal_status"/>
       <desc>
         <p>The current status of the <c>init</c> process can be
           inspected. During system startup (initialization),
-          <c>InternalStatus</c> is <c>starting</c>, and
-          <c>ProvidedStatus</c> indicates how far the boot script has
+          <c><anno>InternalStatus</anno></c> is <c>starting</c>, and
+          <c><anno>ProvidedStatus</anno></c> indicates how far the boot script has
           been interpreted. Each <c>{progress, Info}</c> term
-          interpreted in the boot script affects <c>ProvidedStatus</c>,
-          that is, <c>ProvidedStatus</c> gets the value of <c>Info</c>.</p>
+          interpreted in the boot script affects <c><anno>ProvidedStatus</anno></c>,
+          that is, <c><anno>ProvidedStatus</anno></c> gets the value of <c>Info</c>.</p>
       </desc>
     </func>
     <func>
-      <name>reboot() -> void()</name>
+      <name name="reboot" arity="0"/>
       <fsummary>Take down and restart an Erlang node smoothly</fsummary>
       <desc>
         <p>All applications are taken down smoothly, all code is
@@ -168,7 +149,7 @@
       </desc>
     </func>
     <func>
-      <name>restart() -> void()</name>
+      <name name="restart" arity="0"/>
       <fsummary>Restart the running Erlang node</fsummary>
       <desc>
         <p>The system is restarted <em>inside</em> the running Erlang
@@ -183,20 +164,17 @@
       </desc>
     </func>
     <func>
-      <name>script_id() -> Id</name>
+      <name name="script_id" arity="0"/>
       <fsummary>Get the identity of the used boot script</fsummary>
-      <type>
-        <v>Id = term()</v>
-      </type>
       <desc>
         <p>Get the identity of the boot script used to boot the system.
-          <c>Id</c> can be any Erlang term. In the delivered boot
-          scripts, <c>Id</c> is <c>{Name, Vsn}</c>. <c>Name</c> and
+          <c><anno>Id</anno></c> can be any Erlang term. In the delivered boot
+          scripts, <c><anno>Id</anno></c> is <c>{Name, Vsn}</c>. <c>Name</c> and
           <c>Vsn</c> are strings.</p>
       </desc>
     </func>
     <func>
-      <name>stop() -> void()</name>
+      <name name="stop" arity="0"/>
       <fsummary>Take down an Erlang node smoothly</fsummary>
       <desc>
         <p>All applications are taken down smoothly, all code is
@@ -210,15 +188,12 @@
       </desc>
     </func>
     <func>
-      <name>stop(Status) -> void()</name>
+      <name name="stop" arity="1"/>
       <fsummary>Take down an Erlang node smoothly</fsummary>
-      <type>
-        <v>Status = int()>=0 | string()</v>
-      </type>
       <desc>
         <p>All applications are taken down smoothly, all code is
           unloaded, and all ports are closed before the system
-          terminates by calling <c>halt(Status)</c>. If the
+          terminates by calling <c>halt(<anno>Status</anno>)</c>. If the
           <c>-heart</c> command line flag was given, the <c>heart</c>
           program is terminated before the Erlang node
           terminates. Refer to <c>heart(3)</c> for more
diff --git a/erts/doc/src/specs.xml b/erts/doc/src/specs.xml
new file mode 100644
index 0000000000..e5c2f4783f
--- /dev/null
+++ b/erts/doc/src/specs.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="latin1" ?>
+<specs xmlns:xi="http://www.w3.org/2001/XInclude">
+  <xi:include href="../specs/specs_erl_prim_loader.xml"/>
+  <xi:include href="../specs/specs_erlang.xml"/>
+  <xi:include href="../specs/specs_init.xml"/>
+  <xi:include href="../specs/specs_zlib.xml"/>
+</specs>
diff --git a/erts/doc/src/zlib.xml b/erts/doc/src/zlib.xml
index b1e768bce9..47a649af02 100644
--- a/erts/doc/src/zlib.xml
+++ b/erts/doc/src/zlib.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2005</year><year>2010</year>
+      <year>2005</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -76,96 +76,92 @@ list_to_binary([Compressed|Last])</pre>
     </taglist>
   </description>
 
-  <section>
-    <title>DATA TYPES</title>
-    <code type="none">
-iodata = iolist() | binary()
-
-iolist = [char() | binary() | iolist()]
-  a binary is allowed as the tail of the list
-
-zstream = a zlib stream, see open/0</code>
-  </section>
+  <datatypes>
+    <datatype>
+      <name name="zstream"/>
+      <desc>
+        <p>A zlib stream, see <seealso marker="#open/0">open/0</seealso>.
+        </p>
+       </desc>
+    </datatype>
+    <datatype>
+      <name name="zlevel"/>
+    </datatype>
+    <datatype>
+      <name name="zmemlevel"/>
+    </datatype>
+    <datatype>
+      <name name="zmethod"/>
+    </datatype>
+    <datatype>
+      <name name="zstrategy"/>
+    </datatype>
+    <datatype>
+      <name name="zwindowbits"/>
+      <desc>
+        <p>Normally in the range <c>-15..-9 | 9..15</c>.</p>
+      </desc>
+    </datatype>
+  </datatypes>
   <funcs>
     <func>
-      <name>open() -> Z </name>
+      <name name="open" arity="0"/>
       <fsummary>Open a stream and return a stream reference</fsummary>
-      <type>
-        <v>Z = zstream()</v>
-      </type>
       <desc>
         <p>Open a zlib stream.</p>
       </desc>
     </func>
     <func>
-      <name>close(Z)  -> ok</name>
+      <name name="close" arity="1"/>
       <fsummary>Close a stream</fsummary>
-      <type>
-        <v>Z = zstream()</v>
-      </type>
       <desc>
-        <p>Closes the stream referenced by <c>Z</c>.</p>
+        <p>Closes the stream referenced by <c><anno>Z</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>deflateInit(Z) -> ok</name>
+      <name name="deflateInit" arity="1"/>
       <fsummary>Initialize a session for compression</fsummary>
-      <type>
-        <v>Z = zstream()</v>
-      </type>
       <desc>
-        <p>Same as <c>zlib:deflateInit(Z, default)</c>.</p>
+        <p>Same as <c>zlib:deflateInit(<anno>Z</anno>, default)</c>.</p>
       </desc>
     </func>
     <func>
-      <name>deflateInit(Z, Level) -> ok</name>
+      <name name="deflateInit" arity="2"/>
       <fsummary>Initialize a session for compression</fsummary>
-      <type>
-        <v>Z = zstream()</v>
-        <v>Level = none | default | best_speed | best_compression | 0..9</v>
-      </type>
       <desc>
         <p>Initialize a zlib stream for compression.</p>
-        <p><c>Level</c> decides the compression level to be used, 0
+        <p><c><anno>Level</anno></c> decides the compression level to be used, 0
           (<c>none</c>), gives no compression at all, 1
           (<c>best_speed</c>) gives best speed and 9
           (<c>best_compression</c>) gives best compression.</p>
       </desc>
     </func>
     <func>
-      <name>deflateInit(Z, Level, Method, WindowBits, MemLevel, Strategy) -> ok</name>
+      <name name="deflateInit" arity="6"/>
       <fsummary>Initialize a session for compression</fsummary>
-      <type>
-        <v>Z = zstream()</v>
-        <v>Level = none | default | best_speed | best_compression | 0..9</v>
-        <v>Method = deflated</v>
-        <v>WindowBits = 9..15|-9..-15</v>
-        <v>MemLevel = 1..9</v>
-        <v>Strategy = default|filtered|huffman_only</v>
-      </type>
       <desc>
         <p>Initiates a zlib stream for compression.</p>
-        <p>The <c>Level</c> parameter decides the compression level to be
+        <p>The <c><anno>Level</anno></c> parameter decides the compression level to be
           used, 0 (<c>none</c>), gives no compression at all, 1
           (<c>best_speed</c>) gives best speed and 9
           (<c>best_compression</c>) gives best compression.</p>
-        <p>The <c>Method</c> parameter decides which compression method to use,
+        <p>The <c><anno>Method</anno></c> parameter decides which compression method to use,
           currently the only supported method is <c>deflated</c>.</p>
-        <p>The <c>WindowBits</c> parameter is the base two logarithm
+        <p>The <c><anno>WindowBits</anno></c> parameter is the base two logarithm
           of the window size (the size of the history buffer).  It
           should be in the range 9 through 15. Larger values
           of this parameter result in better compression at the
           expense of memory usage. The default value is 15 if
-          <c>deflateInit/2</c>. A negative <c>WindowBits</c>
+          <c>deflateInit/2</c>. A negative <c><anno>WindowBits</anno></c>
           value suppresses the zlib header (and checksum) from the
           stream. Note that the zlib source mentions this only as a
           undocumented feature.</p>
-        <p>The <c>MemLevel</c> parameter specifies how much memory
+        <p>The <c><anno>MemLevel</anno></c> parameter specifies how much memory
           should be allocated for the internal compression
-          state. <c>MemLevel</c>=1 uses minimum memory but is slow and
-          reduces compression ratio; <c>MemLevel</c>=9 uses maximum
+          state. <c><anno>MemLevel</anno></c>=1 uses minimum memory but is slow and
+          reduces compression ratio; <c><anno>MemLevel</anno></c>=9 uses maximum
           memory for optimal speed. The default value is 8.</p>
-        <p>The <c>Strategy</c> parameter is used to tune the
+        <p>The <c><anno>Strategy</anno></c> parameter is used to tune the
           compression algorithm. Use the value <c>default</c> for
           normal data, <c>filtered</c> for data produced by a filter
           (or predictor), or <c>huffman_only</c> to force Huffman
@@ -175,54 +171,43 @@ zstream = a zlib stream, see open/0</code>
           tuned to compress them better. The effect of
           <c>filtered</c>is to force more Huffman coding and less
           string matching; it is somewhat intermediate between
-          <c>default</c> and <c>huffman_only</c>. The <c>Strategy</c>
+          <c>default</c> and <c>huffman_only</c>. The <c><anno>Strategy</anno></c>
           parameter only affects the compression ratio but not the
           correctness of the compressed output even if it is not set
           appropriately.</p>
       </desc>
     </func>
     <func>
-      <name>deflate(Z, Data)  -> Compressed</name>
+      <name name="deflate" arity="2"/>
       <fsummary>Compress data</fsummary>
-      <type>
-        <v>Z = zstream()</v>
-        <v>Data = iodata()</v>
-        <v>Compressed = iolist()</v>
-      </type>
       <desc>
-        <p>Same as <c>deflate(Z, Data, none)</c>.</p>
+        <p>Same as <c>deflate(<anno>Z</anno>, <anno>Data</anno>, none)</c>.</p>
       </desc>
     </func>
     <func>
-      <name>deflate(Z, Data, Flush)  -> </name>
+      <name name="deflate" arity="3"/>
       <fsummary>Compress data</fsummary>
-      <type>
-        <v>Z = zstream()</v>
-        <v>Data = iodata()</v>
-        <v>Flush = none | sync | full | finish</v>
-        <v>Compressed = iolist()</v>
-      </type>
       <desc>
         <p><c>deflate/3</c> compresses as much data as possible, and
           stops when the input buffer becomes empty. It may introduce
           some output latency (reading input without producing any
           output) except when forced to flush.</p>
-        <p>If the parameter <c>Flush</c> is set to <c>sync</c>, all
+        <p>If the parameter <c><anno>Flush</anno></c> is set to <c>sync</c>, all
           pending output is flushed to the output buffer and the
           output is aligned on a byte boundary, so that the
           decompressor can get all input data available so far. 
           Flushing may degrade compression for some compression algorithms and so
           it should be used only when necessary.</p>
-        <p>If <c>Flush</c> is set to <c>full</c>, all output is flushed as with
+        <p>If <c><anno>Flush</anno></c> is set to <c>full</c>, all output is flushed as with
           <c>sync</c>, and the compression state is reset so that decompression can
           restart from this point if previous compressed data has been damaged or if
           random access is desired. Using <c>full</c> too often can seriously degrade
           the compression.</p>
-        <p>If the parameter <c>Flush</c> is set to <c>finish</c>,
+        <p>If the parameter <c><anno>Flush</anno></c> is set to <c>finish</c>,
           pending input is processed, pending output is flushed and
           <c>deflate/3</c> returns. Afterwards the only possible
           operations on the stream are <c>deflateReset/1</c> or <c>deflateEnd/1</c>.</p>
-        <p><c>Flush</c> can be set to <c>finish</c> immediately after 
+        <p><c><anno>Flush</anno></c> can be set to <c>finish</c> immediately after
           <c>deflateInit</c> if all compression is to be done in one step.</p>
         <pre>
  
@@ -234,13 +219,8 @@ list_to_binary([B1,B2])</pre>
       </desc>
     </func>
     <func>
-      <name>deflateSetDictionary(Z, Dictionary) -> Adler32</name>
+      <name name="deflateSetDictionary" arity="2"/>
       <fsummary>Initialize the compression dictionary</fsummary>
-      <type>
-        <v>Z = zstream()</v>
-        <v>Dictionary = binary()</v>
-        <v>Adler32 = integer()</v>
-      </type>
       <desc>
         <p>Initializes the compression dictionary from the given byte
           sequence without producing any compressed output. This
@@ -253,11 +233,8 @@ list_to_binary([B1,B2])</pre>
       </desc>
     </func>
     <func>
-      <name>deflateReset(Z) -> ok</name>
+      <name name="deflateReset" arity="1"/>
       <fsummary>Reset the deflate session</fsummary>
-      <type>
-        <v>Z = zstream()</v>
-      </type>
       <desc>
         <p>This function is equivalent to <c>deflateEnd/1</c>
           followed by <c>deflateInit/[1|2|6]</c>, but does not free
@@ -267,34 +244,26 @@ list_to_binary([B1,B2])</pre>
       </desc>
     </func>
     <func>
-      <name>deflateParams(Z, Level, Strategy) -> ok </name>
+      <name name="deflateParams" arity="3"/>
       <fsummary>Dynamicly update deflate parameters</fsummary>
-      <type>
-        <v>Z = zstream()</v>
-        <v>Level = none | default | best_speed | best_compression | 0..9</v>
-        <v>Strategy = default|filtered|huffman_only</v>
-      </type>
       <desc>
         <p>Dynamically update the compression level and compression
-          strategy.  The interpretation of <c>Level</c> and
-          <c>Strategy</c> is as in <c>deflateInit/6</c>.  This can be
+          strategy.  The interpretation of <c><anno>Level</anno></c> and
+          <c><anno>Strategy</anno></c> is as in <c>deflateInit/6</c>.  This can be
           used to switch between compression and straight copy of the
           input data, or to switch to a different kind of input data
           requiring a different strategy. If the compression level is
           changed, the input available so far is compressed with the
           old level (and may be flushed); the new level will take
           effect only at the next call of <c>deflate/3</c>.</p>
-        <p>Before the call of deflateParams, the stream state must be set as for
+        <p>Before the call of <c>deflateParams</c>, the stream state must be set as for
           a call of <c>deflate/3</c>, since the currently available input may have to
           be compressed and flushed.</p>
       </desc>
     </func>
     <func>
-      <name>deflateEnd(Z)  -> ok</name>
+      <name name="deflateEnd" arity="1"/>
       <fsummary>End deflate session</fsummary>
-      <type>
-        <v>Z = zstream()</v>
-      </type>
       <desc>
         <p>End the deflate session and cleans all data used.
           Note that this function will throw an <c>data_error</c>
@@ -304,43 +273,31 @@ list_to_binary([B1,B2])</pre>
       </desc>
     </func>
     <func>
-      <name>inflateInit(Z)  -> ok </name>
+      <name name="inflateInit" arity="1"/>
       <fsummary>Initialize a session for decompression</fsummary>
-      <type>
-        <v>Z = zstream()</v>
-      </type>
       <desc>
         <p>Initialize a zlib stream for decompression.</p>
       </desc>
     </func>
     <func>
-      <name>inflateInit(Z, WindowBits)  -> ok </name>
+      <name name="inflateInit" arity="2"/>
       <fsummary>Initialize a session for decompression</fsummary>
-      <type>
-        <v>Z = zstream()</v>
-        <v>WindowBits = 9..15|-9..-15</v>
-      </type>
       <desc>
         <p>Initialize decompression session on zlib stream.</p>
-        <p>The <c>WindowBits</c> parameter is the base two logarithm
+        <p>The <c><anno>WindowBits</anno></c> parameter is the base two logarithm
           of the maximum window size (the size of the history buffer).
           It should be in the range 9 through 15.
           The default value is 15 if <c>inflateInit/1</c> is used.
           If a compressed stream with a larger window size is
           given as input, inflate() will throw the <c>data_error</c>
-          exception. A negative <c>WindowBits</c> value makes zlib ignore the
+          exception. A negative <c><anno>WindowBits</anno></c> value makes zlib ignore the
           zlib header (and checksum) from the stream.  Note that the zlib
           source mentions this only as a undocumented feature.</p>
       </desc>
     </func>
     <func>
-      <name>inflate(Z, Data)  -> DeCompressed </name>
+      <name name="inflate" arity="2"/>
       <fsummary>Decompress data</fsummary>
-      <type>
-        <v>Z = zstream()</v>
-        <v>Data = iodata()</v>
-        <v>DeCompressed = iolist()</v>
-      </type>
       <desc>
         <p><c>inflate/2</c> decompresses as much data as possible.
           It may some introduce some output latency (reading
@@ -353,12 +310,8 @@ list_to_binary([B1,B2])</pre>
       </desc>
     </func>
     <func>
-      <name>inflateSetDictionary(Z, Dictionary)  -> ok</name>
+      <name name="inflateSetDictionary" arity="2"/>
       <fsummary>Initialize the decompression dictionary</fsummary>
-      <type>
-        <v>Z = zstream()</v>
-        <v>Dictionary = binary()</v>
-      </type>
       <desc>
         <p>Initializes the decompression dictionary from the given
           uncompressed byte sequence. This function must be called
@@ -381,11 +334,8 @@ unpack(Z, Compressed, Dict) ->
       </desc>
     </func>
     <func>
-      <name>inflateReset(Z)  -> ok</name>
+      <name name="inflateReset" arity="1"/>
       <fsummary>>Reset the inflate session</fsummary>
-      <type>
-        <v>Z = zstream()</v>
-      </type>
       <desc>
         <p>This function is equivalent to <c>inflateEnd/1</c> followed
           by <c>inflateInit/1</c>, but does not free and reallocate all
@@ -394,11 +344,8 @@ unpack(Z, Compressed, Dict) ->
       </desc>
     </func>
     <func>
-      <name>inflateEnd(Z)  -> ok</name>
+      <name name="inflateEnd" arity="1"/>
       <fsummary>End inflate session</fsummary>
-      <type>
-        <v>Z = zstream()</v>
-      </type>
       <desc>
         <p>End the inflate session and cleans all data used. Note
           that this function will throw a <c>data_error</c> exception
@@ -407,62 +354,39 @@ unpack(Z, Compressed, Dict) ->
       </desc>
     </func>
     <func>
-      <name>setBufSize(Z, Size)  -> ok</name>
+      <name name="setBufSize" arity="2"/>
       <fsummary>Set buffer size</fsummary>
-      <type>
-        <v>Z = zstream()</v>
-        <v>Size = integer()</v>
-      </type>
       <desc>
         <p>Sets the intermediate buffer size.</p>
       </desc>
     </func>
     <func>
-      <name>getBufSize(Z)  -> Size</name>
+      <name name="getBufSize" arity="1"/>
       <fsummary>Get buffer size</fsummary>
-      <type>
-        <v>Z = zstream()</v>
-        <v>Size = integer()</v>
-      </type>
       <desc>
         <p>Get the size of intermediate buffer.</p>
       </desc>
     </func>
     <func>
-      <name>crc32(Z)  -> CRC</name>
+      <name name="crc32" arity="1"/>
       <fsummary>Get current CRC</fsummary>
-      <type>
-        <v>Z = zstream()</v>
-        <v>CRC = integer()</v>
-      </type>
       <desc>
         <p>Get the current calculated CRC checksum.</p>
       </desc>
     </func>
     <func>
-      <name>crc32(Z, Binary)  -> CRC</name>
+      <name name="crc32" arity="2"/>
       <fsummary>Calculate CRC</fsummary>
-      <type>
-        <v>Z = zstream()</v>
-        <v>Binary = binary()</v>
-        <v>CRC = integer()</v>
-      </type>
       <desc>
-        <p>Calculate the CRC checksum for <c>Binary</c>.</p>
+        <p>Calculate the CRC checksum for <c><anno>Binary</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>crc32(Z, PrevCRC, Binary)  -> CRC </name>
+      <name name="crc32" arity="3"/>
       <fsummary>Calculate CRC</fsummary>
-      <type>
-        <v>Z = zstream()</v>
-        <v>PrevCRC = integer()</v>
-        <v>Binary = binary()</v>
-        <v>CRC = integer()</v>
-      </type>
-      <desc>
-        <p>Update a running CRC checksum for <c>Binary</c>.
-          If <c>Binary</c> is the empty binary, this function returns
+      <desc>
+        <p>Update a running CRC checksum for <c><anno>Binary</anno></c>.
+          If <c><anno>Binary</anno></c> is the empty binary, this function returns
           the required initial value for the crc.</p>
         <pre>
 Crc = lists:foldl(fun(Bin,Crc0) ->  
@@ -471,49 +395,31 @@ Crc = lists:foldl(fun(Bin,Crc0) ->
       </desc>
     </func>
     <func>
-      <name>crc32_combine(Z, CRC1, CRC2, Size2)  -> CRC </name>
+      <name name="crc32_combine" arity="4"/>
       <fsummary>Combine two CRC's</fsummary>
-      <type>
-        <v>Z = zstream()</v>
-	<v>CRC = integer()</v>
-        <v>CRC1 = integer()</v>
-        <v>CRC2 = integer()</v>
-        <v>Size2 = integer()</v>
-      </type>
       <desc>
 	<p>Combine two CRC checksums into one.  For two binaries,
 	  <c>Bin1</c> and <c>Bin2</c> with sizes of <c>Size1</c> and
-	  <c>Size2</c>, with CRC checksums <c>CRC1</c> and
-	  <c>CRC2</c>.  <c>crc32_combine/4</c> returns the <c>CRC</c>
+	  <c><anno>Size2</anno></c>, with CRC checksums <c><anno>CRC1</anno></c> and
+	  <c><anno>CRC2</anno></c>.  <c>crc32_combine/4</c> returns the <c><anno>CRC</anno></c>
 	  checksum of <c>&lt;&lt;Bin1/binary,Bin2/binary&gt;&gt;</c>, requiring
-	  only <c>CRC1</c>, <c>CRC2</c>, and <c>Size2</c>.
+	  only <c><anno>CRC1</anno></c>, <c><anno>CRC2</anno></c>, and <c><anno>Size2</anno></c>.
 	</p>
       </desc>
     </func>
     <func>
-      <name>adler32(Z, Binary)  -> Checksum</name>
+      <name name="adler32" arity="2"/>
       <fsummary>Calculate the adler checksum</fsummary>
-      <type>
-        <v>Z = zstream()</v>
-        <v>Binary = binary()</v>
-        <v>Checksum = integer()</v>
-      </type>
       <desc>
-        <p>Calculate the Adler-32 checksum for <c>Binary</c>.</p>
+        <p>Calculate the Adler-32 checksum for <c><anno>Binary</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>adler32(Z, PrevAdler, Binary)  -> Checksum</name>
+      <name name="adler32" arity="3"/>
       <fsummary>Calculate the adler checksum</fsummary>
-      <type>
-        <v>Z = zstream()</v>
-        <v>PrevAdler = integer()</v>
-        <v>Binary = binary()</v>
-        <v>Checksum = integer()</v>
-      </type>
-      <desc>
-        <p>Update a running Adler-32 checksum for <c>Binary</c>.
-          If <c>Binary</c> is the empty binary, this function returns
+      <desc>
+        <p>Update a running Adler-32 checksum for <c><anno>Binary</anno></c>.
+          If <c><anno>Binary</anno></c> is the empty binary, this function returns
           the required initial value for the checksum.</p>
         <pre>
 Crc = lists:foldl(fun(Bin,Crc0) ->  
@@ -522,81 +428,56 @@ Crc = lists:foldl(fun(Bin,Crc0) ->
       </desc>
     </func>
     <func>
-      <name>adler32_combine(Z, Adler1, Adler2, Size2)  -> Adler </name>
+      <name name="adler32_combine" arity="4"/>
       <fsummary>Combine two Adler-32 checksums</fsummary>
-      <type>
-        <v>Z = zstream()</v>
-        <v>Adler = integer()</v>
-        <v>Adler1 = integer()</v>
-        <v>Adler2 = integer()</v>
-        <v>Size2 = integer()</v>
-      </type>
       <desc>
 	<p>Combine two Adler-32 checksums into one.  For two binaries,
 	  <c>Bin1</c> and <c>Bin2</c> with sizes of <c>Size1</c> and
-	  <c>Size2</c>, with Adler-32 checksums <c>Adler1</c> and
-	  <c>Adler2</c>.  <c>adler32_combine/4</c> returns the <c>Adler</c>
+	  <c><anno>Size2</anno></c>, with Adler-32 checksums <c><anno>Adler1</anno></c> and
+	  <c><anno>Adler2</anno></c>.  <c>adler32_combine/4</c> returns the <c><anno>Adler</anno></c>
 	  checksum of <c>&lt;&lt;Bin1/binary,Bin2/binary&gt;&gt;</c>, requiring
-	  only <c>Adler1</c>, <c>Adler2</c>, and <c>Size2</c>.
+	  only <c><anno>Adler1</anno></c>, <c><anno>Adler2</anno></c>, and <c><anno>Size2</anno></c>.
 	</p>
       </desc>
     </func>
     <func>
-      <name>compress(Binary)  -> Compressed </name>
+      <name name="compress" arity="1"/>
       <fsummary>Compress a binary with standard zlib functionality</fsummary>
-      <type>
-        <v>Binary = Compressed = binary()</v>
-      </type>
       <desc>
         <p>Compress a binary (with zlib headers and checksum).</p>
       </desc>
     </func>
     <func>
-      <name>uncompress(Binary)  -> Decompressed</name>
+      <name name="uncompress" arity="1"/>
       <fsummary>Uncompress a binary with standard zlib functionality</fsummary>
-      <type>
-        <v>Binary = Decompressed = binary()</v>
-      </type>
       <desc>
         <p>Uncompress a binary (with zlib headers and checksum).</p>
       </desc>
     </func>
     <func>
-      <name>zip(Binary)  -> Compressed</name>
+      <name name="zip" arity="1"/>
       <fsummary>Compress a binary without the zlib headers</fsummary>
-      <type>
-        <v>Binary = Compressed = binary()</v>
-      </type>
       <desc>
         <p>Compress a binary (without zlib headers and checksum).</p>
       </desc>
     </func>
     <func>
-      <name>unzip(Binary)  -> Decompressed</name>
+      <name name="unzip" arity="1"/>
       <fsummary>Uncompress a binary without the zlib headers</fsummary>
-      <type>
-        <v>Binary = Decompressed = binary()</v>
-      </type>
       <desc>
         <p>Uncompress a binary (without zlib headers and checksum).</p>
       </desc>
     </func>
     <func>
-      <name>gzip(Data)  -> Compressed</name>
+      <name name="gzip" arity="1"/>
       <fsummary>Compress a binary with gz header</fsummary>
-      <type>
-        <v>Binary = Compressed = binary()</v>
-      </type>
       <desc>
         <p>Compress a binary (with gz headers and checksum).</p>
       </desc>
     </func>
     <func>
-      <name>gunzip(Bin) -> Decompressed</name>
+      <name name="gunzip" arity="1"/>
       <fsummary>Uncompress a binary with gz header</fsummary>
-      <type>
-        <v>Binary = Decompressed = binary()</v>
-      </type>
       <desc>
         <p>Uncompress a binary (with gz headers and checksum).</p>
       </desc>
diff --git a/erts/preloaded/ebin/erl_prim_loader.beam b/erts/preloaded/ebin/erl_prim_loader.beam
index dccb92a5af..20c82c52bb 100644
--- a/erts/preloaded/ebin/erl_prim_loader.beam
+++ b/erts/preloaded/ebin/erl_prim_loader.beam
diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam
index b537546071..9202b5be4f 100644
--- a/erts/preloaded/ebin/erlang.beam
+++ b/erts/preloaded/ebin/erlang.beam
diff --git a/erts/preloaded/ebin/init.beam b/erts/preloaded/ebin/init.beam
index 901def5eba..faa2cf573c 100644
--- a/erts/preloaded/ebin/init.beam
+++ b/erts/preloaded/ebin/init.beam
diff --git a/erts/preloaded/ebin/zlib.beam b/erts/preloaded/ebin/zlib.beam
index 542e266f88..d400269ed0 100644
--- a/erts/preloaded/ebin/zlib.beam
+++ b/erts/preloaded/ebin/zlib.beam
diff --git a/erts/preloaded/src/erl_prim_loader.erl b/erts/preloaded/src/erl_prim_loader.erl
index 024b20eadb..ccfa7978c8 100644
--- a/erts/preloaded/src/erl_prim_loader.erl
+++ b/erts/preloaded/src/erl_prim_loader.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
 %%
 %% 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
@@ -102,8 +102,14 @@ debug(#prim_state{debug = Deb}, Term) ->
 %%% Interface Functions. 
 %%% --------------------------------------------------------
 
--spec start(term(), atom() | string(), host() | [host()]) ->
-	    {'ok', pid()} | {'error', term()}.
+-spec start(Id, Loader, Hosts) ->
+	    {'ok', Pid} | {'error', What} when
+      Id :: term(),
+      Loader :: atom() | string(),
+      Hosts :: Host | [Host],
+      Host :: host(),
+      Pid :: pid(),
+      What :: term().
 start(Id, Pgm, Hosts) when is_atom(Hosts) ->
     start(Id, Pgm, [Hosts]);
 start(Id, Pgm0, Hosts) ->
@@ -123,18 +129,6 @@ start(Id, Pgm0, Hosts) ->
             {error,Reason}
     end.
 
-start_it("ose_inet"=Cmd, Id, Pid, Hosts) ->
-    %% Setup reserved port for ose_inet driver (only OSE)
-    case catch erlang:open_port({spawn,Cmd}, [binary]) of
-        {'EXIT',Why} ->
-            ?dbg(ose_inet_port_open_fail, Why),
-            Why;
-        OseInetPort ->
-            ?dbg(ose_inet_port, OseInetPort),
-            OseInetPort
-    end,
-    start_it("inet", Id, Pid, Hosts);
-
 %% Hosts must be a list on form ['1.2.3.4' ...]
 start_it("inet", Id, Pid, Hosts) ->
     process_flag(trap_exit, true),
@@ -174,15 +168,20 @@ init_ack(Pid) ->
     Pid ! {self(),ok},
     ok.
 
--spec set_path([string()]) -> 'ok'.
+-spec set_path(Path) -> 'ok' when
+      Path :: [Dir :: string()].
 set_path(Paths) when is_list(Paths) ->
     request({set_path,Paths}).
 
--spec get_path() -> {'ok', [string()]}.
+-spec get_path() -> {'ok', Path} when
+      Path :: [Dir :: string()].
 get_path() ->
     request({get_path,[]}).
 
--spec get_file(atom() | string()) -> {'ok', binary(), string()} | 'error'.
+-spec get_file(Filename) -> {'ok', Bin, FullName} | 'error' when
+      Filename :: atom() | string(),
+      Bin :: binary(),
+      FullName :: string().
 get_file(File) when is_atom(File) ->
     get_file(atom_to_list(File));
 get_file(File) ->
@@ -202,13 +201,15 @@ get_files(ModFiles, Fun) ->
             ok
     end.
 
--spec list_dir(string()) -> {'ok', [string()]} | 'error'.
+-spec list_dir(Dir) -> {'ok', Filenames} | 'error' when
+      Dir :: string(),
+      Filenames :: [Filename :: string()].
 list_dir(Dir) ->
     check_file_result(list_dir, Dir, request({list_dir,Dir})).
 
-%% -> {ok,Info} | error
--spec read_file_info(string()) -> {'ok', tuple()} | 'error'.
-
+-spec read_file_info(Filename) -> {'ok', FileInfo} | 'error' when
+      Filename :: string(),
+      FileInfo :: file:file_info().
 read_file_info(File) ->
     check_file_result(read_file_info, File, request({read_file_info,File})).
 
@@ -1360,9 +1361,7 @@ pathtype(Name) when is_list(Name) ->
 		    absolute;
 		_ ->
 		    relative
-	    end;
-	{ose,_} ->
-	    unix_pathtype(Name)
+	    end
     end.
 
 unix_pathtype(Name) ->
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl
index 4679a916c7..5deb69edab 100644
--- a/erts/preloaded/src/erlang.erl
+++ b/erts/preloaded/src/erlang.erl
@@ -53,22 +53,31 @@
 -compile({no_auto_import,[spawn_opt/4]}).
 -compile({no_auto_import,[spawn_opt/5]}).
 
-%%--------------------------------------------------------------------------
+-export_type([timestamp/0]).
 
--type date() :: {pos_integer(), pos_integer(), pos_integer()}.
--type time() :: {non_neg_integer(), non_neg_integer(), non_neg_integer()}.
--type date_time() :: {date(), time()}.
+-type timestamp() :: {MegaSecs :: non_neg_integer(),
+                      Secs :: non_neg_integer(),
+                      MicroSecs :: non_neg_integer()}.
 
 %%--------------------------------------------------------------------------
 
+-spec apply(Fun, Args) -> term() when
+      Fun :: function(),
+      Args :: [term()].
 apply(Fun, Args) ->
     erlang:apply(Fun, Args).
 
+-spec apply(Module, Function, Args) -> term() when
+      Module :: module(),
+      Function :: atom(),
+      Args :: [term()].
 apply(Mod, Name, Args) ->
     erlang:apply(Mod, Name, Args).
 
 %% Spawns with a fun
 
+-spec spawn(Fun) -> pid() when
+      Fun :: function().
 spawn(F) when is_function(F) ->
     spawn(erlang, apply, [F, []]);
 spawn({M,F}=MF) when is_atom(M), is_atom(F) ->
@@ -76,6 +85,9 @@ spawn({M,F}=MF) when is_atom(M), is_atom(F) ->
 spawn(F) ->
     erlang:error(badarg, [F]).
 
+-spec spawn(Node, Fun) -> pid() when
+      Node :: node(),
+      Fun :: function().
 spawn(N, F) when N =:= node() ->
     spawn(F);
 spawn(N, F) when is_function(F) ->
@@ -85,6 +97,8 @@ spawn(N, {M,F}=MF) when is_atom(M), is_atom(F) ->
 spawn(N, F) ->
     erlang:error(badarg, [N, F]).
 
+-spec spawn_link(Fun) -> pid() when
+      Fun :: function().
 spawn_link(F) when is_function(F) ->
     spawn_link(erlang, apply, [F, []]);
 spawn_link({M,F}=MF) when is_atom(M), is_atom(F) ->
@@ -92,6 +106,9 @@ spawn_link({M,F}=MF) when is_atom(M), is_atom(F) ->
 spawn_link(F) ->
     erlang:error(badarg, [F]).
 
+-spec spawn_link(Node, Fun) -> pid() when
+      Node :: node(),
+      Fun :: function().
 spawn_link(N, F) when N =:= node() ->
     spawn_link(F);
 spawn_link(N, F) when is_function(F) ->
@@ -103,16 +120,30 @@ spawn_link(N, F) ->
 
 %% Spawn and atomically set up a monitor.
 
+-spec spawn_monitor(Fun) -> {pid(), reference()} when
+      Fun :: function().
 spawn_monitor(F) when is_function(F, 0) ->
     erlang:spawn_opt({erlang,apply,[F,[]],[monitor]});
 spawn_monitor(F) ->
     erlang:error(badarg, [F]).
 
+-spec spawn_monitor(Module, Function, Args) -> {pid(), reference()} when
+      Module :: module(),
+      Function :: atom(),
+      Args :: [term()].
 spawn_monitor(M, F, A) when is_atom(M), is_atom(F), is_list(A) ->
     erlang:spawn_opt({M,F,A,[monitor]});
 spawn_monitor(M, F, A) ->
     erlang:error(badarg, [M,F,A]).
 
+-spec spawn_opt(Fun, Options) -> pid() | {pid(), reference()} when
+      Fun :: function(),
+      Options :: [Option],
+      Option :: link | monitor | {priority, Level}
+              | {fullsweep_after, Number :: non_neg_integer()}
+              | {min_heap_size, Size :: non_neg_integer()}
+              | {min_bin_vheap_size, VSize :: non_neg_integer()},
+      Level :: low | normal | high.
 spawn_opt(F, O) when is_function(F) ->
     spawn_opt(erlang, apply, [F, []], O);
 spawn_opt({M,F}=MF, O) when is_atom(M), is_atom(F) ->
@@ -122,6 +153,15 @@ spawn_opt({M,F,A}, O) -> % For (undocumented) backward compatibility
 spawn_opt(F, O) ->
     erlang:error(badarg, [F, O]).
 
+-spec spawn_opt(Node, Fun, Options) -> pid() | {pid(), reference()} when
+      Node :: node(),
+      Fun :: function(),
+      Options :: [Option],
+      Option :: link | monitor | {priority, Level}
+              | {fullsweep_after, Number :: non_neg_integer()}
+              | {min_heap_size, Size :: non_neg_integer()}
+              | {min_bin_vheap_size, VSize :: non_neg_integer()},
+      Level :: low | normal | high.
 spawn_opt(N, F, O) when N =:= node() ->
     spawn_opt(F, O);
 spawn_opt(N, F, O) when is_function(F) ->
@@ -133,6 +173,11 @@ spawn_opt(N, F, O) ->
 
 %% Spawns with MFA
 
+-spec spawn(Node, Module, Function, Args) -> pid() when
+      Node :: node(),
+      Module :: module(),
+      Function :: atom(),
+      Args :: [term()].
 spawn(N,M,F,A) when N =:= node(), is_atom(M), is_atom(F), is_list(A) ->
     spawn(M,F,A);
 spawn(N,M,F,A) when is_atom(N), is_atom(M), is_atom(F) ->
@@ -158,6 +203,11 @@ spawn(N,M,F,A) when is_atom(N), is_atom(M), is_atom(F) ->
 spawn(N,M,F,A) ->
     erlang:error(badarg, [N, M, F, A]).
 
+-spec spawn_link(Node, Module, Function, Args) -> pid() when
+      Node :: node(),
+      Module :: module(),
+      Function :: atom(),
+      Args :: [term()].
 spawn_link(N,M,F,A) when N =:= node(), is_atom(M), is_atom(F), is_list(A) ->
     spawn_link(M,F,A);
 spawn_link(N,M,F,A) when is_atom(N), is_atom(M), is_atom(F) ->
@@ -183,6 +233,17 @@ spawn_link(N,M,F,A) when is_atom(N), is_atom(M), is_atom(F) ->
 spawn_link(N,M,F,A) ->
     erlang:error(badarg, [N, M, F, A]).
 
+-spec spawn_opt(Module, Function, Args, Options) ->
+                       pid() | {pid(), reference()} when
+      Module :: module(),
+      Function :: atom(),
+      Args :: [term()],
+      Options :: [Option],
+      Option :: link | monitor | {priority, Level}
+              | {fullsweep_after, Number :: non_neg_integer()}
+              | {min_heap_size, Size :: non_neg_integer()}
+              | {min_bin_vheap_size, VSize :: non_neg_integer()},
+      Level :: low | normal | high.
 spawn_opt(M, F, A, Opts) ->
     case catch erlang:spawn_opt({M,F,A,Opts}) of
 	{'EXIT',{Reason,_}} ->
@@ -191,6 +252,18 @@ spawn_opt(M, F, A, Opts) ->
 	    Res
     end.
 
+-spec spawn_opt(Node, Module, Function, Args, Options) ->
+                       pid() | {pid(), reference()} when
+      Node :: node(),
+      Module :: module(),
+      Function :: atom(),
+      Args :: [term()],
+      Options :: [Option],
+      Option :: link | monitor | {priority, Level}
+              | {fullsweep_after, Number :: non_neg_integer()}
+              | {min_heap_size, Size :: non_neg_integer()}
+              | {min_bin_vheap_size, VSize :: non_neg_integer()},
+      Level :: low | normal | high.
 spawn_opt(N, M, F, A, O) when N =:= node(),
 			      is_atom(M), is_atom(F), is_list(A),
 			      is_list(O) ->
@@ -260,18 +333,25 @@ crasher(Node,Mod,Fun,Args,Opts,Reason) ->
 			     [Mod,Fun,Args,Opts,Node]),
     exit(Reason).
 
--spec yield() -> 'true'.
+-spec erlang:yield() -> 'true'.
 yield() ->
     erlang:yield().
 
--spec nodes() -> [node()].
+-spec nodes() -> Nodes when
+      Nodes :: [node()].
 nodes() ->
     erlang:nodes(visible).
 
--spec disconnect_node(node()) -> boolean().
+-spec disconnect_node(Node) -> boolean() | ignored when
+      Node :: node().
 disconnect_node(Node) ->
     net_kernel:disconnect(Node).
 
+-spec erlang:fun_info(Fun) -> [{Item, Info}] when
+      Fun :: function(),
+      Item :: arity | env | index | name
+            | module | new_index | new_uniq | pid | type | uniq,
+      Info :: term().
 fun_info(Fun) when is_function(Fun) ->
     Keys = [type,env,arity,name,uniq,index,new_uniq,new_index,module,pid],
     fun_info_1(Keys, Fun, []).
@@ -283,24 +363,37 @@ fun_info_1([K|Ks], Fun, A) ->
     end;
 fun_info_1([], _, A) -> A.
 
--type dst() :: pid() | port() | atom() | {atom(), node()}.
+-type dst() :: pid()
+             | port()
+             | (RegName :: atom())
+             | {RegName :: atom(), Node :: node()}.
 
--spec send_nosuspend(dst(), term()) -> boolean().
+-spec erlang:send_nosuspend(Dest, Msg) -> boolean() when
+      Dest :: dst(),
+      Msg :: term().
 send_nosuspend(Pid, Msg) ->
     send_nosuspend(Pid, Msg, []).
 
--spec send_nosuspend(dst(), term(), ['noconnect' | 'nosuspend']) -> boolean().
+-spec erlang:send_nosuspend(Dest, Msg, Options) -> boolean() when
+      Dest :: dst(),
+      Msg :: term(),
+      Options :: [noconnect].
 send_nosuspend(Pid, Msg, Opts) ->
     case erlang:send(Pid, Msg, [nosuspend|Opts]) of
 	ok -> true;
 	_  -> false
     end.
 
--spec localtime_to_universaltime(date_time()) -> date_time().
+-spec erlang:localtime_to_universaltime({Date1, Time1}) -> {Date2, Time2} when
+      Date1 :: calendar:date(),
+      Date2 :: calendar:date(),
+      Time1 :: calendar:time(),
+      Time2 :: calendar:time().
 localtime_to_universaltime(Localtime) ->
     erlang:localtime_to_universaltime(Localtime, undefined).
 
--spec suspend_process(pid()) -> 'true'.
+-spec erlang:suspend_process(Suspendee) -> 'true' when
+      Suspendee :: pid().
 suspend_process(P) ->
     case catch erlang:suspend_process(P, []) of
 	{'EXIT', {Reason, _}} -> erlang:error(Reason, [P]);
@@ -426,6 +519,9 @@ delay_trap(Result, Timeout) -> receive after Timeout -> Result end.
 %% Messages to us use our cookie. IF we change our cookie, other nodes 
 %% have to reflect that, which we cannot forsee.
 %%
+-spec erlang:set_cookie(Node, Cookie) -> true when
+      Node :: node(),
+      Cookie :: atom().
 set_cookie(Node, C) when Node =/= nonode@nohost, is_atom(Node) ->
     case is_atom(C) of
 	true ->
@@ -434,14 +530,19 @@ set_cookie(Node, C) when Node =/= nonode@nohost, is_atom(Node) ->
 	    error(badarg)
     end.
 
--spec get_cookie() -> atom().
+-spec erlang:get_cookie() -> Cookie | nocookie when
+      Cookie :: atom().
 get_cookie() ->
     auth:get_cookie().
 
+-spec concat_binary(ListOfBinaries) -> binary() when
+      ListOfBinaries :: iolist().
 concat_binary(List) ->
     list_to_binary(List).
 
--spec integer_to_list(integer(), 1..255) -> string().
+-spec integer_to_list(Integer, Base) -> string() when
+      Integer :: integer(),
+      Base :: 2..36.
 integer_to_list(I, 10) ->
     erlang:integer_to_list(I);
 integer_to_list(I, Base) 
@@ -469,6 +570,9 @@ integer_to_list(I0, Base, R0) ->
     end.
 
 
+-spec list_to_integer(String, Base) -> integer() when
+      String :: string(),
+      Base :: 2..36.
 list_to_integer(L, 10) ->
     erlang:list_to_integer(L);
 list_to_integer(L, Base)
@@ -689,10 +793,16 @@ await_proc_exit(Proc, Op, Data) ->
 	    end
     end.
 
--spec min(term(), term()) -> term().
+-spec min(Term1, Term2) -> Minimum when
+      Term1 :: term(),
+      Term2 :: term(),
+      Minimum :: term().
 min(A, B) when A > B -> B;
 min(A, _) -> A.
 
--spec max(term(), term()) -> term().
+-spec max(Term1, Term2) -> Maximum when
+      Term1 :: term(),
+      Term2 :: term(),
+      Maximum :: term().
 max(A, B) when A < B -> B;
 max(A, _) -> A.
diff --git a/erts/preloaded/src/init.erl b/erts/preloaded/src/init.erl
index 24430a3d40..e52c813029 100644
--- a/erts/preloaded/src/init.erl
+++ b/erts/preloaded/src/init.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
 %%
 %% 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
@@ -28,10 +28,10 @@
 %%                       : $Var in the boot script is expanded to
 %%                         Value.
 %%        -loader LoaderMethod
-%%                       : efile, inet, ose_inet
+%%                       : efile, inet
 %%                         (Optional - default efile)
 %%        -hosts [Node]  : List of hosts from which we can boot.
-%%                         (Mandatory if -loader inet or ose_inet)
+%%                         (Mandatory if -loader inet)
 %%        -mode embedded : Load all modules at startup, no automatic loading
 %%        -mode interactive : Auto load modules (default system behaviour).
 %%        -path          : Override path in bootfile.
@@ -79,19 +79,24 @@
 debug(false, _) -> ok;
 debug(_, T)     -> erlang:display(T).
 
--spec get_arguments() -> [{atom(), [string()]}].
+-spec get_arguments() -> Flags when
+      Flags :: [{Flag :: atom(), Values :: [string()]}].
 get_arguments() ->
     request(get_arguments).
 
--spec get_plain_arguments() -> [string()].
+-spec get_plain_arguments() -> [Arg] when
+      Arg :: string().
 get_plain_arguments() ->
     bs2ss(request(get_plain_arguments)).
 
--spec get_argument(atom()) -> 'error' | {'ok', [[string()]]}.
+-spec get_argument(Flag) -> {'ok', Arg} | 'error' when
+      Flag :: atom(),
+      Arg :: [Values :: [string()]].
 get_argument(Arg) ->
     request({get_argument, Arg}).
 
--spec script_id() -> term().
+-spec script_id() -> Id when
+      Id :: term().
 script_id() ->
     request(script_id).
 
@@ -105,7 +110,9 @@ bs2ss(L0) when is_list(L0) ->
 bs2ss(L) ->
     L.
 
--spec get_status() -> {internal_status(), term()}.
+-spec get_status() -> {InternalStatus, ProvidedStatus} when
+      InternalStatus :: internal_status(),
+      ProvidedStatus :: term().
 get_status() ->
     request(get_status).
 
@@ -150,10 +157,12 @@ reboot() -> init ! {stop,reboot}, ok.
 -spec stop() -> 'ok'.
 stop() -> init ! {stop,stop}, ok.
 
--spec stop(non_neg_integer() | string()) -> 'ok'.
+-spec stop(Status) -> 'ok' when
+      Status :: non_neg_integer() | string().
 stop(Status) -> init ! {stop,{stop,Status}}, ok.
 
--spec boot([binary()]) -> no_return().
+-spec boot(BootArgs) -> no_return() when
+      BootArgs :: [binary()].
 boot(BootArgs) ->
     register(init, self()),
     process_flag(trap_exit, true),
@@ -1024,7 +1033,7 @@ start_it({eval,Bin}) ->
 	      TsR -> reverse([{dot,1} | TsR])
 	  end,
     {ok,Expr} = erl_parse:parse_exprs(Ts1),
-    erl_eval:exprs(Expr, []),
+    erl_eval:exprs(Expr, erl_eval:new_bindings()),
     ok;
 start_it([_|_]=MFA) ->
     Ref = make_ref(),
diff --git a/erts/preloaded/src/zlib.erl b/erts/preloaded/src/zlib.erl
index 51d6cd0a0b..6cc7b27114 100644
--- a/erts/preloaded/src/zlib.erl
+++ b/erts/preloaded/src/zlib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2003-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2011. All Rights Reserved.
 %%
 %% 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
@@ -124,7 +124,6 @@
 -type zwindowbits() :: -15..-9 | 9..47.
 -type zmemlevel()   :: 1..9.
 -type zstrategy()   :: 'default' | 'filtered' | 'huffman_only'.
--type zflush()      :: 'none' | 'sync' | 'full' | 'finish'.
 
 %%------------------------------------------------------------------------
 
@@ -134,7 +133,8 @@ open() ->
     open_port({spawn, "zlib_drv"}, [binary]).
 
 %% close and release z_stream
--spec close(zstream()) -> 'ok'.
+-spec close(Z) -> 'ok' when
+      Z :: zstream().
 close(Z) ->
     try
 	true = port_close(Z),
@@ -145,16 +145,25 @@ close(Z) ->
     catch _:_ -> erlang:error(badarg)
     end.
 
--spec deflateInit(zstream()) -> 'ok'.
+-spec deflateInit(Z) -> 'ok' when
+      Z :: zstream().
 deflateInit(Z) ->
     call(Z, ?DEFLATE_INIT, <<?Z_DEFAULT_COMPRESSION:32>>).
 
--spec deflateInit(zstream(), zlevel()) -> 'ok'.
+-spec deflateInit(Z, Level) -> 'ok' when
+      Z :: zstream(),
+      Level :: zlevel().
 deflateInit(Z, Level) ->
     call(Z, ?DEFLATE_INIT, <<(arg_level(Level)):32>>).
 
--spec deflateInit(zstream(), zlevel(), zmethod(),
-		  zwindowbits(), zmemlevel(), zstrategy()) -> 'ok'.
+-spec deflateInit(Z, Level, Method,
+		  WindowBits, MemLevel, Strategy) -> 'ok' when
+      Z :: zstream(),
+      Level :: zlevel(),
+      Method :: zmethod(),
+      WindowBits :: zwindowbits(),
+      MemLevel :: zmemlevel(),
+      Strategy :: zstrategy().
 deflateInit(Z, Level, Method, WindowBits, MemLevel, Strategy) ->
     call(Z, ?DEFLATE_INIT2, <<(arg_level(Level)):32, 
 			     (arg_method(Method)):32,
@@ -162,24 +171,38 @@ deflateInit(Z, Level, Method, WindowBits, MemLevel, Strategy) ->
 			     (arg_mem(MemLevel)):32,
 			     (arg_strategy(Strategy)):32>>).
 
--spec deflateSetDictionary(zstream(), binary()) -> integer().
+-spec deflateSetDictionary(Z, Dictionary) -> Adler32 when
+      Z :: zstream(),
+      Dictionary :: binary(),
+      Adler32 :: integer().
 deflateSetDictionary(Z, Dictionary) ->
     call(Z, ?DEFLATE_SETDICT, Dictionary).
 
--spec deflateReset(zstream()) -> 'ok'.
+-spec deflateReset(Z) -> 'ok' when
+      Z :: zstream().
 deflateReset(Z) ->
     call(Z, ?DEFLATE_RESET, []).
 
--spec deflateParams(zstream(), zlevel(), zstrategy()) -> 'ok'.
+-spec deflateParams(Z, Level, Strategy) -> ok when
+      Z :: zstream(),
+      Level :: zlevel(),
+      Strategy :: zstrategy().
 deflateParams(Z, Level, Strategy) ->
     call(Z, ?DEFLATE_PARAMS, <<(arg_level(Level)):32, 
 			      (arg_strategy(Strategy)):32>>).
 
--spec deflate(zstream(), iodata()) -> iolist().
+-spec deflate(Z, Data) -> Compressed when
+      Z :: zstream(),
+      Data :: iodata(),
+      Compressed :: iolist().
 deflate(Z, Data) ->
     deflate(Z, Data, none).
 
--spec deflate(zstream(), iodata(), zflush()) -> iolist().
+-spec deflate(Z, Data, Flush) -> Compressed when
+      Z :: zstream(),
+      Data :: iodata(),
+      Flush :: none | sync | full | finish,
+      Compressed :: iolist().
 deflate(Z, Data, Flush) ->
     try port_command(Z, Data) of
 	true ->
@@ -191,19 +214,25 @@ deflate(Z, Data, Flush) ->
 	    erlang:error(badarg) 
     end.
 
--spec deflateEnd(zstream()) -> 'ok'.
+-spec deflateEnd(Z) -> 'ok' when
+      Z :: zstream().
 deflateEnd(Z) ->
     call(Z, ?DEFLATE_END, []).    
 
--spec inflateInit(zstream()) -> 'ok'.
+-spec inflateInit(Z) -> 'ok' when
+      Z :: zstream().
 inflateInit(Z) ->
     call(Z, ?INFLATE_INIT, []).
 
--spec inflateInit(zstream(), zwindowbits()) -> 'ok'.
+-spec inflateInit(Z, WindowBits) -> 'ok' when
+      Z :: zstream(),
+      WindowBits :: zwindowbits().
 inflateInit(Z, WindowBits) -> 
     call(Z, ?INFLATE_INIT2, <<(arg_bitsz(WindowBits)):32>>).
 
--spec inflateSetDictionary(zstream(), binary()) -> 'ok'.
+-spec inflateSetDictionary(Z, Dictionary) -> 'ok' when
+      Z :: zstream(),
+      Dictionary :: binary().
 inflateSetDictionary(Z, Dictionary) -> 
     call(Z, ?INFLATE_SETDICT, Dictionary).
 
@@ -211,11 +240,15 @@ inflateSetDictionary(Z, Dictionary) ->
 inflateSync(Z) -> 
     call(Z, ?INFLATE_SYNC, []).
 
--spec inflateReset(zstream()) -> 'ok'.
+-spec inflateReset(Z) -> 'ok' when
+      Z :: zstream().
 inflateReset(Z) -> 
     call(Z, ?INFLATE_RESET, []).
 
--spec inflate(zstream(), iodata()) -> iolist().
+-spec inflate(Z, Data) -> Decompressed when
+      Z :: zstream(),
+      Data :: iodata(),
+      Decompressed :: iolist().
 inflate(Z, Data) ->
     try port_command(Z, Data) of
 	true -> 
@@ -227,50 +260,81 @@ inflate(Z, Data) ->
 	    erlang:error(badarg) 
     end.
 
--spec inflateEnd(zstream()) -> 'ok'.
+-spec inflateEnd(Z) -> 'ok' when
+      Z :: zstream().
 inflateEnd(Z) ->
     call(Z, ?INFLATE_END, []).
 
--spec setBufSize(zstream(), non_neg_integer()) -> 'ok'.
+-spec setBufSize(Z, Size) -> 'ok' when
+      Z :: zstream(),
+      Size :: non_neg_integer().
 setBufSize(Z, Size) ->
     call(Z, ?SET_BUFSZ, <<Size:32>>).
 
--spec getBufSize(zstream()) -> non_neg_integer().
+-spec getBufSize(Z) -> Size when
+      Z :: zstream(),
+      Size :: non_neg_integer().
 getBufSize(Z) ->
     call(Z, ?GET_BUFSZ, []).
 
--spec crc32(zstream()) -> integer().
+-spec crc32(Z) -> CRC when
+      Z :: zstream(),
+      CRC :: integer().
 crc32(Z) ->
     call(Z, ?CRC32_0, []).
 
--spec crc32(zstream(), binary()) -> integer().
+-spec crc32(Z, Binary) -> CRC when
+      Z :: zstream(),
+      Binary :: binary(),
+      CRC :: integer().
 crc32(Z, Binary) ->
     call(Z, ?CRC32_1, Binary).
 
--spec crc32(zstream(), integer(), binary()) -> integer().
+-spec crc32(Z, PrevCRC, Binary) -> CRC when
+      Z :: zstream(),
+      PrevCRC :: integer(),
+      Binary :: binary(),
+      CRC :: integer().
 crc32(Z, CRC, Binary) when is_binary(Binary), is_integer(CRC) ->
     call(Z, ?CRC32_2, <<CRC:32, Binary/binary>>);
 crc32(_Z, _CRC, _Binary)  ->
     erlang:error(badarg).
 
--spec adler32(zstream(), binary()) -> integer().
+-spec adler32(Z, Binary) -> CheckSum when
+      Z :: zstream(),
+      Binary :: binary(),
+      CheckSum :: integer().
 adler32(Z, Binary) ->
     call(Z, ?ADLER32_1, Binary).
 
--spec adler32(zstream(), integer(), binary()) -> integer().
+-spec adler32(Z, PrevAdler, Binary) -> CheckSum when
+      Z :: zstream(),
+      PrevAdler :: integer(),
+      Binary :: binary(),
+      CheckSum :: integer().
 adler32(Z, Adler, Binary) when is_binary(Binary), is_integer(Adler) ->
     call(Z, ?ADLER32_2, <<Adler:32, Binary/binary>>);
 adler32(_Z, _Adler, _Binary)  ->
     erlang:error(badarg).
 
--spec crc32_combine(zstream(), integer(), integer(), integer()) -> integer().
+-spec crc32_combine(Z, CRC1, CRC2, Size2) -> CRC when
+      Z :: zstream(),
+      CRC :: integer(),
+      CRC1 :: integer(),
+      CRC2 :: integer(),
+      Size2 :: integer().
 crc32_combine(Z, CRC1, CRC2, Len2) 
   when is_integer(CRC1), is_integer(CRC2), is_integer(Len2) ->
     call(Z, ?CRC32_COMBINE, <<CRC1:32, CRC2:32, Len2:32>>);
 crc32_combine(_Z, _CRC1, _CRC2, _Len2) ->
     erlang:error(badarg).
 
--spec adler32_combine(zstream(), integer(), integer(), integer()) -> integer().
+-spec adler32_combine(Z, Adler1, Adler2, Size2) -> Adler when
+      Z :: zstream(),
+      Adler :: integer(),
+      Adler1 :: integer(),
+      Adler2 :: integer(),
+      Size2 :: integer().
 adler32_combine(Z, Adler1, Adler2, Len2) 
   when is_integer(Adler1), is_integer(Adler2), is_integer(Len2) ->
     call(Z, ?ADLER32_COMBINE, <<Adler1:32, Adler2:32, Len2:32>>);
@@ -282,7 +346,9 @@ getQSize(Z) ->
     call(Z, ?GET_QSIZE, []).
 
 %% compress/uncompress zlib with header
--spec compress(binary()) -> binary().
+-spec compress(Binary) -> Compressed when
+      Binary :: binary(),
+      Compressed :: binary().
 compress(Binary) ->
     Z = open(),
     deflateInit(Z, default),
@@ -291,7 +357,9 @@ compress(Binary) ->
     close(Z),
     list_to_binary(Bs).
 
--spec uncompress(binary()) -> binary().
+-spec uncompress(Binary) -> Decompressed when
+      Binary  :: binary(),
+      Decompressed :: binary().
 uncompress(Binary) when byte_size(Binary) >= 8 ->
     Z = open(),
     inflateInit(Z),
@@ -303,7 +371,9 @@ uncompress(Binary) when is_binary(Binary) -> erlang:error(data_error);
 uncompress(_) -> erlang:error(badarg).
 
 %% unzip/zip zlib without header (zip members)
--spec zip(binary()) -> binary().
+-spec zip(Binary) -> Compressed when
+      Binary :: binary(),
+      Compressed :: binary().
 zip(Binary) ->
     Z = open(),
     deflateInit(Z, default, deflated, -?MAX_WBITS, 8, default),
@@ -312,7 +382,9 @@ zip(Binary) ->
     close(Z),
     list_to_binary(Bs).
 
--spec unzip(binary()) -> binary().
+-spec unzip(Binary) -> Decompressed when
+      Binary :: binary(),
+      Decompressed :: binary().
 unzip(Binary) ->
     Z = open(),
     inflateInit(Z, -?MAX_WBITS),
@@ -321,7 +393,9 @@ unzip(Binary) ->
     close(Z),
     list_to_binary(Bs).
     
--spec gzip(iodata()) -> binary().
+-spec gzip(Data) -> Compressed when
+      Data :: iodata(),
+      Compressed :: binary().
 gzip(Data) when is_binary(Data); is_list(Data) ->
     Z = open(),
     deflateInit(Z, default, deflated, 16+?MAX_WBITS, 8, default),
@@ -331,7 +405,9 @@ gzip(Data) when is_binary(Data); is_list(Data) ->
     iolist_to_binary(Bs);
 gzip(_) -> erlang:error(badarg).
 
--spec gunzip(iodata()) -> binary().
+-spec gunzip(Binary) -> Decompressed when
+      Binary :: binary(),
+      Decompressed :: binary().
 gunzip(Data) when is_binary(Data); is_list(Data) ->
     Z = open(),
     inflateInit(Z, 16+?MAX_WBITS),
diff --git a/lib/erl_docgen/priv/bin/xref_mod_app.escript b/lib/erl_docgen/priv/bin/xref_mod_app.escript
index 13671ef2f8..c2bd62f9e0 100755
--- a/lib/erl_docgen/priv/bin/xref_mod_app.escript
+++ b/lib/erl_docgen/priv/bin/xref_mod_app.escript
@@ -73,7 +73,12 @@ usage() ->
 modapp(TopDir) ->
     AppDirs = filelib:wildcard(filename:join([TopDir,"lib","*"])),
     AM = [appmods(D) || D <- AppDirs],
-    lists:keysort(1, [{M,A} || {A,Ms} <- AM, M <- Ms]).
+    ERTS = [preloaded(TopDir) || lists:keyfind("erts", 1, AM) =:= false],
+    lists:keysort(1, [{M,A} || {A,Ms} <- ERTS++AM, M <- Ms]).
+
+preloaded(TopDir) ->
+    {"preloaded",Mods} = appmods(filename:join([TopDir,"erts","preloaded"])),
+    {"erts",Mods}.
 
 %% It's OK if too much data is generated as long as all applications
 %% and all modules are mentioned.
diff --git a/lib/erl_docgen/priv/xsl/db_html.xsl b/lib/erl_docgen/priv/xsl/db_html.xsl
index 982572aeef..a9052f29e5 100644
--- a/lib/erl_docgen/priv/xsl/db_html.xsl
+++ b/lib/erl_docgen/priv/xsl/db_html.xsl
@@ -433,6 +433,8 @@
     <!-- Search "local types" as well -->
     <xsl:variable name="local_types"
                 select="ancestor::desc/preceding-sibling::type
+	                       [string-length(@name) > 0]
+                      | ancestor::type_desc/preceding-sibling::type
 	                       [string-length(@name) > 0]"/>
     <xsl:variable name="has_anno_in_local_type">
       <xsl:for-each select="$local_types">
diff --git a/lib/erl_docgen/priv/xsl/db_man.xsl b/lib/erl_docgen/priv/xsl/db_man.xsl
index 25b62f68c5..8db4714249 100644
--- a/lib/erl_docgen/priv/xsl/db_man.xsl
+++ b/lib/erl_docgen/priv/xsl/db_man.xsl
@@ -363,6 +363,8 @@
     <!-- Search "local types" as well -->
     <xsl:variable name="local_types"
                 select="ancestor::desc/preceding-sibling::type
+	                       [string-length(@name) > 0]
+                      | ancestor::type_desc/preceding-sibling::type
 	                       [string-length(@name) > 0]"/>
     <xsl:variable name="has_anno_in_local_type">
       <xsl:for-each select="$local_types">
diff --git a/lib/erl_docgen/priv/xsl/db_pdf.xsl b/lib/erl_docgen/priv/xsl/db_pdf.xsl
index 5119e3e36a..a3d601d861 100644
--- a/lib/erl_docgen/priv/xsl/db_pdf.xsl
+++ b/lib/erl_docgen/priv/xsl/db_pdf.xsl
@@ -410,6 +410,8 @@
     <!-- Search "local types" as well -->
     <xsl:variable name="local_types"
                 select="ancestor::desc/preceding-sibling::type
+	                       [string-length(@name) > 0]
+                      | ancestor::type_desc/preceding-sibling::type
 	                       [string-length(@name) > 0]"/>
     <xsl:variable name="has_anno_in_local_type">
       <xsl:for-each select="$local_types">
diff --git a/lib/hipe/cerl/erl_bif_types.erl b/lib/hipe/cerl/erl_bif_types.erl
index 0b47c7b6e1..f1be658054 100644
--- a/lib/hipe/cerl/erl_bif_types.erl
+++ b/lib/hipe/cerl/erl_bif_types.erl
@@ -702,7 +702,7 @@ type(erlang, demonitor, 1, Xs) ->
 type(erlang, demonitor, 2, Xs) ->
   strict(arg_types(erlang, demonitor, 2), Xs, fun (_) -> t_boolean() end);
 type(erlang, disconnect_node, 1, Xs) ->
-  strict(arg_types(erlang, disconnect_node, 1), Xs, fun (_) -> t_boolean() end);
+  strict(arg_types(erlang, disconnect_node, 1), Xs, fun (_) -> t_sup([t_boolean(), t_atom('ignored')]) end);
 type(erlang, display, 1, _) -> t_atom('true');
 type(erlang, display_string, 1, Xs) ->
   strict(arg_types(erlang, display_string, 1), Xs, fun(_) -> t_atom('true') end);
@@ -1124,7 +1124,7 @@ type(erlang, nodes, 0, _) -> t_list(t_node());
 type(erlang, nodes, 1, Xs) ->
   strict(arg_types(erlang, nodes, 1), Xs, fun (_) -> t_list(t_node()) end);
 type(erlang, now, 0, _) ->
-  t_time();
+  t_timestamp();
 type(erlang, open_port, 2, Xs) ->
   strict(arg_types(erlang, open_port, 2), Xs, fun (_) -> t_port() end);
 type(erlang, phash, 2, Xs) ->
@@ -1585,8 +1585,7 @@ type(erlang, system_info, 1, Xs) ->
 		   ['multi_scheduling_blockers'] ->
 		     t_list(t_pid());
 		   ['os_type'] ->
-		     t_tuple([t_sup([t_atom('ose'),	% XXX: undocumented
-				     t_atom('unix'),
+		     t_tuple([t_sup([t_atom('unix'),
 				     t_atom('vxworks'),
 				     t_atom('win32')]),
 			      t_atom()]);
@@ -2693,7 +2692,7 @@ type(os, getpid, 0, _) -> t_string();
 type(os, putenv, 2, Xs) ->
   strict(arg_types(os, putenv, 2), Xs, fun (_) -> t_atom('true') end);
 type(os, timestamp, 0, _) ->
-  t_time();
+  t_timestamp();
 %%-- re -----------------------------------------------------------------------
 type(re, compile, 1, Xs) ->
   strict(arg_types(re, compile, 1), Xs,
@@ -4458,6 +4457,9 @@ t_date() ->
 t_time() ->
   t_tuple([t_non_neg_fixnum(), t_non_neg_fixnum(), t_non_neg_fixnum()]).
 
+t_timestamp() ->
+  t_tuple([t_non_neg_fixnum(), t_non_neg_fixnum(), t_non_neg_fixnum()]).
+
 t_packet() ->
   t_sup([t_binary(), t_iolist(), t_httppacket()]).
 
diff --git a/lib/kernel/doc/src/Makefile b/lib/kernel/doc/src/Makefile
index de10e31d36..214e994889 100644
--- a/lib/kernel/doc/src/Makefile
+++ b/lib/kernel/doc/src/Makefile
@@ -104,6 +104,8 @@ TOP_SPECS_FILE = specs.xml
 # ----------------------------------------------------
 XML_FLAGS += 
 
+SPECS_ESRC = ../../src
+
 SPECS_FLAGS = -I../../include
 
 # ----------------------------------------------------
diff --git a/lib/kernel/doc/src/code.xml b/lib/kernel/doc/src/code.xml
index 6f85388c22..98cdd416b0 100644
--- a/lib/kernel/doc/src/code.xml
+++ b/lib/kernel/doc/src/code.xml
@@ -288,196 +288,156 @@
 
   <datatypes>
     <datatype>
+      <name name="load_ret"/>
+    </datatype>
+    <datatype>
       <name name="load_error_rsn"/>
     </datatype>
   </datatypes>
 
   <funcs>
     <func>
-      <name>set_path(Path) -> true | {error, What}</name>
+      <name name="set_path" arity="1"/>
       <fsummary>Set the code server search path</fsummary>
-      <type>
-        <v>Path = [Dir]</v>
-        <v>Dir = string()</v>
-        <v>What = bad_directory | bad_path</v>
-      </type>
       <desc>
-        <p>Sets the code path to the list of directories <c>Path</c>.</p>
+        <p>Sets the code path to the list of directories <c><anno>Path</anno></c>.</p>
         <p>Returns <c>true</c> if successful, or
-          <c>{error, bad_directory}</c> if any <c>Dir</c> is not
+          <c>{error, bad_directory}</c> if any <c><anno>Dir</anno></c> is not
           the name of a directory, or <c>{error, bad_path}</c> if
           the argument is invalid.</p>
       </desc>
     </func>
     <func>
-      <name>get_path() -> Path</name>
+      <name name="get_path" arity="0"/>
       <fsummary>Return the code server search path</fsummary>
-      <type>
-        <v>Path = [Dir]</v>
-        <v>Dir = string()</v>
-      </type>
       <desc>
         <p>Returns the code path</p>
       </desc>
     </func>
     <func>
-      <name>add_path(Dir) -> true | {error, What}</name>
-      <name>add_pathz(Dir) -> true | {error, What}</name>
+      <name name="add_path" arity="1"/>
+      <name name="add_pathz" arity="1"/>
       <fsummary>Add a directory to the end of the code path</fsummary>
-      <type>
-        <v>Dir = string()</v>
-        <v>What = bad_directory</v>
-      </type>
+      <type name="add_path_ret"/>
       <desc>
-        <p>Adds <c>Dir</c> to the code path. The directory is added as
-          the last directory in the new path. If <c>Dir</c> already
+        <p>Adds <c><anno>Dir</anno></c> to the code path. The directory is added as
+          the last directory in the new path. If <c><anno>Dir</anno></c> already
           exists in the path, it is not added.</p>
         <p>Returns <c>true</c> if successful, or
-          <c>{error, bad_directory}</c> if <c>Dir</c> is not the name
+          <c>{error, bad_directory}</c> if <c><anno>Dir</anno></c> is not the name
           of a directory.</p>
       </desc>
     </func>
     <func>
-      <name>add_patha(Dir) -> true | {error, What}</name>
+      <name name="add_patha" arity="1"/>
       <fsummary>Add a directory to the beginning of the code path</fsummary>
-      <type>
-        <v>Dir = string()</v>
-        <v>What = bad_directory</v>
-      </type>
+      <type name="add_path_ret"/>
       <desc>
-        <p>Adds <c>Dir</c> to the beginning of the code path. If
-          <c>Dir</c> already exists, it is removed from the old
+        <p>Adds <c><anno>Dir</anno></c> to the beginning of the code path. If
+          <c><anno>Dir</anno></c> already exists, it is removed from the old
           position in the code path.</p>
         <p>Returns <c>true</c> if successful, or
-          <c>{error, bad_directory}</c> if <c>Dir</c> is not the name
+          <c>{error, bad_directory}</c> if <c><anno>Dir</anno></c> is not the name
           of a directory.</p>
       </desc>
     </func>
     <func>
-      <name>add_paths(Dirs) -> ok</name>
-      <name>add_pathsz(Dirs) -> ok</name>
+      <name name="add_paths" arity="1"/>
+      <name name="add_pathsz" arity="1"/>
       <fsummary>Add directories to the end of the code path</fsummary>
-      <type>
-        <v>Dirs = [Dir]</v>
-        <v>Dir = string()</v>
-      </type>
       <desc>
-        <p>Adds the directories in <c>Dirs</c> to the end of the code
-          path. If a <c>Dir</c> already exists, it is not added. This
+        <p>Adds the directories in <c><anno>Dirs</anno></c> to the end of the code
+          path. If a <c><anno>Dir</anno></c> already exists, it is not added. This
           function always returns <c>ok</c>, regardless of the validity
-          of each individual <c>Dir</c>.</p>
+          of each individual <c><anno>Dir</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>add_pathsa(Dirs) -> ok</name>
+      <name name="add_pathsa" arity="1"/>
       <fsummary>Add directories to the beginning of the code path</fsummary>
-      <type>
-        <v>Dirs = [Dir]</v>
-        <v>Dir = string()</v>
-      </type>
       <desc>
-        <p>Adds the directories in <c>Dirs</c> to the beginning of
-          the code path. If a <c>Dir</c> already exists, it is removed
+        <p>Adds the directories in <c><anno>Dirs</anno></c> to the beginning of
+          the code path. If a <c><anno>Dir</anno></c> already exists, it is removed
           from the old position in the code path. This function always
           returns <c>ok</c>, regardless of the validity of each
-          individual <c>Dir</c>.</p>
+          individual <c><anno>Dir</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>del_path(Name | Dir) -> true | false | {error, What}</name>
+      <name name="del_path" arity="1"/>
       <fsummary>Delete a directory from the code path</fsummary>
-      <type>
-        <v>Name = atom()</v>
-        <v>Dir = string()</v>
-        <v>What = bad_name</v>
-      </type>
       <desc>
         <p>Deletes a directory from the code path. The argument can be
-          an atom <c>Name</c>, in which case the directory with
-          the name <c>.../Name[-Vsn][/ebin]</c> is deleted from the code
+          an atom <c><anno>Name</anno></c>, in which case the directory with
+          the name <c>.../<anno>Name</anno>[-Vsn][/ebin]</c> is deleted from the code
           path. It is also possible to give the complete directory name
-          <c>Dir</c> as argument.</p>
+          <c><anno>Dir</anno></c> as argument.</p>
         <p>Returns <c>true</c> if successful, or <c>false</c> if
           the directory is not found, or <c>{error, bad_name}</c> if
           the argument is invalid.</p>
       </desc>
     </func>
     <func>
-      <name>replace_path(Name, Dir) -> true | {error, What}</name>
+      <name name="replace_path" arity="2"/>
       <fsummary>Replace a directory with another in the code path</fsummary>
-      <type>
-        <v>Name = atom()</v>
-        <v>Dir = string()</v>
-        <v>What = bad_name | bad_directory | {badarg, term()}</v>
-      </type>
       <desc>
         <p>This function replaces an old occurrence of a directory
-          named <c>.../Name[-Vsn][/ebin]</c>, in the code path, with
-          <c>Dir</c>. If <c>Name</c> does not exist, it adds the new
-          directory <c>Dir</c> last in the code path. The new directory
-          must also be named <c>.../Name[-Vsn][/ebin]</c>. This function
+          named <c>.../<anno>Name</anno>[-Vsn][/ebin]</c>, in the code path, with
+          <c><anno>Dir</anno></c>. If <c><anno>Name</anno></c> does not exist, it adds the new
+          directory <c><anno>Dir</anno></c> last in the code path. The new directory
+          must also be named <c>.../<anno>Name</anno>[-Vsn][/ebin]</c>. This function
           should be used if a new version of the directory (library) is
           added to a running system.</p>
         <p>Returns <c>true</c> if successful, or
-          <c>{error, bad_name}</c> if <c>Name</c> is not found, or
-          <c>{error, bad_directory}</c> if <c>Dir</c> does not exist, or
-          <c>{error, {badarg, [Name, Dir]}}</c> if <c>Name</c> or
-          <c>Dir</c> is invalid.</p>
+          <c>{error, bad_name}</c> if <c><anno>Name</anno></c> is not found, or
+          <c>{error, bad_directory}</c> if <c><anno>Dir</anno></c> does not exist, or
+          <c>{error, {badarg, [<anno>Name</anno>, <anno>Dir</anno>]}}</c> if <c><anno>Name</anno></c> or
+          <c><anno>Dir</anno></c> is invalid.</p>
       </desc>
     </func>
     <func>
-      <name>load_file(Module) -> {module, Module} | {error, What}</name>
+      <name name="load_file" arity="1"/>
       <fsummary>Load a module</fsummary>
-      <type>
-        <v>Module = atom()</v>
-        <v>What = nofile | sticky_directory | badarg | term()</v>
-      </type>
+      <type name="load_ret"/>
       <desc>
-        <p>Tries to load the Erlang module <c>Module</c>, using
+        <p>Tries to load the Erlang module <c><anno>Module</anno></c>, using
           the code path. It looks for the object code file with an
           extension that corresponds to the Erlang machine used, for
-          example <c>Module.beam</c>. The loading fails if the module
+          example <c><anno>Module</anno>.beam</c>. The loading fails if the module
           name found in the object code differs from the name
-          <c>Module</c>.
+          <c><anno>Module</anno></c>.
           <seealso marker="#load_binary/3">load_binary/3</seealso> must
           be used to load object code with a module name that is
           different from the file name.</p>
-        <p>Returns <c>{module, Module}</c> if successful, or
+        <p>Returns <c>{module, <anno>Module</anno>}</c> if successful, or
           <c>{error, nofile}</c> if no object code is found, or
           <c>{error, sticky_directory}</c> if the object code resides in
-          a sticky directory, or <c>{error, badarg}</c> if the argument
-          is invalid. Also if the loading fails, an error tuple is
+          a sticky directory. Also if the loading fails, an error tuple is
           returned. See
           <seealso marker="erts:erlang#load_module/2">erlang:load_module/2</seealso>
-          for possible values of <c>What</c>.</p>
+          for possible values of <c><anno>What</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>load_abs(Filename) -> {module, Module} | {error, What}</name>
+      <name name="load_abs" arity="1"/>
       <fsummary>Load a module, residing in a given file</fsummary>
-      <type>
-        <v>Filename = string()</v>
-        <v>Module = atom()</v>
-        <v>What = nofile | sticky_directory | badarg | term()</v>
-      </type>
+      <type name="load_ret"/>
+      <type name="loaded_filename"/>
+      <type name="loaded_ret_atoms"/>
       <desc>
-        <p>Does the same as <c>load_file(Module)</c>, but
-          <c>Filename</c> is either an absolute file name, or a
+        <p>Does the same as <c>load_file(<anno>Module</anno>)</c>, but
+          <c><anno>Filename</anno></c> is either an absolute file name, or a
           relative file name. The code path is not searched. It returns
           a value in the same way as
           <seealso marker="#load_file/1">load_file/1</seealso>. Note
-          that <c>Filename</c> should not contain the extension (for
+          that <c><anno>Filename</anno></c> should not contain the extension (for
           example <c>".beam"</c>); <c>load_abs/1</c> adds the correct
           extension itself.</p>
       </desc>
     </func>
     <func>
-      <name>ensure_loaded(Module) -> {module, Module} | {error, What}</name>
+      <name name="ensure_loaded" arity="1"/>
       <fsummary>Ensure that a module is loaded</fsummary>
-      <type>
-        <v>Module = atom()</v>
-        <v>What = nofile | sticky_directory | embedded | badarg | term()</v>
-      </type>
       <desc>
         <p>Tries to to load a module in the same way as
           <seealso marker="#load_file/1">load_file/1</seealso>,
@@ -487,54 +447,45 @@
       </desc>
     </func>
     <func>
-      <name>load_binary(Module, Filename, Binary) -> {module, Module} | {error, What}</name>
+      <name name="load_binary" arity="3"/>
       <fsummary>Load object code for a module</fsummary>
-      <type>
-        <v>Module = atom()</v>
-        <v>Filename = string()</v>
-        <v>What = sticky_directory | badarg | term()</v>
-      </type>
+      <type name="loaded_filename"/>
+      <type name="loaded_ret_atoms"/>
       <desc>
         <p>This function can be used to load object code on remote
-          Erlang nodes. The argument <c>Binary</c> must contain
-	  object code for <c>Module</c>.
-          <c>Filename</c> is only used by the code server to keep a
-          record of from which file the object code for <c>Module</c>
-          comes. Accordingly, <c>Filename</c> is not opened and read by
+          Erlang nodes. The argument <c><anno>Binary</anno></c> must contain
+	  object code for <c><anno>Module</anno></c>.
+          <c><anno>Filename</anno></c> is only used by the code server to keep a
+          record of from which file the object code for <c><anno>Module</anno></c>
+          comes. Accordingly, <c><anno>Filename</anno></c> is not opened and read by
           the code server.</p>
-        <p>Returns <c>{module, Module}</c> if successful, or
+        <p>Returns <c>{module, <anno>Module</anno>}</c> if successful, or
           <c>{error, sticky_directory}</c> if the object code resides in
           a sticky directory, or <c>{error, badarg}</c> if any argument
           is invalid. Also if the loading fails, an error tuple is
           returned. See
           <seealso marker="erts:erlang#load_module/2">erlang:load_module/2</seealso>
-          for possible values of <c>What</c>.</p>
+          for possible values of <c><anno>What</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>delete(Module) -> true | false</name>
+      <name name="delete" arity="1"/>
       <fsummary>Removes current code for a module</fsummary>
-      <type>
-        <v>Module = atom()</v>
-      </type>
       <desc>
-        <p>Removes the current code for <c>Module</c>, that is,
-          the current code for <c>Module</c> is made old. This means
+        <p>Removes the current code for <c><anno>Module</anno></c>, that is,
+          the current code for <c><anno>Module</anno></c> is made old. This means
           that processes can continue to execute the code in the module,
           but that no external function calls can be made to it.</p>
         <p>Returns <c>true</c> if successful, or <c>false</c> if there
-          is old code for <c>Module</c> which must be purged first, or
-          if <c>Module</c> is not a (loaded) module.</p>
+          is old code for <c><anno>Module</anno></c> which must be purged first, or
+          if <c><anno>Module</anno></c> is not a (loaded) module.</p>
       </desc>
     </func>
     <func>
-      <name>purge(Module) -> true | false</name>
+      <name name="purge" arity="1"/>
       <fsummary>Removes old code for a module</fsummary>
-      <type>
-        <v>Module = atom()</v>
-      </type>
       <desc>
-        <p>Purges the code for <c>Module</c>, that is, removes code
+        <p>Purges the code for <c><anno>Module</anno></c>, that is, removes code
           marked as old. If some processes still linger in the old code,
           these processes are killed before the code is removed.</p>
         <p>Returns <c>true</c> if successful and any process needed to
@@ -542,31 +493,26 @@
       </desc>
     </func>
     <func>
-      <name>soft_purge(Module) -> true | false</name>
+      <name name="soft_purge" arity="1"/>
       <fsummary>Removes old code for a module, unless no process uses it</fsummary>
-      <type>
-        <v>Module = atom()</v>
-      </type>
       <desc>
-        <p>Purges the code for <c>Module</c>, that is, removes code
+        <p>Purges the code for <c><anno>Module</anno></c>, that is, removes code
           marked as old, but only if no processes linger in it.</p>
         <p>Returns <c>false</c> if the module could not be purged due
           to processes lingering in old code, otherwise <c>true</c>.</p>
       </desc>
     </func>
     <func>
-      <name>is_loaded(Module) -> {file, Loaded} | false</name>
+      <name name="is_loaded" arity="1"/>
       <fsummary>Check if a module is loaded</fsummary>
-      <type>
-        <v>Module = atom()</v>
-        <v>Loaded = Absname | preloaded | cover_compiled</v>
-        <v>Absname = string()</v>
-      </type>
-      <desc>
-        <p>Checks if <c>Module</c> is loaded. If it is,
-          <c>{file, Loaded}</c> is returned, otherwise <c>false</c>.</p>
-        <p>Normally, <c>Loaded</c> is the absolute file name
-          <c>Absname</c> from which the code was obtained. If the module
+      <type name="loaded_filename"/>
+      <type name="loaded_ret_atoms"/>
+      <type_desc name="loaded_filename"><c><anno>Filename</anno></c> is an absolute filename</type_desc>
+      <desc>
+        <p>Checks if <c><anno>Module</anno></c> is loaded. If it is,
+          <c>{file, <anno>Loaded</anno>}</c> is returned, otherwise <c>false</c>.</p>
+        <p>Normally, <c><anno>Loaded</anno></c> is the absolute file name
+          <c>Filename</c> from which the code was obtained. If the module
           is preloaded (see
           <seealso marker="sasl:script">script(4)</seealso>),
           <c>Loaded==preloaded</c>. If the module is Cover compiled (see
@@ -575,32 +521,26 @@
       </desc>
     </func>
     <func>
-      <name>all_loaded() -> [{Module, Loaded}]</name>
+      <name name="all_loaded" arity="0"/>
       <fsummary>Get all loaded modules</fsummary>
-      <type>
-        <v>Module = atom()</v>
-        <v>Loaded = Absname | preloaded | cover_compiled</v>
-        <v>Absname = string()</v>
-      </type>
+      <type name="loaded_filename"/>
+      <type name="loaded_ret_atoms"/>
+      <type_desc name="loaded_filename"><c><anno>Filename</anno></c> is an absolute filename</type_desc>
       <desc>
-        <p>Returns a list of tuples <c>{Module, Loaded}</c> for all
-          loaded modules. <c>Loaded</c> is normally the absolute file
+        <p>Returns a list of tuples <c>{<anno>Module</anno>, <anno>Loaded</anno>}</c> for all
+          loaded modules. <c><anno>Loaded</anno></c> is normally the absolute file
           name, as described for
           <seealso marker="#is_loaded/1">is_loaded/1</seealso>.</p>
       </desc>
     </func>
     <func>
-      <name>which(Module) -> Which</name>
+      <name name="which" arity="1"/>
       <fsummary>The object code file of a module</fsummary>
-      <type>
-        <v>Module = atom()</v>
-        <v>Which = Filename | non_existing | preloaded | cover_compiled</v>
-        <v>Filename = string()</v>
-      </type>
+      <type name="loaded_ret_atoms"/>
       <desc>
         <p>If the module is not loaded, this function searches the code
           path for the first file which contains object code for
-          <c>Module</c> and returns the absolute file name. If
+          <c><anno>Module</anno></c> and returns the absolute file name. If
           the module is loaded, it returns the name of the file which
           contained the loaded object code. If the module is pre-loaded,
           <c>preloaded</c> is returned. If the module is Cover compiled,
@@ -609,21 +549,16 @@
       </desc>
     </func>
     <func>
-      <name>get_object_code(Module) -> {Module, Binary, Filename} | error</name>
+      <name name="get_object_code" arity="1"/>
       <fsummary>Get the object code for a module</fsummary>
-      <type>
-        <v>Module = atom()</v>
-        <v>Binary = binary()</v>
-        <v>Filename = string()</v>
-      </type>
       <desc>
         <p>Searches the code path for the object code of the module
-          <c>Module</c>. It returns <c>{Module, Binary, Filename}</c>
-          if successful, and <c>error</c> if not. <c>Binary</c> is a
+          <c><anno>Module</anno></c>. It returns <c>{<anno>Module</anno>, <anno>Binary</anno>, <anno>Filename</anno>}</c>
+          if successful, and <c>error</c> if not. <c><anno>Binary</anno></c> is a
           binary data object which contains the object code for
           the module. This can be useful if code is to be loaded on a
           remote node in a distributed system. For example, loading
-          module <c>Module</c> on a node <c>Node</c> is done as
+          module <c><anno>Module</anno></c> on a node <c>Node</c> is done as
           follows:</p>
         <code type="none">
 ...
@@ -633,7 +568,7 @@ rpc:call(Node, code, load_binary, [Module, Filename, Binary]),
       </desc>
     </func>
     <func>
-      <name>root_dir() -> string()</name>
+      <name name="root_dir" arity="0"/>
       <fsummary>Root directory of Erlang/OTP</fsummary>
       <desc>
         <p>Returns the root directory of Erlang/OTP, which is
@@ -644,7 +579,7 @@ rpc:call(Node, code, load_binary, [Module, Filename, Binary]),
       </desc>
     </func>
     <func>
-      <name>lib_dir() -> string()</name>
+      <name name="lib_dir" arity="0"/>
       <fsummary>Library directory of Erlang/OTP</fsummary>
       <desc>
         <p>Returns the library directory, <c>$OTPROOT/lib</c>, where
@@ -655,19 +590,16 @@ rpc:call(Node, code, load_binary, [Module, Filename, Binary]),
       </desc>
     </func>
     <func>
-      <name>lib_dir(Name) -> string() | {error, bad_name}</name>
+      <name name="lib_dir" arity="1"/>
       <fsummary>Library directory for an application</fsummary>
-      <type>
-        <v>Name = atom()</v>
-      </type>
       <desc>
         <p>This function is mainly intended for finding out the path
           for the "library directory", the top directory, for an
-          application <c>Name</c> located under <c>$OTPROOT/lib</c> or
+          application <c><anno>Name</anno></c> located under <c>$OTPROOT/lib</c> or
           on a directory referred to via the <c>ERL_LIBS</c>
           environment variable.</p>
-        <p>If there is a regular directory called <c>Name</c> or
-          <c>Name-Vsn</c> in the code path with an <c>ebin</c>
+        <p>If there is a regular directory called <c><anno>Name</anno></c> or
+          <c><anno>Name</anno>-Vsn</c> in the code path with an <c>ebin</c>
           subdirectory, the path to this directory is returned (not
           the <c>ebin</c> directory). If the directory refers to a
           directory in an archive, the archive name is stripped away
@@ -681,23 +613,19 @@ rpc:call(Node, code, load_binary, [Module, Filename, Binary]),
         <pre>
 > <input>code:lib_dir(mnesia).</input>
 "/usr/local/otp/lib/mnesia-4.2.2"</pre>
-        <p>Returns <c>{error, bad_name}</c> if <c>Name</c>
+        <p>Returns <c>{error, bad_name}</c> if <c><anno>Name</anno></c>
 	 is not the name of an application under <c>$OTPROOT/lib</c> or
 	 on a directory referred to via the <c>ERL_LIBS</c>
          environment variable. Fails with an exception if <c>Name</c>
          has the wrong type.</p>
 
-	<warning><p>For backward compatibility, <c>Name</c> is also allowed to
+	<warning><p>For backward compatibility, <c><anno>Name</anno></c> is also allowed to
 	be a string. That will probably change in a future release.</p></warning>
       </desc>
     </func>
     <func>
-      <name>lib_dir(Name, SubDir) -> string() | {error, bad_name}</name>
+      <name name="lib_dir" arity="2"/>
       <fsummary>subdirectory for an application</fsummary>
-      <type>
-        <v>Name = atom()</v>
-        <v>SubDir = atom()</v>
-      </type>
       <desc>
         <p>Returns the path to a subdirectory directly under the top
          directory of an application. Normally the subdirectories
@@ -711,12 +639,12 @@ rpc:call(Node, code, load_binary, [Module, Filename, Binary]),
 > <input>code:lib_dir(megaco, priv).</input>
 "/usr/local/otp/lib/megaco-3.9.1.1/priv"</pre>
 
-        <p>Fails with an exception if <c>Name</c> or <c>SubDir</c> has
+        <p>Fails with an exception if <c><anno>Name</anno></c> or <c><anno>SubDir</anno></c> has
         the wrong type.</p>
       </desc>
     </func>
     <func>
-      <name>compiler_dir() -> string()</name>
+      <name name="compiler_dir" arity="0"/>
       <fsummary>Library directory for the compiler</fsummary>
       <desc>
         <p>Returns the compiler library directory. Equivalent to
@@ -724,21 +652,18 @@ rpc:call(Node, code, load_binary, [Module, Filename, Binary]),
       </desc>
     </func>
     <func>
-      <name>priv_dir(Name) -> string() | {error, bad_name}</name>
+      <name name="priv_dir" arity="1"/>
       <fsummary>Priv directory for an application</fsummary>
-      <type>
-        <v>Name = atom()</v>
-      </type>
       <desc>
         <p>Returns the path to the <c>priv</c> directory in an
-         application. Equivalent to <c>code:lib_dir(Name,priv).</c>.</p>
+         application. Equivalent to <c>code:lib_dir(<anno>Name</anno>, priv).</c>.</p>
 
-	<warning><p>For backward compatibility, <c>Name</c> is also allowed to
+	<warning><p>For backward compatibility, <c><anno>Name</anno></c> is also allowed to
 	be a string. That will probably change in a future release.</p></warning>
       </desc>
     </func>
     <func>
-      <name>objfile_extension() -> ".beam"</name>
+      <name name="objfile_extension" arity="0"/>
       <fsummary>Object code file extension</fsummary>
       <desc>
         <p>Returns the object code file extension that corresponds to
@@ -746,24 +671,16 @@ rpc:call(Node, code, load_binary, [Module, Filename, Binary]),
       </desc>
     </func>
     <func>
-      <name>stick_dir(Dir) -> ok | error</name>
+      <name name="stick_dir" arity="1"/>
       <fsummary>Mark a directory as sticky</fsummary>
-      <type>
-        <v>Dir = string()</v>
-        <v>What = term()</v>
-      </type>
       <desc>
-        <p>This function marks <c>Dir</c> as sticky.</p>
+        <p>This function marks <c><anno>Dir</anno></c> as sticky.</p>
         <p>Returns <c>ok</c> if successful or <c>error</c> if not.</p>
       </desc>
     </func>
     <func>
-      <name>unstick_dir(Dir) -> ok | error</name>
+      <name name="unstick_dir" arity="1"/>
       <fsummary>Remove a sticky directory mark</fsummary>
-      <type>
-        <v>Dir = string()</v>
-        <v>What = term()</v>
-      </type>
       <desc>
         <p>This function unsticks a directory which has been marked as
           sticky.</p>
@@ -771,45 +688,39 @@ rpc:call(Node, code, load_binary, [Module, Filename, Binary]),
       </desc>
     </func>
     <func>
-      <name>is_sticky(Module) -> true | false</name>
+      <name name="is_sticky" arity="1"/>
       <fsummary>Test whether a module is sticky</fsummary>
-      <type>
-        <v>Module = atom()</v>
-      </type>
       <desc>
-        <p>This function returns <c>true</c> if <c>Module</c> is the
+        <p>This function returns <c>true</c> if <c><anno>Module</anno></c> is the
 	name of a module that has been loaded from a sticky directory
 	(or in other words: an attempt to reload the module will fail),
-	or <c>false</c> if <c>Module</c> is not a loaded module or is
+	or <c>false</c> if <c><anno>Module</anno></c> is not a loaded module or is
 	not sticky.</p>
       </desc>
     </func>
     <func>
-      <name>rehash() -> ok</name>
+      <name name="rehash" arity="0"/>
       <fsummary>Rehash or create code path cache</fsummary>
       <desc>
         <p>This function creates or rehashes the code path cache.</p>
       </desc>
     </func>
     <func>
-      <name>where_is_file(Filename) -> Absname | non_existing</name>
+      <name name="where_is_file" arity="1"/>
       <fsummary>Full name of a file located in the code path</fsummary>
-      <type>
-        <v>Filename = Absname = string()</v>
-      </type>
       <desc>
-        <p>Searches the code path for <c>Filename</c>, a file of
+        <p>Searches the code path for <c><anno>Filename</anno></c>, a file of
           arbitrary type. If found, the full name is returned.
           <c>non_existing</c> is returned if the file cannot be found.
           The function can be useful, for example, to locate
           application resource files. If the code path cache is used,
           the code server will efficiently read the full name from
-          the cache, provided that <c>Filename</c> is an object code
+          the cache, provided that <c><anno>Filename</anno></c> is an object code
           file or an <c>.app</c> file.</p>
       </desc>
     </func>
     <func>
-      <name>clash() -> ok</name>
+      <name name="clash" arity="0"/>
       <fsummary>Search for modules with identical names.</fsummary>
       <desc>
         <p>Searches the entire code space for module names with
@@ -817,10 +728,10 @@ rpc:call(Node, code, load_binary, [Module, Filename, Binary]),
       </desc>
     </func>
     <func>
-      <name>is_module_native(Module) -> true | false | undefined</name>
+      <name>is_module_native(Module) -> boolean() | undefined</name>
       <fsummary>Test whether a module has native code</fsummary>
       <type>
-        <v>Module = atom()</v>
+        <v>Module = module()</v>
       </type>
       <desc>
         <p>This function returns <c>true</c> if <c>Module</c> is 
diff --git a/lib/kernel/doc/src/file.xml b/lib/kernel/doc/src/file.xml
index e0feaf6ee7..861c582211 100644
--- a/lib/kernel/doc/src/file.xml
+++ b/lib/kernel/doc/src/file.xml
@@ -95,9 +95,6 @@
 
   <datatypes>
     <datatype>
-      <name name="bindings"/>
-    </datatype>
-    <datatype>
       <name name="deep_list"/>
     </datatype>
     <datatype>
@@ -136,12 +133,6 @@
       </desc>
     </datatype>
     <datatype>
-      <name name="date"/>
-    </datatype>
-    <datatype>
-      <name name="time"/>
-    </datatype>
-    <datatype>
       <name name="date_time"/>
       <desc>
         <p>Must denote a valid date and time.</p>
@@ -1220,15 +1211,15 @@ f.txt:  {person, "kalle", 25}.
           <item>
             <p>The current system access to the file.</p>
           </item>
-          <tag><c>atime = time()</c></tag>
+          <tag><c>atime = <seealso marker="#type-date_time">date_time()</seealso></c></tag>
           <item>
             <p>The last (local) time the file was read.</p>
           </item>
-          <tag><c>mtime = time()</c></tag>
+          <tag><c>mtime = <seealso marker="#type-date_time">date_time()</seealso></c></tag>
           <item>
             <p>The last (local) time the file was written.</p>
           </item>
-          <tag><c>ctime = time()</c></tag>
+          <tag><c>ctime = <seealso marker="#type-date_time">date_time()</seealso></c></tag>
           <item>
             <p>The interpretation of this time field depends on
               the operating system. On Unix, it is the last time
@@ -1669,15 +1660,15 @@ f.txt:  {person, "kalle", 25}.
         <p>The following fields are used from the record, if they are
           given.</p>
         <taglist>
-          <tag><c>atime = time()</c></tag>
+          <tag><c>atime = <seealso marker="#type-date_time">date_time()</seealso></c></tag>
           <item>
             <p>The last (local) time the file was read.</p>
           </item>
-          <tag><c>mtime = time()</c></tag>
+          <tag><c>mtime = <seealso marker="#type-date_time">date_time()</seealso></c></tag>
           <item>
             <p>The last (local) time the file was written.</p>
           </item>
-          <tag><c>ctime = time()</c></tag>
+          <tag><c>ctime = <seealso marker="#type-date_time">date_time()</seealso></c></tag>
           <item>
             <p>On Unix, any value give for this field will be ignored
               (the "ctime" for the file will be set to the current
diff --git a/lib/kernel/doc/src/os.xml b/lib/kernel/doc/src/os.xml
index 56fc1834ec..e94119845a 100644
--- a/lib/kernel/doc/src/os.xml
+++ b/lib/kernel/doc/src/os.xml
@@ -126,9 +126,10 @@ DirOut = os:cmd("dir"), % on Win32 platform</code>
       </desc>
     </func>
     <func>
-      <name>timestamp() -> {MegaSecs, Secs, MicroSecs}</name>
+      <name>timestamp() -> Timestamp</name>
       <fsummary>Returna a timestamp from the OS in the erlang:now/0 format</fsummary>
       <type>
+        <v>Timestamp = {MegaSecs, Secs, MicroSecs} = <seealso marker="erts:erlang#type-timestamp">erlang:timestamp()</seealso></v>
         <v>MegaSecs = Secs = MicroSecs = integer() >= 0</v>
       </type>
       <desc>
diff --git a/lib/kernel/src/auth.erl b/lib/kernel/src/auth.erl
index 25c88a4e1d..ac25ab958c 100644
--- a/lib/kernel/src/auth.erl
+++ b/lib/kernel/src/auth.erl
@@ -58,7 +58,7 @@ start_link() ->
 %%--Deprecated interface------------------------------------------------
 
 -spec is_auth(Node) -> 'yes' | 'no' when
-      Node :: Node :: node().
+      Node :: node().
 
 is_auth(Node) ->
     case net_adm:ping(Node) of
diff --git a/lib/kernel/src/code.erl b/lib/kernel/src/code.erl
index b0f99305f2..882e9625fe 100644
--- a/lib/kernel/src/code.erl
+++ b/lib/kernel/src/code.erl
@@ -82,7 +82,8 @@
 %% add_pathsa([Dir])             -> ok
 %% add_pathsz([Dir])             -> ok
 %% del_path(Dir)		 -> boolean() | {error, bad_name}
-%% replace_path(Name, Dir)       -> true | replace_path_error()
+%% replace_path(Name, Dir)       -> true | {error, bad_directory | bad_name
+%%                                                 | {badarg,_}}
 %% load_file(Module)		 -> {module, Module} | {error, What :: atom()}
 %% load_abs(File)		 -> {module, Module} | {error, What :: atom()}
 %% load_abs(File, Module)	 -> {module, Module} | {error, What :: atom()}
@@ -113,11 +114,16 @@
 %% Some types for basic exported functions of this module
 %%----------------------------------------------------------------------------
 
--type load_error_rsn() :: 'badfile' | 'native_code' | 'nofile' | 'not_purged'
-		        | 'sticky_directory'.	% for some functions only
--type load_ret() :: {'error', load_error_rsn()} | {'module', atom()}.
+-type load_error_rsn() :: 'badfile'
+                        | 'native_code'
+                        | 'nofile'
+                        | 'not_purged'
+                        | 'on_load'
+                        | 'sticky_directory'.
+-type load_ret() :: {'error', What :: load_error_rsn()}
+                  | {'module', Module :: module()}.
 -type loaded_ret_atoms() :: 'cover_compiled' | 'preloaded'.
--type loaded_filename() :: file:filename() | loaded_ret_atoms().
+-type loaded_filename() :: (Filename :: file:filename()) | loaded_ret_atoms().
 
 %%----------------------------------------------------------------------------
 %% User interface
@@ -127,55 +133,74 @@
 objfile_extension() ->
     init:objfile_extension().
 
--spec load_file(Module :: atom()) -> load_ret(). 
+-spec load_file(Module) -> load_ret() when
+      Module :: module().
 load_file(Mod) when is_atom(Mod) ->
     call({load_file,Mod}).
 
--spec ensure_loaded(Module :: atom()) -> load_ret().
+-spec ensure_loaded(Module) -> {module, Module} | {error, What} when
+      Module :: module(),
+      What :: embedded | badfile | native_code | nofile | on_load.
 ensure_loaded(Mod) when is_atom(Mod) -> 
     call({ensure_loaded,Mod}).
 
 %% XXX File as an atom is allowed only for backwards compatibility.
--spec load_abs(Filename :: file:filename()) -> load_ret().
+-spec load_abs(Filename) -> load_ret() when
+      Filename :: file:filename().
 load_abs(File) when is_list(File); is_atom(File) -> call({load_abs,File,[]}).
 
 %% XXX Filename is also an atom(), e.g. 'cover_compiled'
--spec load_abs(Filename :: loaded_filename(), Module :: atom()) -> load_ret().
+-spec load_abs(Filename :: loaded_filename(), Module :: module()) -> load_ret().
 load_abs(File, M) when (is_list(File) orelse is_atom(File)), is_atom(M) ->
     call({load_abs,File,M}).
 
 %% XXX Filename is also an atom(), e.g. 'cover_compiled'
--spec load_binary(Module :: atom(), Filename :: loaded_filename(), Binary :: binary()) -> load_ret().
+-spec load_binary(Module, Filename, Binary) ->
+                         {module, Module} | {error, What} when
+      Module :: module(),
+      Filename :: loaded_filename(),
+      Binary :: binary(),
+      What :: badarg | load_error_rsn().
 load_binary(Mod, File, Bin)
   when is_atom(Mod), (is_list(File) orelse is_atom(File)), is_binary(Bin) ->
     call({load_binary,Mod,File,Bin}).
 
--spec load_native_partial(Module :: atom(), Binary :: binary()) -> load_ret().
+-spec load_native_partial(Module :: module(), Binary :: binary()) -> load_ret().
 load_native_partial(Mod, Bin) when is_atom(Mod), is_binary(Bin) ->
     call({load_native_partial,Mod,Bin}).
 
--spec load_native_sticky(Module :: atom(), Binary :: binary(), WholeModule :: 'false' | binary()) -> load_ret().
+-spec load_native_sticky(Module :: module(), Binary :: binary(), WholeModule :: 'false' | binary()) -> load_ret().
 load_native_sticky(Mod, Bin, WholeModule)
   when is_atom(Mod), is_binary(Bin),
        (is_binary(WholeModule) orelse WholeModule =:= false) ->
     call({load_native_sticky,Mod,Bin,WholeModule}).
 
--spec delete(Module :: atom()) -> boolean().
+-spec delete(Module) -> boolean() when
+      Module :: module().
 delete(Mod) when is_atom(Mod) -> call({delete,Mod}).
 
--spec purge(Module :: atom()) -> boolean().
+-spec purge(Module) -> boolean() when
+      Module :: module().
 purge(Mod) when is_atom(Mod) -> call({purge,Mod}).
 
--spec soft_purge(Module :: atom()) -> boolean().
+-spec soft_purge(Module) -> boolean() when
+      Module :: module().
 soft_purge(Mod) when is_atom(Mod) -> call({soft_purge,Mod}).
 
--spec is_loaded(Module :: atom()) -> {'file', loaded_filename()} | 'false'.
+-spec is_loaded(Module) -> {'file', Loaded} | false when
+      Module :: module(),
+      Loaded :: loaded_filename().
 is_loaded(Mod) when is_atom(Mod) -> call({is_loaded,Mod}).
 
--spec get_object_code(Module :: atom()) -> {atom(), binary(), file:filename()} | 'error'.
+-spec get_object_code(Module) -> {Module, Binary, Filename} | error when
+      Module :: module(),
+      Binary :: binary(),
+      Filename :: file:filename().
 get_object_code(Mod) when is_atom(Mod) -> call({get_object_code, Mod}).
 
--spec all_loaded() -> [{atom(), loaded_filename()}].
+-spec all_loaded() -> [{Module, Loaded}] when
+      Module :: module(),
+      Loaded :: loaded_filename().
 all_loaded() -> call(all_loaded).
 
 -spec stop() -> no_return().
@@ -188,65 +213,86 @@ root_dir() -> call({dir,root_dir}).
 lib_dir() -> call({dir,lib_dir}).
 
 %% XXX is_list() is for backwards compatibility -- take out in future version
--spec lib_dir(App :: atom()) -> file:filename() | {'error', 'bad_name'}.
+-spec lib_dir(Name) -> file:filename() | {'error', 'bad_name'} when
+      Name :: atom().
 lib_dir(App) when is_atom(App) ; is_list(App) -> call({dir,{lib_dir,App}}).
 
--spec lib_dir(App :: atom(), SubDir :: atom()) -> file:filename() | {'error', 'bad_name'}.
+-spec lib_dir(Name, SubDir) -> file:filename() | {'error', 'bad_name'} when
+      Name :: atom(),
+      SubDir :: atom().
 lib_dir(App, SubDir) when is_atom(App), is_atom(SubDir) -> call({dir,{lib_dir,App,SubDir}}).
 
 -spec compiler_dir() -> file:filename().
 compiler_dir() -> call({dir,compiler_dir}).
 
 %% XXX is_list() is for backwards compatibility -- take out in future version
--spec priv_dir(App :: atom()) -> file:filename() | {'error', 'bad_name'}.
+-spec priv_dir(Name) -> file:filename() | {'error', 'bad_name'} when
+      Name :: atom().
 priv_dir(App) when is_atom(App) ; is_list(App) -> call({dir,{priv_dir,App}}).
 
--spec stick_dir(Directory :: file:filename()) -> 'ok' | 'error'.
+-spec stick_dir(Dir) -> 'ok' | 'error' when
+      Dir :: file:filename().
 stick_dir(Dir) when is_list(Dir) -> call({stick_dir,Dir}).
 
--spec unstick_dir(Directory :: file:filename()) -> 'ok' | 'error'.
+-spec unstick_dir(Dir) -> 'ok' | 'error' when
+      Dir :: file:filename().
 unstick_dir(Dir) when is_list(Dir) -> call({unstick_dir,Dir}).
 
--spec stick_mod(Module :: atom()) -> 'true'.
+-spec stick_mod(Module :: module()) -> 'true'.
 stick_mod(Mod) when is_atom(Mod) -> call({stick_mod,Mod}).
 
--spec unstick_mod(Module :: atom()) -> 'true'.
+-spec unstick_mod(Module :: module()) -> 'true'.
 unstick_mod(Mod) when is_atom(Mod) -> call({unstick_mod,Mod}).
 
--spec is_sticky(Module :: atom()) -> boolean().
+-spec is_sticky(Module) -> boolean() when
+      Module :: module().
 is_sticky(Mod) when is_atom(Mod) -> call({is_sticky,Mod}).
 
--spec set_path(Directories :: [file:filename()]) ->
-	'true' | {'error', 'bad_directory' | 'bad_path'}.
+-spec set_path(Path) -> 'true' | {'error', What} when
+      Path :: [Dir :: file:filename()],
+      What :: 'bad_directory' | 'bad_path'.
 set_path(PathList) when is_list(PathList) -> call({set_path,PathList}).
 
--spec get_path() -> [file:filename()].
+-spec get_path() -> Path when
+      Path :: [Dir :: file:filename()].
 get_path() -> call(get_path).
 
 -type add_path_ret() :: 'true' | {'error', 'bad_directory'}.
--spec add_path(Directory :: file:filename()) -> add_path_ret().
+-spec add_path(Dir) -> add_path_ret() when
+      Dir :: file:filename().
 add_path(Dir) when is_list(Dir) -> call({add_path,last,Dir}).
 
--spec add_pathz(Directory :: file:filename()) -> add_path_ret().
+-spec add_pathz(Dir) -> add_path_ret() when
+      Dir :: file:filename().
 add_pathz(Dir) when is_list(Dir) -> call({add_path,last,Dir}).
 
--spec add_patha(Directory :: file:filename()) -> add_path_ret().
+-spec add_patha(Dir) -> add_path_ret() when
+      Dir :: file:filename().
 add_patha(Dir) when is_list(Dir) -> call({add_path,first,Dir}).
 
--spec add_paths(Directories :: [file:filename()]) -> 'ok'.
+-spec add_paths(Dirs) -> 'ok' when
+      Dirs :: [Dir :: file:filename()].
 add_paths(Dirs) when is_list(Dirs) -> call({add_paths,last,Dirs}).
 
--spec add_pathsz(Directories :: [file:filename()]) -> 'ok'.
+-spec add_pathsz(Dirs) -> 'ok' when
+      Dirs :: [Dir :: file:filename()].
 add_pathsz(Dirs) when is_list(Dirs) -> call({add_paths,last,Dirs}).
 
--spec add_pathsa(Directories :: [file:filename()]) -> 'ok'.
+-spec add_pathsa(Dirs) -> 'ok' when
+      Dirs :: [Dir :: file:filename()].
 add_pathsa(Dirs) when is_list(Dirs) -> call({add_paths,first,Dirs}).
 
--spec del_path(Name :: file:filename() | atom()) -> boolean() | {'error', 'bad_name'}.
+-spec del_path(NameOrDir) -> boolean() | {'error', What} when
+      NameOrDir :: Name | Dir,
+      Name :: atom(),
+      Dir :: file:filename(),
+      What :: 'bad_name'.
 del_path(Name) when is_list(Name) ; is_atom(Name) -> call({del_path,Name}).
 
--type replace_path_error() :: {'error', 'bad_directory' | 'bad_name' | {'badarg',_}}.
--spec replace_path(Name:: atom(), Dir :: file:filename()) -> 'true' | replace_path_error().
+-spec replace_path(Name, Dir) -> 'true' | {'error', What} when
+      Name:: atom(),
+      Dir :: file:filename(),
+      What :: 'bad_directory' | 'bad_name' | {'badarg',_}.
 replace_path(Name, Dir) when (is_atom(Name) orelse is_list(Name)),
 			     (is_atom(Dir) orelse is_list(Dir)) ->
     call({replace_path,Name,Dir}).
@@ -351,10 +397,9 @@ get_mode(Flags) ->
 %% In that case return the name of the file which contains
 %% the loaded object code
 
--type which_ret_atoms() :: loaded_ret_atoms() | 'non_existing'.
-
--spec which(Module :: atom()) -> file:filename() | which_ret_atoms().
-
+-spec which(Module) -> Which when
+      Module :: module(),
+      Which :: file:filename() | loaded_ret_atoms() | non_existing.
 which(Module) when is_atom(Module) ->
     case is_loaded(Module) of
 	false ->
@@ -394,9 +439,9 @@ which(File, Base, [Directory|Tail]) ->
 %% Search the code path for a specific file. Try to locate
 %% it in the code path cache if possible.
 
--spec where_is_file(Filename :: file:filename()) ->
-        'non_existing' | file:filename().
-
+-spec where_is_file(Filename) -> non_existing | Absname when
+      Filename :: file:filename(),
+      Absname :: file:filename().
 where_is_file(File) when is_list(File) ->
     case call({is_cached,File}) of
 	no ->
diff --git a/lib/kernel/src/file.erl b/lib/kernel/src/file.erl
index f1a8aa9f77..5e4e1b0ba8 100644
--- a/lib/kernel/src/file.erl
+++ b/lib/kernel/src/file.erl
@@ -100,15 +100,7 @@
 		   | 'enotblk' | 'enotdir' | 'enotsup' | 'enxio'  | 'eperm'
 		   | 'epipe'   | 'erofs'   | 'espipe'  | 'esrch'  | 'estale'
 		   | 'exdev'.
--type bindings()  :: erl_eval:binding_struct().
-
--type date()      :: {Year :: pos_integer(),
-                      Month :: pos_integer(),
-                      Day ::pos_integer()}.
--type time()      :: {Hour :: non_neg_integer(),
-                      Minute :: non_neg_integer(),
-                      Second :: non_neg_integer()}.
--type date_time() :: {date(), time()}.
+-type date_time() :: calendar:datetime().
 -type posix_file_advise() :: 'normal' | 'sequential' | 'random'
                            | 'no_reuse' | 'will_need' | 'dont_need'.
 
@@ -920,7 +912,7 @@ eval(File) ->
 
 -spec eval(Filename, Bindings) -> ok | {error, Reason} when
       Filename :: name(),
-      Bindings :: bindings(),
+      Bindings :: erl_eval:binding_struct(),
       Reason :: posix() | badarg | terminated | system_limit
               | {Line :: integer(), Mod :: module(), Term :: term()}.
 
@@ -948,7 +940,7 @@ path_eval(Path, File) ->
              {ok, FullName} | {error, Reason} when
       Path :: [Dir :: name()],
       Filename :: name(),
-      Bindings :: bindings(),
+      Bindings :: erl_eval:binding_struct(),
       FullName :: filename(),
       Reason :: posix() | badarg | terminated | system_limit
               | {Line :: integer(), Mod :: module(), Term :: term()}.
@@ -979,7 +971,7 @@ script(File) ->
 
 -spec script(Filename, Bindings) -> {ok, Value} | {error, Reason} when
       Filename :: name(),
-      Bindings :: bindings(),
+      Bindings :: erl_eval:binding_struct(),
       Value :: term(),
       Reason :: posix() | badarg | terminated | system_limit
               | {Line :: integer(), Mod :: module(), Term :: term()}.
@@ -1010,7 +1002,7 @@ path_script(Path, File) ->
           {ok, Value, FullName} | {error, Reason} when
       Path :: [Dir :: name()],
       Filename :: name(),
-      Bindings :: bindings(),
+      Bindings :: erl_eval:binding_struct(),
       Value :: term(),
       FullName :: filename(),
       Reason :: posix() | badarg | terminated | system_limit
diff --git a/lib/kernel/src/inet_config.erl b/lib/kernel/src/inet_config.erl
index 2458876326..1ddbdcec25 100644
--- a/lib/kernel/src/inet_config.erl
+++ b/lib/kernel/src/inet_config.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2011. All Rights Reserved.
 %%
 %% 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
@@ -44,26 +44,6 @@
 %%
 -spec init() -> 'ok'.
 init() ->
-    OsType = os:type(),
-    case OsType of
-	{ose,_} ->
-	    case init:get_argument(loader) of
-		{ok,[["ose_inet"]]} ->			
-		    %% port already started by prim_loader
-		    ok;
-		_Other ->
-		    %% Setup reserved port for ose_inet driver (only OSE)
-		    case catch erlang:open_port({spawn,"ose_inet"}, [binary]) of
-			{'EXIT',Why} ->
-			    error("can't open port for ose_inet: ~p", [Why]);
-			OseInetPort ->
-			    erlang:display({ose_inet_port,OseInetPort})
-		    end
-	    end;
-	_ ->
-	    ok
-    end,
-
     set_hostname(),
 
     %% Note: In shortnames (or non-distributed) mode we don't need to know
@@ -71,6 +51,7 @@ init() ->
     %% the user to provide it (by means of inetrc), so we need to look 
     %% for it ourselves.
 
+    OsType = os:type(),
     do_load_resolv(OsType, erl_dist_mode()),
 
     case OsType of
@@ -226,35 +207,6 @@ do_load_resolv(vxworks, _) ->
 	    load_resolv(Resolv, resolv)
     end;
 
-do_load_resolv({ose,_Type}, _) ->
-    inet_db:set_lookup([file, dns]),
-    case os:getenv("NAMESERVER") of
-	false ->
-	    case os:getenv("RESOLVFILE") of
-		false ->
-		    erlang:display('Warning: No NAMESERVER or RESOLVFILE specified!'),
-		    no_resolv;
-		Resolv ->
-		    load_resolv(Resolv, resolv)
-	    end;
-	Ns ->
-	    {ok,IP} = inet_parse:address(Ns),
-	    inet_db:add_rc_list([{nameserver,IP}])
-    end,
-    case os:getenv("DOMAIN") of
-	false ->
-	    no_domain;
-	D ->
-	    ok = inet_db:add_rc_list([{domain,D}])
-    end,
-    case os:getenv("HOSTSFILE") of
-	false ->
-	    erlang:display('Warning: No HOSTSFILE specified!'),
-	    no_hosts_file;
-	File ->
-	    load_hosts(File, ose)
-    end;
-
 do_load_resolv(_, _) ->
     inet_db:set_lookup([native]).
 
diff --git a/lib/kernel/src/rpc.erl b/lib/kernel/src/rpc.erl
index be35f99ed2..e214ffa404 100644
--- a/lib/kernel/src/rpc.erl
+++ b/lib/kernel/src/rpc.erl
@@ -662,9 +662,10 @@ async_call(Node, Mod, Fun, Args) ->
 	      ReplyTo ! {self(), {promise_reply, R}}  %% self() is key
       end).
 
--spec yield(Key) -> {value, Val} | timeout when
+-spec yield(Key) -> Res | {badrpc, Reason} when
       Key :: key(),
-      Val :: (Res :: term()) | {badrpc, Reason :: term()}.
+      Res :: term(),
+      Reason :: term().
 
 yield(Key) when is_pid(Key) ->
     {value,R} = do_yield(Key, infinity),
diff --git a/lib/stdlib/doc/src/calendar.xml b/lib/stdlib/doc/src/calendar.xml
index 4876b37127..f8db48e00c 100644
--- a/lib/stdlib/doc/src/calendar.xml
+++ b/lib/stdlib/doc/src/calendar.xml
@@ -75,13 +75,13 @@
 
   <datatypes>
     <datatype>
-      <name name="t_datetime"/>
+      <name name="datetime"/>
     </datatype>
     <datatype>
-      <name name="t_datetime1970"/>
+      <name name="datetime1970"/>
     </datatype>
     <datatype>
-      <name name="t_date"/>
+      <name name="date"/>
     </datatype>
     <datatype>
       <name name="year"/>
@@ -100,7 +100,7 @@
       <name name="day"/>
     </datatype>
     <datatype>
-      <name name="t_time"/>
+      <name name="time"/>
     </datatype>
     <datatype>
       <name name="hour"/>
@@ -118,12 +118,7 @@
       <name name="ldom"/>
     </datatype>
     <datatype>
-      <name name="t_now"/>
-      <desc><p>See <seealso marker="erts:erlang#now/0">erlang:now/0</seealso>.</p>
-      </desc>
-    </datatype>
-    <datatype>
-      <name name="t_yearweeknum"/>
+      <name name="yearweeknum"/>
     </datatype>
     <datatype>
       <name name="weeknum"/>
diff --git a/lib/stdlib/doc/src/io.xml b/lib/stdlib/doc/src/io.xml
index af9c75d546..667d758e29 100644
--- a/lib/stdlib/doc/src/io.xml
+++ b/lib/stdlib/doc/src/io.xml
@@ -439,7 +439,7 @@ ok</pre>
           <item>
             <p>Prints the argument with the <c>string</c> syntax. The
               argument is, if no Unicode translation modifier is present, an 
-	      <seealso marker="erts:erlang#iolist_definition">I/O list</seealso>, a binary, or an atom. If the Unicode translation modifier ('t') is in effect, the argument is unicode:chardata(), meaning that binaries are in UTF-8. The characters
+              iolist(), a binary, or an atom. If the Unicode translation modifier ('t') is in effect, the argument is unicode:chardata(), meaning that binaries are in UTF-8. The characters
               are printed without quotes. The string is first truncated
 	      by the given precision and then padded and justified
 	      to the given field width. The default precision is the field width.</p>
diff --git a/lib/stdlib/src/calendar.erl b/lib/stdlib/src/calendar.erl
index 8d1071209e..0320e0cd0e 100644
--- a/lib/stdlib/src/calendar.erl
+++ b/lib/stdlib/src/calendar.erl
@@ -63,7 +63,7 @@
 %% Types
 %%----------------------------------------------------------------------
 
--export_type([t_now/0]).
+-export_type([date/0, time/0, datetime/0, datetime1970/0]).
 
 -type year()     :: non_neg_integer().
 -type year1970() :: 1970..10000.	% should probably be 1970..
@@ -76,15 +76,11 @@
 -type ldom()     :: 28 | 29 | 30 | 31. % last day of month
 -type weeknum()  :: 1..53.
 
--type t_now()    :: {MegaSecs :: non_neg_integer(),
-                     Secs :: non_neg_integer(),
-                     MicroSecs :: non_neg_integer()}.
-
--type t_date()         :: {year(),month(),day()}.
--type t_time()         :: {hour(),minute(),second()}.
--type t_datetime()     :: {t_date(),t_time()}.
--type t_datetime1970() :: {{year1970(),month(),day()},t_time()}.
--type t_yearweeknum()  :: {year(),weeknum()}.
+-type date()           :: {year(),month(),day()}.
+-type time()           :: {hour(),minute(),second()}.
+-type datetime()       :: {date(),time()}.
+-type datetime1970()   :: {{year1970(),month(),day()},time()}.
+-type yearweeknum()    :: {year(),weeknum()}.
 
 %%----------------------------------------------------------------------
 
@@ -123,7 +119,7 @@ date_to_gregorian_days(Year, Month, Day) when is_integer(Day), Day > 0 ->
     end.
 
 -spec date_to_gregorian_days(Date) -> Days when
-      Date :: t_date(),
+      Date :: date(),
       Days :: non_neg_integer().
 date_to_gregorian_days({Year, Month, Day}) ->
     date_to_gregorian_days(Year, Month, Day).
@@ -135,7 +131,7 @@ date_to_gregorian_days({Year, Month, Day}) ->
 %% January 1st.
 %%
 -spec datetime_to_gregorian_seconds(DateTime) -> Seconds when
-      DateTime :: t_datetime(),
+      DateTime :: datetime(),
       Seconds :: non_neg_integer().
 datetime_to_gregorian_seconds({Date, Time}) ->
     ?SECONDS_PER_DAY*date_to_gregorian_days(Date) +
@@ -155,14 +151,14 @@ day_of_the_week(Year, Month, Day) ->
     (date_to_gregorian_days(Year, Month, Day) + 5) rem 7 + 1.
 
 -spec day_of_the_week(Date) -> daynum() when
-      Date:: t_date().
+      Date:: date().
 day_of_the_week({Year, Month, Day}) ->
     day_of_the_week(Year, Month, Day).
 
 
 %% gregorian_days_to_date(Days) = {Year, Month, Day}
 %%
--spec gregorian_days_to_date(Days) -> t_date() when
+-spec gregorian_days_to_date(Days) -> date() when
       Days :: non_neg_integer().
 gregorian_days_to_date(Days) ->
     {Year, DayOfYear} = day_to_year(Days),
@@ -172,7 +168,7 @@ gregorian_days_to_date(Days) ->
 
 %% gregorian_seconds_to_datetime(Secs)
 %%
--spec gregorian_seconds_to_datetime(Seconds) -> t_datetime() when
+-spec gregorian_seconds_to_datetime(Seconds) -> datetime() when
       Seconds :: non_neg_integer().
 gregorian_seconds_to_datetime(Secs) when Secs >= 0 ->
     Days = Secs div ?SECONDS_PER_DAY,
@@ -198,7 +194,7 @@ is_leap_year1(_) -> false.
 %%
 %% Calculates the iso week number for the current date.
 %%
--spec iso_week_number() -> t_yearweeknum().
+-spec iso_week_number() -> yearweeknum().
 iso_week_number() ->
     {Date, _} = local_time(),
     iso_week_number(Date).
@@ -207,8 +203,8 @@ iso_week_number() ->
 %%
 %% Calculates the iso week number for the given date.
 %%
--spec iso_week_number(Date) -> t_yearweeknum() when
-      Date :: t_date().
+-spec iso_week_number(Date) -> yearweeknum() when
+      Date :: date().
 iso_week_number({Year, Month, Day}) ->
     D = date_to_gregorian_days({Year, Month, Day}),
     W01_1_Year = gregorian_days_of_iso_w01_1(Year),
@@ -260,7 +256,7 @@ last_day_of_the_month1(_, M) when is_integer(M), M > 0, M < 13 ->
 %% local_time()
 %%
 %% Returns: {date(), time()}, date() = {Y, M, D}, time() = {H, M, S}.
--spec local_time() -> t_datetime().
+-spec local_time() -> datetime().
 local_time() ->
     erlang:localtime().
 
@@ -268,20 +264,20 @@ local_time() ->
 %% local_time_to_universal_time(DateTime)
 %%
 -spec local_time_to_universal_time(DateTime1) -> DateTime2 when
-      DateTime1 :: t_datetime1970(),
-      DateTime2 :: t_datetime1970().
+      DateTime1 :: datetime1970(),
+      DateTime2 :: datetime1970().
 local_time_to_universal_time(DateTime) ->
     erlang:localtime_to_universaltime(DateTime).
 
--spec local_time_to_universal_time(t_datetime1970(),
+-spec local_time_to_universal_time(datetime1970(),
 				   'true' | 'false' | 'undefined') ->
-       					t_datetime1970().
+                                          datetime1970().
 local_time_to_universal_time(DateTime, IsDst) ->
     erlang:localtime_to_universaltime(DateTime, IsDst).
 
 -spec local_time_to_universal_time_dst(DateTime1) -> [DateTime] when
-      DateTime1 :: t_datetime1970(),
-      DateTime :: t_datetime1970().
+      DateTime1 :: datetime1970(),
+      DateTime :: datetime1970().
 local_time_to_universal_time_dst(DateTime) ->
     UtDst = erlang:localtime_to_universaltime(DateTime, true),
     Ut    = erlang:localtime_to_universaltime(DateTime, false),
@@ -309,14 +305,14 @@ local_time_to_universal_time_dst(DateTime) ->
 %% = MilliSec = integer() 
 %% Returns: {date(), time()}, date() = {Y, M, D}, time() = {H, M, S}.
 %% 
--spec now_to_datetime(Now) -> t_datetime1970() when
-      Now :: t_now().
+-spec now_to_datetime(Now) -> datetime1970() when
+      Now :: erlang:timestamp().
 now_to_datetime({MSec, Sec, _uSec}) ->
     Sec0 = MSec*1000000 + Sec + ?DAYS_FROM_0_TO_1970*?SECONDS_PER_DAY,
     gregorian_seconds_to_datetime(Sec0).
 
--spec now_to_universal_time(Now) -> t_datetime1970() when
-      Now :: t_now().
+-spec now_to_universal_time(Now) -> datetime1970() when
+      Now :: erlang:timestamp().
 now_to_universal_time(Now) ->
     now_to_datetime(Now).
 
@@ -325,8 +321,8 @@ now_to_universal_time(Now) ->
 %%
 %% Args: Now = now()
 %%
--spec now_to_local_time(Now) -> t_datetime1970() when
-      Now :: t_now().
+-spec now_to_local_time(Now) -> datetime1970() when
+      Now :: erlang:timestamp().
 now_to_local_time({MSec, Sec, _uSec}) ->
     erlang:universaltime_to_localtime(
       now_to_universal_time({MSec, Sec, _uSec})).
@@ -338,7 +334,7 @@ now_to_local_time({MSec, Sec, _uSec}) ->
 -spec seconds_to_daystime(Seconds) -> {Days, Time} when
       Seconds :: integer(),
       Days :: integer(),
-      Time :: t_time().
+      Time :: time().
 seconds_to_daystime(Secs) ->
     Days0 = Secs div ?SECONDS_PER_DAY,
     Secs0 = Secs rem ?SECONDS_PER_DAY,
@@ -356,7 +352,7 @@ seconds_to_daystime(Secs) ->
 %% Wraps.
 %%
 -type secs_per_day() :: 0..?SECONDS_PER_DAY.
--spec seconds_to_time(Seconds) -> t_time() when
+-spec seconds_to_time(Seconds) -> time() when
       Seconds :: secs_per_day().
 seconds_to_time(Secs) when Secs >= 0, Secs < ?SECONDS_PER_DAY ->
     Secs0 = Secs rem ?SECONDS_PER_DAY,
@@ -375,10 +371,10 @@ seconds_to_time(Secs) when Secs >= 0, Secs < ?SECONDS_PER_DAY ->
 %% Year = Month = Day = Hour = Minute = Sec = integer()
 %%
 -spec time_difference(T1, T2) -> {Days, Time} when
-      T1 :: t_datetime(),
-      T2 :: t_datetime(),
+      T1 :: datetime(),
+      T2 :: datetime(),
       Days :: integer(),
-      Time :: t_time().
+      Time :: time().
 time_difference({{Y1, Mo1, D1}, {H1, Mi1, S1}}, 
 		{{Y2, Mo2, D2}, {H2, Mi2, S2}}) ->
     Secs = datetime_to_gregorian_seconds({{Y2, Mo2, D2}, {H2, Mi2, S2}}) -
@@ -390,7 +386,7 @@ time_difference({{Y1, Mo1, D1}, {H1, Mi1, S1}},
 %% time_to_seconds(Time)
 %%
 -spec time_to_seconds(Time) -> secs_per_day() when
-      Time :: t_time().
+      Time :: time().
 time_to_seconds({H, M, S}) when is_integer(H), is_integer(M), is_integer(S) ->
     H * ?SECONDS_PER_HOUR +
 	M * ?SECONDS_PER_MINUTE + S.
@@ -399,15 +395,15 @@ time_to_seconds({H, M, S}) when is_integer(H), is_integer(M), is_integer(S) ->
 %% universal_time()
 %%
 %% Returns: {date(), time()}, date() = {Y, M, D}, time() = {H, M, S}.
--spec universal_time() -> t_datetime().
+-spec universal_time() -> datetime().
 universal_time() ->
     erlang:universaltime().
  
 
 %% universal_time_to_local_time(DateTime)
 %%
--spec universal_time_to_local_time(DateTime) -> t_datetime() when
-      DateTime :: t_datetime1970().
+-spec universal_time_to_local_time(DateTime) -> datetime() when
+      DateTime :: datetime1970().
 universal_time_to_local_time(DateTime) ->
     erlang:universaltime_to_localtime(DateTime).
 
@@ -429,7 +425,7 @@ valid_date1(_, _, _) ->
     false.
 
 -spec valid_date(Date) -> boolean() when
-      Date :: t_date().
+      Date :: date().
 valid_date({Y, M, D}) ->
     valid_date(Y, M, D).
 
diff --git a/lib/stdlib/src/timer.erl b/lib/stdlib/src/timer.erl
index 89fae05e4f..e3d6c905b6 100644
--- a/lib/stdlib/src/timer.erl
+++ b/lib/stdlib/src/timer.erl
@@ -200,8 +200,8 @@ tc(M, F, A) ->
 %% erlang:now() timestamps, T2-T1.
 %%
 -spec now_diff(T1, T2) -> Tdiff when
-      T1 :: calendar:t_now(),
-      T2 :: calendar:t_now(),
+      T1 :: erlang:timestamp(),
+      T2 :: erlang:timestamp(),
       Tdiff :: integer().
 now_diff({A2, B2, C2}, {A1, B1, C1}) ->
     ((A2-A1)*1000000 + B2-B1)*1000000 + C2-C1.
diff --git a/make/otp.mk.in b/make/otp.mk.in
index a4e9dad46f..1ba74a3048 100644
--- a/make/otp.mk.in
+++ b/make/otp.mk.in
@@ -239,7 +239,9 @@ FOP = @FOP@
 
 DOCGEN=$(ERL_TOP)/lib/erl_docgen
 
+ifneq (,$(findstring $(origin SPECS_ESRC),$(DUBIOUS_ORIGINS)))
 SPECS_ESRC = ../../src
+endif
 SPECS_EXTRACTOR=$(DOCGEN)/priv/bin/specs_gen.escript
 # Extract specifications and types from Erlang source files (-spec, -type)
 $(SPECDIR)/specs_%.xml: $(SPECS_ESRC)/%.erl