Merge branch 'master' of https://github.com/systemed/potlatch2
authorRichard Fairhurst <richard@systemeD.net>
Fri, 30 Sep 2011 22:34:14 +0000 (23:34 +0100)
committerRichard Fairhurst <richard@systemeD.net>
Fri, 30 Sep 2011 22:34:14 +0000 (23:34 +0100)
resources/map_features.xml
resources/map_features/amenities.xml

index f095821..604bbb4 100644 (file)
 
   <inputSet id="waterways">
     <inputSet ref="simpleName"/>
-    <input type="freetext" presence="always" name="Width" category="Properties" key="width" description="The width in metres"/>
+    <input type="freetext" presence="always" name="Width" category="Details" key="width" description="The width in metres"/>
     <inputSet ref="boatPermissions"/>
   </inputSet>
 <!-- Would be good to have a dedicated 'access' type of input -->
index 0f249f5..3dbd64a 100644 (file)
         <choice value="weather_shelter" text="Weather shelter"/>
         <choice value="wildlife_hide" text="Wildlife hide"/>
       </input>
-    <inputset ref="names"/>
+    <inputSet ref="names"/>
     <inputSet ref="common"/>
   </feature>