diff options
| author | Lukas Larsson <[email protected]> | 2018-02-06 09:54:18 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-02-06 09:54:18 +0100 |
| commit | 1c0843886908513a2a6bd5f315010acf5668e2b9 (patch) | |
| tree | f445d3e55b0ff1577985091bbf7a8f9a4b03d180 /erts | |
| parent | b6d0807aebf676063ab522833ded99b2a7fb31c9 (diff) | |
| parent | 2ab931cec15917e1297aafce350439c8daa7a726 (diff) | |
| download | otp-1c0843886908513a2a6bd5f315010acf5668e2b9.tar.gz otp-1c0843886908513a2a6bd5f315010acf5668e2b9.tar.bz2 otp-1c0843886908513a2a6bd5f315010acf5668e2b9.zip | |
Merge pull request #1704 from fxn/patch-2
Reword docs related to the runtime system mode
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/doc/src/erl.xml | 12 | ||||
| -rw-r--r-- | erts/preloaded/src/init.erl | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml index bd824b3405..99f0421080 100644 --- a/erts/doc/src/erl.xml +++ b/erts/doc/src/erl.xml @@ -360,11 +360,12 @@ </item> <tag><c><![CDATA[-mode interactive | embedded]]></c></tag> <item> - <p>Indicates if the system is to load code dynamically - (<c><![CDATA[interactive]]></c>), or if all code is to be loaded - during system initialization (<c><![CDATA[embedded]]></c>); see - <seealso marker="kernel:code"><c>code(3)</c></seealso>. - Defaults to <c><![CDATA[interactive]]></c>.</p> + <p>Modules are auto loaded when they are first referenced if the + runtime system runs in <c><![CDATA[interactive]]></c> mode, which is + the default. In <c><![CDATA[embedded]]></c> mode modules are not auto + loaded. The latter is recommended when the boot script preloads all + modules, as conventionally happens in OTP releases. See + <seealso marker="kernel:code"><c>code(3)</c></seealso></p>. </item> <tag><c><![CDATA[-name Name]]></c></tag> <item> @@ -1693,4 +1694,3 @@ code:load_abs("..../user_default"). ]]></code> <seealso marker="tools:make"><c>make(3)</c></seealso></p> </section> </comref> - diff --git a/erts/preloaded/src/init.erl b/erts/preloaded/src/init.erl index 679a2241d2..e0ae6b1656 100644 --- a/erts/preloaded/src/init.erl +++ b/erts/preloaded/src/init.erl @@ -32,8 +32,8 @@ %% (Optional - default efile) %% -hosts [Node] : List of hosts from which we can boot. %% (Mandatory if -loader inet) -%% -mode embedded : Load all modules at startup, no automatic loading -%% -mode interactive : Auto load modules (default system behaviour). +%% -mode interactive : Auto load modules not needed at startup (default system behaviour). +%% -mode embedded : Load all modules in the boot script, disable auto loading. %% -path : Override path in bootfile. %% -pa Path+ : Add my own paths first. %% -pz Path+ : Add my own paths last. |