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

diff --combined CONFIGURE.md
index 21695397acf85ddd4a5acf8eca95b87122630306,165ca2913a0423b0e9dd0127184c67684caf584b..dcc8ae2ac1d20a5001ae568a2dbf17b18735ab48
--- 1/CONFIGURE.md
--- 2/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'