diff options
| author | Gustav Simonsson <[email protected]> | 2012-03-19 16:12:46 +0100 |
|---|---|---|
| committer | Gustav Simonsson <[email protected]> | 2012-03-19 16:12:46 +0100 |
| commit | bd8e724a56aff8936fe61bfdb72e9548637ef561 (patch) | |
| tree | 4acf72f622ab19089bcab840ad867f530f971432 /system | |
| parent | 8406f47252a5f1fd38cd771aa7fa692817677709 (diff) | |
| parent | 662e3ffeed74d9121315d86af46430dd71e01709 (diff) | |
| download | otp-bd8e724a56aff8936fe61bfdb72e9548637ef561.tar.gz otp-bd8e724a56aff8936fe61bfdb72e9548637ef561.tar.bz2 otp-bd8e724a56aff8936fe61bfdb72e9548637ef561.zip | |
Merge branch 'maint'
Diffstat (limited to 'system')
| -rw-r--r-- | system/doc/design_principles/sup_princ.xml | 2 | ||||
| -rw-r--r-- | system/doc/efficiency_guide/profiling.xml | 2 | ||||
| -rw-r--r-- | system/doc/tutorial/c_portdriver.xmlsrc | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/system/doc/design_principles/sup_princ.xml b/system/doc/design_principles/sup_princ.xml index c473e257fa..353430752c 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> diff --git a/system/doc/efficiency_guide/profiling.xml b/system/doc/efficiency_guide/profiling.xml index 65ba4b3369..230aa3504b 100644 --- a/system/doc/efficiency_guide/profiling.xml +++ b/system/doc/efficiency_guide/profiling.xml @@ -116,7 +116,7 @@ minimize runtime performance impact. Using fprof is just a matter of calling a few library functions, see <seealso marker="tools:fprof">fprof</seealso> - manual page under the application tools.<c>fprof</c> was introduced in + manual page under the application tools.<c> fprof</c> was introduced in version R8 of Erlang/OTP. </p> </section> diff --git a/system/doc/tutorial/c_portdriver.xmlsrc b/system/doc/tutorial/c_portdriver.xmlsrc index f875fa80d2..e6887a25d1 100644 --- a/system/doc/tutorial/c_portdriver.xmlsrc +++ b/system/doc/tutorial/c_portdriver.xmlsrc @@ -68,8 +68,8 @@ start(SharedLib) -> case erl_ddll:load_driver(".", SharedLib) of ok -> ok; -\011{error, already_loaded} -> ok; -\011_ -> exit({error, could_not_load_driver}) + {error, already_loaded} -> ok; + _ -> exit({error, could_not_load_driver}) end, spawn(?MODULE, init, [SharedLib]). @@ -102,7 +102,7 @@ loop(Port) -> {call, Caller, Msg} -> Port ! {self(), {command, encode(Msg)}}, receive -\011 {Port, {data, Data}} -> + {Port, {data, Data}} -> Caller ! {complex, decode(Data)} end, loop(Port) |