Merge branch 'develop' into room-initial-sync

Conflicts:
	synapse/handlers/message.py

1 files changed, 4 insertions, 1 deletions

diff --git a/synapse/config/_base.py b/synapse/config/_base.py

index 8ebd2eba4a..6870af10e8 100644
--- a/synapse/config/_base.py
+++ b/synapse/config/_base.py
@@ -36,7 +36,10 @@ class Config(object):
         if file_path is None:
             raise ConfigError(
                 "Missing config for %s."
-                " Try running again with --generate-config"
+                " You must specify a path for the config file. You can "
+                "do this with the -c or --config-path option. "
+                "Adding --generate-config along with --server-name "
+                "<server name> will generate a config file at the given path."
                 % (config_name,)
             )
         if not os.path.exists(file_path):