aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2016-05-27 10:35:03 +0200
committerRickard Green <[email protected]>2016-05-27 10:35:03 +0200
commitf0510a55fdc2591ea71107f77e36d6fc7b001874 (patch)
tree23978a2d83ef2dd7f83a575822d2fc40e8aa3733 /erts
parenta390d27f5c39d5a120db1f3e8e7185f85a05debd (diff)
parent4a2b7cd9a8cab8e8a6842f7d08ddc36613eba678 (diff)
downloadotp-f0510a55fdc2591ea71107f77e36d6fc7b001874.tar.gz
otp-f0510a55fdc2591ea71107f77e36d6fc7b001874.tar.bz2
otp-f0510a55fdc2591ea71107f77e36d6fc7b001874.zip
Merge branch 'rickard/doc-fix'
* rickard/doc-fix: Minor doc fix
Diffstat (limited to 'erts')
-rw-r--r--erts/doc/src/erl_nif.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/doc/src/erl_nif.xml b/erts/doc/src/erl_nif.xml
index 33a4fee182..57e047af08 100644
--- a/erts/doc/src/erl_nif.xml
+++ b/erts/doc/src/erl_nif.xml
@@ -295,14 +295,14 @@ ok
</p></item>
<tag><marker id="time_measurement"/>Time Measurement</tag>
- <item><p>Support for time measurement in NIF libraries:
+ <item><p>Support for time measurement in NIF libraries:</p>
<list>
<item><seealso marker="#ErlNifTime"><c>ErlNifTime</c></seealso></item>
<item><seealso marker="#ErlNifTimeUnit"><c>ErlNifTimeUnit</c></seealso></item>
<item><seealso marker="#enif_monotonic_time"><c>enif_monotonic_time()</c></seealso></item>
<item><seealso marker="#enif_time_offset"><c>enif_time_offset()</c></seealso></item>
<item><seealso marker="#enif_convert_time_unit"><c>enif_convert_time_unit()</c></seealso></item>
- </list></p>
+ </list>
</item>
<tag><marker id="lengthy_work"/>Long-running NIFs</tag>