summary refs log tree commit diff
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2019-06-05 12:39:04 +0100
committerNeil Johnson <neil@matrix.org>2019-06-05 12:39:04 +0100
commite36e10357679006af8050688043d3aba5cc783ef (patch)
tree1941f265947fba276806f2bef2ec6705fb8f7746
parentUpdate docs/sample_config.yaml (diff)
downloadsynapse-neilj/mau-tracking-config-explainer.tar.xz
-rw-r--r--docs/sample_config.yaml10
-rw-r--r--synapse/config/server.py2
2 files changed, 6 insertions, 6 deletions
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml

index d333e25bf7..2bd170366d 100644 --- a/docs/sample_config.yaml +++ b/docs/sample_config.yaml
@@ -261,17 +261,17 @@ listeners: # Monthly Active User Blocking # -# Used in cases where the admin or server owner wants to limit the +# Used in cases where the admin or server owner wants to limit to the # number of monthly active users. # # 'limit_usage_by_mau' disables/enables monthly active user blocking. When -# enabled and a limit is reached the server returns a 'ResourceLimitError' -# with error type Codes.RESOURCE_LIMIT_EXCEEDED. +# anabled and a limit is reached the server returns a 'ResourceLimitError' +# with error type Codes.RESOURCE_LIMIT_EXCEEDED # # 'max_mau_value' is the hard limit of monthly active users above which # the server will start blocking user actions. # -# 'mau_trial_days' is a means for adding a grace period for active users. It +# 'mau_trial_days' is a means to add a grace period for active users. It # means that users must be active for this number of days before they # can be considered active and guards against the case where lots of users # sign up in a short space of time never to return after their initial @@ -280,7 +280,7 @@ listeners: #limit_usage_by_mau: False #max_mau_value: 50 #mau_trial_days: 2 -# + # If enabled, the metrics for the number of monthly active users will # be populated, however no one will be limited. If limit_usage_by_mau # is true, this is implied to be true. diff --git a/synapse/config/server.py b/synapse/config/server.py
index db143042db..334921d421 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py
@@ -604,7 +604,7 @@ class ServerConfig(Config): #limit_usage_by_mau: False #max_mau_value: 50 #mau_trial_days: 2 - # + # If enabled, the metrics for the number of monthly active users will # be populated, however no one will be limited. If limit_usage_by_mau # is true, this is implied to be true.