Giving up puts us in the FATAL state, not ERROR.
Merge pull request #32 from jszakmeister/fix-startretries-doc

Giving up puts us in the FATAL state, not ERROR.
Fix grammar
Merge pull request #33 from mawbid/master

Grammar fix
Mention issue #34 in TODO
Merge branch 'master' of github.com:Supervisor/supervisor
Set REMOTE_ADDR to '127.0.0.1' when using UNIX domain sockets.
Merge pull request #35 from dbinit/master

Server Error behind Nginx using Unix Domain Sockets
fixed tiny spelling error and misaligned semicolons
Merge pull request #39 from elpres/patch-1

fixed tiny spelling error and misaligned semicolons
Mention configuration reloading in TODO.  Closes #37
Environment variables might be used in strings expansion (in options).
Removed unused import.
Merge pull request #46 from silver-/master

Using environment variables as strings expansion in options
Mention pull request #20 in TODO
Fix a race condition where supervisord might ignore a signal.  Closes #54.
Trivial: fix rst typo
Merge pull request #56 from gthb/patch-1

Trivial: fix rst typo
Correcting a minor spelling mistake in config skeleton
Merge pull request #59 from JensRantil/minor_spelling_mistake

Correcting a minor spelling mistake in config skeleton