Merge branch '4.0.x'

Closes gh-50199

Author: snicoll

documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/security/oauth2.adoc

@@ -125,7 +125,7 @@ For production environments, consider using a javadoc:org.springframework.securi
 === OAuth2 Client Registration for Common Providers
 
 For common OAuth2 and OpenID providers (Google, Github, Facebook, and Okta), we provide a set of provider defaults.
-The IDs of these common provides are `google`, `github`, `facebook`, and `okta`, respectively.
+The IDs of these common providers are `google`, `github`, `facebook`, and `okta`, respectively.
 
 If you do not need to customize these providers, set the registration's `provider` property to the ID of one of the common providers.
 Alternatively, you can xref:security/oauth2.adoc#security.oauth2.client[use a registration ID that matches the ID of the provider].