Instructions for unsetting default locale in Ubuntu.
Assume yes flag for python-software-properties.
Make sure we're in a dir that the alaveteli user can access

Otherwise, can get the error 'fatal: Could not change back to '/root': Permission denied'
Make clearer that gem install of bundler is not on default path.
postgresql and postgresql-client are on the package lists.

If you've followed the guide so far, they're now installed.
Vim not actually required.

I suggest we let people figure out their own editor.
Restore wheezy repo

Used to get bundler.
Handle the case where the rails-3-develop branch has a different commonlib commit.
Drop reference to WDTK/mysociety.

Just tell people what they need to do.
Set mail recipient as alaveteli user in example

To avoid errors if only local delivery is set up.
Consistently reference new init script names.

See also https://github.com/mysociety/alaveteli/pull/1801
Make clear that init script won't run without varnish
Set environment for init scripts.

Also, add note about setting staging_site. If you don't do this, init scripts don't run in production unless you set the RAILS_ENV in them explicitly. With staging_site set, rails-post-deploy creates config/rails_env.rb to force the production environment.
The alaveteli user needs to be able to write to /var/www to create cron lock files.
More information on what init scripts do.
Remove permissions section

We've already set the permissions on the init scripts earlier in the
guide, so no need to give people an alternative way to make them
runnable.
Fix typo
Remove redundant asset precompilation.

rails-post-deploy will precompile assets if STAGING_SITE has been set to 0 in general.yml as instructed in ecc0fe6.
Make it clearer that the SSL and non SSL config files are alternatives.

You don't install the non-SSL one and then the SSL one. Promote the SSL
one to the first option, and give varnish it's own heading to make clear
that it applies to all webserver setups.
Add notes on how to run tests from a production install.