Merge branch 'insp3' into master.

1 files changed, 8 insertions, 8 deletions

diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf.example
index 20ead6fd9..40391d71b 100644
--- a/docs/conf/modules.conf.example
+++ b/docs/conf/modules.conf.example
@@ -2361,19 +2361,19 @@
 # Requires SHA-1 hash support available in the sha1 module.
 #<module name="websocket">
 #
+# defaultmode: The default frame mode if a client does not send a
+#              WebSocket subprotocol. Potential values are "text" to
+#              encode messages as UTF-8 text frames, "binary" to send
+#              messages as raw binary frames, or "reject" to close
+#              connections which do not request a subprotocol. Defaults
+#              to "text".
 # proxyranges: A space-delimited list of glob or CIDR matches to trust
 #              the X-Real-IP or X-Forwarded-For headers from. If enabled
 #              the server will use the IP address specified by those HTTP
 #              headers. You should NOT enable this unless you are using
 #              a HTTP proxy like nginx as it will allow IP spoofing.
-# sendastext: Whether to re-encode messages as UTF-8 before sending to
-#             WebSocket clients. This is recommended as the WebSocket
-#             protocol requires all text frames to be sent as UTF-8.
-#             If you do not have this enabled messages will be sent as
-#             binary frames instead. Clients can override this using a
-#             WebSocket subprotocol. See the docs page for more info.
-#<websocket proxyranges="192.0.2.0/24 198.51.100.*"
-#           sendastext="yes">
+#<websocket defaultmode="text"
+#           proxyranges="192.0.2.0/24 198.51.100.*">
 #
 # If you use the websocket module you MUST specify one or more origins
 # which are allowed to connect to the server. You should set this as