aboutsummaryrefslogtreecommitdiffstats
path: root/erts/doc/src
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2015-12-17 07:31:21 +0100
committerBjörn Gustavsson <[email protected]>2015-12-17 07:31:21 +0100
commita8714487f0856e728e4d2c324118425f07e55736 (patch)
tree9b35e7bb0b6b267fb9e527787ae5d52a9617ed6f /erts/doc/src
parenta985104c38d154b7d0f2eb8ccf9f8fe053b6aad5 (diff)
parentef8a03c6dc3965ed56a746df524036b6b205feb9 (diff)
downloadotp-a8714487f0856e728e4d2c324118425f07e55736.tar.gz
otp-a8714487f0856e728e4d2c324118425f07e55736.tar.bz2
otp-a8714487f0856e728e4d2c324118425f07e55736.zip
Merge branch 'bjorn/erts/clean-up-preloaded/OTP-13112'
* bjorn/erts/clean-up-preloaded/OTP-13112: Update preloaded modules erl_prim_loader doc: Remove mention of user supplied loader erl_prim_loader: Clean up string_match() erl_prim_loader: Avoid making absolute paths erl_prim_loader: Clean up splitting of filenames init: Eliminate the concat/1 function Clean up start of erl_prim_loader Remove erl_prim_loader:get_files/2 erl_prim_loader: Remove code for handling OSE erl_prim_loader: Break loop/3 into two functions for readability prim_file: Suppress a dialyzer warning Reduce the ludicrous number of arguments for eval_script() Clean up handling of boot_vars init_SUITE: Correct the test for a "real system" Remove useless 'catch' in start_it/1 Simplify get_flag() and get_flag_list() Clean up parsing and lookup of flags
Diffstat (limited to 'erts/doc/src')
-rw-r--r--erts/doc/src/erl_prim_loader.xml42
1 files changed, 4 insertions, 38 deletions
diff --git a/erts/doc/src/erl_prim_loader.xml b/erts/doc/src/erl_prim_loader.xml
index db4f132609..8f66e07ae1 100644
--- a/erts/doc/src/erl_prim_loader.xml
+++ b/erts/doc/src/erl_prim_loader.xml
@@ -50,36 +50,9 @@
<c>-loader_debug</c> are also experimental</p></warning>
</description>
- <datatypes>
- <datatype>
- <name name="host"/>
- </datatype>
- </datatypes>
<funcs>
<func>
- <name name="start" arity="3"/>
- <fsummary>Start the Erlang low level loader</fsummary>
- <desc>
- <p>Starts the Erlang low level loader. This function is called
- by the <c>init</c> process (and module). The <c>init</c>
- process reads the command line flags <c>-id <anno>Id</anno></c>,
- <c>-loader <anno>Loader</anno></c>, and <c>-hosts <anno>Hosts</anno></c>. These are
- the arguments supplied to the <c>start/3</c> function.</p>
- <p>If <c>-loader</c> is not given, the default loader is
- <c>efile</c> which tells the system to read from the file
- system.</p>
- <p>If <c>-loader</c> is <c>inet</c>, the <c>-id <anno>Id</anno></c>,
- <c>-hosts <anno>Hosts</anno></c>, and <c>-setcookie Cookie</c> flags must
- also be supplied. <c><anno>Hosts</anno></c> identifies hosts which this
- node can contact in order to load modules. One Erlang
- runtime system with a <c>erl_boot_server</c> process must be
- started on each of hosts given in <c><anno>Hosts</anno></c> in order to
- answer the requests. See <seealso
- marker="kernel:erl_boot_server">erl_boot_server(3)</seealso>.</p>
- </desc>
- </func>
- <func>
<name name="get_file" arity="1"/>
<fsummary>Get a file</fsummary>
<desc>
@@ -87,8 +60,6 @@
<c><anno>Filename</anno></c> is either an absolute file name or just the name
of the file, for example <c>"lists.beam"</c>. If an internal
path is set to the loader, this path is used to find the file.
- If a user supplied loader is used, the path can be stripped
- off if it is obsolete, and the loader does not use a path.
<c><anno>FullName</anno></c> is the complete name of the fetched file.
<c><anno>Bin</anno></c> is the contents of the file as a binary.</p>
@@ -189,17 +160,12 @@
<p>Specifies which other Erlang nodes the <c>inet</c> loader
can use. This flag is mandatory if the <c>-loader inet</c>
flag is present. On each host, there must be on Erlang node
- with the <c>erl_boot_server</c> which handles the load
- requests. <c>Hosts</c> is a list of IP addresses (hostnames
+ with the <seealso
+ marker="kernel:erl_boot_server">erl_boot_server(3)</seealso>
+ which handles the load requests.
+ <c>Hosts</c> is a list of IP addresses (hostnames
are not acceptable).</p>
</item>
- <tag><c>-id Id</c></tag>
- <item>
- <p>Specifies the identity of the Erlang runtime system. If
- the system runs as a distributed node, <c>Id</c> must be
- identical to the name supplied with the <c>-sname</c> or
- <c>-name</c> distribution flags.</p>
- </item>
<tag><c>-setcookie Cookie</c></tag>
<item>
<p>Specifies the cookie of the Erlang runtime system. This flag