Commit b59fec2

committed

Merge branch '6.2.x'

2 parents acc3783 + e1c008f commit b59fec2Copy full SHA for b59fec2

File tree

-7

lines changed

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

-7

lines changed

Lines changed: 3 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -123,12 +123,11 @@ You can map requests by using glob patterns and wildcards:`
`123`	`123`	\| `+{name}+`
`124`	`124`	`\| Matches a path segment and captures it as a variable named "name"`
`125`	`125`	\| `+"/projects/{project}/versions"+` matches `+"/projects/spring/versions"+` and captures `+project=spring+`
`126`		`-`
`127`	`126`	`+"/projects/{project}/versions"+` does not match `+"/projects/spring/framework/versions"+` as it captures a single path segment.
`128`	`127`
`129`		-\| `+{name:[a-z]+}+`
`130`		-\| Matches the regexp `+"[a-z]+"+` as a path variable named "name"
`131`		-\| `+"/projects/{project:[a-z]+}/versions"+` matches `+"/projects/spring/versions"+` but not `+"/projects/spring1/versions"+`
	`128`	+\| `{name:[a-z]+}`
	`129`	+\| Matches the regexp `[a-z]+` as a path variable named "name"
	`130`	+\| `/projects/{project:[a-z]+}/versions` matches `/projects/spring/versions` but not `/projects/spring1/versions`
`132`	`131`
`133`	`132`	\| `+{*path}+`
`134`	`133`	`\| Matches zero or more path segments and captures it as a variable named "path"`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -135,9 +135,9 @@ You can map requests by using glob patterns and wildcards:`
`135`	`135`
`136`	`136`	`+"/projects/{project}/versions"+` does not match `+"/projects/spring/framework/versions"+` as it captures a single path segment.
`137`	`137`
`138`		-\| `+{name:[a-z]+}+`
`139`		-\| Matches the regexp `+"[a-z]+"+` as a path variable named "name"
`140`		-\| `+"/projects/{project:[a-z]+}/versions"+` matches `+"/projects/spring/versions"+` but not `+"/projects/spring1/versions"+`
	`138`	+\| `{name:[a-z]+}`
	`139`	+\| Matches the regexp `[a-z]+` as a path variable named "name"
	`140`	+\| `/projects/{project:[a-z]+}/versions` matches `/projects/spring/versions` but not `/projects/spring1/versions`
`141`	`141`
`142`	`142`	\| `+{*path}+`
`143`	`143`	`\| Matches zero or more path segments and captures it as a variable named "path"`

Comments

(0)