Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 9030)
+++ trunk/data/defaultpresets.xml	(revision 9031)
@@ -70,5 +70,5 @@
     </chunk>
     <chunk id="railway_service">
-        <combo key="service" text="Service type" values="yard,siding,spur" />
+        <combo key="service" text="Service type" values="yard,siding,spur,crossover" />
     </chunk>
     <chunk id="railway_electrified">
Index: trunk/data/validator/deprecated.mapcss
===================================================================
--- trunk/data/validator/deprecated.mapcss	(revision 9030)
+++ trunk/data/validator/deprecated.mapcss	(revision 9031)
@@ -535,2 +535,9 @@
   suggestAlternative: "postal_code";
 }
+
+*[water=intermittent] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "intermittent=yes";
+  fixRemove: "water";
+  fixAdd: "intermittent=yes";
+}