diff --git a/synapse/app/admin_cmd.py b/synapse/app/admin_cmd.py index bd73c47ae20a882e62f1feb11b4ac3f105624097..e618a62432c3455e8f730804a2de3dd31800a0e7 100644 --- a/synapse/app/admin_cmd.py +++ b/synapse/app/admin_cmd.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright 2016 OpenMarket Ltd +# Copyright 2019 Matrix.org Foundation C.I.C. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -109,7 +109,7 @@ def start(config_options): subparser = parser.add_subparsers( title="Admin Commands", - description="Choose and admin command to perform.", + description="Choose an admin command to perform.", required=True, dest="command", metavar="<admin_command>", diff --git a/synapse/config/_base.py b/synapse/config/_base.py index e588f829812ef87f2e76bf3f7e0a81ed166f1c2a..74a7980ebe39cda7d7ebf82c4e24af7a8f00c850 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -284,7 +284,7 @@ class Config(object): Used for workers where we want to add extra flags/subcommands. Args: - conifg_parser (ArgumentParser) + config_parser (ArgumentParser) argv (list[str]) Returns: