Merge branch 'maint'

18 files changed, 152 insertions, 152 deletions

diff --git a/lib/mnesia/src/mnesia.erl b/lib/mnesia/src/mnesia.erl
index 3b771e8c5b..b68b2de028 100644
--- a/lib/mnesia/src/mnesia.erl
+++ b/lib/mnesia/src/mnesia.erl
@@ -2283,9 +2283,9 @@ list_index_plugins([{N,M,F} | T] = Ps, Legend) ->
 	  lists:foldl(fun({N1,_,_}, Wa) ->
 			      erlang:max(Wa, length(pp_ix_name(N1)))
 		      end, 0, Ps)),
-    io:fwrite(Legend ++ "~-" ++ W ++ "s - ~s:~s~n",
+    io:fwrite(Legend ++ "~-" ++ W ++ "s - ~s:~ts~n",
 	      [pp_ix_name(N), atom_to_list(M), atom_to_list(F)]),
-    [io:fwrite(Indent ++ "~-" ++ W ++ "s - ~s:~s~n",
+    [io:fwrite(Indent ++ "~-" ++ W ++ "s - ~s:~ts~n",
 	       [pp_ix_name(N1), atom_to_list(M1), atom_to_list(F1)])
      || {N1,M1,F1} <- T].
 
diff --git a/lib/mnesia/src/mnesia_bup.erl b/lib/mnesia/src/mnesia_bup.erl
index 3e55deb958..34f16f178b 100644
--- a/lib/mnesia/src/mnesia_bup.erl
+++ b/lib/mnesia/src/mnesia_bup.erl
@@ -920,7 +920,7 @@ create_dat_files([{schema, Tab, TabDef} | Tail], Ext, LocalTabs) ->
 				       ok ->
 					   ok;
 				       {error, Reason} ->
-					   mnesia_lib:fatal("Cannot rename file ~p -> ~p: ~p~n",
+					   mnesia_lib:fatal("Cannot rename file ~tp -> ~tp: ~tp~n",
 							    [TmpFile, DclFile, Reason])
 				   end
 			   end
@@ -1016,7 +1016,7 @@ disc_only_swap_fun(disc_only_copies, Expunge, Open, Close) ->
 		ok ->
 		    ok;
 		{error, Reason} ->
-		    mnesia_lib:fatal("Cannot rename file ~p -> ~p: ~p~n",
+		    mnesia_lib:fatal("Cannot rename file ~tp -> ~tp: ~tp~n",
 				     [TmpFile, DatFile, Reason])
 	    end
     end;
diff --git a/lib/mnesia/src/mnesia_checkpoint.erl b/lib/mnesia/src/mnesia_checkpoint.erl
index 8659e4622c..2ff77326a9 100644
--- a/lib/mnesia/src/mnesia_checkpoint.erl
+++ b/lib/mnesia/src/mnesia_checkpoint.erl
@@ -683,14 +683,14 @@ retainer_create(_Cp, R, Tab, Name, Ext = {ext, Alias, Mod}) ->
     Cs = val({Tab, cstruct}),
     Mod:load_table(Alias, T, {retainer, create_table},
 		   mnesia_schema:cs2list(Cs)),
-    dbg_out("Checkpoint retainer created ~p ~p~n", [Name, Tab]),
+    dbg_out("Checkpoint retainer created ~p ~tp~n", [Name, Tab]),
     R#retainer{store = {Ext, T}, really_retain = true};
 retainer_create(_Cp, R, Tab, Name, disc_only_copies) ->
     Fname = tab2retainer({Tab, Name}),
     file:delete(Fname),
     Args = [{file, Fname}, {type, set}, {keypos, 2}, {repair, false}],
     {ok, _} = mnesia_lib:dets_sync_open({Tab, Name}, Args),
-    dbg_out("Checkpoint retainer created ~p ~p~n", [Name, Tab]),
+    dbg_out("Checkpoint retainer created ~p ~tp~n", [Name, Tab]),
     R#retainer{store = {dets, {Tab, Name}}, really_retain = true};
 retainer_create(Cp, R, Tab, Name, Storage) ->
     T = ?ets_new_table(mnesia_retainer, [set, public, {keypos, 2}]),
@@ -698,7 +698,7 @@ retainer_create(Cp, R, Tab, Name, Storage) ->
     ReallyR = R#retainer.really_retain,
     ReallyCp = lists:member(Tab, Overriders),
     ReallyR2 = prepare_ram_tab(Tab, T, Storage, ReallyR, ReallyCp),
-    dbg_out("Checkpoint retainer created ~p ~p~n", [Name, Tab]),
+    dbg_out("Checkpoint retainer created ~p ~tp~n", [Name, Tab]),
     R#retainer{store = {ets, T}, really_retain = ReallyR2}.
 
 %% Copy the dumped table into retainer if needed
@@ -849,7 +849,7 @@ retainer_loop(Cp = #checkpoint_args{is_activated=false, name=Name}) ->
 	    retainer_loop(Cp#checkpoint_args{iterators = Iters});
 
 	{system, From, Msg} ->
-	    dbg_out("~p got {system, ~p, ~p}~n", [?MODULE, From, Msg]),
+	    dbg_out("~p got {system, ~p, ~tp}~n", [?MODULE, From, Msg]),
 	    sys:handle_system_msg(Msg, From, Cp#checkpoint_args.supervisor,
 				  ?MODULE, [], Cp)
     end;
@@ -938,11 +938,11 @@ retainer_loop(Cp = #checkpoint_args{name=Name}) ->
 	    retainer_loop(Cp#checkpoint_args{iterators = Iters});
 
 	{system, From, Msg} ->
-	    dbg_out("~p got {system, ~p, ~p}~n", [?MODULE, From, Msg]),
+	    dbg_out("~p got {system, ~p, ~tp}~n", [?MODULE, From, Msg]),
 	    sys:handle_system_msg(Msg, From, Cp#checkpoint_args.supervisor,
 				  ?MODULE, [], Cp);
 	Msg ->
-	    dbg_out("~p got ~p~n", [?MODULE, Msg])
+	    dbg_out("~p got ~tp~n", [?MODULE, Msg])
     end.
 
 maybe_activate(Cp)
diff --git a/lib/mnesia/src/mnesia_controller.erl b/lib/mnesia/src/mnesia_controller.erl
index 6b93935cb4..77013489b3 100644
--- a/lib/mnesia/src/mnesia_controller.erl
+++ b/lib/mnesia/src/mnesia_controller.erl
@@ -446,7 +446,7 @@ try_schedule_late_disc_load(Tabs, Reason, MsgTag) ->
 		    [BadNodes]),
 	    try_schedule_late_disc_load(Tabs, Reason, MsgTag);
 	{aborted, AbortReason} ->
-	    fatal("Cannot late_load_tables~p: ~p~n",
+	    fatal("Cannot late_load_tables ~tp: ~tp~n",
 		  [[Tabs, Reason, MsgTag], AbortReason])
     end.
 
@@ -535,7 +535,7 @@ try_merge_schema(Nodes, Told0, UserFun) ->
 		   end,
 	    try_merge_schema(Nodes, Told, UserFun);
 	{atomic, {"Cannot get cstructs", Node, Reason}} ->
-	    dbg_out("Cannot get cstructs, Node ~p ~p~n", [Node, Reason]),
+	    dbg_out("Cannot get cstructs, Node ~p ~tp~n", [Node, Reason]),
 	    timer:sleep(300), % Avoid a endless loop look alike
 	    try_merge_schema(Nodes, Told0, UserFun);
 	{aborted, {shutdown, _}} ->  %% One of the nodes is going down
@@ -826,12 +826,12 @@ handle_call({del_other, Who}, _From, State = #state{others=Others0}) ->
     {reply, ok, State#state{others=Others}};
 
 handle_call(Msg, _From, State) ->
-    error("~p got unexpected call: ~p~n", [?SERVER_NAME, Msg]),
+    error("~p got unexpected call: ~tp~n", [?SERVER_NAME, Msg]),
     noreply(State).
 
 late_disc_load(TabsR, Reason, RemoteLoaders, From,
 	       State = #state{loader_queue = LQ, late_loader_queue = LLQ}) ->
-    verbose("Intend to load tables: ~p~n", [TabsR]),
+    verbose("Intend to load tables: ~tp~n", [TabsR]),
     ?eval_debug_fun({?MODULE, late_disc_load},
 		    [{tabs, TabsR},
 		     {reason, Reason},
@@ -1118,7 +1118,7 @@ handle_cast({adopt_orphans, Node, Tabs}, State) ->
     noreply(State2);
 
 handle_cast(Msg, State) ->
-    error("~p got unexpected cast: ~p~n", [?SERVER_NAME, Msg]),
+    error("~p got unexpected cast: ~tp~n", [?SERVER_NAME, Msg]),
     noreply(State).
 
 handle_sync_tabs([Tab | Tabs], From) ->
@@ -1166,7 +1166,7 @@ handle_info(#dumper_done{worker_pid=Pid, worker_res=Res}, State) ->
 	    State3 = opt_start_worker(State2),
 	    noreply(State3);
 	true ->
-	    fatal("Dumper failed: ~p~n state: ~p~n", [Res, State]),
+	    fatal("Dumper failed: ~p~n state: ~tp~n", [Res, State]),
 	    {stop, fatal, State}
     end;
 
@@ -1249,7 +1249,7 @@ handle_info(#sender_done{worker_pid=Pid, worker_res=Res}, State)  ->
 	true ->
 	    %% No need to send any message to the table receiver
 	    %% since it will soon get a mnesia_down anyway
-	    fatal("Sender failed: ~p~n state: ~p~n", [Res, State]),
+	    fatal("Sender failed: ~p~n state: ~tp~n", [Res, State]),
 	    {stop, fatal, State}
     end;
 
@@ -1257,7 +1257,7 @@ handle_info({'EXIT', Pid, R}, State) when Pid == State#state.supervisor ->
     ?SAFE(set(mnesia_status, stopping)),
     case State#state.dumper_pid of
 	undefined ->
-	    dbg_out("~p was ~p~n", [?SERVER_NAME, R]),
+	    dbg_out("~p was ~tp~n", [?SERVER_NAME, R]),
 	    {stop, shutdown, State};
 	_ ->
 	    noreply(State#state{is_stopping = true})
@@ -1266,12 +1266,12 @@ handle_info({'EXIT', Pid, R}, State) when Pid == State#state.supervisor ->
 handle_info({'EXIT', Pid, R}, State) when Pid == State#state.dumper_pid ->
     case State#state.dumper_queue of
 	[#schema_commit_lock{}|Workers] -> %% Schema trans crashed or was killed
-	    dbg_out("WARNING: Dumper ~p exited ~p~n", [Pid, R]),
+	    dbg_out("WARNING: Dumper ~p exited ~tp~n", [Pid, R]),
 	    State2 = State#state{dumper_queue = Workers, dumper_pid = undefined},
 	    State3 = opt_start_worker(State2),
 	    noreply(State3);
 	_Other ->
-	    fatal("Dumper or schema commit crashed: ~p~n state: ~p~n", [R, State]),
+	    fatal("Dumper or schema commit crashed: ~p~n state: ~tp~n", [R, State]),
 	    {stop, fatal, State}
     end;
 
@@ -1280,15 +1280,15 @@ handle_info(Msg = {'EXIT', Pid, R}, State) when R /= wait_for_tables_timeout ->
 	true ->
 	    %% No need to send any message to the table receiver
 	    %% since it will soon get a mnesia_down anyway
-	    fatal("Sender crashed: ~p~n state: ~p~n", [{Pid,R}, State]),
+	    fatal("Sender crashed: ~p~n state: ~tp~n", [{Pid,R}, State]),
 	    {stop, fatal, State};
 	false ->
 	    case lists:keymember(Pid, 1, get_loaders(State)) of
 		true ->
-		    fatal("Loader crashed: ~p~n state: ~p~n", [R, State]),
+		    fatal("Loader crashed: ~p~n state: ~tp~n", [R, State]),
 		    {stop, fatal, State};
 		false ->
-		    error("~p got unexpected info: ~p~n", [?SERVER_NAME, Msg]),
+		    error("~p got unexpected info: ~tp~n", [?SERVER_NAME, Msg]),
 		    noreply(State)
 	    end
     end;
@@ -1308,7 +1308,7 @@ handle_info({'EXIT', Pid, wait_for_tables_timeout}, State) ->
     noreply(State);
 
 handle_info(Msg, State) ->
-    error("~p got unexpected info: ~p~n", [?SERVER_NAME, Msg]),
+    error("~p got unexpected info: ~tp~n", [?SERVER_NAME, Msg]),
     noreply(State).
 
 sync_tab_timeout(Pid, [{{sync_tab, Tab}, Pids} | Tail]) ->
@@ -2054,7 +2054,7 @@ opt_start_sender2([Sender|R], Pids, Kept, LoaderQ) ->
 	    Pid = spawn_link(?MODULE, send_and_reply,[self(), Sender]),
 	    opt_start_sender2(R,[{Pid,Sender}|Pids],Kept,LoaderQ);
 	true ->
-	    verbose("Send table failed ~p not active on this node ~n", [Tab]),
+	    verbose("Send table failed ~tp not active on this node ~n", [Tab]),
 	    Sender#send_table.receiver_pid ! {copier_done, node()},
 	    opt_start_sender2(R,Pids, Kept, LoaderQ)
     end.
@@ -2239,7 +2239,7 @@ disc_load_table(Tab, Reason, ReplyTo) ->
 	    Done#loader_done{is_loaded = false,
 			     reply = Res};
 	true ->
-	    fatal("Cannot load table ~p from disc: ~p~n", [Tab, Res])
+	    fatal("Cannot load table ~tp from disc: ~tp~n", [Tab, Res])
     end.
 
 filter_active(Tab) ->
diff --git a/lib/mnesia/src/mnesia_dumper.erl b/lib/mnesia/src/mnesia_dumper.erl
index eb02a585a6..f0ed7aef4a 100644
--- a/lib/mnesia/src/mnesia_dumper.erl
+++ b/lib/mnesia/src/mnesia_dumper.erl
@@ -193,7 +193,7 @@ do_perform_dump(Cont, InPlace, InitBy, Regulator, OldVersion) ->
 		    do_perform_dump(C2, InPlace, InitBy, Regulator, Version)
 	    catch _:R when R =/= fatal ->
 		    ST = erlang:get_stacktrace(),
-		    Reason = {"Transaction log dump error: ~p~n", [{R, ST}]},
+		    Reason = {"Transaction log dump error: ~tp~n", [{R, ST}]},
 		    close_files(InPlace, {error, Reason}, InitBy),
 		    exit(Reason)
 	    end;
@@ -329,7 +329,7 @@ perform_update(Tid, SchemaOps, _DumperMode, _UseDir) ->
 	    ST = erlang:get_stacktrace(),
 	    Error = {error, {"Schema update error", {Reason, ST}}},
 	    close_files(InPlace, Error, InitBy),
-            fatal("Schema update error ~p ~p", [{Reason,ST}, SchemaOps])
+            fatal("Schema update error ~tp ~tp", [{Reason,ST}, SchemaOps])
     end.
 
 insert_ops(_Tid, _Storage, [], _InPlace, _InitBy, _) ->    ok;
@@ -1166,7 +1166,7 @@ needs_dump_ets(Tab) ->
             DcdF =  mnesia_lib:tab2dcd(Tab),
             case file:read_file_info(DcdF) of
                 {error, Reason} ->
-                    mnesia_lib:dbg_out("File ~p info_error ~p ~n",
+                    mnesia_lib:dbg_out("File ~tp info_error ~tp ~n",
                                        [DcdF, Reason]),
                     true;
                 {ok, DcdInfo} ->
@@ -1205,7 +1205,7 @@ prepare_open(Tab, UpdateInPlace) ->
 	    Tmp = mnesia_lib:tab2tmp(Tab),
 	    try ok = mnesia_lib:copy_file(Dat, Tmp)
 	    catch error:Error ->
-		    fatal("Cannot copy dets file ~p to ~p: ~p~n",
+		    fatal("Cannot copy dets file ~tp to ~tp: ~tp~n",
 			  [Dat, Tmp, Error])
 	    end,
 	    Tmp
@@ -1441,7 +1441,7 @@ start_regulator() ->
 		{ok, Pid} ->
 		    Pid;
 		{error, Reason} ->
-		    fatal("Failed to start ~n: ~p~n", [N, Reason])
+		    fatal("Failed to start ~n: ~tp~n", [N, Reason])
 	    end
     end.
 
diff --git a/lib/mnesia/src/mnesia_event.erl b/lib/mnesia/src/mnesia_event.erl
index b06043bc61..49b3990086 100644
--- a/lib/mnesia/src/mnesia_event.erl
+++ b/lib/mnesia/src/mnesia_event.erl
@@ -103,11 +103,11 @@ handle_any_event({mnesia_system_event, Event}, State) ->
 handle_any_event({mnesia_table_event, Event}, State) ->
     handle_table_event(Event, State);
 handle_any_event(Msg, State) ->
-    report_error("~p got unexpected event: ~p~n", [?MODULE, Msg]),
+    report_error("~p got unexpected event: ~tp~n", [?MODULE, Msg]),
     {ok, State}.
 
 handle_table_event({Oper, Record, TransId}, State) ->
-    report_info("~p performed by ~p on record:~n\t~p~n",
+    report_info("~p performed by ~p on record:~n\t~tp~n",
 		[Oper, TransId, Record]),
     {ok, State}.  
 
@@ -155,7 +155,7 @@ handle_system_event({mnesia_down, Node}, State) ->
     end;
 
 handle_system_event({mnesia_overload, Details}, State) ->
-    report_warning("Mnesia is overloaded: ~w~n", [Details]),
+    report_warning("Mnesia is overloaded: ~tw~n", [Details]),
     {ok, State}; 
 
 handle_system_event({mnesia_info, Format, Args}, State) ->
@@ -175,16 +175,16 @@ handle_system_event({mnesia_fatal, Format, Args, BinaryCore}, State) ->
     {ok, State#state{dumped_core = true}};
 
 handle_system_event({inconsistent_database, Reason, Node}, State) ->
-    report_error("mnesia_event got {inconsistent_database, ~w, ~w}~n",
+    report_error("mnesia_event got {inconsistent_database, ~tw, ~w}~n",
 		 [Reason, Node]),
     {ok, State}; 
 
 handle_system_event({mnesia_user, Event}, State) ->
-    report_info("User event: ~p~n", [Event]),
+    report_info("User event: ~tp~n", [Event]),
     {ok, State}; 
 
 handle_system_event(Msg, State) ->
-    report_error("mnesia_event got unexpected system event: ~p~n", [Msg]),
+    report_error("mnesia_event got unexpected system event: ~tp~n", [Msg]),
     {ok, State}.
 
 report_info(Format0, Args0) ->
diff --git a/lib/mnesia/src/mnesia_index.erl b/lib/mnesia/src/mnesia_index.erl
index c79f790973..d121bd01e9 100644
--- a/lib/mnesia/src/mnesia_index.erl
+++ b/lib/mnesia/src/mnesia_index.erl
@@ -420,7 +420,7 @@ make_ram_index(Tab, Storage, [Pos | Tail]) ->
 
 add_ram_index(Tab, Storage, {Pos, _Pref}) ->
     Type = ordered,
-    verbose("Creating index for ~w ~p ~p~n", [Tab, Pos, Type]),
+    verbose("Creating index for ~tw ~p ~p~n", [Tab, Pos, Type]),
     SetOrBag = val({Tab, setorbag}),
     IxValsF = index_vals_f(Storage, Tab, Pos),
     IxFun = fun(Val, Key) -> {{Val, Key}} end,
diff --git a/lib/mnesia/src/mnesia_late_loader.erl b/lib/mnesia/src/mnesia_late_loader.erl
index e273329ffc..e4f8dcf2b9 100644
--- a/lib/mnesia/src/mnesia_late_loader.erl
+++ b/lib/mnesia/src/mnesia_late_loader.erl
@@ -87,13 +87,13 @@ loop(State) ->
 	    loop(State);
 
 	{system, From, Msg} ->
-	    mnesia_lib:dbg_out("~p got {system, ~p, ~p}~n",
+	    mnesia_lib:dbg_out("~p got {system, ~p, ~tp}~n",
 			       [?SERVER_NAME, From, Msg]),
 	    Parent = State#state.supervisor,
 	    sys:handle_system_msg(Msg, From, Parent, ?MODULE, [], State);
 	    
 	Msg ->
-	    mnesia_lib:error("~p got unexpected message: ~p~n",
+	    mnesia_lib:error("~p got unexpected message: ~tp~n",
 			     [?SERVER_NAME, Msg]),
 	    loop(State)
     end.
diff --git a/lib/mnesia/src/mnesia_lib.erl b/lib/mnesia/src/mnesia_lib.erl
index 1fdc656600..53fdd76de8 100644
--- a/lib/mnesia/src/mnesia_lib.erl
+++ b/lib/mnesia/src/mnesia_lib.erl
@@ -467,7 +467,7 @@ pr_other(Var) ->
 	    no -> {node_not_running, node()};
 	    _ -> {no_exists, Var}
 	end,
-    verbose("~p (~p) val(mnesia_gvar, ~w) -> ~p ~p ~n",
+    verbose("~p (~tp) val(mnesia_gvar, ~tw) -> ~p ~tp ~n",
 	    [self(), process_info(self(), registered_name),
 	     Var, Why, erlang:get_stacktrace()]),
     mnesia:abort(Why).
@@ -654,7 +654,7 @@ coredump() ->
 coredump(CrashInfo) ->
     Core = mkcore(CrashInfo),
     Out = core_file(),
-    important("Writing Mnesia core to file: ~p...~p~n", [Out, CrashInfo]),
+    important("Writing Mnesia core to file: ~tp...~tp~n", [Out, CrashInfo]),
     _ = file:write_file(Out, Core),
     Out.
 
@@ -844,7 +844,7 @@ vcore() ->
     case file:list_dir(Cwd) of
 	{ok, Files}->
 	    CoreFiles = lists:sort(lists:zf(Filter, Files)),
-	    show("Mnesia core files: ~p~n", [CoreFiles]),
+	    show("Mnesia core files: ~tp~n", [CoreFiles]),
 	    vcore(lists:last(CoreFiles));
 	Error ->
 	    Error
@@ -853,17 +853,17 @@ vcore() ->
 vcore(Bin) when is_binary(Bin) ->
     Core = binary_to_term(Bin),
     Fun = fun({Item, Info}) ->
-		  show("***** ~p *****~n", [Item]),
+		  show("***** ~tp *****~n", [Item]),
 		  case catch vcore_elem({Item, Info}) of
 		      {'EXIT', Reason} ->
-			  show("{'EXIT', ~p}~n", [Reason]);
+			  show("{'EXIT', ~tp}~n", [Reason]);
 		      _ -> ok
 		  end
 	  end,
     lists:foreach(Fun, Core);
     
 vcore(File) ->
-    show("~n***** Mnesia core: ~p *****~n", [File]),
+    show("~n***** Mnesia core: ~tp *****~n", [File]),
     case file:read_file(File) of
 	{ok, Bin} ->
 	    vcore(Bin);
@@ -879,7 +879,7 @@ vcore_elem({schema_file, {ok, B}}) ->
 
 vcore_elem({logfile, {ok, BinList}}) ->
     Fun = fun({F, Info}) ->
-		  show("----- logfile: ~p -----~n", [F]),
+		  show("----- logfile: ~tp -----~n", [F]),
 		  case Info of
 		      {ok, B} ->
 			  Fname = "/tmp/mnesia_vcore_elem.TMP",
@@ -887,7 +887,7 @@ vcore_elem({logfile, {ok, BinList}}) ->
 			  mnesia_log:view(Fname),
 			  file:delete(Fname);
 		      _ ->
-			  show("~p~n", [Info])
+			  show("~tp~n", [Info])
 		  end
 	  end,
     lists:foreach(Fun, BinList);
@@ -895,12 +895,12 @@ vcore_elem({logfile, {ok, BinList}}) ->
 vcore_elem({crashinfo, {Format, Args}}) ->
     show(Format, Args);
 vcore_elem({gvar, L}) ->
-    show("~p~n", [lists:sort(L)]);
+    show("~tp~n", [lists:sort(L)]);
 vcore_elem({transactions, Info}) ->
     mnesia_tm:display_info(user, Info);
 
 vcore_elem({_Item, Info}) ->
-    show("~p~n", [Info]).
+    show("~tp~n", [Info]).
 
 fix_error(X) ->
     set(last_error, X), %% for debugabililty
@@ -1018,7 +1018,7 @@ report_system_event({'EXIT', Reason}, Event) ->
             end;
 
 	Error ->
-	    Msg = "Mnesia(~p): Cannot report event ~p: ~p (~p)~n",
+	    Msg = "Mnesia(~tp): Cannot report event ~tp: ~tp (~tp)~n",
 	    error_logger:format(Msg, [node(), Event, Reason, Error])
     end,
     ok;
diff --git a/lib/mnesia/src/mnesia_loader.erl b/lib/mnesia/src/mnesia_loader.erl
index c710470a2c..4c6336cb73 100644
--- a/lib/mnesia/src/mnesia_loader.erl
+++ b/lib/mnesia/src/mnesia_loader.erl
@@ -46,7 +46,7 @@ val(Var) ->
 disc_load_table(Tab, Reason) ->
     Storage =  val({Tab, storage_type}),
     Type = val({Tab, setorbag}),
-    dbg_out("Getting table ~p (~p) from disc: ~p~n",
+    dbg_out("Getting table ~tp (~p) from disc: ~tp~n",
 	    [Tab, Storage, Reason]),
     ?eval_debug_fun({?MODULE, do_get_disc_copy},
 		    [{tab, Tab},
@@ -56,7 +56,7 @@ disc_load_table(Tab, Reason) ->
     do_get_disc_copy2(Tab, Reason, Storage, Type).
 
 do_get_disc_copy2(Tab, _Reason, Storage, _Type) when Storage == unknown ->
-    verbose("Local table copy of ~p has recently been deleted, ignored.~n",
+    verbose("Local table copy of ~tp has recently been deleted, ignored.~n",
 	    [Tab]),
     {not_loaded, storage_unknown};
 do_get_disc_copy2(Tab, Reason, Storage, Type) when Storage == disc_copies ->
@@ -199,20 +199,20 @@ net_load_table(Tab, Reason, Ns, _Cs) ->
     try_net_load_table(Tab, Reason, Ns, val({Tab, cstruct})).
 
 try_net_load_table(Tab, _Reason, [], _Cs) ->
-    verbose("Copy failed. No active replicas of ~p are available.~n", [Tab]),
+    verbose("Copy failed. No active replicas of ~tp are available.~n", [Tab]),
     {not_loaded, none_active};
 try_net_load_table(Tab, Reason, Ns, Cs) ->
     Storage = mnesia_lib:cs_to_storage_type(node(), Cs),
     do_get_network_copy(Tab, Reason, Ns, Storage, Cs).
 
 do_get_network_copy(Tab, _Reason, _Ns, unknown, _Cs) ->
-    verbose("Local table copy of ~p has recently been deleted, ignored.~n", [Tab]),
+    verbose("Local table copy of ~tp has recently been deleted, ignored.~n", [Tab]),
     {not_loaded, storage_unknown};
 do_get_network_copy(Tab, Reason, Ns, Storage, Cs) ->
     [Node | Tail] = Ns,
     case lists:member(Node,val({current, db_nodes})) of
 	true ->
-	    dbg_out("Getting table ~p (~p) from node ~p: ~p~n",
+	    dbg_out("Getting table ~tp (~p) from node ~p: ~tp~n",
 		    [Tab, Storage, Node, Reason]),
 	    ?eval_debug_fun({?MODULE, do_get_network_copy},
 			    [{tab, Tab}, {reason, Reason},
@@ -222,7 +222,7 @@ do_get_network_copy(Tab, Reason, Ns, Storage, Cs) ->
 		    set({Tab, load_node}, Node),
 		    set({Tab, load_reason}, Reason),
 		    mnesia_controller:i_have_tab(Tab),
-		    dbg_out("Table ~p copied from ~p to ~p~n", [Tab, Node, node()]),
+		    dbg_out("Table ~tp copied from ~p to ~p~n", [Tab, Node, node()]),
 		    {loaded, ok};
 		Err = {error, _} when element(1, Reason) == dumper ->
 		    {not_loaded,Err};
@@ -286,12 +286,12 @@ init_receiver(Node, Tab,Storage,Cs,Reason) ->
 		  element(1,Reason) == dumper ->
 		{error,Result};
 	    {atomic, {error,Result}} ->
-		fatal("Cannot create table ~p: ~p~n",
+		fatal("Cannot create table ~tp: ~tp~n",
 		      [[Tab, Storage], Result]);
 	    {atomic,  Result} -> Result;
 	    {aborted, nomore} -> restart;
 	    {aborted, _Reas} ->
-		verbose("Receiver failed on ~p from ~p:~nReason: ~p~n",
+		verbose("Receiver failed on ~tp from ~p:~nReason: ~tp~n",
 			[Tab,Node,_Reas]),
 		down  %% either this node or sender is dying
 	end,
@@ -313,7 +313,7 @@ start_remote_sender(Node,Tab,Storage) ->
 	    {SenderPid, TabSize, DetsData};
 	%% Protocol conversion hack
 	{copier_done, Node} ->
-	    verbose("Sender of table ~p crashed on node ~p ~n", [Tab, Node]),
+	    verbose("Sender of table ~tp crashed on node ~p ~n", [Tab, Node]),
 	    down(Tab, Storage)
     end.
 
@@ -374,7 +374,7 @@ do_init_table(Tab,Storage,Cs,SenderPid,
 		    tab_receiver(Node,Tab,Storage,Cs,OrigTabRec);
 		Reason ->
 		    Msg = "[d]ets:init table failed",
-		    verbose("~s: ~p: ~p~n", [Msg, Tab, Reason]),
+		    verbose("~ts: ~tp: ~tp~n", [Msg, Tab, Reason]),
 		    down(Tab, Storage)
 	    end;
 	Error ->
@@ -432,7 +432,7 @@ tab_receiver(Node, Tab, Storage, Cs, OrigTabRec) ->
 
 	%% Protocol conversion hack
 	{copier_done, Node} ->
-	    verbose("Sender of table ~p crashed on node ~p ~n", [Tab, Node]),
+	    verbose("Sender of table ~tp crashed on node ~p ~n", [Tab, Node]),
 	    down(Tab, Storage);
 
 	{'EXIT', Pid, Reason} ->
@@ -490,7 +490,7 @@ ext_load_table(Mod, Alias, Tab, Reason) ->
 ext_init_table(Action, Alias, Mod, Tab, Fun, State, Sender) ->
     case Fun(Action) of
 	{copier_done, Node} ->
-	    verbose("Receiver of table ~p crashed on ~p (more)~n", [Tab, Node]),
+	    verbose("Receiver of table ~tp crashed on ~p (more)~n", [Tab, Node]),
 	    down(Tab, {ext,Alias,Mod});
 	{Data, NewFun} ->
 	    case Mod:receive_data(Data, Alias, Tab, Sender, State) of
@@ -553,7 +553,7 @@ finish_copy(Storage,Tab,Cs,SenderPid,DatBin,OrigTabRec) ->
 	    ok;
 	{error, Reason} ->
 	    Msg = "Failed to handle last",
-	    verbose("~s: ~p: ~p~n", [Msg, Tab, Reason]),
+	    verbose("~ts: ~tp: ~tp~n", [Msg, Tab, Reason]),
 	    down(Tab, Storage)
     end.
 
@@ -859,7 +859,7 @@ send_more(Pid, N, Chunk, DataState, Tab, Storage) ->
 	    send_more(Pid, 1, NewChunk, Init(), Tab, Storage);
 
 	{copier_done, Node} when Node == node(Pid)->
-	    verbose("Receiver of table ~p crashed on ~p (more)~n", [Tab, Node]),
+	    verbose("Receiver of table ~tp crashed on ~p (more)~n", [Tab, Node]),
 	    throw(receiver_died)
     end.
 
@@ -937,7 +937,7 @@ finish_copy(Pid, Tab, Storage, RemoteS, NeedLock) ->
 		    {Pid, no_more} -> % Dont bother about the spurious 'more' message
 			no_more;
 		    {copier_done, Node} ->
-			verbose("Tab receiver ~p crashed (more): ~p~n", [Tab, Node]),
+			verbose("Tab receiver ~tp crashed (more): ~p~n", [Tab, Node]),
 			receiver_died
 		end
 	end,
diff --git a/lib/mnesia/src/mnesia_locker.erl b/lib/mnesia/src/mnesia_locker.erl
index 59fd89059f..073b48abc0 100644
--- a/lib/mnesia/src/mnesia_locker.erl
+++ b/lib/mnesia/src/mnesia_locker.erl
@@ -245,7 +245,7 @@ loop(State) ->
 	    do_stop();
 
 	{system, From, Msg} ->
-	    verbose("~p got {system, ~p, ~p}~n", [?MODULE, From, Msg]),
+	    verbose("~p got {system, ~p, ~tp}~n", [?MODULE, From, Msg]),
 	    Parent = State#state.supervisor,
 	    sys:handle_system_msg(Msg, From, Parent, ?MODULE, [], State);
 
@@ -254,7 +254,7 @@ loop(State) ->
 	    loop(State);
 
 	Msg ->
-	    error("~p got unexpected message: ~p~n", [?MODULE, Msg]),
+	    error("~p got unexpected message: ~tp~n", [?MODULE, Msg]),
 	    loop(State)
     end.
 
diff --git a/lib/mnesia/src/mnesia_log.erl b/lib/mnesia/src/mnesia_log.erl
index 9536effd42..55b1d6e419 100644
--- a/lib/mnesia/src/mnesia_log.erl
+++ b/lib/mnesia/src/mnesia_log.erl
@@ -310,7 +310,7 @@ verify_no_exists(Fname) ->
 	false ->
 	    ok;
 	true ->
-	    fatal("Log file exists: ~p~n", [Fname])
+	    fatal("Log file exists: ~tp~n", [Fname])
     end.
 
 open_log(Name, Header, Fname) ->
@@ -331,7 +331,7 @@ open_log(Name, Header, Fname, Exists, Repair) ->
 
 open_log(Name, Header, Fname, Exists, Repair, Mode) ->
     Args = [{file, Fname}, {name, Name}, {repair, Repair}, {mode, Mode}],
-%%    io:format("~p:open_log: ~p ~p~n", [?MODULE, Name, Fname]),
+%%    io:format("~p:open_log: ~tp ~tp~n", [?MODULE, Name, Fname]),
     case mnesia_monitor:open_log(Args) of
 	{ok, Log} when Exists == true ->
 	    Log;
@@ -344,19 +344,19 @@ open_log(Name, Header, Fname, Exists, Repair, Mode) ->
 	    write_header(Log, Header),
 	    Log;
 	{repaired, Log, _Recover, BadBytes} ->
-	    mnesia_lib:important("Data may be missing, log ~p repaired: Lost ~p bytes~n",
+	    mnesia_lib:important("Data may be missing, log ~tp repaired: Lost ~p bytes~n",
 				 [Fname, BadBytes]),
 	    Log;
 	{error, Reason = {file_error, _Fname, emfile}} ->
-	    fatal("Cannot open log file ~p: ~p~n", [Fname, Reason]);
+	    fatal("Cannot open log file ~tp: ~tp~n", [Fname, Reason]);
 	{error, Reason} when Repair == true ->
 	    file:delete(Fname),
-	    mnesia_lib:important("Data may be missing, Corrupt logfile deleted: ~p, ~p ~n",
+	    mnesia_lib:important("Data may be missing, Corrupt logfile deleted: ~tp, ~tp ~n",
 				 [Fname, Reason]),
 	    %% Create a new
 	    open_log(Name, Header, Fname, false, false, read_write);
 	{error, Reason} ->
-	    fatal("Cannot open log file ~p: ~p~n", [Fname, Reason])
+	    fatal("Cannot open log file ~tp: ~tp~n", [Fname, Reason])
     end.
 
 write_header(Log, Header) ->
@@ -381,7 +381,7 @@ close_log(Log) ->
 	{error, {read_only_mode, Log}} ->
 	    ok;
 	{error, Reason} ->
-	    mnesia_lib:important("Failed syncing ~p to_disk reason ~p ~n",
+	    mnesia_lib:important("Failed syncing ~tp to_disk reason ~tp ~n",
 				 [Log, Reason])
     end,
     mnesia_monitor:close_log(Log).
@@ -464,13 +464,13 @@ chunk_log(_Log, eof) ->
 chunk_log(Log, Cont) ->
     case disk_log:chunk(Log, Cont) of
 	{error, Reason} ->
-	    fatal("Possibly truncated ~p file: ~p~n",
+	    fatal("Possibly truncated ~tp file: ~tp~n",
 		  [Log, Reason]);
 	{C2, Chunk, _BadBytes} ->
 	    %% Read_only case, should we warn about the bad log file?
 	    %% BUGBUG Should we crash if Repair == false ??
 	    %% We got to check this !!
-	    mnesia_lib:important("~p repaired, lost ~p bad bytes~n", [Log, _BadBytes]),
+	    mnesia_lib:important("~tp repaired, lost ~p bad bytes~n", [Log, _BadBytes]),
 	    {C2, Chunk};
 	Other ->
 	    Other
@@ -505,7 +505,7 @@ prepare_decision_log_dump(false, Prev) ->
 	ok ->
 	    prepare_decision_log_dump(true, Prev);
 	{error, Reason} ->
-	    fatal("Cannot rename decision log file ~p -> ~p: ~p~n",
+	    fatal("Cannot rename decision log file ~tp -> ~tp: ~tp~n",
 		     [decision_log_file(), Prev, Reason])
     end;
 prepare_decision_log_dump(true, Prev) ->
@@ -522,7 +522,7 @@ confirm_decision_log_dump() ->
 	ok ->
 	    file:delete(previous_decision_log_file());
 	{error, Reason} ->
-	    fatal("Cannot confirm decision log dump: ~p~n",
+	    fatal("Cannot confirm decision log dump: ~tp~n",
 		  [Reason])
     end.
 
@@ -561,7 +561,7 @@ view() ->
     lists:foreach(fun(F) -> view(F) end, log_files()).
 
 view(File) ->
-    mnesia_lib:show("*****  ~p ***** ~n", [File]),
+    mnesia_lib:show("*****  ~tp ***** ~n", [File]),
     case exists(File) of
 	false ->
 	    nolog;
@@ -574,25 +574,25 @@ view(File) ->
 		{repaired, _, _, _} ->
 		    view_file(start, N);
 		{error, Reason} ->
-		    error("Cannot open log ~p: ~p~n", [File, Reason])
+		    error("Cannot open log ~tp: ~tp~n", [File, Reason])
 	    end
     end.
 
 view_file(C, Log) ->
     case disk_log:chunk(Log, C) of
 	{error, Reason} ->
-	    error("** Possibly truncated FILE ~p~n", [Reason]),
+	    error("** Possibly truncated FILE ~tp~n", [Reason]),
 	    error;
 	eof ->
 	    disk_log:close(Log),
 	    eof;
 	{C2, Terms, _BadBytes} ->
-	    dbg_out("Lost ~p bytes in ~p ~n", [_BadBytes, Log]),
-	    lists:foreach(fun(X) -> mnesia_lib:show("~p~n", [X]) end,
+	    dbg_out("Lost ~p bytes in ~tp ~n", [_BadBytes, Log]),
+	    lists:foreach(fun(X) -> mnesia_lib:show("~tp~n", [X]) end,
 			  Terms),
 	    view_file(C2, Log);
 	{C2, Terms} ->
-	    lists:foreach(fun(X) -> mnesia_lib:show("~p~n", [X]) end,
+	    lists:foreach(fun(X) -> mnesia_lib:show("~tp~n", [X]) end,
 			  Terms),
 	    view_file(C2, Log)
     end.
@@ -750,12 +750,12 @@ abort_write_fun(B, What, Args) ->
 abort_write(B, What, Args, Reason) ->
     Mod = B#backup_args.module,
     Opaque = B#backup_args.opaque,
-    dbg_out("Failed to perform backup. M=~p:F=~p:A=~p -> ~p~n",
+    dbg_out("Failed to perform backup. M=~p:F=~tp:A=~tp -> ~tp~n",
 	    [Mod, What, Args, Reason]),
     try apply(Mod, abort_write, [Opaque]) of
 	{ok, _Res} -> throw({error, Reason})
     catch _:Other ->
-	    error("Failed to abort backup. ~p:~p~p -> ~p~n",
+	    error("Failed to abort backup. ~p:~tp~tp -> ~tp~n",
 		  [Mod, abort_write, [Opaque], Other]),
 	    throw({error, Reason})
     end.
@@ -802,7 +802,7 @@ select_source(Tab, Name, PrevName) ->
 		    {PrevName, retainer};
 		_ ->
 		    %% Do a full backup anyway
-		    dbg_out("Incremental backup escalated to full backup: ~p~n", [Tab]),
+		    dbg_out("Incremental backup escalated to full backup: ~tp~n", [Tab]),
 		    {Name, table}
 	    end
     end.
diff --git a/lib/mnesia/src/mnesia_monitor.erl b/lib/mnesia/src/mnesia_monitor.erl
index 22a24b6dc9..4cfe16dec0 100644
--- a/lib/mnesia/src/mnesia_monitor.erl
+++ b/lib/mnesia/src/mnesia_monitor.erl
@@ -178,10 +178,10 @@ check_protocol([{Node, {reject, _Mon, Version, Protocol}} | Tail], Protocols) ->
 	    [Node, Protocols, Version, Protocol]),
     check_protocol(Tail, Protocols);
 check_protocol([{error, _Reason} | Tail], Protocols) ->
-    dbg_out("~p connect failed error: ~p~n", [?MODULE, _Reason]),
+    dbg_out("~p connect failed error: ~tp~n", [?MODULE, _Reason]),
     check_protocol(Tail, Protocols);
 check_protocol([{badrpc, _Reason} | Tail], Protocols) ->
-    dbg_out("~p connect failed badrpc: ~p~n", [?MODULE, _Reason]),
+    dbg_out("~p connect failed badrpc: ~tp~n", [?MODULE, _Reason]),
     check_protocol(Tail, Protocols);
 check_protocol([], [Protocol | _Protocols]) ->
     set(protocol_version, Protocol),
@@ -246,10 +246,10 @@ start_proc(Who, Mod, Fun, Args) ->
     proc_lib:start_link(mnesia_sp, init_proc, Args2, infinity).
 
 terminate_proc(Who, R, State) when R /= shutdown, R /= killed ->
-    fatal("~p crashed: ~p state: ~p~n", [Who, R, State]);
+    fatal("~p crashed: ~p state: ~tp~n", [Who, R, State]);
 
 terminate_proc(Who, Reason, _State) ->
-    mnesia_lib:verbose("~p terminated: ~p~n", [Who, Reason]),
+    mnesia_lib:verbose("~p terminated: ~tp~n", [Who, Reason]),
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -294,7 +294,7 @@ init([Parent]) ->
 
 	    {ok, #state{supervisor = Parent}}
     catch _:Reason ->
-	    mnesia_lib:report_fatal("Bad configuration: ~p~n", [Reason]),
+	    mnesia_lib:report_fatal("Bad configuration: ~tp~n", [Reason]),
 	    {stop, {bad_config, Reason}}
     end.
 
@@ -333,7 +333,7 @@ handle_call({mktab, Tab, Args}, _From, State) ->
     catch error:ExitReason ->
 	    Msg = "Cannot create ets table",
 	    Reason = {system_limit, Msg, Tab, Args, ExitReason},
-	    fatal("~p~n", [Reason]),
+	    fatal("~tp~n", [Reason]),
 	    {noreply, State}
     end;
 
@@ -353,7 +353,7 @@ handle_call({open_dets, Tab, Args}, _From, State) ->
 	{error, Reason} ->
 	    Msg = "Cannot open dets table",
 	    Error = {error, {Msg, Tab, Args, Reason}},
-	    fatal("~p~n", [Error]),
+	    fatal("~tp~n", [Error]),
 	    {noreply, State}
     end;
 
@@ -385,7 +385,7 @@ handle_call({reopen_log, Name, Fname, Head}, _From, State) ->
         {error, Reason} ->
 	    Msg = "Cannot rename disk_log file",
             Error = {error, {Msg, Name, Fname, Head, Reason}},
-	    fatal("~p~n", [Error]),
+	    fatal("~tp~n", [Error]),
  	    {noreply, State}
     end;
 
@@ -400,7 +400,7 @@ handle_call({close_log, Name}, _From, State) ->
         {error, Reason} ->
 	    Msg = "Cannot close disk_log file",
             Error = {error, {Msg, Name, Reason}},
-	    fatal("~p~n", [Error]),
+	    fatal("~tp~n", [Error]),
 	    {noreply, State}
     end;
 
@@ -461,7 +461,7 @@ handle_call(init, _From, State) ->
     {reply, EarlyNodes, State2};
 
 handle_call(Msg, _From, State) ->
-    error("~p got unexpected call: ~p~n", [?MODULE, Msg]),
+    error("~p got unexpected call: ~tp~n", [?MODULE, Msg]),
     {noreply, State}.
 
 accept_protocol(Mon, Version, Protocol, From, State) ->
@@ -535,7 +535,7 @@ handle_cast({inconsistent_database, Context, Node}, State) ->
     {noreply, State};
 
 handle_cast(Msg, State) ->
-    error("~p got unexpected cast: ~p~n", [?MODULE, Msg]),
+    error("~p got unexpected cast: ~tp~n", [?MODULE, Msg]),
     {noreply, State}.
 
 %%----------------------------------------------------------------------
@@ -572,7 +572,7 @@ handle_info(Msg = {'EXIT',Pid,_}, State) ->
 	    %% We have probably got an exit signal from
 	    %% disk_log or dets
 	    Hint = "Hint: check that the disk still is writable",
-	    fatal("~p got unexpected info: ~p; ~p~n",
+	    fatal("~p got unexpected info: ~tp; ~p~n",
 		  [?MODULE, Msg, Hint])
     end;
 
@@ -599,13 +599,13 @@ handle_info({disk_log, _Node, Log, Info}, State) ->
 	{truncated, _No} ->
 	    ok;
 	_ ->
-	    mnesia_lib:important("Warning Log file ~p error reason ~s~n",
+	    mnesia_lib:important("Warning Log file ~tp error reason ~ts~n",
 				 [Log, disk_log:format_error(Info)])
     end,
     {noreply, State};
 
 handle_info(Msg, State) ->
-    error("~p got unexpected info (~p): ~p~n", [?MODULE, State, Msg]).
+    error("~p got unexpected info (~tp): ~tp~n", [?MODULE, State, Msg]).
 
 process_q(State = #state{mq=[]}) -> {noreply,State};
 process_q(State = #state{mq=[{info,Msg}|R]}) ->
diff --git a/lib/mnesia/src/mnesia_recover.erl b/lib/mnesia/src/mnesia_recover.erl
index b204fb282f..d792070332 100644
--- a/lib/mnesia/src/mnesia_recover.erl
+++ b/lib/mnesia/src/mnesia_recover.erl
@@ -762,7 +762,7 @@ handle_call(sync, _From, State) ->
     {reply, ok, State};
 
 handle_call(Msg, _From, State) ->
-    error("~p got unexpected call: ~p~n", [?MODULE, Msg]),
+    error("~p got unexpected call: ~tp~n", [?MODULE, Msg]),
     {noreply, State}.
 
 do_log_mnesia_up(Node) ->
@@ -881,7 +881,7 @@ handle_cast({log_dump_overload, Flag}, State) when is_boolean(Flag) ->
     {noreply, State#state{log_dump_overload = Flag}};
 
 handle_cast(Msg, State) ->
-    error("~p got unexpected cast: ~p~n", [?MODULE, Msg]),
+    error("~p got unexpected cast: ~tp~n", [?MODULE, Msg]),
     {noreply, State}.
 
 %%----------------------------------------------------------------------
@@ -927,11 +927,11 @@ handle_info({force_decision, Tid}, State) ->
     end;
 
 handle_info({'EXIT', Pid, R}, State) when Pid == State#state.supervisor ->
-    mnesia_lib:dbg_out("~p was ~p~n",[?MODULE, R]),
+    mnesia_lib:dbg_out("~p was ~tp~n",[?MODULE, R]),
     {stop, shutdown, State};
 
 handle_info(Msg, State) ->
-    error("~p got unexpected info: ~p~n", [?MODULE, Msg]),
+    error("~p got unexpected info: ~tp~n", [?MODULE, Msg]),
     {noreply, State}.
 
 %%----------------------------------------------------------------------
diff --git a/lib/mnesia/src/mnesia_schema.erl b/lib/mnesia/src/mnesia_schema.erl
index f71ee26d7c..83cc19c678 100644
--- a/lib/mnesia/src/mnesia_schema.erl
+++ b/lib/mnesia/src/mnesia_schema.erl
@@ -386,7 +386,7 @@ delete_schema(Ns) when is_list(Ns), Ns /= [] ->
 			[] ->
 			    ok;
 			BadReplies ->
-			    verbose("~s: ~p~n", [Reason, BadReplies]),
+			    verbose("~s: ~tp~n", [Reason, BadReplies]),
 			    {error, {"All nodes not running", BadReplies}}
 		    end;
 		{_Replies, BadNs} ->
@@ -467,10 +467,10 @@ opt_create_dir(UseDir, Dir) when UseDir == true->
         false ->
             case file:make_dir(Dir) of
                 ok ->
-                    verbose("Create Directory ~p~n", [Dir]),
+                    verbose("Create Directory ~tp~n", [Dir]),
                     ok;
                 {error, Reason} ->
-                    verbose("Cannot create mnesia dir ~p~n", [Reason]),
+                    verbose("Cannot create mnesia dir ~tp~n", [Reason]),
                     {error, {"Cannot create Mnesia dir", Dir, Reason}}
             end
     end;
@@ -1470,7 +1470,7 @@ verify_backend_type(Name, Module) ->
         [] ->
 	    ok;
         _Other ->
-	    io:fwrite(user, "Missing backend_type exports: ~p~n", [_Other]),
+	    io:fwrite(user, "Missing backend_type exports: ~tp~n", [_Other]),
             mnesia:abort({bad_type, {backend_type,Name,Module}})
     end.
 
@@ -1776,7 +1776,7 @@ make_del_table_copy(Tab, Node) ->
             mnesia:abort({combine_error, Tab, "Last replica"});
         [] ->
 	    ensure_active(Cs),
-            dbg_out("Last replica deleted in table ~p~n",  [Tab]),
+            dbg_out("Last replica deleted in table ~tp~n",  [Tab]),
             make_delete_table(Tab,  whole_table);
         _ when Tab == schema ->
 	    %% ensure_active(Cs2),
@@ -2178,13 +2178,13 @@ do_write_table_property(Tab, Prop) ->
     case change_prop_in_existing_op(Tab, Prop, write_property, Store) of
 	true ->
 	    dbg_out("change_prop_in_existing_op"
-		    "(~p,~p,write_property,Store) -> true~n",
+		    "(~tp,~p,write_property,Store) -> true~n",
 		    [Tab,Prop]),
 	    %% we have merged the table prop into the create_table op
 	    ok;
 	false ->
 	    dbg_out("change_prop_in_existing_op"
-		    "(~p,~p,write_property,Store) -> false~n",
+		    "(~tp,~p,write_property,Store) -> false~n",
 		    [Tab,Prop]),
 	    %% this must be an existing table
 	    get_tid_ts_and_lock(Tab, none),
@@ -2315,13 +2315,13 @@ do_delete_table_property(Tab, PropKey) ->
     case change_prop_in_existing_op(Tab, PropKey, delete_property, Store) of
 	true ->
 	    dbg_out("change_prop_in_existing_op"
-		    "(~p,~p,delete_property,Store) -> true~n",
+		    "(~tp,~p,delete_property,Store) -> true~n",
 		    [Tab,PropKey]),
 	    %% we have merged the table prop into the create_table op
 	    ok;
 	false ->
 	    dbg_out("change_prop_in_existing_op"
-		    "(~p,~p,delete_property,Store) -> false~n",
+		    "(~tp,~p,delete_property,Store) -> false~n",
 		    [Tab,PropKey]),
 	    %% this must be an existing table
 	    get_tid_ts_and_lock(Tab, none),
@@ -2435,17 +2435,17 @@ prepare_op(_Tid, {op, sync_trans}, {part, CoordPid}) ->
 	{sync_trans, CoordPid} ->
 	    {false, optional};
 	{mnesia_down, _Node} = Else ->
-	    mnesia_lib:verbose("sync_op terminated due to ~p~n", [Else]),
+	    mnesia_lib:verbose("sync_op terminated due to ~tp~n", [Else]),
 	    mnesia:abort(Else);
 	{'EXIT', _, _} = Else ->
-	    mnesia_lib:verbose("sync_op terminated due to ~p~n", [Else]),
+	    mnesia_lib:verbose("sync_op terminated due to ~tp~n", [Else]),
 	    mnesia:abort(Else)
     end;
 
 prepare_op(_Tid, {op, sync_trans}, {coord, Nodes}) ->
     case receive_sync(Nodes, []) of
 	{abort, Reason} ->
-	    mnesia_lib:verbose("sync_op terminated due to ~p~n", [Reason]),
+	    mnesia_lib:verbose("sync_op terminated due to ~tp~n", [Reason]),
 	    mnesia:abort(Reason);
 	Pids ->
 	    [Pid ! {sync_trans, self()} || Pid <- Pids],
@@ -2707,7 +2707,7 @@ prepare_op(_Tid, {op, transform, Fun, TabDef}, _WaitFor) ->
                     {true, Objs, mandatory}
 	    catch _:Reason ->
 		    mnesia_lib:db_fixtable(Storage, Tab, false),
-		    mnesia_lib:important("Transform function failed: '~p' in '~p'",
+		    mnesia_lib:important("Transform function failed: '~tp' in '~tp'",
 					 [Reason, erlang:get_stacktrace()]),
                     exit({"Bad transform function", Tab, Fun, node(), Reason})
             end
@@ -2719,7 +2719,7 @@ prepare_op(_Tid, {op, merge_schema, TabDef}, _WaitFor) ->
 	ok  ->
 	    {true, optional};
 	Error ->
-	    verbose("Merge_Schema ~p failed on ~p: ~p~n", [_Tid,node(),Error]),
+	    verbose("Merge_Schema ~p failed on ~p: ~tp~n", [_Tid,node(),Error]),
 	    mnesia:abort({bad_commit, Error})
     end;
 prepare_op(_Tid, _Op, _WaitFor) ->
@@ -3133,7 +3133,7 @@ ext_real_suffixes(Ext) ->
 		    [M || {_,M} <- Ext])
     catch
         error:E ->
-            verbose("Cant find real ext suffixes (~p)~n", [E]),
+            verbose("Cant find real ext suffixes (~tp)~n", [E]),
             []
     end.
 
@@ -3142,7 +3142,7 @@ ext_tmp_suffixes(Ext) ->
 		    [M || {_,M} <- Ext])
     catch
         error:E ->
-            verbose("Cant find tmp ext suffixes (~p)~n", [E]),
+            verbose("Cant find tmp ext suffixes (~tp)~n", [E]),
             []
     end.
 
@@ -3153,14 +3153,14 @@ info() ->
 
 info(Tab) ->
     Props = get_table_properties(Tab),
-    io:format("-- Properties for ~w table --- ~n",[Tab]),
+    io:format("-- Properties for ~tw table --- ~n",[Tab]),
     info2(Tab, Props).
 info2(Tab, [{cstruct, _V} | Tail]) -> % Ignore cstruct
     info2(Tab, Tail);
 info2(Tab, [{frag_hash, _V} | Tail]) -> % Ignore frag_hash
     info2(Tab, Tail);
 info2(Tab, [{P, V} | Tail]) ->
-    io:format("~-20w -> ~p~n",[P,V]),
+    io:format("~-20tw -> ~tp~n",[P,V]),
     info2(Tab, Tail);
 info2(_, []) ->
     io:format("~n", []).
@@ -3726,7 +3726,7 @@ merge_versions(AnythingNew, Cs, RemoteCs, Force) ->
 	    ok;
 	true ->
 	    Str = io_lib:format("Bad cookies. Cannot merge definitions of "
-				"table ~w. Local = ~w, Remote = ~w~n",
+				"table ~tw. Local = ~w, Remote = ~w~n",
 				[Cs#cstruct.name, Cs, RemoteCs]),
 	    throw(Str)
     end,
@@ -3746,7 +3746,7 @@ merge_versions(AnythingNew, Cs, RemoteCs, Force) ->
 	    do_merge_versions(AnythingNew, Cs, RemoteCs);
 	true ->
 	    Str1 = io_lib:format("Cannot merge definitions of "
-				"table ~w. Local = ~w, Remote = ~w~n",
+				"table ~tw. Local = ~w, Remote = ~w~n",
 				[Cs#cstruct.name, Cs, RemoteCs]),
 	    throw(Str1)
     end.
diff --git a/lib/mnesia/src/mnesia_subscr.erl b/lib/mnesia/src/mnesia_subscr.erl
index c2748f5bae..dfaa20d2d3 100644
--- a/lib/mnesia/src/mnesia_subscr.erl
+++ b/lib/mnesia/src/mnesia_subscr.erl
@@ -264,7 +264,7 @@ handle_call({change, How}, _From, State) ->
     {reply, Reply, State};
 
 handle_call(Msg, _From, State) ->
-    error("~p got unexpected call: ~p~n", [?MODULE, Msg]),
+    error("~p got unexpected call: ~tp~n", [?MODULE, Msg]),
     {noreply, State}.
 
 %%----------------------------------------------------------------------
@@ -274,7 +274,7 @@ handle_call(Msg, _From, State) ->
 %%          {stop, Reason, State}            (terminate/2 is called)
 %%----------------------------------------------------------------------
 handle_cast(Msg, State) ->
-    error("~p got unexpected cast: ~p~n", [?MODULE, Msg]),
+    error("~p got unexpected cast: ~tp~n", [?MODULE, Msg]),
     {noreply, State}.
 
 %%----------------------------------------------------------------------
@@ -292,7 +292,7 @@ handle_info({'EXIT', Pid, _Reason}, State) ->
     {noreply, State};
 
 handle_info(Msg, State) ->
-    error("~p got unexpected info: ~p~n", [?MODULE, Msg]),
+    error("~p got unexpected info: ~tp~n", [?MODULE, Msg]),
     {noreply, State}.
 
 %%----------------------------------------------------------------------
diff --git a/lib/mnesia/src/mnesia_text.erl b/lib/mnesia/src/mnesia_text.erl
index 21adca813a..7d24d09472 100644
--- a/lib/mnesia/src/mnesia_text.erl
+++ b/lib/mnesia/src/mnesia_text.erl
@@ -87,18 +87,18 @@ validate_tab(_) -> error(badtab).
 make_tabs([{Tab, Def} | Tail]) ->
     try mnesia:table_info(Tab, where_to_read) of
 	Node ->
-	    io:format("** Table ~w already exists on ~p, just entering data~n",
+	    io:format("** Table ~tw already exists on ~p, just entering data~n",
 		      [Tab, Node]),
 	    make_tabs(Tail)
     catch exit:_ -> %% non-existing table
 	    case mnesia:create_table(Tab, Def) of
 		{aborted, Reason} ->
-		    io:format("** Failed to create table ~w ~n"
-			      "** Reason = ~w, Args = ~p~n", 
+		    io:format("** Failed to create table ~tw ~n"
+			      "** Reason = ~tw, Args = ~tp~n", 
 			      [Tab, Reason, Def]),
 		    [Tab | make_tabs(Tail)];
 		_ -> 
-		    io:format("New table ~w~n", [Tab]),
+		    io:format("New table ~tw~n", [Tab]),
 		    make_tabs(Tail)
 	    end
     end;
@@ -139,12 +139,12 @@ collect_data(Tabs, [{Line, Term} | Tail]) when is_tuple(Term) ->
 	{value, _} ->
 	    [Term | collect_data(Tabs, Tail)];
 	_Other ->
-	    io:format("Object:~p at line ~w unknown\n", [Term,Line]),
+	    io:format("Object:~tp at line ~w unknown\n", [Term,Line]),
 	    error(undefined_object)
     end;
 collect_data(_Tabs, []) -> [];
 collect_data(_Tabs, [H|_T]) ->
-    io:format("Object:~p unknown\n", [H]),
+    io:format("Object:~tp unknown\n", [H]),
     error(undefined_object).
 
 error(What) -> throw({error, What}).
@@ -178,7 +178,7 @@ read_term_from_stream(Stream, File, Line) ->
 		    {ok, {Line, Term}, EndLine};
 		{error, {NewLine,Mod,What}} ->
 		    Str = Mod:format_error(What),
-		    io:format("Error in line:~p of:~p ~s\n",
+		    io:format("Error in line:~p of:~tp ~ts\n",
 			      [NewLine, File, Str]),
 		    error
 	    end;
diff --git a/lib/mnesia/src/mnesia_tm.erl b/lib/mnesia/src/mnesia_tm.erl
index 305bf14bcf..ebf580d09e 100644
--- a/lib/mnesia/src/mnesia_tm.erl
+++ b/lib/mnesia/src/mnesia_tm.erl
@@ -314,7 +314,7 @@ doit_loop(#state{coordinators=Coordinators,participants=Participants,supervisor=
 	    ?eval_debug_fun({?MODULE, do_abort, pre}, [{tid, Tid}]),
 	    case gb_trees:lookup(Tid, Participants) of
 		none ->
-		    verbose("Tried to abort a non participant transaction ~p: ~p~n",
+		    verbose("Tried to abort a non participant transaction ~p: ~tp~n",
 			    [Tid, Reason]),
 		    mnesia_locker:release_tid(Tid),
 		    doit_loop(State);
@@ -417,7 +417,7 @@ doit_loop(#state{coordinators=Coordinators,participants=Participants,supervisor=
 	{From, {unblock_me, Tab}} ->
 	    case lists:member(Tab, State#state.blocked_tabs) of
 		false ->
-		    verbose("Wrong dirty Op blocked on ~p ~p ~p",
+		    verbose("Wrong dirty Op blocked on ~p ~tp ~p",
 			    [node(), Tab, From]),
 		    reply(From, unblocked),
 		    doit_loop(State);
@@ -466,11 +466,11 @@ doit_loop(#state{coordinators=Coordinators,participants=Participants,supervisor=
 	    end;
 
 	{system, From, Msg} ->
-	    dbg_out("~p got {system, ~p, ~p}~n", [?MODULE, From, Msg]),
+	    dbg_out("~p got {system, ~p, ~tp}~n", [?MODULE, From, Msg]),
 	    sys:handle_system_msg(Msg, From, Sup, ?MODULE, [], State);
 
 	Msg ->
-	    verbose("** ERROR ** ~p got unexpected message: ~p~n", [?MODULE, Msg]),
+	    verbose("** ERROR ** ~p got unexpected message: ~tp~n", [?MODULE, Msg]),
 	    doit_loop(State)
     end.
 
@@ -556,7 +556,7 @@ handle_exit(Pid, Reason, State) ->
 		    %% We got exit from a local fool
 		    doit_loop(State);
 		{P = #participant{}, _RestP} ->
-		    fatal("Participant ~p in transaction ~p died ~p~n",
+		    fatal("Participant ~p in transaction ~p died ~tp~n",
 			  [P#participant.pid, P#participant.tid, Reason]),
 		    NewPs = gb_trees:delete(P#participant.tid,State#state.participants),
 		    doit_loop(State#state{participants = NewPs})
@@ -598,7 +598,7 @@ recover_coordinator(Tid, Etabs) ->
 		    ok    %% to the new nested trans store.
 	    end
     catch _:Reason ->
-	    dbg_out("Recovery of coordinator ~p failed:~n",
+	    dbg_out("Recovery of coordinator ~p failed: ~tp~n",
 		    [Tid, {Reason, erlang:get_stacktrace()}]),
 	    Protocol = asym_trans,
 	    tell_outcome(Tid, Protocol, node(), CheckNodes, TellNodes)
@@ -941,7 +941,7 @@ decr(_X) -> 0.
 
 return_abort(Fun, Args, Reason)  ->
     {_Mod, Tid, Ts} = get(mnesia_activity_state),
-    dbg_out("Transaction ~p calling ~p with ~p failed: ~n ~p~n",
+    dbg_out("Transaction ~p calling ~tp with ~tp failed: ~n ~tp~n",
 	    [Tid, Fun, Args, Reason]),
     OldStore = Ts#tidstore.store,
     Nodes = get_elements(nodes, OldStore),
@@ -1714,7 +1714,7 @@ commit_participant(Coord, Tid, Bin, C0, DiscNs, _RamNs) ->
 			    mnesia_schema:undo_prepare_commit(Tid, C0);
 
 			Msg ->
-			    verbose("** ERROR ** commit_participant ~p, got unexpected msg: ~p~n",
+			    verbose("** ERROR ** commit_participant ~p, got unexpected msg: ~tp~n",
 				    [Tid, Msg])
 		    end;
 		{Tid, {do_abort, Reason}} ->
@@ -1730,7 +1730,7 @@ commit_participant(Coord, Tid, Bin, C0, DiscNs, _RamNs) ->
 
 		Msg ->
 		    reply(Coord, {do_abort, Tid, self(), {bad_commit,internal}}),
-		    verbose("** ERROR ** commit_participant ~p, got unexpected msg: ~p~n",
+		    verbose("** ERROR ** commit_participant ~p, got unexpected msg: ~tp~n",
 			    [Tid, Msg])
 	    end
     catch _:Reason ->
@@ -1804,7 +1804,7 @@ do_update(Tid, Storage, [Op | Ops], OldRes) ->
 	    %%         Determine actual storage type and try again.
 	    %% BUGBUG: Updates may be lost if table is transformed.
 	    ST = erlang:get_stacktrace(),
-	    verbose("do_update in ~w failed: ~p -> {'EXIT', ~p}~n",
+	    verbose("do_update in ~w failed: ~tp -> {'EXIT', ~tp}~n",
 		    [Tid, Op, {Reason, ST}]),
 	    do_update(Tid, Storage, Ops, OldRes)
     end;
@@ -1919,7 +1919,7 @@ do_snmp(Tid, [Head|Tail]) ->
 	    %% deleted our local replica or recently deattached
 	    %% the snmp table
 	    ST = erlang:get_stacktrace(),
-	    verbose("do_snmp in ~w failed: ~p -> {'EXIT', ~p}~n",
+	    verbose("do_snmp in ~w failed: ~tp -> {'EXIT', ~tp}~n",
 		    [Tid, Head, {Reason, ST}])
     end,
     do_snmp(Tid, Tail).
@@ -2151,7 +2151,7 @@ pr_participant(Stream, P) ->
 	    true -> Commit0
 	end,
     pr_tid(Stream, P#participant.tid),
-    io:format(Stream, "with participant objects ~p~n", [Commit]).
+    io:format(Stream, "with participant objects ~tp~n", [Commit]).
 
 
 pr_tid(Stream, Tid) ->
@@ -2193,7 +2193,7 @@ search_pr_participant(S, [ P | Tail]) ->
 		    true -> Commit0
 		end,
 
-	    io:format("~p~n", [Commit]),
+	    io:format("~tp~n", [Commit]),
 	    search_pr_participant(S,Tail);  %% !!!!!
 	true ->
 	    search_pr_participant(S, Tail)
@@ -2214,12 +2214,12 @@ display_pid_info(Pid) ->
 	    Reds  = fetch(reductions, Info),
 	    LM = length(fetch(messages, Info)),
 	    pformat(io_lib:format("~p", [Pid]),
-		    io_lib:format("~p", [Call]),
-		    io_lib:format("~p", [Curr]), Reds, LM)
+		    io_lib:format("~tp", [Call]),
+		    io_lib:format("~tp", [Curr]), Reds, LM)
     end.
 
 pformat(A1, A2, A3, A4, A5) ->
-    io:format( "~-12s ~-21s ~-21s ~9w ~4w~n", [A1,A2,A3,A4,A5]).
+    io:format( "~-12s ~-21ts ~-21ts ~9w ~4w~n", [A1,A2,A3,A4,A5]).
 
 fetch(Key, Info) ->
     case lists:keysearch(Key, 1, Info) of