Index: trunk/resources/data/defaultpresets.xml
===================================================================
--- trunk/resources/data/defaultpresets.xml	(revision 18722)
+++ trunk/resources/data/defaultpresets.xml	(revision 18730)
@@ -41,9 +41,10 @@
     </chunk>
     <chunk id="highway_yesno">
-        <checkgroup columns="4">
+        <checkgroup columns="5">
             <check key="bridge" text="Bridge" disable_off="true" />
             <check key="tunnel" text="Tunnel" disable_off="true" />
             <check key="embankment" text="Embankment" disable_off="true" />
             <check key="cutting" text="Cutting" disable_off="true" />
+            <check key="lane_markings" text="Lane Markings" />
         </checkgroup>
     </chunk>
@@ -1339,5 +1340,12 @@
             <key key="highway" value="footway" />
             <optional>
-                <combo key="footway" text="Type" values="access_aisle,crossing,sidewalk" values_context="footway" />
+                <combo key="footway" text="Type" values_context="footway" >
+                    <list_entry value="access_aisle" short_description="Marked footpath in a parking lot" />
+                    <list_entry value="crossing" short_description="A pedestrian crossing"/>
+                    <list_entry value="sidewalk" short_description="A footway alongside a street"/>
+                    <list_entry value="link" short_description="Footway sections that do not exist but are necessary for routing"/>
+                    <list_entry value="traffic_island" short_description="Footway sections inside a crossing island"/>
+                    <list_entry value="alley" short_description="Access for back entrances and/or emergency access"/>
+                </combo>
                 <reference ref="name_layer" />
                 <reference ref="surface_smoothness" />
@@ -2516,4 +2524,11 @@
             </optional>
         </item> <!-- Bus Guideway -->
+        <item name="Miniature Rail" icon="presets/transport/railway/miniature_rail.svg" type="way" preset_name_label="true">
+            <link wiki="Tag:railway=miniature" />
+            <key key="railway" value="miniature" />
+            <optional>
+                <reference ref="railway_service_gauge_electrified_yesno" />
+            </optional>
+        </item>
         <separator/>
         <item name="Railway construction" icon="presets/transport/railway/railway_construction.svg" type="way" preset_name_label="true">
@@ -5990,4 +6005,13 @@
             <key key="man_made" value="embankment" />
         </item> <!-- Embankment -->
+        <item name="Avalanche Protection" icon="presets/misc/avalanche_protection.svg" type="node,way,closed_way" preset_name_label="true">
+            <link wiki="Tag:man_made=avalanche_protection" />
+            <space />
+            <key key="man_made" value="avalanche_protection" />
+            <optional>
+                <combo key="avalanche_protection" values="snow_bridge,dam,berm,mound,shed,gas_ignition" />
+                <check key="barrier" value="fence" />
+            </optional>
+        </item> <!-- Avalanche Protection -->
         <separator/>
         <item name="Utility Pole" icon="presets/tower/pole.svg" type="node" preset_name_label="true">
@@ -7032,4 +7056,16 @@
             <combo key="archaeological_site" text="Type" values="baths,catacombs,city,crannog,enclosure,fortification,geoglyph,grave_field,petroglyph,hut_circle,megalith,necropolis,roman_circus,roman_theater,roman_villa,settlement,tumulus" />
             <reference ref="name_oh_wheelchair" />
+            <optional>
+                <combo key="fortification_type">
+                    <list_entry value="hill_fort" short_description="Forts using a rise of elevation"/>
+                    <list_entry value="limes" short_description="Fortifications for border defense"/>
+                    <list_entry value="sconce" short_description="A small protective fortification"/>
+                    <list_entry value="ring_ditch" short_description="Circular ditched enclosures"/>
+                    <list_entry value="ringfort" short_description="Circular fortified settlement"/>
+                    <list_entry value="motte" short_description="Raised area of ground for a castle"/>
+                    <list_entry value="watchtower" short_description="Military observation"/>
+                    <list_entry value="battery" short_description="A group of artillary (cannon) in a fixed fortification"/>
+                </combo>
+            </optional>
         </item> <!-- Archaeological Site -->
         <item name="Battlefield" icon="presets/sightseeing/battlefield.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -9068,4 +9104,14 @@
             <preset_link preset_name="Garden" text="Similar but different tags:" />
         </item> <!-- Flowerbed -->
+        <item name="Planter" icon="presets/misc/planter.svg" type="closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:man_made=planter"/>
+            <space />
+            <key key="man_made" value="planter"/>
+            <optional>
+                <text key="material" text="The material the planter is made out of"/>
+                <text key="surface" text="The material inside the planter"/>
+                <check key="barrier" value_on="planter" disable_off="true"/>
+            </optional>
+        </item>
         <item name="Garden" icon="presets/leisure/garden.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:leisure=garden" />
@@ -9165,5 +9211,5 @@
             <space />
             <key key="landuse" value="industrial" />
-            <combo key="industrial" text="Type" values="bakery,brewery,brickyard,depot,distributor,factory,grinding_mill,heating_station,machine_shop,mine,oil,port,salt_pond,sawmill,scrap_yard,shipyard,slaughterhouse,warehouse" values_context="industrial" />
+            <combo key="industrial" text="Type" values="bakery,brewery,brickyard,depot,distributor,factory,grinding_mill,heating_station,machine_shop,mine,oil,port,salt_pond,sawmill,scrap_yard,shipyard,slaughterhouse,warehouse,wellsite" values_context="industrial" />
             <reference ref="optional_name" />
         </item> <!-- Industrial -->
Index: trunk/resources/data/validator/ignoretags.cfg
===================================================================
--- trunk/resources/data/validator/ignoretags.cfg	(revision 18722)
+++ trunk/resources/data/validator/ignoretags.cfg	(revision 18730)
@@ -230,4 +230,5 @@
 K:building=tank
 K:building=trullo
+K:landuse=static_caravan
 K:leisure=recreation_ground
 E:old_railway_operator
@@ -485,4 +486,5 @@
 K:craft=yes
 K:service=yes
+K:service=driveway2
 K:place=yes
 E:place_name
@@ -766,4 +768,6 @@
 K:highway=corridor
 K:historic=bomb_crater
+; May be duplicate of older tagging, `hiking=yes` + `bicycle=yes` versus `guidepost=hiking;bicycle`
+K:guidepost
 K:indoor=area
 K:indoor=corridor
@@ -783,4 +787,9 @@
 K:military=trench
 K:natural=crevasse
+; Streetside parking tags (see #22901 22901.patch for starting icons)
+; There is an external preset for these tags
+S:parking:both
+S:parking:right
+S:parking:left
 K:path=crossing
 K:railway=proposed
Index: trunk/resources/data/validator/words.cfg
===================================================================
--- trunk/resources/data/validator/words.cfg	(revision 18722)
+++ trunk/resources/data/validator/words.cfg	(revision 18730)
@@ -63,4 +63,6 @@
 -denominatation
 -denoination
++driveway
+-driveway2
 +foot
 -foor