diff options
| author | Henrik Nord <[email protected]> | 2015-11-11 16:00:46 +0100 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2015-11-11 16:00:46 +0100 |
| commit | 6da32c313f53990eb9ca718cccc72f2b4df29839 (patch) | |
| tree | c13ecf2ff1dfe7d5435224c234987d692efc3028 | |
| parent | 79452c126e3448b0300d04a70ffe7dd748eaff99 (diff) | |
| parent | 7eb292fd6849e43dad0b738027d90ca4944d14e2 (diff) | |
| download | otp-6da32c313f53990eb9ca718cccc72f2b4df29839.tar.gz otp-6da32c313f53990eb9ca718cccc72f2b4df29839.tar.bz2 otp-6da32c313f53990eb9ca718cccc72f2b4df29839.zip | |
Merge branch 'maint'
| -rw-r--r-- | erts/doc/src/erlang.xml | 2 | ||||
| -rw-r--r-- | erts/epmd/src/epmd.c | 2 | ||||
| -rw-r--r-- | system/doc/reference_manual/processes.xml | 4 |
3 files changed, 3 insertions, 5 deletions
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml index 026d245a1c..93e42c1230 100644 --- a/erts/doc/src/erlang.xml +++ b/erts/doc/src/erlang.xml @@ -8227,7 +8227,7 @@ timestamp() -> <tag><c>bin_old_vheap_size</c></tag> <item>The total size of unique off-heap binaries referenced from the process old heap.</item> - <tag><c>bin_vheap_block_size</c></tag> + <tag><c>bin_old_vheap_block_size</c></tag> <item>The total size of binaries allowed in the virtual old heap in the process before doing a garbage collection.</item> </taglist> diff --git a/erts/epmd/src/epmd.c b/erts/epmd/src/epmd.c index 7c373509be..21ce4e52b0 100644 --- a/erts/epmd/src/epmd.c +++ b/erts/epmd/src/epmd.c @@ -29,7 +29,7 @@ #ifdef HAVE_STDLIB_H # include <stdlib.h> #endif - +#include <time.h> /* forward declarations */ static void usage(EpmdVars *); diff --git a/system/doc/reference_manual/processes.xml b/system/doc/reference_manual/processes.xml index 6755bd8be6..f656d0318e 100644 --- a/system/doc/reference_manual/processes.xml +++ b/system/doc/reference_manual/processes.xml @@ -100,11 +100,9 @@ spawn(Module, Name, Args) -> pid() <item><c>exit(Reason)</c></item> <item><c>erlang:error(Reason)</c></item> <item><c>erlang:error(Reason, Args)</c></item> - <item><c>erlang:fault(Reason)</c></item> - <item><c>erlang:fault(Reason, Args)</c></item> </list> <p>The process then terminates with reason <c>Reason</c> for - <c>exit/1</c> or <c>{Reason,Stack} for the others</c>.</p> + <c>exit/1</c> or <c>{Reason,Stack}</c> for the others.</p> <p>A process can also be terminated if it receives an exit signal with another exit reason than <c>normal</c>, see <seealso marker="#errors">Error Handling</seealso>.</p> |