diff --git a/scripts/shairport-sync.conf b/scripts/shairport-sync.conf
index 70365f0f..c49f141b 100644
--- a/scripts/shairport-sync.conf
+++ b/scripts/shairport-sync.conf
@@ -3,17 +3,18 @@
 // General Settings
 general =
 {
-//	name = "Music Player"; // default is "Shairport Sync on <hostname>"
-//	daemonize = no;
-//	mdns_backend = avahi; // not used, not tested
-//	output_backend = alsa; // setting is not used, alsa is default
+//	name = "Shairport Sync Player"; // This is the name the service will advertise to iTunes. The default is "Shairport Sync on <hostname>"
+//	daemonize = "no";
+//	mdns_backend = "avahi"; // not used, not tested
+//	output_backend = "alsa"; // setting is not used, alsa is default
 //	port = 5000;
-//	password = "secret"; // default is no password needed
-//	interpolation = basic; // aka "stuffing". Default is basic, alternative is soxr
-//	statistics = no; // print statistics in the log
-//	tolerance = 88; // allow this number of frames of drift before correcting it
-//	resync_threshold = 2205; a synchronisation error greater than this will cause resynchronisation
+//	password = "secret"; // default is no password
+//	interpolation = "basic"; // aka "stuffing". Default is "basic", alternative is "soxr"
+//	statistics = "no"; // print statistics in the log
+//	drift = 88; // allow this number of frames of drift before correcting it
+//	resync_threshold = 2205; // a synchronisation error greater than this will cause resynchronisation; 0 disables it
 //	log_verbosity = 0; // "0" means no verbosity, "3" is highest.
+//  ignore_volume_control = "no"; // set this to "yes" if you want the volume to be at 100% no matter what the volume control is set to.
 };
 
 latencies =
@@ -26,27 +27,25 @@ latencies =
 
 metadata =
 {
-//	metadata_feed_enabled = no;
-//	include_cover_art = no;
-//	metadata_pipe = "/tmp/shairport-sync-coverart";
+//	enabled = "no";
+//	include_cover_art = "no";
+//	pipe_name = "/tmp/shairport-sync-metadata";
 };
 
 sessioncontrol = 
 {
-//	run_before_play_begins = "/path/to/application";
-//	run_after_play_ends = "/path/to/application";
-//	wait_for_completion = no;
-//	allow_session_interruption = no;
+//	run_this_before_play_begins = "/path/to/application and args";
+//	run_this_after_play_ends = "/path/to/application and args";
+//	wait_for_completion = "no";
+//	allow_session_interruption = "no";
 //	session_timeout = 120;
 };
 
 alsa =
 {
-//	device_type = software;
-//	device = "default";
-//	mixer = "default"; // default is that the device is also the mixer
-//	mixer_control_name = "PCM"
+//  output_device = "default";
+//  mixer_type = "software"; // "software" or "hardware"
+//  mixer_device = "default"; //actually, the mixer default is whatever the output_device is. Normally you wouldn't have to use this.
+//  mixer_control_name = "PCM"; // the name of the mixer to use -- there is no default.
 };
 
-
-