diff --git a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc index 25b3b626df..2bbadd04c0 100644 --- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc +++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc @@ -1607,7 +1607,7 @@ you can see how to set things up. There is also a in the Jersey 1.x sample that the spring-boot maven plugin has been configured to unpack some Jersey jars so they can be scanned by the JAX-RS implementation (because the sample asks for them to be scanned in its `Filter` registration). You may need to do the same if -any of your JAX-RS resources are packages as nested jars. +any of your JAX-RS resources are packaged as nested jars. @@ -3398,7 +3398,7 @@ property with a different value for each instance of your application. === Using a Bitronix transaction manager Bitronix is another popular open source JTA transaction manager implementation. You can -use the `spring-boot-starter-jta-bitronix` starter POM to add the appropriate Birtronix +use the `spring-boot-starter-jta-bitronix` starter POM to add the appropriate Bitronix dependencies to your project. As with Atomikos, Spring Boot will automatically configure Bitronix and post-process your beans to ensure that startup and shutdown ordering is correct. diff --git a/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc b/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc index 6233e2bcf2..e9ebc7a25e 100644 --- a/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc +++ b/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc @@ -554,7 +554,7 @@ source is a `@Configuration` class. Usually the class that defines the `main` me is also a good candidate as the primary `@Configuration`. TIP: Many Spring configuration examples have been published on the Internet that use XML -configuration. Always try to use the equivalent Java-base configuration if possible. +configuration. Always try to use the equivalent Java-based configuration if possible. Searching for `+enable*+` annotations can be a good starting point.