diff --git a/language/context/socket.xml b/language/context/socket.xml
index 9c9689855b..0c42aa5049 100644
--- a/language/context/socket.xml
+++ b/language/context/socket.xml
@@ -53,6 +53,49 @@
+
+ ipv6_v6only
+
+
+ Overrides the OS default regarding mapping IPv4 into IPv6.
+
+
+
+ This is important in particular when trying to listen on IPv4 addresses
+ separately while there exists a binding on [::].
+
+
+ This is only applicable to stream_socket_server.
+
+
+
+
+
+ so_reuseport
+
+
+ Allows multiple bindings to a same ip:port pair, even from separate processes.
+
+
+
+ This is only applicable to stream_socket_server.
+
+
+
+
+
+ so_broadcast
+
+
+ Enables sending and receiving data to/from broadcast addresses.
+
+
+
+ This is only applicable to stream_socket_server.
+
+
+
+
@@ -69,6 +112,24 @@
+
+ 7.0.1
+
+ Added ipv6_v6only.
+
+
+
+ 7.0.0
+
+ Added so_broadcast.
+
+
+
+ 7.0.0
+
+ Added so_reuseport.
+
+
5.3.3