diff --git a/src/Config.cpp b/src/Config.cpp
index f41e402be..f3c32cf01 100644
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -296,13 +296,11 @@ std::string Config::_defaults =
   "fontunderline=yes                              # Uses underlines rather than -------\n"
   "shell.prompt=task>                             # Prompt used by the shell command\n"
   "\n"
-	"# Merge options\n"
-  "#\n"
-  "# WARNING: Please read the documentation (man task-sync) before proceeding with these\n"
-  "#          synchronization features.  If improperly used, data can be lost!\n"
-	"merge.autopush=ask                             # Push database to remote origin after merge: yes, no, ask\n"
-	"#merge.default.uri=user@host.xz:.task/         # URI for merge\n"
-	"#pull.default.uri=rsync://host.xz/task-backup/ # URI for pull\n"
+  "# WARNING: Please read the documentation (man task-sync) before setting up\n"
+  "#          Taskwarrior for Task Server synchronization.\n"
+  "#taskd.certificate <certificat file>\n"
+  "#taskd.credentials <organization>/<name>/<password>\n"
+  "#taskd.server      <server>:<port>\n"
 	"\n"
   "# Aliases - alternate names for commands\n"
   "alias.rm=delete                                # Alias for the delete command\n"