diff options
| author | Sverker Eriksson <[email protected]> | 2018-07-11 22:11:19 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2018-07-11 22:11:19 +0200 |
| commit | 7b206e455df25a8e4ae78cae1939748ed693be40 (patch) | |
| tree | 4d1bff8b41da4a5ecc241a43f0e94ad6c8bbc545 /erts/doc | |
| parent | c7a831d68e84b05b03c693d29d1c127edc0170f7 (diff) | |
| parent | 97626fffd082904576efbdad3e437720525d5fc2 (diff) | |
| download | otp-7b206e455df25a8e4ae78cae1939748ed693be40.tar.gz otp-7b206e455df25a8e4ae78cae1939748ed693be40.tar.bz2 otp-7b206e455df25a8e4ae78cae1939748ed693be40.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts/doc')
| -rw-r--r-- | erts/doc/src/erl_nif.xml | 2 | ||||
| -rw-r--r-- | erts/doc/src/erlang.xml | 15 |
2 files changed, 13 insertions, 4 deletions
diff --git a/erts/doc/src/erl_nif.xml b/erts/doc/src/erl_nif.xml index a8eff43623..0fff8f7cad 100644 --- a/erts/doc/src/erl_nif.xml +++ b/erts/doc/src/erl_nif.xml @@ -194,7 +194,7 @@ ok <p>Binaries are sequences of whole bytes. Bitstrings with an arbitrary bit length have no support yet.</p> </item> - <tag>Resource objects</tag> + <tag><marker id="resource_objects"/>Resource objects</tag> <item> <p>The use of resource objects is a safe way to return pointers to native data structures from a NIF. A resource object is diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml index 73800687b7..8e014c3010 100644 --- a/erts/doc/src/erlang.xml +++ b/erts/doc/src/erlang.xml @@ -197,6 +197,15 @@ </desc> </datatype> + <datatype> + <name name="nif_resource"></name> + <desc> + <p>An opaque handle identifing a + <seealso marker="erl_nif#resource_objects">NIF resource object + </seealso>.</p> + </desc> + </datatype> + </datatypes> <funcs> @@ -5288,10 +5297,10 @@ RealSystem = system + MissedSystem</code> <p><c><anno>MinBinVHeapSize</anno></c> is the minimum binary virtual heap size for the process.</p> </item> - <tag><c>{monitored_by, <anno>Pids</anno>}</c></tag> + <tag><c>{monitored_by, <anno>MonitoredBy</anno>}</c></tag> <item> - <p>A list of process identifiers monitoring the process (with - <c>monitor/2</c>).</p> + <p>A list of identifiers for all the processes, ports and NIF + resources, that are monitoring the process.</p> </item> <tag><c>{monitors, <anno>Monitors</anno>}</c></tag> <item> |