diff --git a/doc/misc/tutorial/extra.txt b/doc/misc/tutorial/extra.txt
index 907f9b385..95b2c1ee2 100644
--- a/doc/misc/tutorial/extra.txt
+++ b/doc/misc/tutorial/extra.txt
@@ -5,9 +5,6 @@ Calendar trick
 Metadata
 
 Sync
-  push
-  pull
-  merge
   sync (needs 2.3.0 & task server)
 
 Logo?
diff --git a/src/commands/CmdShow.cpp b/src/commands/CmdShow.cpp
index eccef86e1..1005fad0f 100644
--- a/src/commands/CmdShow.cpp
+++ b/src/commands/CmdShow.cpp
@@ -234,9 +234,9 @@ int CmdShow::execute (std::string& output)
           i->first.substr (0,  7) != "report."               &&
           i->first.substr (0,  6) != "alias."                &&
           i->first.substr (0,  5) != "hook."                 &&
-          i->first.substr (0,  5) != "push."                 &&
-          i->first.substr (0,  5) != "pull."                 &&
-          i->first.substr (0,  6) != "merge."                &&
+          i->first.substr (0,  5) != "push."                 && // Deprecated 2.3.0
+          i->first.substr (0,  5) != "pull."                 && // Deprecated 2.3.0
+          i->first.substr (0,  6) != "merge."                && // Deprecated 2.3.0
           i->first.substr (0,  4) != "uda."                  &&
           i->first.substr (0,  4) != "default."              &&
           i->first.substr (0, 21) != "urgency.user.project." &&
@@ -300,10 +300,11 @@ int CmdShow::execute (std::string& output)
       // TODO Deprecated.
       std::string value = i->second;
       // hide sensible information
-      if ( (i->first.substr (0, 5) == "push."   ||
+      if ((i->first.substr (0, 5) == "push."   ||
             i->first.substr (0, 5) == "pull."   ||
-            i->first.substr (0, 6) == "merge.") && (i->first.find (".uri") != std::string::npos) ) {
-
+            i->first.substr (0, 6) == "merge.") &&
+          (i->first.find (".uri") != std::string::npos))
+      {
         Uri uri (value);
         uri.parse ();
         value = uri.ToString ();