This reverts commit 283ade8e33.
This was supposed to come as a collection of commits, not squashed into
one.
Configuration
This section contains information on tweaking Synapse via the various options in the configuration file. A configuration file should have been generated when you installed Synapse.