Index: trunk/data/validator/deprecated.mapcss
===================================================================
--- trunk/data/validator/deprecated.mapcss	(revision 13320)
+++ trunk/data/validator/deprecated.mapcss	(revision 13339)
@@ -1195,2 +1195,23 @@
   group: tr("deprecated tagging");
 }
+
+/* #15804 */
+relation[water=salt],
+way[water=salt],
+way[water=salt_pool],
+way[water=salt_panne],
+way[water=salt_pond] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "salt=yes";
+  suggestAlternative: "landuse=salt_pond";
+  group: tr("deprecated tagging");
+}
+
+/* #15805 */
+way[water=tidal] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "tidal=yes";
+  fixAdd: "tidal=yes";
+  fixRemove: "water";
+  group: tr("deprecated tagging");
+}