Merge branch 'master' into openstreetbugs

[rails.git] / config / example.application.yml

diff --git a/config/example.application.yml b/config/example.application.yml
index 763eda8ef9474d3779f36ce7724feb5938c50a53..501b3d2ad4bdbbc64d94faded0b929d7ac304d17 100644 (file)
--- a/config/example.application.yml
+++ b/config/example.application.yml
@@ -24,6 +24,8 @@ defaults: &defaults
   max_number_of_nodes: 50000
   # Maximum number of nodes that can be in a way (checked on save)
   max_number_of_way_nodes: 2000
+  # The maximum area you're allowed to request notes from, in square degrees
+  max_note_request_area: 25
   # Zoom level to use for postcode results from the geocoder
   postcode_zoom: 15
   # Zoom level to use for geonames results from the geocoder
@@ -56,7 +58,7 @@ defaults: &defaults
   gpx_trace_dir: "/home/osm/traces"
   gpx_image_dir: "/home/osm/images"
   # Location of data for attachments
-  attachments_dir: ":rails_root/public"
+  attachments_dir: ":rails_root/public/attachments"
   # Log file to use
   #log_path: ""
   # List of memcache servers to use for caching