Index: trunk/resources/data/validator/combinations.mapcss
===================================================================
--- trunk/resources/data/validator/combinations.mapcss	(revision 18229)
+++ trunk/resources/data/validator/combinations.mapcss	(revision 18230)
@@ -126,9 +126,16 @@
 }
 
-/* {0.tag} without {1.key} (warning level), #18411, #18246 */
+/* {0.key} without {1.tag}, {2.tag}, {3.tag} or {4.tag}, #20530 */
+*[pump_mechanism][man_made!=pump][man_made!=windpump][man_made!=water_well][man_made!=petroleum_well] {
+  throwWarning: tr("{0} without {1}, {2}, {3} or {4}", "{0.key}", "{1.tag}", "{2.tag}", "{3.tag}", "{4.tag}");
+  group: tr("missing tag");
+}
+
+/* {0.tag} without {1.key} (warning level), #18411, #18246, #20530 */
 way[railway=construction][!construction],
 way[highway=construction][!construction],
 node[traffic_sign=maxspeed][!maxspeed][!/^maxspeed:.+/],
-node[actuator=manual][!handle],
+*[actuator=manual][!handle],
+*[mechanical_driver=manual][!handle],
 node[emergency=fire_hydrant][!fire_hydrant:type],
 way[     boundary=administrative][!admin_level],
@@ -246,5 +253,5 @@
 }
 
-/* {0.tag} together with {1.key}, see #17664, #17707, #16464, #10837, #14034, #9389, #11977, #13156, #16888 */
+/* {0.tag} together with {1.key}, see #17664, #17707, #16464, #10837, #14034, #9389, #11977, #13156, #16888, #20530 */
 *[power=plant][/^generator:/],
 *[power=generator][/^plant:/],
@@ -256,4 +263,6 @@
 *[amenity=vending_machine][shop],
 *[noname?][name],
+*[actuator][handle][actuator !~ /(^|;)manual(;|$)/],
+*[mechanical_driver][handle][mechanical_driver !~ /(^|;)manual(;|$)/],
 way[oneway=yes][/:backward/][!traffic_sign:backward][bicycle:backward!=use_sidepath][oneway:bicycle!=no][oneway:psv!=no],
 way[oneway=yes][/:forward/ ][!traffic_sign:forward ][bicycle:forward!=use_sidepath ][oneway:bicycle!=no][oneway:psv!=no],
Index: trunk/resources/data/validator/deprecated.mapcss
===================================================================
--- trunk/resources/data/validator/deprecated.mapcss	(revision 18229)
+++ trunk/resources/data/validator/deprecated.mapcss	(revision 18230)
@@ -2278,4 +2278,43 @@
 }
 
+/* #20530 */
+*[man_made=pumping_rig][!pump_mechanism][!mechanical_driver][!mechanical_coupling] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "man_made=petroleum_well";
+  suggestAlternative: "man_made=water_well";
+  fixAdd: "pump_mechanism=piston";
+  fixAdd: "mechanical_driver=combustion_engine";
+  fixAdd: "mechanical_coupling=nodding_donkey";
+  group: tr("deprecated tagging");
+  set pumping_ring_no_mech;
+}
+*[man_made=pumping_rig]!.pumping_ring_no_mech {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "man_made=petroleum_well";
+  suggestAlternative: "man_made=water_well";
+  group: tr("deprecated tagging");
+}
+*[pump:type=beam_pump][!pump_mechanism][!mechanical_driver][!mechanical_coupling] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "pump_mechanism";
+  fixRemove: "pump:type";
+  fixAdd: "pump_mechanism=piston";
+  fixAdd: "mechanical_driver=combustion_engine";
+  fixAdd: "mechanical_coupling=nodding_donkey";
+  group: tr("deprecated tagging");
+  set beam_pump_no_mech
+}
+*[pump:type]!.beam_pump_no_mech {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "pump_mechanism";
+  group: tr("deprecated tagging");
+}
+*[substance=heat] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "substance=hot_water";
+  suggestAlternative: "substance=steam";
+  group: tr("deprecated tagging");
+}
+
 /* #20959 */
 *[landuse=school] {
Index: trunk/resources/data/validator/ignoretags.cfg
===================================================================
--- trunk/resources/data/validator/ignoretags.cfg	(revision 18229)
+++ trunk/resources/data/validator/ignoretags.cfg	(revision 18230)
@@ -174,5 +174,4 @@
 K:bicycle=dismount
 K:wall=no
-K:man_made=petroleum_well
 K:man_made=yes
 K:man_made=clearcut
@@ -705,4 +704,7 @@
 E:role
 E:levels
+K:man_made=pumping_rig
+E:pump:type
+K:substance=heat
 ;
 ; Tags not yet decided (to remove from this section when added or moved up when deprecated)