Index: trunk/data/validator/combinations.mapcss
===================================================================
--- trunk/data/validator/combinations.mapcss	(revision 15002)
+++ trunk/data/validator/combinations.mapcss	(revision 15004)
@@ -267,5 +267,6 @@
 }
 
-/* {0.key} together with {1.key}, #17604 */
+/* {0.key} together with {1.key}, #17630, #17604 */
+*[building:part][building],
 *[addr:street][addr:place] {
   throwWarning: tr("{0} together with {1}", "{0.key}", "{1.key}");
Index: trunk/data/validator/deprecated.mapcss
===================================================================
--- trunk/data/validator/deprecated.mapcss	(revision 15002)
+++ trunk/data/validator/deprecated.mapcss	(revision 15004)
@@ -1421,2 +1421,15 @@
   fixRemove: "{0.key}";
 }
+
+/* #17593 */
+*[sport=football] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "sport=soccer";
+  suggestAlternative: "sport=american_football";
+  suggestAlternative: "sport=australian_football";
+  suggestAlternative: "sport=canadian_football";
+  suggestAlternative: "sport=rugby_league";
+  suggestAlternative: "sport=rugby_union";
+  suggestAlternative: "sport=gaelic_games";
+  group: tr("deprecated tagging");
+}