diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2022-07-19 16:14:02 +0200 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2022-07-19 16:14:02 +0200 |
| commit | 47822fd2e863719175ff512ce3e0234135d72ebf (patch) | |
| tree | 8e251812da29d36348f23292b08282484e9bd15e /synapse | |
| parent | Reduce memory usage of state group cache (#13323) (diff) | |
| parent | Improve precision on validation improvements (diff) | |
| download | synapse-47822fd2e863719175ff512ce3e0234135d72ebf.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'synapse')
| -rwxr-xr-x | synapse/_scripts/generate_config.py | 2 | ||||
| -rw-r--r-- | synapse/config/_base.py | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/synapse/_scripts/generate_config.py b/synapse/_scripts/generate_config.py index 08eb8ef114..06c11c60da 100755 --- a/synapse/_scripts/generate_config.py +++ b/synapse/_scripts/generate_config.py @@ -33,7 +33,7 @@ def main() -> None: parser.add_argument( "--report-stats", action="store", - help="Whether the generated config reports anonymized usage statistics", + help="Whether the generated config reports homeserver usage statistics", choices=["yes", "no"], ) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 095eca16c5..7c9cf403ef 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -97,16 +97,16 @@ def format_config_error(e: ConfigError) -> Iterator[str]: # We split these messages out to allow packages to override with package # specific instructions. MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ -Please opt in or out of reporting anonymized homeserver usage statistics, by -setting the `report_stats` key in your config file to either True or False. +Please opt in or out of reporting homeserver usage statistics, by setting +the `report_stats` key in your config file to either True or False. """ MISSING_REPORT_STATS_SPIEL = """\ We would really appreciate it if you could help our project out by reporting -anonymized usage statistics from your homeserver. Only very basic aggregate -data (e.g. number of users) will be reported, but it helps us to track the -growth of the Matrix community, and helps us to make Matrix a success, as well -as to convince other networks that they should peer with us. +homeserver usage statistics from your homeserver. Your homeserver's server name, +along with very basic aggregate data (e.g. number of users) will be reported. But +it helps us to track the growth of the Matrix community, and helps us to make Matrix +a success, as well as to convince other networks that they should peer with us. Thank you. """ @@ -621,7 +621,7 @@ class RootConfig: generate_group.add_argument( "--report-stats", action="store", - help="Whether the generated config reports anonymized usage statistics.", + help="Whether the generated config reports homeserver usage statistics.", choices=["yes", "no"], ) generate_group.add_argument( |