aboutsummaryrefslogtreecommitdiffstats
path: root/erts/doc/src
diff options
context:
space:
mode:
authorNiclas Axelsson <[email protected]>2011-03-02 15:49:16 +0100
committerNiclas Axelsson <[email protected]>2011-03-02 15:49:22 +0100
commitbbed1363f171199b3d87145d8a5e2c1875ca90ca (patch)
treebd8212d67719f81809a8d0ea65dda2c958904332 /erts/doc/src
parent1ce3103d3bd8a869225bd461b586f97f90bf930a (diff)
parent98e954dfaf707895f1558d51a1ea9fd22812e161 (diff)
downloadotp-bbed1363f171199b3d87145d8a5e2c1875ca90ca.tar.gz
otp-bbed1363f171199b3d87145d8a5e2c1875ca90ca.tar.bz2
otp-bbed1363f171199b3d87145d8a5e2c1875ca90ca.zip
Merge branch 'hw/erl-clarify-detached-doc' into dev
* hw/erl-clarify-detached-doc: Mention that "-detached" implies "-noinput" OTP-9086
Diffstat (limited to 'erts/doc/src')
-rw-r--r--erts/doc/src/erl.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml
index 77bd952d41..1e6e290f6b 100644
--- a/erts/doc/src/erl.xml
+++ b/erts/doc/src/erl.xml
@@ -231,7 +231,8 @@
<tag><c><![CDATA[-detached]]></c></tag>
<item>
<p>Starts the Erlang runtime system detached from the system
- console. Useful for running daemons and backgrounds processes.</p>
+ console. Useful for running daemons and backgrounds processes. Implies
+ <c><![CDATA[-noinput]]></c>.</p>
</item>
<tag><c><![CDATA[-emu_args]]></c></tag>
<item>