aboutsummaryrefslogtreecommitdiffstats
path: root/erts/doc/src/ref_man.xml
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2019-02-04 14:47:48 +0100
committerMicael Karlberg <[email protected]>2019-02-04 14:47:48 +0100
commitad0beca8fb612fa33dabcfb3592796a92e858684 (patch)
tree97fdd079a2a8abfb3b9de8992ef6452dd2193acd /erts/doc/src/ref_man.xml
parent4b3c3ae0bdcab6028faa5a5ea3e4076ce6af5de4 (diff)
parent875825874d4a8d52ec5cc593f5024afc696c29df (diff)
downloadotp-ad0beca8fb612fa33dabcfb3592796a92e858684.tar.gz
otp-ad0beca8fb612fa33dabcfb3592796a92e858684.tar.bz2
otp-ad0beca8fb612fa33dabcfb3592796a92e858684.zip
Merge branch 'bmk/20180918/nififying_inet/OTP-14831' into bmk/20190204/socket_as_nif/OTP-14831
Diffstat (limited to 'erts/doc/src/ref_man.xml')
-rw-r--r--erts/doc/src/ref_man.xml4
1 files changed, 3 insertions, 1 deletions
diff --git a/erts/doc/src/ref_man.xml b/erts/doc/src/ref_man.xml
index 811d299f06..80cdcf9145 100644
--- a/erts/doc/src/ref_man.xml
+++ b/erts/doc/src/ref_man.xml
@@ -4,7 +4,7 @@
<application xmlns:xi="http://www.w3.org/2001/XInclude">
<header>
<copyright>
- <year>1996</year><year>2016</year>
+ <year>1996</year><year>2018</year>
<holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>
@@ -46,8 +46,10 @@
<xi:include href="erts_alloc.xml"/>
<xi:include href="escript.xml"/>
<xi:include href="init.xml"/>
+ <xi:include href="net.xml"/>
<xi:include href="persistent_term.xml"/>
<xi:include href="run_erl.xml"/>
+ <xi:include href="socket.xml"/>
<xi:include href="start.xml"/>
<xi:include href="start_erl.xml"/>
<xi:include href="werl.xml"/>