Merge branch '2.7.x'

Author: philwebb

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/asciidoc/packaging-oci-image.adoc

@@ -169,23 +169,20 @@ Where `<options>` can contain:
 * `volume-opt=key=value` to specify key-value pairs consisting of an option name and its value
 |
 
-| `network` +
-(`spring-boot.build-image.network`)
+| `network` + (`spring-boot.build-image.network`)
 | The https://docs.docker.com/network/#network-drivers[network driver] the builder container will be configured to use.
 The value supplied will be passed unvalidated to Docker when creating the builder container.
 |
 
-| `cleanCache` +
-(`spring-boot.build-image.cleanCache`)
+| `cleanCache` + (`spring-boot.build-image.cleanCache`)
 | Whether to clean the cache before building.
 | `false`
 
 | `verboseLogging`
 | Enables verbose logging of builder operations.
 | `false`
 
-| `publish` +
-(`spring-boot.build-image.publish`)
+| `publish` + (`spring-boot.build-image.publish`)
 | Whether to publish the generated image to a Docker registry.
 | `false`