diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2019-11-26 10:53:48 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-26 10:53:48 +0000 |
| commit | 4c1b799e1b9f8e04f6cd86a0977e28685ac20aea (patch) | |
| tree | fcaea2671bf38721520191c13bb37adf18ef84c5 /synapse/_scripts | |
| parent | Format changelog (diff) | |
| parent | Make sure that we close cursors before returning from a query (#6408) (diff) | |
| download | synapse-4c1b799e1b9f8e04f6cd86a0977e28685ac20aea.tar.xz | |
Merge branch 'develop' into babolivier/context_filters
Diffstat (limited to 'synapse/_scripts')
| -rw-r--r-- | synapse/_scripts/register_new_matrix_user.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/_scripts/register_new_matrix_user.py b/synapse/_scripts/register_new_matrix_user.py index bdcd915bbe..d528450c78 100644 --- a/synapse/_scripts/register_new_matrix_user.py +++ b/synapse/_scripts/register_new_matrix_user.py @@ -144,8 +144,8 @@ def main(): logging.captureWarnings(True) parser = argparse.ArgumentParser( - description="Used to register new users with a given home server when" - " registration has been disabled. The home server must be" + description="Used to register new users with a given homeserver when" + " registration has been disabled. The homeserver must be" " configured with the 'registration_shared_secret' option" " set." ) @@ -202,7 +202,7 @@ def main(): "server_url", default="https://localhost:8448", nargs="?", - help="URL to use to talk to the home server. Defaults to " + help="URL to use to talk to the homeserver. Defaults to " " 'https://localhost:8448'.", ) |