6 files changed, 12 insertions, 12 deletions
diff --git a/lib/sasl/src/rb.erl b/lib/sasl/src/rb.erl
index 28829132a1..bef4268d3a 100644
--- a/lib/sasl/src/rb.erl
+++ b/lib/sasl/src/rb.erl
@@ -890,7 +890,7 @@ read_rep(Fd, FilePosition, Device, Abort, Log) ->
     
 handle_bad_form(Date, Msg, Device, Abort, Log) ->
     io:format("rb: ERROR! A report on bad form was encountered. " ++
-	      "It can not be printed to the log.~n~n"),
+	      "It cannot be printed to the log.~n~n"),
     io:format("Details:~n~p ~tp~n~n", [Date,Msg]),
     case {Abort,Device,open_log_file(Log)} of
 	{true,standard_io,standard_io} ->
diff --git a/lib/sasl/src/release_handler.erl b/lib/sasl/src/release_handler.erl
index 7570b74c1a..48feac1a21 100644
--- a/lib/sasl/src/release_handler.erl
+++ b/lib/sasl/src/release_handler.erl
@@ -1120,7 +1120,7 @@ new_emulator_make_hybrid_config(CurrentVsn,ToVsn,TmpVsn,RelDir,Masters) ->
 	    {ok,[FC]} ->
 		FC;
 	    {error,Error1} ->
-		io:format("Warning: ~w can not read ~tp: ~tp~n",
+		io:format("Warning: ~w cannot read ~tp: ~tp~n",
 			  [?MODULE,FromFile,Error1]),
 		[]
 	end,
@@ -1130,7 +1130,7 @@ new_emulator_make_hybrid_config(CurrentVsn,ToVsn,TmpVsn,RelDir,Masters) ->
 	    {ok,[ToConfig]} ->
 		[lists:keyfind(App,1,ToConfig) || App <- [kernel,stdlib,sasl]];
 	    {error,Error2} ->
-		io:format("Warning: ~w can not read ~tp: ~tp~n",
+		io:format("Warning: ~w cannot read ~tp: ~tp~n",
 			  [?MODULE,ToFile,Error2]),
 		[false,false,false]
 	end,
diff --git a/lib/sasl/src/release_handler_1.erl b/lib/sasl/src/release_handler_1.erl
index ca97515299..bf18691687 100644
--- a/lib/sasl/src/release_handler_1.erl
+++ b/lib/sasl/src/release_handler_1.erl
@@ -147,7 +147,7 @@ split_instructions([], Before) ->
 %%          If PrePurgeMethod == soft_purge, the function will succeed
 %%          only if there is no process running old code of any of the
 %%          modules. Else it will throw {error,Mod}, where Mod is the
-%%          first module found that can not be soft_purged.
+%%          first module found that cannot be soft_purged.
 %%
 %%          If PrePurgeMethod == brutal_purge, the function will
 %%          always succeed and return a list of all modules that are
diff --git a/lib/sasl/src/systools.erl b/lib/sasl/src/systools.erl
index dd1a58c3c1..34eca6679f 100644
--- a/lib/sasl/src/systools.erl
+++ b/lib/sasl/src/systools.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2019. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -73,7 +73,7 @@ make_tar(RelName, Opt) ->
 script2boot(File) ->
     case systools_lib:file_term2binary(File ++ ".script", File ++ ".boot") of
 	{error,Error} ->
-	    io:format(systools_make:format_error(Error)),
+	    io:format("~ts", [systools_make:format_error(Error)]),
 	    error;
 	_ ->
 	    ok
@@ -84,7 +84,7 @@ script2boot(File, Output0, _Opt) ->
     Output = Output0++".boot",
     case systools_lib:file_term2binary(Input, Output) of
 	{error,Error} ->
-	    io:format(systools_make:format_error(Error)),
+	    io:format("~ts", [systools_make:format_error(Error)]),
 	    error;
 	_ ->
 	    ok
diff --git a/lib/sasl/src/systools_make.erl b/lib/sasl/src/systools_make.erl
index f085246924..c2c91fd667 100644
--- a/lib/sasl/src/systools_make.erl
+++ b/lib/sasl/src/systools_make.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2019. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -1562,11 +1562,11 @@ mandatory_modules() ->
 
 preloaded() ->
     %% Sorted
-    [atomics, counters, erl_prim_loader,erl_tracer,erlang,
+    [atomics,counters,erl_init,erl_prim_loader,erl_tracer,erlang,
      erts_code_purger,erts_dirty_process_signal_handler,
      erts_internal,erts_literal_area_collector,
-     init,otp_ring0,persistent_term,prim_buffer,prim_eval,prim_file,
-     prim_inet,prim_zip,zlib].
+     init,net,persistent_term,prim_buffer,prim_eval,prim_file,
+     prim_inet,prim_zip,socket,zlib].
 
 %%______________________________________________________________________
 %% Kernel processes; processes that are specially treated by the init
diff --git a/lib/sasl/src/systools_relup.erl b/lib/sasl/src/systools_relup.erl
index e836d57670..5f1176ec69 100644
--- a/lib/sasl/src/systools_relup.erl
+++ b/lib/sasl/src/systools_relup.erl
@@ -587,7 +587,7 @@ default(warnings_as_errors) -> false.
 
 print_error({error, Mod, Error}) ->
     S = apply(Mod, format_error, [Error]),
-    io:format(S, []);
+    io:format("~ts", [S]);
 print_error(Other) ->
     io:format("Error: ~tp~n", [Other]).