aboutsummaryrefslogtreecommitdiffstats
path: root/lib/compiler/doc/src
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2012-07-18 11:26:09 +0200
committerHenrik Nord <[email protected]>2012-07-18 11:26:09 +0200
commit9b13eaca6cf8a72b95a74a882dd6cb13a8aa2390 (patch)
treeef6344901bc1f7c505eab25c3f85840b6229beba /lib/compiler/doc/src
parent0ccc6e476e261b5057ed8d74204c6b52cbdd2605 (diff)
parent95bf75bc27c07bc6a5054fb762cd07335d64b642 (diff)
downloadotp-9b13eaca6cf8a72b95a74a882dd6cb13a8aa2390.tar.gz
otp-9b13eaca6cf8a72b95a74a882dd6cb13a8aa2390.tar.bz2
otp-9b13eaca6cf8a72b95a74a882dd6cb13a8aa2390.zip
Merge branch 'maint'
Conflicts: erts/preloaded/ebin/erl_prim_loader.beam lib/kernel/src/code.erl
Diffstat (limited to 'lib/compiler/doc/src')
-rw-r--r--lib/compiler/doc/src/compile.xml6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/compiler/doc/src/compile.xml b/lib/compiler/doc/src/compile.xml
index b577e5ca4f..be9eb1cd75 100644
--- a/lib/compiler/doc/src/compile.xml
+++ b/lib/compiler/doc/src/compile.xml
@@ -294,6 +294,12 @@ module.beam: module.erl \
describing what it is doing.</p>
</item>
+ <tag><c>{source,FileName}</c></tag>
+ <item>
+ <p>Sets the value of the source, as returned by
+ <c>module_info(compile)</c>.</p>
+ </item>
+
<tag><c>{outdir,Dir}</c></tag>
<item>
<p>Sets a new directory for the object code. The current