aboutsummaryrefslogtreecommitdiffstats
path: root/erts/preloaded/src/erlang.erl
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2015-10-06 19:22:04 +0200
committerSverker Eriksson <[email protected]>2015-10-06 19:22:04 +0200
commit5fccd24ca22d19e65bb539cc0a71b2748d3b8dcd (patch)
treef755546cd19edcd3f6fe78fd83115e0a466113c7 /erts/preloaded/src/erlang.erl
parent258c8cd05d0a4215255121e7466e4ccd4c8ae82c (diff)
parentef9119ca3662c4e60e2d49c7edc0622cc73c21a0 (diff)
downloadotp-5fccd24ca22d19e65bb539cc0a71b2748d3b8dcd.tar.gz
otp-5fccd24ca22d19e65bb539cc0a71b2748d3b8dcd.tar.bz2
otp-5fccd24ca22d19e65bb539cc0a71b2748d3b8dcd.zip
Merge branch 'sverk/erts/doc-review' into maint
* sverk/erts/doc-review: erts: Spell-check erlang.xml erts: Review newer additions to erlang.xml erts: Review module erlang docs erts: Update module erlang docs erts: Review time correction docs erts: Update erts time correction docs
Diffstat (limited to 'erts/preloaded/src/erlang.erl')
-rw-r--r--erts/preloaded/src/erlang.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl
index 291356c7b1..4e55f711b2 100644
--- a/erts/preloaded/src/erlang.erl
+++ b/erts/preloaded/src/erlang.erl
@@ -2423,7 +2423,7 @@ tuple_to_list(_Tuple) ->
MinBinVHeapSize :: pos_integer()};
(modified_timing_level) -> integer() | undefined;
(multi_scheduling) -> disabled | blocked | enabled;
- (multi_scheduling_blockers) -> [PID :: pid()];
+ (multi_scheduling_blockers) -> [Pid :: pid()];
(nif_version) -> string();
(otp_release) -> string();
(os_monotonic_time_source) -> [{atom(),term()}];