Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 14987)
+++ trunk/data/defaultpresets.xml	(revision 14998)
@@ -1193,5 +1193,5 @@
         </item> <!-- Turning Loop -->
         <item name="City Limit Sign" icon="presets/vehicle/restriction/city_limit.svg" type="node" preset_name_label="true">
-            <link wiki="Key:traffic_sign" />
+            <link wiki="Tag:traffic_sign=city_limit" />
             <space />
             <key key="traffic_sign" value="city_limit" />
@@ -6443,5 +6443,5 @@
     </item> <!-- Shoemaker -->
     <separator/> <!-- other "soft"/art craft group -->
-    <item name="Sawmill" type="node,closedway,multipolygon" preset_name_label="true">
+    <item name="Sawmill" icon="presets/craft/sawmill.svg" type="node,closedway,multipolygon" preset_name_label="true">
         <link wiki="Tag:craft=sawmill" />
         <space />
@@ -7439,5 +7439,5 @@
         </group> <!-- Routes -->
         <item name="Route Network" icon="presets/misc/route.svg" type="relation" preset_name_label="true">
-            <link wiki="Relations/Proposed/Network" />
+            <link wiki="Relation:network" />
             <space />
             <key key="type" value="network" />
Index: trunk/data/validator/combinations.mapcss
===================================================================
--- trunk/data/validator/combinations.mapcss	(revision 14987)
+++ trunk/data/validator/combinations.mapcss	(revision 14998)
@@ -267,7 +267,7 @@
 }
 
-/* {0.key} together with {1.key} (info level) */
+/* {0.key} together with {1.key}, #17604 */
 *[addr:street][addr:place] {
-  throwOther: tr("{0} together with {1}", "{0.key}", "{1.key}");
+  throwWarning: tr("{0} together with {1}", "{0.key}", "{1.key}");
   group: tr("suspicious tag combination");
 }
Index: trunk/data/validator/territories.mapcss
===================================================================
--- trunk/data/validator/territories.mapcss	(revision 14987)
+++ trunk/data/validator/territories.mapcss	(revision 14998)
@@ -23,2 +23,9 @@
   assertNoMatch: "way name=Hauptstrasse";
 }
+
+/* #17484 */
+relation[type=associatedStreet][inside("DE")] {
+  throwWarning: tr("{0} is deprecated in {1}", "{0.tag}", "Deutschland");
+  suggestAlternative: "addr:street";
+  group: tr("deprecated tagging");
+}