Index: /trunk/data/validator/combinations.mapcss
===================================================================
--- /trunk/data/validator/combinations.mapcss	(revision 8056)
+++ /trunk/data/validator/combinations.mapcss	(revision 8057)
@@ -102,4 +102,5 @@
 *[reservoir_type               ][landuse!=reservoir][water!=reservoir],
 *[bridge:movable               ][bridge!=movable],
+*[parking                      ][amenity!~/^(parking|parking_space|parking_entrance|motorcycle_parking)$/]
 *[bunker_type                  ][military!=bunker] {
   throwWarning: tr("{0} without {1}", "{0.key}", "{1.tag}");
@@ -121,14 +122,13 @@
 
 /* {0.key} without {1.key} or {2.tag} */
-*[smoothness                   ][!highway][amenity!=parking][amenity!=parking_space][amenity!=parking_entrance][amenity!=motorcycle_parking],
+*[smoothness                   ][!highway][amenity!~/^(parking|parking_space|parking_entrance|motorcycle_parking)$/],
 *[segregated                   ][!highway][railway!=crossing],
-*[boat                         ][!waterway][natural!=water],
-*[intermittent                 ][!waterway][natural!=water] {
+*[boat                         ][!waterway][natural!=water] {
   throwWarning: tr("{0} without {1} or {2}", "{0.key}", "{1.key}", "{2.tag}");
 }
 
-/* {0.key} without {1.tag}, {2.tag} or {3.tag} */
-*[parking                      ][amenity!=parking][amenity!=parking_entrance][amenity!=motorcycle_parking] {
-  throwWarning: tr("{0} without {1}, {2} or {3}", "{0.key}", "{1.tag}", "{2.tag}", "{3.tag}");
+/* {0.key} without {1.key}, {2.tag} or {3.tag} */
+*[intermittent                 ][!waterway][natural!~/^(water|spring)$/][ford!=yes] {
+  throwWarning: tr("{0} without {1}, {2} or {3}", "{0.key}", "{1.key}", "{2.tag}", "{3.tag}");
 }