Merge pull request #22207 from Sineaggi

wilkinsona · wilkinsona · commit 1ad66cf92b2f · 2020-07-07T10:46:44.000+01:00
* gh-22207: Polish "Rename NoneOfNestedConditions to NoneNestedConditions in example docs" Rename NoneOfNestedConditions to NoneNestedConditions in example docs Closes gh-22207
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/NoneNestedConditions.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/NoneNestedConditions.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.
@@ -26,7 +26,7 @@
  * be used to create composite conditions, for example:
  *
  * <pre class="code">
- * static class OnNeitherJndiNorProperty extends NoneOfNestedConditions {
+ * static class OnNeitherJndiNorProperty extends NoneNestedConditions {
  *
  *    OnNeitherJndiNorProperty() {
  *        super(ConfigurationPhase.PARSE_CONFIGURATION);

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2012-2019 the original author or authors.`
	`2`	`+ * Copyright 2012-2020 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -26,7 +26,7 @@`
`26`	`26`	`* be used to create composite conditions, for example:`
`27`	`27`	`*`
`28`	`28`	`* <pre class="code">`
`29`		`- * static class OnNeitherJndiNorProperty extends NoneOfNestedConditions {`
	`29`	`+ * static class OnNeitherJndiNorProperty extends NoneNestedConditions {`
`30`	`30`	`*`
`31`	`31`	`* OnNeitherJndiNorProperty() {`
`32`	`32`	`* super(ConfigurationPhase.PARSE_CONFIGURATION);`