diff options
author | Lukas Larsson <[email protected]> | 2016-05-03 10:18:59 +0200 |
---|---|---|
committer | Lukas Larsson <[email protected]> | 2016-05-03 10:18:59 +0200 |
commit | e36b604cb3fe58fcd7a8916d8498b5f2182ddcff (patch) | |
tree | 27949ccebd800e7b0ee08b2209b1cbe8b90ceb77 /erts/doc/src/erl.xml | |
parent | 0dcc4dad547fb7774f9c3b964fadec14fda15243 (diff) | |
parent | e1c70e582bc9e9eddd56d5483e59edc6eb75c3a6 (diff) | |
download | otp-e36b604cb3fe58fcd7a8916d8498b5f2182ddcff.tar.gz otp-e36b604cb3fe58fcd7a8916d8498b5f2182ddcff.tar.bz2 otp-e36b604cb3fe58fcd7a8916d8498b5f2182ddcff.zip |
Merge branch 'lukas/erts/rename_xmqd_to_hmqd/OTP-13366'
* lukas/erts/rename_xmqd_to_hmqd/OTP-13366:
erts: Rename erl flag +xmqd to +hmqd in erlexec
Fix proc_lib message_queue_data spec
erts: Fix total_heap_size calculation for on_heap
erts: Rename erl flag +xmqd to +hmqd
Diffstat (limited to 'erts/doc/src/erl.xml')
-rw-r--r-- | erts/doc/src/erl.xml | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml index e13470c83c..c499fc8081 100644 --- a/erts/doc/src/erl.xml +++ b/erts/doc/src/erl.xml @@ -632,6 +632,15 @@ <p>Sets the initial process dictionary size of processes to the size <c><![CDATA[Size]]></c>.</p> </item> + <tag><marker id="+hmqd"><c>+hmqd off_heap|on_heap|mixed</c></marker></tag> + <item><p> + Sets the default value for the process flag + <c>message_queue_data</c>. If <c>+hmqd</c> is not + passed, <c>mixed</c> will be the default. For more information, + see the documentation of + <seealso marker="erlang#process_flag_message_queue_data"><c>process_flag(message_queue_data, + MQD)</c></seealso>. + </p></item> <tag><c><![CDATA[+K true | false]]></c></tag> <item> <p>Enables or disables the kernel poll functionality if @@ -1361,21 +1370,6 @@ <seealso marker="kernel:error_logger#warning_map/0">error_logger(3)</seealso> for further information.</p> </item> - <tag><c><![CDATA[+xFlag Value]]></c></tag> - <item> - <p>Default process flag settings.</p> - <taglist> - <tag><marker id="+xmqd"><c>+xmqd off_heap|on_heap|mixed</c></marker></tag> - <item><p> - Sets the default value for the process flag - <c>message_queue_data</c>. If <c>+xmqd</c> is not - passed, <c>mixed</c> will be the default. For more information, - see the documentation of - <seealso marker="erlang#process_flag_message_queue_data"><c>process_flag(message_queue_data, - MQD)</c></seealso>. - </p></item> - </taglist> - </item> <tag><c><![CDATA[+zFlag Value]]></c></tag> <item> <p>Miscellaneous flags.</p> |