Fix history sidebar

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

diff --git a/config/example.application.yml b/config/example.application.yml
index c795fc0d9e4966b219d9c54ce7ea8b3142dbc3c8..d6a855ef5003b68fb343298bac7b60fd2a1faa73 100644 (file)
--- a/config/example.application.yml
+++ b/config/example.application.yml
@@ -11,7 +11,7 @@ defaults: &defaults
   email_return_path: "bounces@openstreetmap.org"
   # API version
   api_version: "0.6"
   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
   #   :online - online and operating normally
   #   :api_readonly - site online but API in read-only mode
   #   :api_offline - site online but API offline


@@ -73,17 +73,17 @@ defaults: &defaults
   # URL of Nominatim instance to use for geocoding
   nominatim_url: "http://nominatim.openstreetmap.org/"
   # Default editor
   # 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 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
   require_terms_agreed: false
   # 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
   require_terms_agreed: false

-  # Piwik details
-  #piwik_location: "piwik.openstreetmap.org"
-  #piwik_site: 1
-  #piwik_signup_goal: 1

 
 development:
   <<: *defaults
 
 development:
   <<: *defaults