Merge branch '2.2.x'

Closes gh-20013

spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto.adoc

@@ -861,8 +861,8 @@ You can add an `org.apache.catalina.connector.Connector` to the `TomcatServletWe
 			return connector;
 		}
 		catch (IOException ex) {
-			throw new IllegalStateException("can't access keystore: [" + "keystore"
-					+ "] or truststore: [" + "keystore" + "]", ex);
+			throw new IllegalStateException("can't access keystore: [" + keystore
+					+ "] or truststore: [" + truststore + "]", ex);
 		}
 	}
 ----

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

@@ -4277,7 +4277,6 @@ The following code listing shows how to inject a Cassandra bean:
 
 		private final CassandraTemplate template;
 
-		@Autowired
 		public MyBean(CassandraTemplate template) {
 			this.template = template;
 		}