Skip to content

Commit b588cea

Browse files
Merge branch '5.8.x' into 6.0.x
Closes gh-14106
2 parents e5033c1 + eff9814 commit b588cea

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

docs/modules/ROOT/pages/features/authentication/index.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ Once authentication is performed we know the identity and can perform authorizat
88

99
Spring Security provides built-in support for authenticating users.
1010
This section is dedicated to generic authentication support that applies in both Servlet and WebFlux environments.
11-
See the sections on authentication for xref:servlet/authentication/index.adoc#servlet-authentication[Servlet] and WebFlux for details on what is supported for each stack.
11+
Refer to the sections on authentication for xref:servlet/authentication/index.adoc#servlet-authentication[Servlet] and xref:servlet/authentication/index.adoc[WebFlux] for details on what is supported for each stack.

docs/modules/ROOT/pages/features/authorization/index.adoc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ Spring Security provides https://en.wikipedia.org/wiki/Defense_in_depth_(computi
88
[[authorization-request]]
99
== Request Based Authorization
1010

11-
Spring Security provides authorization based upon the request for both xref:servlet/authorization/index.adoc[Servlet] and WebFlux environments.
11+
Spring Security provides authorization based upon the request for both xref:servlet/authorization/authorize-http-requests.adoc[Servlet] and xref:reactive/authorization/authorize-http-requests.adoc[WebFlux] environments.
1212

1313
[[authorization-method]]
1414
== Method Based Authorization
15+
16+
Spring Security provides authorization based on the method invocation for both xref:servlet/authorization/method-security.adoc[Servlet] and xref:reactive/authorization/method.adoc[WebFlux] environments.

docs/modules/ROOT/pages/features/integrations/index.adoc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,4 @@
44

55
Spring Security provides integrations with numerous frameworks and APIs.
66
In this section, we discuss generic integrations that are not specific to Servlet or Reactive environments.
7-
To see specific integrations, refer to the xref:servlet/integrations/index.adoc[Servlet] and xref:servlet/integrations/index.adoc[Reactive] Integrations sections.
8-
// FIXME add link to reactive integrations
7+
To see specific integrations, refer to the xref:servlet/integrations/index.adoc[Servlet] and xref:reactive/integrations/cors.adoc[Reactive] Integrations sections.

0 commit comments

Comments
 (0)