summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Bakken <lbakken@pivotal.io>2018-02-12 10:56:03 -0800
committerLuke Bakken <lbakken@pivotal.io>2018-02-12 10:56:03 -0800
commitabdcaeb9eacdc424e3b5eb7a6a791d334322b960 (patch)
tree3cc33923a1dbfdd9ba2d8120d359e3311161ea37
parent2ea133b5ac38abc430283fd163dade9faaa8c4e2 (diff)
parent633881838302e9b2d6f50287a613b8d9abd3d780 (diff)
downloadrabbitmq-server-git-abdcaeb9eacdc424e3b5eb7a6a791d334322b960.tar.gz
Merge branch 'rabbitmq-website-495-v3.7.x' into rabbitmq-website-495-master
-rw-r--r--docs/rabbitmq-service.84
-rw-r--r--docs/rabbitmq.conf.example7
2 files changed, 9 insertions, 2 deletions
diff --git a/docs/rabbitmq-service.8 b/docs/rabbitmq-service.8
index 1e0f3760bb..12b7f28a33 100644
--- a/docs/rabbitmq-service.8
+++ b/docs/rabbitmq-service.8
@@ -89,8 +89,8 @@ using the service control panel.
.It Ev RABBITMQ_SERVICENAME
Defaults to RabbitMQ.
.It Ev RABBITMQ_BASE
-Defaults to the application data directory of the current user.
-This is the location of log and database directories.
+Note: Windows only. Defaults to the application data directory of the
+current user. This is the location of log and database directories.
.It Ev RABBITMQ_NODENAME
Defaults to
.Qq rabbit .
diff --git a/docs/rabbitmq.conf.example b/docs/rabbitmq.conf.example
index bc1a8b3c11..c362e9a8d2 100644
--- a/docs/rabbitmq.conf.example
+++ b/docs/rabbitmq.conf.example
@@ -240,6 +240,13 @@
# tcp_listen_options.backlog = 128
# tcp_listen_options.nodelay = true
# tcp_listen_options.exit_on_close = false
+#
+# tcp_listen_options.keepalive = true
+# tcp_listen_options.send_timeout = 15000
+#
+# tcp_listen_options.buffer = 196608
+# tcp_listen_options.sndbuf = 196608
+# tcp_listen_options.recbuf = 196608
##
## Resource Limits & Flow Control