Merge branch 'master' into openstreetbugs

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

diff --git a/config/example.application.yml b/config/example.application.yml
index 303c5626a9f385b9c52e8a821d0b313fe1d0ab64..13936cfa5dfaf240a39cd50aa105e507a89ba3c2 100644 (file)
--- a/config/example.application.yml
+++ b/config/example.application.yml
@@ -62,15 +62,18 @@ standard_settings: &standard_settings
   # URL of Nominatim instance to use for geocoding
   nominatim_url: "http://nominatim.openstreetmap.org/"
   # Default editor
-  default_editor: "potlatch"
+  default_editor: "potlatch2"
   # OAuth consumer key for Potlatch 2
   #potlatch2_key: ""
+  # Whether to require users to view the CTs before continuing to edit...
+  require_terms_seen: false
 
 development:
   <<: *standard_settings
 
 production:
   <<: *standard_settings
+  require_terms_seen: false
 
 test:
   <<: *standard_settings