Index: trunk/resources/data/defaultpresets.xml
===================================================================
--- trunk/resources/data/defaultpresets.xml	(revision 19221)
+++ trunk/resources/data/defaultpresets.xml	(revision 19222)
@@ -533,4 +533,9 @@
         </optional>
     </chunk>
+    <chunk id="managed">
+        <optional>
+            <combo key="managed" text="Managed" values="no,yes,grazing,undergrowth,mowing,scientific" values_context="Key:managed" />
+        </optional>
+    </chunk>
     <chunk id="substance">
         <combo key="substance" text="Substance" values="water,hot_water,steam,sewage,gas,oil" values_sort="false" values_searchable="true" />
@@ -936,5 +941,7 @@
                 <text key="width" text="Width (meters)" />
                 <combo key="bus_bay" text="Bus bay" values="both,left,right" />
-                <combo key="sidewalk" text="Sidewalk" values="both,left,right,no,separate" values_context="sidewalk" />
+                <combo key="sidewalk:both" text="Sidewalk (both)" values="yes,no,separate" values_context="sidewalk" />
+                <combo key="sidewalk:left" text="Sidewalk (left)" values="yes,no,separate" values_context="sidewalk" />
+                <combo key="sidewalk:right" text="Sidewalk (right)" values="yes,no,separate" values_context="sidewalk" />
                 <checkgroup columns="3">
                     <check key="dual_carriageway" text="Divided highway" disable_off="true" />
@@ -2405,4 +2412,5 @@
             <combo key="wetland" text="Type" values="bog,fen,mangrove,marsh,reedbed,saltern,saltmarsh,string_bog,swamp,tidalflat,wet_meadow" values_searchable="true" />
             <check key="seasonal" text="Seasonal" disable_off="true" />
+            <reference ref="managed" />
         </item> <!-- Wetland -->
         <item name="Mud" icon="presets/landuse/mud.svg" type="closedway,multipolygon" preset_name_label="true">
@@ -9287,4 +9295,5 @@
             <text key="name" text="Name" />
             <reference ref="leaf" />
+            <reference ref="managed" />
         </item> <!-- Wood -->
         <item name="Forest" icon="presets/landmark/forest.svg" type="closedway,multipolygon" preset_name_label="true">
@@ -9340,4 +9349,5 @@
             <key key="natural" value="fell" />
             <text key="name" text="Name" />
+            <reference ref="managed" />
         </item> <!-- Fell -->
         <item name="Scrub" icon="presets/landuse/scrub.svg" type="closedway,multipolygon" preset_name_label="true">
@@ -9359,4 +9369,5 @@
             <key key="natural" value="heath" />
             <text key="name" text="Name" />
+            <reference ref="managed" />
         </item> <!-- Heath -->
         <item name="Sand" icon="presets/landuse/sand.svg" type="closedway,multipolygon" preset_name_label="true">
Index: trunk/resources/data/validator/deprecated.mapcss
===================================================================
--- trunk/resources/data/validator/deprecated.mapcss	(revision 19221)
+++ trunk/resources/data/validator/deprecated.mapcss	(revision 19222)
@@ -2578,4 +2578,9 @@
   suggestAlternative: "oneway:bicycle=no + cycleway:right=* + cycleway:left=* + cycleway:right:oneway=-1";
 }
+*[residential=condominium] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  group: tr("deprecated tagging");
+  suggestAlternative: "residential=apartments + condo=*"
+}
 
 /* When tags are deprecated they should be added to ignoretags.cfg too. */
Index: trunk/resources/data/validator/ignoretags.cfg
===================================================================
--- trunk/resources/data/validator/ignoretags.cfg	(revision 19221)
+++ trunk/resources/data/validator/ignoretags.cfg	(revision 19222)
@@ -169,4 +169,6 @@
 E:genus:de
 E:heritage:operator
+E:admin_type:PH
+E:sidewalk
 ;
 ; Ignore valid and semi-valid keys that end with...
@@ -753,4 +755,5 @@
 E:ref:gnis
 E:tiger:PLACENS
+K:residential=condominium
 ;
 ; Tags not yet decided (to remove from this section when added or moved up when deprecated)