Index: trunk/data/validator/deprecated.mapcss
===================================================================
--- trunk/data/validator/deprecated.mapcss	(revision 14814)
+++ trunk/data/validator/deprecated.mapcss	(revision 14815)
@@ -470,9 +470,4 @@
 }
 
-way[footway =~ /^(both|right|left|no|none)$/] {
-  throwWarning: tr("{0} is deprecated", "{0.tag}");
-  group: tr("deprecated tagging");
-  fixChangeKey: "footway => sidewalk";
-}
 way[sidewalk=yes] {
   throwWarning: tr("{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or ''both''.", "{0.key}", "{0.value}");
@@ -979,8 +974,16 @@
 }
 
-/* #12431, #17379 */
-*[amenity=swimming_pool],
+/* #12431 */
+*[amenity=swimming_pool] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "leisure=swimming_pool";
+  group: tr("deprecated tagging");
+  fixChangeKey: "amenity => leisure";
+}
+
+/* #17379 */
 *[amenity=sauna] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "leisure=sauna";
   group: tr("deprecated tagging");
   fixChangeKey: "amenity => leisure";
@@ -1380,5 +1383,5 @@
 
 /* #17383 */
-node[natural=waterfall] {
+*[natural=waterfall] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "waterway=waterfall";