Merge branch '1.1.x'

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

@@ -597,9 +597,9 @@ endpoint you should see a response similar to this:
 	{
 		"counter.status.200.root": 20,
 		"counter.status.200.metrics": 3,
-		"counter.status.200.**": 5,
+		"counter.status.200.star-star": 5,
 		"counter.status.401.root": 4,
-		"gauge.response.**": 6,
+		"gauge.response.star-star": 6,
 		"gauge.response.root": 2,
 		"gauge.response.metrics": 3,
 		"classes": 5808,
@@ -625,7 +625,7 @@ endpoint you should see a response similar to this:
 Here we can see basic `memory`, `heap`, `class loading`, `processor` and `thread pool`
 information along with some HTTP metrics. In this instance the `root` (``/'') and `/metrics`
 URLs have returned `HTTP 200` responses `20` and `3` times respectively. It also appears
-that the `root` URL returned `HTTP 401` (unauthorized) `4` times. The double asterix (`**`)
+that the `root` URL returned `HTTP 401` (unauthorized) `4` times. The double asterix (`star-star`)
 comes from a request matched by Spring MVC as `/**` (normally a static resource).
 
 The `gauge` shows the last response time for a request. So the last request to `root` took