diff options
| author | Henrik Nord <[email protected]> | 2012-02-16 12:47:11 +0100 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2012-02-16 12:47:11 +0100 |
| commit | 5620b434415d7c7d7060dbeff2c71d6bb96b91da (patch) | |
| tree | 28d681356120a3a5fc8c4fba7c2e9b2acfd64718 /system | |
| parent | ddfe258f12a7706f3aea4f20bf6fc46b839ab70c (diff) | |
| parent | c826b7309e57e33b1209d5b6c0f15a0e26122729 (diff) | |
| download | otp-5620b434415d7c7d7060dbeff2c71d6bb96b91da.tar.gz otp-5620b434415d7c7d7060dbeff2c71d6bb96b91da.tar.bz2 otp-5620b434415d7c7d7060dbeff2c71d6bb96b91da.zip | |
Merge branch 'maint'
Conflicts:
lib/hipe/cerl/erl_bif_types.erl
lib/stdlib/doc/src/binary.xml
Diffstat (limited to 'system')
| -rw-r--r-- | system/doc/design_principles/sup_princ.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/doc/design_principles/sup_princ.xml b/system/doc/design_principles/sup_princ.xml index 5b8fd604c8..c473e257fa 100644 --- a/system/doc/design_principles/sup_princ.xml +++ b/system/doc/design_principles/sup_princ.xml @@ -136,7 +136,7 @@ init(...) -> M = F = atom() A = [term()] Restart = permanent | transient | temporary - Shutdown = brutal_kill | integer() >=0 | infinity + Shutdown = brutal_kill | integer()>=0 | infinity Type = worker | supervisor Modules = [Module] | dynamic Module = atom()]]></code> |