aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib/test/supervisor_SUITE.erl
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2011-02-28 19:07:16 +0100
committerMicael Karlberg <[email protected]>2011-02-28 19:07:16 +0100
commit7c1117fd0e509115fb17a1a101233f19be555991 (patch)
treef0eeb2636a879bf37120b7b976ddf3979be8890d /lib/stdlib/test/supervisor_SUITE.erl
parent2c13b770cf24be58db1862afc38143d889ac2600 (diff)
parent98d3b0c86ff3d99a4d175291df54c5ed48357fce (diff)
downloadotp-7c1117fd0e509115fb17a1a101233f19be555991.tar.gz
otp-7c1117fd0e509115fb17a1a101233f19be555991.tar.bz2
otp-7c1117fd0e509115fb17a1a101233f19be555991.zip
Merge branch 'dev' into bmk/snmp/snmp419_integration/OTP-9068
Diffstat (limited to 'lib/stdlib/test/supervisor_SUITE.erl')
-rw-r--r--lib/stdlib/test/supervisor_SUITE.erl6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/stdlib/test/supervisor_SUITE.erl b/lib/stdlib/test/supervisor_SUITE.erl
index 8aed93ce12..6e927da2ab 100644
--- a/lib/stdlib/test/supervisor_SUITE.erl
+++ b/lib/stdlib/test/supervisor_SUITE.erl
@@ -1310,7 +1310,7 @@ count_children_memory(Config) when is_list(Config) ->
%% count_children consumes memory using an accumulator function,
%% but the space can be reclaimed incrementally,
- %% which_children may generate garbage that will reclaimed later.
+ %% which_children may generate garbage that will be reclaimed later.
case (Size5 =< Size4) of
true -> ok;
false ->
@@ -1338,8 +1338,8 @@ count_children_allocator_test(MemoryState) ->
lists:all(fun(State) -> State == {e, true} end, AllocStates).
%-------------------------------------------------------------------------
do_not_save_start_parameters_for_temporary_children(doc) ->
- ["Temporary children shall not be restarted so they should not"
- "save start parameters, as it potentially can"
+ ["Temporary children shall not be restarted so they should not "
+ "save start parameters, as it potentially can "
"take up a huge amount of memory for no purpose."];
do_not_save_start_parameters_for_temporary_children(suite) ->
[];