Index: trunk/resources/data/validator/deprecated.mapcss
===================================================================
--- trunk/resources/data/validator/deprecated.mapcss	(revision 17091)
+++ trunk/resources/data/validator/deprecated.mapcss	(revision 17092)
@@ -8,5 +8,5 @@
   assertNoMatch: "way barrier=fence";
 }
-  
+
 *[barrier=wood_fence] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
@@ -16,5 +16,5 @@
   fixAdd: "fence_type=wood";
 }
-  
+
 node[highway=ford] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
@@ -29,14 +29,12 @@
   group: tr("deprecated tagging");
 }
-  
+
+/* from http://wiki.openstreetmap.org/wiki/Deprecated_features */  
 way[class] {
-  /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
   throwWarning: tr("{0} is deprecated", "{0.key}");
   suggestAlternative: "highway";
   group: tr("deprecated tagging");
 }
-  
 *[highway=stile] {
-  /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "barrier=stile";
@@ -45,21 +43,15 @@
   fixAdd: "barrier=stile";
 }
-  
 *[highway=incline] {
-  /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "incline";
   group: tr("deprecated tagging");
 }
-  
 *[highway=incline_steep] {
-  /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "incline";
   group: tr("deprecated tagging");
 }
-  
 *[highway=unsurfaced] {
-  /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "highway=* + surface=unpaved";
@@ -68,7 +60,5 @@
   fixAdd: "surface=unpaved";
 }
-  
 *[landuse=wood] {
-  /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "landuse=forest";
@@ -76,7 +66,5 @@
   group: tr("deprecated tagging");
 }
-  
 *[natural=marsh] {
-  /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "natural=wetland + wetland=marsh";
@@ -85,25 +73,19 @@
   fixAdd: "wetland=marsh";
 }
-  
 *[highway=byway] {
-  /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
-  throwWarning: tr("{0} is deprecated", "{0.tag}");
-  group: tr("deprecated tagging");
-}
-  
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  group: tr("deprecated tagging");
+}
 *[power_source] {
-  /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
   throwWarning: tr("{0} is deprecated", "{0.key}");
   suggestAlternative: "generator:source";
   group: tr("deprecated tagging");
 }
-  
 *[power_rating] {
-  /* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
   throwWarning: tr("{0} is deprecated", "{0.key}");
   suggestAlternative: "generator:output";
   group: tr("deprecated tagging");
 }
-  
+
 *[shop=antique] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
@@ -129,5 +111,4 @@
 
 *[shop=organic] {
-  /* from http://wiki.openstreetmap.org/wiki/Tag:shop=organic */
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "shop=* + organic=yes";
@@ -151,5 +132,4 @@
 
 *[bicycle_parking=sheffield] {
-  /* from http://wiki.openstreetmap.org/wiki/Key:bicycle_parking */
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "bicycle_parking=stands";
@@ -157,7 +137,6 @@
   fixAdd: "bicycle_parking=stands";
 }
-  
+
 *[amenity=emergency_phone] {
-  /* http://wiki.openstreetmap.org/wiki/Tag:emergency=phone */
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "emergency=phone";
@@ -166,7 +145,7 @@
   fixAdd: "emergency=phone";
 }
-  
+ 
+/* #8132 */ 
 *[sport=gaelic_football] {
-  /* fix #8132 - http://wiki.openstreetmap.org/wiki/Tag:sport=gaelic_football */
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "sport=gaelic_games";
@@ -174,7 +153,7 @@
   fixAdd: "sport=gaelic_games";
 }
-  
+
+/* #8847, #8961 */  
 *[power=station] {
-  /* see #8847 / #8961 - http://wiki.openstreetmap.org/wiki/Tag:power=station */
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "power=plant";
@@ -210,5 +189,5 @@
   fixAdd: "generator:method=water-storage";
 }
-  
+
 *[generator:method=pumped-storage] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
@@ -217,5 +196,5 @@
   fixAdd: "generator:method=water-pumped-storage";
 }
-  
+
 *[generator:method=pumping] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
@@ -224,7 +203,7 @@
   fixAdd: "generator:method=water-pumped-storage";
 }
-  
+
+/* #8962 */ 
 *[fence_type=chain] {
-  /* see #8962 - http://wiki.openstreetmap.org/wiki/Key:fence_type */
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "barrier=chain";
@@ -233,20 +212,20 @@
 }
 
+/* #9000 */ 
 *[building=entrance] {
-  /* see #9000 - http://wiki.openstreetmap.org/wiki/Key:entrance */
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "entrance";
   group: tr("deprecated tagging");
 }
-  
+
+/* #9213 */ 
 *[board_type=board] {
-  /* see #9213 - Useless tag proposed in internal preset for years */
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   group: tr("deprecated tagging");
   fixRemove: "board_type";
 }
-  
+
+/* #8434 */
 *[man_made=measurement_station] {
-  /* see #8434 - http://wiki.openstreetmap.org/wiki/Proposed_features/monitoring_station */
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "man_made=monitoring_station";
@@ -254,5 +233,5 @@
   fixAdd: "man_made=monitoring_station";
 }
-  
+
 *[measurement=water_level] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
@@ -262,5 +241,5 @@
   fixAdd: "monitoring:water_level=yes";
 }
-  
+
 *[measurement=weather] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
@@ -270,5 +249,5 @@
   fixAdd: "monitoring:weather=yes";
 }
-  
+
 *[measurement=seismic] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
@@ -293,6 +272,6 @@
 }
 
+/* #9554 */
 *[emergency=aed] {
-  /* see #9554 - http://wiki.openstreetmap.org/wiki/Proposed_features/automated_external_defibrillator */
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "emergency=defibrillator";
@@ -314,5 +293,5 @@
 }
 
-/* see #10000, http://wiki.openstreetmap.org/wiki/Tag%3Aaccess%3Ddesignated */
+/* #10000 */
 *[access=designated] {
   throwWarning: tr("''{0}'' is meaningless, use more specific tags, e.g. ''{1}''", "access=designated", "bicycle=designated");
@@ -324,5 +303,5 @@
 }
 
-/* see #10085 - give warning for fixme=yes */
+/* #10085 */
 *[fixme=yes], *[FIXME=yes] {
   throwWarning: tr("{0}={1} is unspecific. Instead of ''{1}'' please give more information about what exactly should be fixed.", "{0.key}", "{0.value}");
@@ -343,5 +322,5 @@
 }
 
-/* see #10107, #10108, #10929, #13391 - http://wiki.openstreetmap.org/wiki/Proposed_features/leaftype#Features.2FPages_affected */
+/* #10107, #10108, #10929, #13391 - http://wiki.openstreetmap.org/wiki/Proposed_features/leaftype#Features.2FPages_affected */
 *[type=broad_leaved],
 *[type=broad_leafed] {
@@ -352,5 +331,4 @@
   fixAdd: "leaf_type=broadleaved";
 }
-
 *[wood=coniferous],
 *[type=coniferous],
@@ -362,5 +340,4 @@
   fixAdd: "leaf_type=needleleaved";
 }
-
 *[wood=mixed] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
@@ -370,5 +347,4 @@
   fixAdd: "leaf_type=mixed";
 }
-
 *[wood=evergreen],
 *[type=evergreen] {
@@ -379,5 +355,4 @@
   fixAdd: "leaf_cycle=evergreen";
 }
-
 *[type=deciduous],
 *[type=deciduos] {
@@ -388,5 +363,4 @@
   fixAdd: "leaf_cycle=deciduous";
 }
-
 *[wood=deciduous] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
@@ -394,5 +368,4 @@
   group: tr("deprecated tagging");
 }
-
 node[type=palm],
 way[type=palm] {
@@ -410,5 +383,5 @@
 }
 
-/* see #10447 - https://wiki.openstreetmap.org/wiki/Proposed_features/Bridge_types#Deprecated_bridge_key_values */
+/* #10447 - https://wiki.openstreetmap.org/wiki/Proposed_features/Bridge_types#Deprecated_bridge_key_values */
 *[bridge=causeway] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
@@ -439,5 +412,5 @@
 }
 
-/* See #10530 - Incorrect tag proposed in internal preset for years */
+/* #10530 - Incorrect tag proposed in internal preset for years */
 *[fee=interval],
 *[lit=interval],
@@ -447,5 +420,5 @@
 }
 
-/* See #10582 - JOSM supported this tag as "don't upload this" feature, before the introduction of upload flag at layer level */
+/* #10582 - JOSM supported this tag as "don't upload this" feature, before the introduction of upload flag at layer level */
 *[/josm\/ignore/] {
   throwError: tr("{0} is deprecated. Please delete this object and use a private layer instead", "{0.key}");
@@ -454,5 +427,5 @@
 }
 
-/* see #8281 */
+/* #8281 */
 *[sport=diving] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
@@ -462,5 +435,5 @@
 }
 
-/* see #8281 */
+/* #8281 */
 *[parking=park_and_ride] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
@@ -472,5 +445,5 @@
 }
 
-/* see #19287, #18334, #17950, #10661, #10837, #11737, #12771 */
+/* #19287, #18334, #17950, #10661, #10837, #11737, #12771 */
 *[playground=yes],
 *[manhole=plain],
@@ -492,5 +465,5 @@
 }
 
-/* see #10693 - http://wiki.openstreetmap.org/wiki/Proposed_features/drop_recommendation_for_place_name , #10837 */
+/* #10693 - http://wiki.openstreetmap.org/wiki/Proposed_features/drop_recommendation_for_place_name , #10837 */
 *[place_name][!name] {
   throwWarning: tr("{0} should be replaced with {1}", "{0.key}", "{1.key}");
@@ -526,5 +499,5 @@
 }
 
-/* see #10837 */
+/* #10837 */
 *[building][levels],
 *[building:part=yes][levels] {
@@ -535,5 +508,5 @@
 }
 
-/* see #10691 */
+/* #10691 */
 *[protected_class] {
   throwWarning: tr("{0} is deprecated", "{0.key}");
@@ -543,5 +516,5 @@
 }
 
-/* see #11070 */
+/* #11070 */
 *[kerb=unknown],
 *[lock=unknown],
@@ -557,5 +530,5 @@
 }
 
-/* unclear definition, see #11183 */
+/* #11183 */
 *[sport=skiing] {
   throwWarning: tr("Definition of {0} is unclear", "{0.tag}");
@@ -564,5 +537,5 @@
 }
 
-/* see #11223 */
+/* #11223 */
 *[waterway=wadi] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
@@ -572,5 +545,5 @@
 }
 
-/* see #10346, #15667 (waterway has its own rules in unnecessary.mapcss) */
+/* #10346, #15667 (waterway has its own rules in unnecessary.mapcss) */
 way[oneway=1][!waterway] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
@@ -580,5 +553,5 @@
 }
 
-/* see #11329, #15667 */
+/* #11329, #15667 */
 way[oneway=-1][!waterway] {
   throwWarning: tr("{0} is not recommended. Use the Reverse Ways function from the Tools menu.", "{0.tag}");
@@ -591,5 +564,5 @@
 }
 
-/* see #10329, #15877 */
+/* #10329, #15877 */
   /* simple key change */
 *[color][!colour] {
@@ -685,5 +658,5 @@
 }
 
-/* see #11234 */
+/* #11234 */
 *[/=|\+|\/|&|<|>|;|'|"|%|#|@|\\|,|\.|\{|\}|\?|\*|\^|\$/] {
   throwWarning: tr("{0}", "{0.key}");
@@ -691,5 +664,5 @@
 }
 
-/* see #11330, #18642 */
+/* #11330, #18642 */
 *[/^.$/],
 node[/^..$/],
@@ -706,5 +679,5 @@
 }
 
-/* see #11439 */
+/* #11439 */
 *[sport=hockey] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
@@ -714,5 +687,5 @@
 }
 
-/* see #11471 */
+/* #11471 */
 *[sport=billard],
 *[sport=billards],
@@ -724,5 +697,5 @@
 }
 
-/* see #11499, #16928 */
+/* #11499, #16928 */
 *[payment:credit_cards=yes] {
   throwWarning: tr("{0} is inaccurate. Use separate tags for each specific type, e.g. {1} or {2}.", "{0.tag}", "payment:mastercard=yes", "payment:visa=yes");
@@ -738,5 +711,5 @@
 }
 
-/* defunct payment cards */
+/* #16253 */
 *[payment:ep_quick],
 *[payment:ep_cash],
@@ -748,5 +721,5 @@
 }
 
-/* see #8717 */
+/* #8717 */
 *[kp][highway=milestone],
 *[kp][railway=milestone],
@@ -810,5 +783,5 @@
   group: tr("deprecated tagging");
 }
-/* #12135 - Tag removed rom rendering https://github.com/gravitystorm/openstreetmap-carto/pull/1830 */
+/* #12135 */
 *[landuse=conservation] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");