Index: trunk/data/validator/combinations.mapcss
===================================================================
--- trunk/data/validator/combinations.mapcss	(revision 10770)
+++ trunk/data/validator/combinations.mapcss	(revision 10798)
@@ -293,6 +293,5 @@
 
 /* #6932 */
-*[natural=water][leisure=swimming_pool],
-*[natural=water][amenity=swimming_pool] {
+*[natural=water][leisure=swimming_pool] {
   throwWarning: tr("natural water used for swimming pool");
   fixRemove: "natural";
Index: trunk/data/validator/deprecated.mapcss
===================================================================
--- trunk/data/validator/deprecated.mapcss	(revision 10770)
+++ trunk/data/validator/deprecated.mapcss	(revision 10798)
@@ -319,4 +319,12 @@
   fixRemove: "type";
   fixAdd: "leaf_cycle=deciduous";
+}
+
+node[type=palm],
+way[type=palm] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "leaf_type";
+  suggestAlternative: "trees";
+  suggestAlternative: "species";
 }