aboutsummaryrefslogtreecommitdiffstats
path: root/erts/doc
diff options
context:
space:
mode:
authorHans Bolinder <[email protected]>2016-09-01 08:22:51 +0200
committerHans Bolinder <[email protected]>2016-09-01 08:22:51 +0200
commit155932b26c4b65412a4ef3a28922f0e8d276b919 (patch)
tree1ceeb55916ed544b54e5014ee71d3320df4e3f17 /erts/doc
parent0d36aebf9384cc7d86d74bb328b1257737722002 (diff)
parentfc69b92df1b6ad6487259ab0e24db9a0c3f3fb77 (diff)
downloadotp-155932b26c4b65412a4ef3a28922f0e8d276b919.tar.gz
otp-155932b26c4b65412a4ef3a28922f0e8d276b919.tar.bz2
otp-155932b26c4b65412a4ef3a28922f0e8d276b919.zip
Merge branch 'hasse/doc/fix_xmllint_warnings' into maint
* hasse/doc/fix_xmllint_warnings: Fix xmllint-warnings
Diffstat (limited to 'erts/doc')
-rw-r--r--erts/doc/src/erlang.xml8
1 files changed, 4 insertions, 4 deletions
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index d5eae2d66d..18f1b2e833 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -4455,12 +4455,12 @@ RealSystem = system + MissedSystem</code>
</desc>
</func>
- <marker id="process_flag_min_heap_size"/>
<func>
<name name="process_flag" arity="2" clause_i="3"/>
<fsummary>Set process flag min_heap_size for the calling process.
</fsummary>
<desc>
+ <marker id="process_flag_min_heap_size"/>
<p>Changes the minimum heap size for the calling process.</p>
<p>Returns the old value of the flag.</p>
</desc>
@@ -4477,13 +4477,13 @@ RealSystem = system + MissedSystem</code>
</desc>
</func>
- <marker id="process_flag_max_heap_size"/>
<func>
<name name="process_flag" arity="2" clause_i="5"/>
<fsummary>Set process flag max_heap_size for the calling process.
</fsummary>
<type name="max_heap_size"/>
<desc>
+ <marker id="process_flag_max_heap_size"/>
<p>This flag sets the maximum heap size for the calling process.
If <c><anno>MaxHeapSize</anno></c> is an integer, the system default
values for <c>kill</c> and <c>error_logger</c> are used.
@@ -4551,13 +4551,13 @@ RealSystem = system + MissedSystem</code>
</desc>
</func>
- <marker id="process_flag_message_queue_data"/>
<func>
<name name="process_flag" arity="2" clause_i="6"/>
<fsummary>Set process flag message_queue_data for the calling process.
</fsummary>
<type name="message_queue_data"/>
<desc>
+ <marker id="process_flag_message_queue_data"/>
<p>This flag determines how messages in the message queue
are stored, as follows:</p>
<taglist>
@@ -6745,12 +6745,12 @@ ok
</desc>
</func>
- <marker id="system_flag_max_heap_size"></marker>
<func>
<name name="system_flag" arity="2" clause_i="8"/>
<fsummary>Set system flag max_heap_size.</fsummary>
<type name="max_heap_size"/>
<desc>
+ <marker id="system_flag_max_heap_size"></marker>
<p>
Sets the default maximum heap size settings for processes.
The size is specified in words. The new <c>max_heap_size</c>