Index: trunk/data/validator/deprecated.mapcss
===================================================================
--- trunk/data/validator/deprecated.mapcss	(revision 11231)
+++ trunk/data/validator/deprecated.mapcss	(revision 11232)
@@ -1076,2 +1076,42 @@
   assertNoMatch: "node highway=emergency_access_point phone=123 emergency_telephone_code=123";
 }
+
+/* #13879 */
+way[tracktype=1] {
+  throwError: tr("{0}", "{0.tag}");
+  suggestAlternative: "tracktype=grade1";
+  group: tr("misspelled value");
+  fixAdd: "tracktype=grade1";
+}
+way[tracktype=2] {
+  throwError: tr("{0}", "{0.tag}");
+  suggestAlternative: "tracktype=grade2";
+  group: tr("misspelled value");
+  fixAdd: "tracktype=grade2";
+}
+way[tracktype=3] {
+  throwError: tr("{0}", "{0.tag}");
+  suggestAlternative: "tracktype=grade3";
+  group: tr("misspelled value");
+  fixAdd: "tracktype=grade3";
+}
+way[tracktype=4] {
+  throwError: tr("{0}", "{0.tag}");
+  suggestAlternative: "tracktype=grade4";
+  group: tr("misspelled value");
+  fixAdd: "tracktype=grade4";
+}
+way[tracktype=5] {
+  throwError: tr("{0}", "{0.tag}");
+  suggestAlternative: "tracktype=grade5";
+  group: tr("misspelled value");
+  fixAdd: "tracktype=grade5";
+}
+way[tracktype][tracktype!~/^(1|2|3|4|5|grade1|grade2|grade3|grade4|grade5)$/] {
+  throwError: tr("wrong value: {0}", "{0.tag}");
+  suggestAlternative: "tracktype=grade1";
+  suggestAlternative: "tracktype=grade2";
+  suggestAlternative: "tracktype=grade3";
+  suggestAlternative: "tracktype=grade4";
+  suggestAlternative: "tracktype=grade5";
+}
Index: trunk/data/validator/geometry.mapcss
===================================================================
--- trunk/data/validator/geometry.mapcss	(revision 11231)
+++ trunk/data/validator/geometry.mapcss	(revision 11232)
@@ -297,2 +297,10 @@
     throwWarning: tr("{0} should be on the node where {1} and {2} intersect", "ford", "highway", "waterway");
 }
+/* #13877 */
+area:closed[waterway = canal][area!=no],
+area:closed[waterway = drain][area!=no],
+area:closed[waterway = ditch][area!=no],
+area:closed[waterway = stream][area!=no],
+area:closed[waterway = river][area!=no] {
+  throwWarning: tr("{0} is the tag for the linear waterway. To tag the water area use {1} + {2} instead.", "{1.tag}", "natural=water", "water=*");
+}