From: Tom Hughes <tom@compton.nu>
Date: Thu, 16 Nov 2023 13:43:46 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/4351'
X-Git-Tag: live~1265
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/b9cb8f09212a4d43ef46548615347519c7d89c3c?hp=-c

Merge remote-tracking branch 'upstream/pull/4351'
---

b9cb8f09212a4d43ef46548615347519c7d89c3c
diff --combined CONFIGURE.md
index 21695397a,165ca2913..dcc8ae2ac
--- a/CONFIGURE.md
+++ b/CONFIGURE.md
@@@ -47,6 -47,8 +47,6 @@@ $ bundle exec rails consol
  => #[ ... ]
  >> user.roles.create(:role => "moderator", :granter_id => user.id)
  => #[ ... ]
 ->> user.save!
 -=> true
  >> quit
  ```
  
@@@ -61,7 -63,7 +61,7 @@@ For iD, do the following
  
  * Go to "[OAuth 2 applications](http://localhost:3000/oauth2/applications)" on the My settings page.
  * Click on "Register new application".
- * Unless you have set up alternatives, use Name: "Local iD" and Main Application URL: "http://localhost:3000"
+ * Unless you have set up alternatives, use Name: "Local iD" and Redirect URIs: "http://localhost:3000"
  * Check boxes for the following Permissions
    * 'Read user preferences'
    * 'Modify user preferences'