Get rid of annoying Apache warning

For years I put up with Apaches annoying warning on startup about not being able to determine a fully qualified domain name:

Could not reliably determine the server's fully qualified domain name, using 127.0.0.1 for ServerName

I finally looked up how to get rid of it, and despite a few pieces of incorrect advice in forums the solution is to add the following:

ServerName localhost

to /etc/apache2/apache2.conf, or replace localhost with whatever makes sense.

Disable upstart/non-upstart services on startup

To disable non-upstart services:

$ sudo update-rc.d apache2 disable

To disable upstart services, create file named <service>.override in /etc/init/ folder that contains the word "manual"

$ sudo sh -c 'echo manual >> /etc/init/mysql.override'

Resolving SVN conflict after directory rename

Renaming a folder with "svn ren oldname newname" causes a conflict error to occur. I was able to resolve the conflict by issuing the following commands found at http://stackoverflow.com/questions/3941291/a-sane-way-to-rename-a-directory-in-subversion-working-copy

svn resolve --accept working -R .
svn commit