Skip to content

Commit

Permalink
Merge pull request spring-projects#5553 from izeye/polish-20160401
Browse files Browse the repository at this point in the history
* pr/5553:
  Polish
  • Loading branch information
snicoll committed Apr 1, 2016
2 parents 27b0666 + f88c583 commit 1d4f38e
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 14 deletions.
8 changes: 4 additions & 4 deletions spring-boot-dependencies/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -556,20 +556,20 @@
<version>${cassandra-driver.version}</version>
<exclusions>
<exclusion>
<artifactId>slf4j-log4j12</artifactId>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
<artifactId>log4j</artifactId>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
<exclusion>
<artifactId>guava</artifactId>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
<exclusion>
<artifactId>netty-handler</artifactId>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
</exclusion>
</exclusions>
</dependency>
Expand Down
4 changes: 2 additions & 2 deletions spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -1215,7 +1215,7 @@ root of the classpath, or in a location specified by the Spring `Environment` pr
You can force Spring Boot to use a particular logging system using the
`org.springframework.boot.logging.LoggingSystem` system property. The value should be
the fully-qualified class name of a `LoggingSystem` implementation. You can also disable
Spring Boot's logging configuration entirely by used a value of `none`.
Spring Boot's logging configuration entirely by using a value of `none`.

NOTE: Since logging is initialized *before* the `ApplicationContext` is created, it isn't
possible to control logging from `@PropertySources` in Spring `@Configuration` files.
Expand Down Expand Up @@ -4359,7 +4359,7 @@ how your tests will run:

* `MOCK` -- Loads a `WebApplicationContext` and provides a mock servlet environment.
Embedded servlet containers are not started when using this annotation. If servlet
APIs are not on your classpath this mode will transparantly fallback to creating a
APIs are not on your classpath this mode will transparently fallback to creating a
regular non-web `ApplicationContext`.
* `RANDOM_PORT` -- Loads an `EmbeddedWebApplicationContext` and provides a real
servlet environment. Embedded servlet containers are started and listening on a random
Expand Down
2 changes: 1 addition & 1 deletion spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ The following application starters are provided by Spring Boot under the
include::../../../target/generated-resources/application-starters.adoc[]

In addition to the application starters, the following starters can be used to add
_<<production-ready-featyres.adoc#production-ready, production ready>>_ features:
_<<production-ready-features.adoc#production-ready, production ready>>_ features:

.Spring Boot production starters
include::../../../target/generated-resources/production-starters.adoc[]
Expand Down
7 changes: 0 additions & 7 deletions spring-boot-docs/src/main/groovy/generateStarterTables.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,6 @@ def addStarterCrossLinks(String input) {
input.replaceAll('(spring-boot-starter[A-Za-z-]*)', '<<$1,`$1`>>')
}

def addBackTicksIfNecessary(String input) {
if (!input.contains('`')) {
return "`${input}`"
}
input
}

def getDependencies(def pom) {
dependencies = []
pom.dependencies.dependency.each { dependency ->
Expand Down

0 comments on commit 1d4f38e

Please sign in to comment.