Merge branch '2.1.x' into 2.2.x

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/template/AbstractViewResolverProperties.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -61,7 +61,7 @@ public abstract class AbstractViewResolverProperties {
 	private Charset charset = DEFAULT_CHARSET;
 
 	/**
-	 * The view names that can be resolved.
+	 * View names that can be resolved.
 	 */
 	private String[] viewNames;