Merge pull request spring-projects#5661 from izeye/polish-20160412

* pr/5661:
  Polish

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cache/EhCacheStatisticsProvider.java

@@ -48,8 +48,8 @@ public CacheStatistics getCacheStatistics(CacheManager cacheManager,
 
 	private double cacheHitRatio(StatisticsGateway stats) {
 		long hitCount = stats.cacheHitCount();
-		long cacheMissCount = stats.cacheMissCount();
-		return ((double) hitCount) / (hitCount + cacheMissCount);
+		long missCount = stats.cacheMissCount();
+		return ((double) hitCount) / (hitCount + missCount);
 	}
 
 }

spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc

@@ -844,7 +844,7 @@ content into your application; rather pick only the properties that you need.
 	spring.rabbitmq.listener.default-requeue-rejected= # Whether or not to requeue delivery failures; default `true`.
 	spring.rabbitmq.listener.max-concurrency= # Maximum number of consumers.
 	spring.rabbitmq.listener.prefetch= # Number of messages to be handled in a single request. It should be greater than or equal to the transaction size (if used).
-	spring.rabbitmq.listener.retry.enabled= # Whether or not publishing retries are enabled.
+	spring.rabbitmq.listener.retry.enabled=false # Whether or not publishing retries are enabled.
 	spring.rabbitmq.listener.retry.initial-interval=1000 # Interval between the first and second attempt to deliver a message.
 	spring.rabbitmq.listener.retry.max-attempts=3 # Maximum number of attempts to deliver a message.
 	spring.rabbitmq.listener.retry.max-interval=10000 # Maximum number of attempts to deliver a message.
@@ -864,7 +864,7 @@ content into your application; rather pick only the properties that you need.
 	spring.rabbitmq.template.mandatory=false # Enable mandatory messages.
 	spring.rabbitmq.template.receive-timeout=0 # Timeout for `receive()` methods.
 	spring.rabbitmq.template.reply-timeout=5000 # Timeout for `sendAndReceive()` methods.
-	spring.rabbitmq.template.retry.enabled= # Set to true to enable retries in the `RabbitTemplate`.
+	spring.rabbitmq.template.retry.enabled=false # Set to true to enable retries in the `RabbitTemplate`.
 	spring.rabbitmq.template.retry.initial-interval=1000 # Interval between the first and second attempt to publish a message.
 	spring.rabbitmq.template.retry.max-attempts=3 # Maximum number of attempts to publish a message.
 	spring.rabbitmq.template.retry.max-interval=10000 # Maximum number of attempts to publish a message.

spring-boot-docs/src/main/asciidoc/production-ready-features.adoc

@@ -494,7 +494,7 @@ The example below contributes an `example` entry with a single value:
 	}
 ----
 
-if you hit the `info` endpoint you should see a response that contains the following
+If you hit the `info` endpoint you should see a response that contains the following
 additional entry:
 
 [source,json,indent=0]

spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc

@@ -3527,7 +3527,7 @@ Generic caching is used if the context defines _at least_ one
 [[boot-features-caching-provider-jcache]]
 ==== JCache
 JCache is bootstrapped via the presence of a `javax.cache.spi.CachingProvider` on the
-classpath (i.e. a JSR-107 compliant caching library). It might happen that more that one
+classpath (i.e. a JSR-107 compliant caching library). It might happen that more than one
 provider is present, in which case the provider must be explicitly specified. Even if the
 JSR-107 standard does not enforce a standardized way to define the location of the
 configuration file, Spring Boot does its best to accommodate with implementation details.
@@ -4095,14 +4095,14 @@ Then you can use in any `@RabbitListener`-annotated method as follows:
 
 You can enable retries to handle situations where your listener throws an exception.
 When retries are exhausted, the message will be rejected and either dropped or routed to a dead-letter exchange
-if the broker is so configured.
+if the broker is configured so.
 Retries are disabled by default.
 
 IMPORTANT: If retries are not enabled and the listener throws an exception, by default the delivery will be retried
 indefinitely.
 You can modify this behavior in two ways; set the `defaultRequeueRejected` property to `false` and zero redeliveries
 will be attempted; or, throw an `AmqpRejectAndDontRequeueException` to signal the message should be rejected.
-This is the mechanism used when retries are enabled and the maximum delivery attempts is reached.
+This is the mechanism used when retries are enabled and the maximum delivery attempts are reached.