Merge branch 'master' into notes

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

diff --git a/config/example.application.yml b/config/example.application.yml
index bc66923fea88efbb870825b1e132b1660b7b9e4d..b99e4a103bc5fcf8e81c3940d7f030b5ae6ab949 100644 (file)
--- a/config/example.application.yml
+++ b/config/example.application.yml
@@ -5,13 +5,13 @@ defaults: &defaults
   generator: "OpenStreetMap server"
   copyright_owner: "OpenStreetMap and contributors"
   attribution_url: "http://www.openstreetmap.org/copyright"
-  license_url: "http://creativecommons.org/licenses/by-sa/2.0/"
+  license_url: "http://opendatacommons.org/licenses/odbl/1-0/"
   # Sender addresses for emails
   email_from: "OpenStreetMap <webmaster@openstreetmap.org>"
   email_return_path: "bounces@openstreetmap.org"
   # API version
   api_version: "0.6"
-  # Application status - posstible values are:
+  # Application status - possible values are:
   #   :online - online and operating normally
   #   :api_readonly - site online but API in read-only mode
   #   :api_offline - site online but API offline
@@ -27,6 +27,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