Merge branch develop into server2server_signing

Conflicts:
	synapse/app/homeserver.py

1 files changed, 2 insertions, 2 deletions

diff --git a/synctl b/synctl

index 0f83e9cb1f..c227a9e1e4 100755
--- a/synctl
+++ b/synctl
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-SYNAPSE="synapse/app/homeserver.py"
+SYNAPSE="python -m synapse.app.homeserver"
 
 CONFIGFILE="homeserver.yaml"
 PIDFILE="homeserver.pid"
@@ -14,7 +14,7 @@ case "$1" in
   start)
     if [ ! -f "$CONFIGFILE" ]; then
       echo "No config file found"
-      echo "To generate a config file, run 'python --generate-config'"
+      echo "To generate a config file, run '$SYNAPSE -c $CONFIGFILE --generate-config --server-name=<server name>'"
       exit 1
     fi