root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fix merge conflict in reference manual

This commit is contained in:
Sam Brannen 2018-08-15 15:37:49 +02:00
parent f2506ca7a1
commit 4d7b265258
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/docs/asciidoc/web/webflux.adoc
View File

@ -1749,14 +1749,10 @@ controller. The following code snippet shows the usage:
[TIP] [TIP]
==== ====
<<<<<<< HEAD
Unlike the Servlet API "request parameter" concept that conflates query parameters, form Unlike the Servlet API "request parameter" concept that conflates query parameters, form
=======
Unlike the Servlet API "request paramater" concept that conflate query parameters, form
>>>>>>> parent of 7e91733502... Infer HTTP 404 from empty Optional/Publisher types
data, and multiparts into one, in WebFlux each is accessed individually through the data, and multiparts into one, in WebFlux each is accessed individually through the
`ServerWebExchange`. While `@RequestParam` binds to query parameters only, you can `ServerWebExchange`. While `@RequestParam` binds to query parameters only, you can use
use data binding to apply query paramerters, form data, and multiparts to a data binding to apply query parameters, form data, and multiparts to a
<<webflux-ann-modelattrib-method-args,command object>>. <<webflux-ann-modelattrib-method-args,command object>>.
==== ====