Index: trunk/data/validator/combinations.mapcss
===================================================================
--- trunk/data/validator/combinations.mapcss	(revision 9900)
+++ trunk/data/validator/combinations.mapcss	(revision 9903)
@@ -93,5 +93,4 @@
 
 /* {0.key} without {1.tag} */
-*[substation                   ][power!=substation],
 *[transformer                  ][!power],
 *[fence_type                   ][barrier!=fence],
@@ -105,5 +104,4 @@
 *[artwork_type                 ][tourism!=artwork],
 *[castle_type                  ][historic!=castle],
-*[reservoir_type               ][landuse!=reservoir][water!=reservoir],
 *[bridge:movable               ][bridge!=movable],
 *[parking                      ][amenity!~/^(parking|parking_space|parking_entrance|motorcycle_parking)$/],
@@ -111,4 +109,10 @@
 *[bunker_type                  ][military!=bunker] {
   throwWarning: tr("{0} without {1}", "{0.key}", "{1.tag}");
+}
+
+/* {0.key} without {1.tag} or {2.tag} */
+*[substation                   ][power!=substation][pipeline!=substation],
+*[reservoir_type               ][landuse!=reservoir][water!=reservoir] {
+  throwWarning: tr("{0} without {1} or {2}", "{0.key}", "{1.tag}", "{2.tag}");
 }