aboutsummaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorGustav Simonsson <[email protected]>2012-02-22 09:58:57 +0100
committerGustav Simonsson <[email protected]>2012-02-22 09:58:57 +0100
commite1469ce2f3064237a48ac01f7ca5c6926a023198 (patch)
tree66659dd9a14aafb3903bb331a62cd53d37b6861b /system
parent91b04e4eb2e958f63af0578e83dc358fa46c7fa0 (diff)
parent4bbff5f00c0b407dcab2575a17cc29422391b339 (diff)
downloadotp-e1469ce2f3064237a48ac01f7ca5c6926a023198.tar.gz
otp-e1469ce2f3064237a48ac01f7ca5c6926a023198.tar.bz2
otp-e1469ce2f3064237a48ac01f7ca5c6926a023198.zip
Merge branch 'jv/on_load_docs' into maint
Diffstat (limited to 'system')
-rw-r--r--system/doc/reference_manual/modules.xml8
1 files changed, 7 insertions, 1 deletions
diff --git a/system/doc/reference_manual/modules.xml b/system/doc/reference_manual/modules.xml
index 0dbc0ab56b..377b2853ca 100644
--- a/system/doc/reference_manual/modules.xml
+++ b/system/doc/reference_manual/modules.xml
@@ -114,6 +114,12 @@ fact(0) -> % |
<p>If this attribute is not specified, the version defaults
to the MD5 checksum of the module.</p>
</item>
+ <tag><c>-on_load(Function).</c></tag>
+ <item>
+ <p>Names a function that should be run automatically when a
+ module a loaded. See <seealso marker="code_loading#on_load">
+ code loading</seealso> for more information.</p>
+ </item>
</taglist>
</section>
@@ -180,7 +186,7 @@ fact(0) -> % |
<p>Read more in <seealso marker="typespec">Types and Function specifications</seealso>.
</p>
<p>
- The desciption is based on
+ The description is based on
<url href="http://www.erlang.org/eeps/eep-0008.html">EEP8 -
Types and function specifications</url>
which will not be further updated.