Merge branch '6.2.x'

framework-docs/modules/ROOT/pages/integration/rest-clients.adoc

@@ -938,10 +938,10 @@ method parameters:
 | Dynamically set the HTTP method for the request, overriding the annotation's `method` attribute
 
 | `@RequestHeader`
-| Add a request header or multiple headers. The argument may be a `Map<String, ?>` or
-  `MultiValueMap<String, ?>` with multiple headers, a `Collection<?>` of values, or an
-  individual value. Type conversion is supported for non-String values. This overrides
-  the annotation's `headers` attribute.
+| Add a request header or multiple headers. The argument may be a single value,
+  a `Collection<?>` of values, `Map<String, ?>`,`MultiValueMap<String, ?>`.
+  Type conversion is supported for non-String values. Header values are added and
+  do not override already added header values.
 
 | `@PathVariable`
 | Add a variable for expand a placeholder in the request URL. The argument may be a

framework-docs/modules/ROOT/pages/web/webflux/controller/ann-requestmapping.adoc

@@ -605,9 +605,4 @@ For method parameters and returns values, generally, `@HttpExchange` supports a
 subset of the method parameters that `@RequestMapping` does. Notably, it excludes any
 server-side specific parameter types. For details, see the list for
 xref:integration/rest-clients.adoc#rest-http-interface-method-parameters[@HttpExchange] and
-xref:web/webflux/controller/ann-methods/arguments.adoc[@RequestMapping].
-
-`@HttpExchange` also supports a `headers()` parameter which accepts `"name=value"`-like
-pairs like in `@RequestMapping(headers={})` on the client side. On the server side,
-this extends to the full syntax that
-xref:#webflux-ann-requestmapping-params-and-headers[`@RequestMapping`] supports.
+xref:web/webflux/controller/ann-methods/arguments.adoc[@RequestMapping].