Skip to content

Commit e3fa4e1

Browse files
committed
Merge branch '5.1.x'
2 parents 0e98032 + ecc165a commit e3fa4e1

File tree

1 file changed

+13
-12
lines changed

1 file changed

+13
-12
lines changed

src/docs/asciidoc/index.adoc

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,23 @@
44

55
****
66
_What's New_, _Upgrade Notes_, _Supported Versions_, and other topics,
7-
independent of release cadence, are maintained externaly on the project's
7+
independent of release cadence, are maintained externally on the project's
88
https://github.com/spring-projects/spring-framework/wiki[*Github Wiki*].
99
****
1010

1111
[horizontal]
1212
<<overview.adoc#overview, Overview>> :: history, design philosophy, feedback,
1313
getting started.
14-
<<core.adoc#spring-core, Core>> :: IoC container, Events, Resources, i18n, Validation,
15-
Data Binding, Type Conversion, SpEL, AOP.
16-
<<testing.adoc#testing, Testing>> :: Mock objects, TestContext framework,
14+
<<core.adoc#spring-core, Core>> :: IoC Container, Events, Resources, i18n,
15+
Validation, Data Binding, Type Conversion, SpEL, AOP.
16+
<<testing.adoc#testing, Testing>> :: Mock Objects, TestContext Framework,
1717
Spring MVC Test, WebTestClient.
18-
<<data-access.adoc#spring-data-tier, Data Access>> :: Transactions, DAO support, JDBC,
19-
ORM, Marshalling XML.
20-
<<web.adoc#spring-web, Web Servlet>> :: Spring MVC, WebSocket, SockJS, STOMP messaging.
21-
<<web-reactive.adoc#spring-webflux, Web Reactive>> :: Spring WebFlux,
22-
WebClient, WebSocket.
23-
<<integration.adoc#spring-integration, Integration>> :: Remoting, JMS, JCA, JMX, Email,
24-
Tasks, Scheduling, Cache.
25-
<<languages.adoc#languages, Languages>> :: Kotlin, Groovy, Dynamic languages.
18+
<<data-access.adoc#spring-data-tier, Data Access>> :: Transactions, DAO Support,
19+
JDBC, O/R Mapping, XML Marshalling.
20+
<<web.adoc#spring-web, Web Servlet>> :: Spring MVC, WebSocket, SockJS,
21+
STOMP Messaging.
22+
<<web-reactive.adoc#spring-webflux, Web Reactive>> :: Spring WebFlux, WebClient,
23+
WebSocket.
24+
<<integration.adoc#spring-integration, Integration>> :: Remoting, JMS, JCA, JMX,
25+
Email, Tasks, Scheduling, Caching.
26+
<<languages.adoc#languages, Languages>> :: Kotlin, Groovy, Dynamic Languages.

0 commit comments

Comments
 (0)