diff options
| author | Rickard Green <[email protected]> | 2013-05-16 17:55:39 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2013-05-16 17:55:39 +0200 |
| commit | 92092987b6470969f9ddc1dba8fdf49e7f8724fc (patch) | |
| tree | eb0befb3545266d1c2434b89ef6e40295476da2a /lib/kernel/doc/src | |
| parent | bbb2760fa436ae7e7b7d003252e83a24e4f6cb8a (diff) | |
| parent | 1932b1f4a9f4a8d083f9047b3ba1637dfea1c6d9 (diff) | |
| download | otp-92092987b6470969f9ddc1dba8fdf49e7f8724fc.tar.gz otp-92092987b6470969f9ddc1dba8fdf49e7f8724fc.tar.bz2 otp-92092987b6470969f9ddc1dba8fdf49e7f8724fc.zip | |
Merge branch 'maint'
* maint:
Only verify not busy for erlang:send(Port, Msg, [nosuspend]) until scheduled
Make high_msgq_watermark and low_msgq_watermark generic inet options
Do not treat port_set_data/port_get_data as signals
Add 'frmptr' emulator type
Conflicts:
erts/preloaded/ebin/erlang.beam
erts/preloaded/ebin/erts_internal.beam
erts/preloaded/ebin/prim_inet.beam
Diffstat (limited to 'lib/kernel/doc/src')
| -rw-r--r-- | lib/kernel/doc/src/inet.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/kernel/doc/src/inet.xml b/lib/kernel/doc/src/inet.xml index f99aef57b7..119d7d8df9 100644 --- a/lib/kernel/doc/src/inet.xml +++ b/lib/kernel/doc/src/inet.xml @@ -559,7 +559,7 @@ fe80::204:acff:fe17:bf38 <c>[Byte1,Byte2|Binary]</c>.</p> </item> - <tag><c>{high_msgq_watermark, Size}</c> (TCP/IP sockets)</tag> + <tag><c>{high_msgq_watermark, Size}</c></tag> <item> <p>The socket message queue will be set into a busy state when the amount of data queued on the message @@ -674,7 +674,7 @@ fe80::204:acff:fe17:bf38 the flushing time-out in seconds.</p> </item> - <tag><c>{low_msgq_watermark, Size}</c> (TCP/IP sockets)</tag> + <tag><c>{low_msgq_watermark, Size}</c></tag> <item> <p>If the socket message queue is in a busy state, the socket message queue will be set in a not busy state when |