Merge branch 'dev' of super:otp into dev

* 'dev' of super:otp: (166 commits)
  Corrected documentation error and added examples to Users Guide
  In TLS 1.1, failure to properly close a connection no longer requires that a session not be resumed.  This is a change from TLS 1.0 to conform with widespread implementation practice.  Erlang ssl will now in TLS 1.0 conform to the widespread implementation practice instead of the specification to avoid performance issues.
  Add escript to bootstrap/bin
  Remove unused variable warning in inet_res
  Remove unused variable in epmd_port
  Remove compiler warnings in inet_drv
  Add SASL test suite
  Allow same module name in multiple applications if explicitely excluded
  Fix bugs concerning the option report_missing_types
  Fix default encoding in SAX parser.
  re: remove gratuitous "it " in manpage
  Spelling in (backward *compatibility*) comment.
  Improve erl_docgen's support for Dialyzer specs and types
  dialyzer warning on mnesia_tm
  Add documentation text about majority checking
  add mnesia_majority_test suite
  where_to_wlock optimization + change_table_majority/2
  bug in mnesia_tm:needs_majority/2
  optimize sticky_lock maj. check
  check majority for sticky locks
  ...

1 files changed, 18 insertions, 23 deletions

diff --git a/lib/stdlib/src/io_lib_fread.erl b/lib/stdlib/src/io_lib_fread.erl
index 33553692bc..52aa4d073c 100644
--- a/lib/stdlib/src/io_lib_fread.erl
+++ b/lib/stdlib/src/io_lib_fread.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
@@ -22,36 +22,24 @@
 
 -export([fread/2,fread/3]).
 
--export_type([continuation/0, fread_2_ret/0, fread_3_ret/0]).
-
 -import(lists, [reverse/1,reverse/2]).
 
 %%-----------------------------------------------------------------------
-%% Local types
-%%-----------------------------------------------------------------------
-
--type done_arg2() :: {'ok', io_lib:chars()} | 'eof' | {'error', term()}.
-
-%%-----------------------------------------------------------------------
-%% Types also used in other files
-%%-----------------------------------------------------------------------
-
--type continuation() :: [] | {_, _, _, _}.  % XXX: refine
-
--type fread_2_ret()  :: {'ok', io_lib:chars(), string()}
-	              | {'more', string(), non_neg_integer(), io_lib:chars()}
-                      | {'error', term()}.
--type fread_3_ret()  :: {'more', continuation()}
-                      | {'done', done_arg2(), string()}.
-
-%%-----------------------------------------------------------------------
 
 %% fread(Continuation, CharList, FormatString)
 %%  This is the main function into the re-entrant formatted reader. It
 %%  repeatedly collects lines and calls fread/2 to format the input until
 %%  all the format string has been used. And it counts the characters.
 
--spec fread(io_lib_fread:continuation(), string(), string()) -> fread_3_ret().
+-spec fread(Continuation, String, Format) -> Return when
+      Continuation :: io_lib:continuation() |  [],
+      String :: string(),
+      Format :: string(),
+      Return :: {'more', Continuation1 :: io_lib:continuation()}
+              | {'done', Result, LeftOverChars :: string()},
+      Result :: {'ok', InputList :: io_lib:chars()}
+              | 'eof'
+              | {'error', What :: term()}.
 
 fread([], Chars, Format) ->
     %%io:format("FREAD: ~w `~s'~n", [Format,Chars]),
@@ -106,7 +94,14 @@ fread_line(Format0, Line, N0, Results0, More, Newline) ->
 %%   WHITE      Skip white space
 %%   X          Literal X
 
--spec fread(string(), string()) -> fread_2_ret().
+-spec fread(Format, String) -> Result when
+      Format :: string(),
+      String :: string(),
+      Result :: {'ok', InputList :: io_lib:chars(), LeftOverChars :: string()}
+              | {'more', RestFormat :: string(),
+                 Nchars :: non_neg_integer(),
+                 InputStack :: io_lib:chars()}
+              | {'error', What :: term()}.
 
 fread(Format, Line) ->
     fread(Format, Line, 0, []).