Skip to content

Commit 7e7f55c

Browse files
committed
Merge pull request #33166 from hunhee98
* pr/33166: Polish contribution Harmonize phrasing in URI Encoding section Closes gh-33166
2 parents e06115c + 84f20cd commit 7e7f55c

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

framework-docs/modules/ROOT/partials/web/web-uris.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ template.
389389
encode URI component value _after_ URI variables are expanded.
390390
* `NONE`: No encoding is applied.
391391

392-
The `RestTemplate` is set to `EncodingMode.URI_COMPONENT` for historic
392+
The `RestTemplate` is set to `EncodingMode.URI_COMPONENT` for historical
393393
reasons and for backwards compatibility. The `WebClient` relies on the default value
394394
in `DefaultUriBuilderFactory`, which was changed from `EncodingMode.URI_COMPONENT` in
395395
5.0.x to `EncodingMode.TEMPLATE_AND_VALUES` in 5.1.

spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/AbstractNamedValueMethodArgumentResolver.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public abstract class AbstractNamedValueMethodArgumentResolver implements Handle
7676
protected AbstractNamedValueMethodArgumentResolver(ConversionService conversionService,
7777
@Nullable ConfigurableBeanFactory beanFactory) {
7878

79-
// Fallback on shared ConversionService for now for historic reasons.
79+
// Fallback on shared ConversionService for now for historical reasons.
8080
// Possibly remove after discussion in gh-23882.
8181

8282
//noinspection ConstantConditions

0 commit comments

Comments
 (0)