Merge remote-tracking branch 'osmlab/id-default'

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

diff --git a/config/example.application.yml b/config/example.application.yml
index 30f367f1cc0562a3391beabd0e7cd2a00381e93f..c6c15bb1d4003eb79409536b53ee19ea320ae499 100644 (file)
--- a/config/example.application.yml
+++ b/config/example.application.yml
@@ -73,11 +73,13 @@ defaults: &defaults
   # URL of Nominatim instance to use for geocoding
   nominatim_url: "http://nominatim.openstreetmap.org/"
   # Default editor
-  default_editor: "potlatch2"
+  default_editor: "id"
   # OAuth consumer key for Potlatch 2
   #potlatch2_key: ""
   # OAuth consumer key for the web site
   #oauth_key: ""
+  # OAuth consumer key for iD
+  #id_key: ""
   # Whether to require users to view the CTs before continuing to edit...
   require_terms_seen: false
   # Whether to require users to agree to the CTs before editing