Merge branch '4.0.x' into 4.1.x

Closes gh-1665

Author: snicoll

spring-ws-docs/src/docs/asciidoc/index.adoc

@@ -10,7 +10,7 @@ Arjen Poutsma, Rick Evans, Tareq Abed Rabbo, Greg Turnquist, Jay Bryant, Corneil
 :docs-site: https://docs.spring.io
 :spring-framework-docs-root: {docs-site}/spring-framework/docs
 :spring-framework-api: {spring-framework-docs-root}/{spring-framework-version}/javadoc-api/org/springframework
-:spring-framework-docs: https://docs.spring.io/spring-framework/reference
+:spring-framework-docs: https://docs.spring.io/spring-framework/reference/6.2
 :spring-ws-docs-root: {docs-site}/spring-ws/docs
 :spring-ws-api: {spring-ws-docs-root}/{spring-ws-version}/api/org/springframework/ws
 

spring-ws-docs/src/docs/asciidoc/server.adoc

@@ -687,7 +687,7 @@ In the next couple of sections, a more elaborate description of the `@Endpoint`
 Endpoints, like any other Spring Bean, are scoped as a singleton by default.
 That is, one instance of the bean definition is created per container.
 Being a singleton implies that more than one thread can use it at the same time, so the endpoint has to be thread safe.
-If you want to use a different scope, such as prototype, see the {spring-framework-docs}/core/beans/factory-scopes.html#beans-factory-scopes-other-injection[Spring Reference documentation].
+If you want to use a different scope, such as prototype, see the {spring-framework-docs}/core/beans/factory-scopes.html#beans-factory-scopes-other-injection[Spring Framework reference documentation].
 ====
 
 Note that all abstract base classes provided in Spring-WS are thread safe, unless otherwise indicated in the class-level Javadoc.