Merge branch '3.4.x'

Closes gh-44421

Author: snicoll

spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/appendix/configurationmetadata/annotationprocessor/automaticmetadatageneration/MyServerProperties.java

@@ -60,6 +60,6 @@ public int getPort() {
 	public void setPort(int port) {
 		this.port = port;
 	}
-	// fold:off
+	// @fold:off
 
 }

spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/appendix/configurationmetadata/annotationprocessor/automaticmetadatageneration/nestedproperties/MyServerProperties.java

@@ -65,7 +65,7 @@ public int getPort() {
 		public void setPort(int port) {
 			this.port = port;
 		}
-		// @fold:off // getters/setters ...
+		// @fold:off
 
 	}