Merge branch '4.9.x' into router_versions

# Conflicts:
#	gradle.properties

src/main/docs/guide/openApiViews/viewsGenerationWithPropertiesFile.adoc

@@ -1,16 +1,12 @@
-By default the generation of views is disabled. You can enable views generation with a <<propertiesFileConfiguration, configuration properties file>>.
+By default, the generation of views is disabled. You can enable views generation with a <<propertiesFileConfiguration, configuration properties file>>.
 
-.openapi.properties Example Views Generation Swagger-UI Redoc, Rapidoc
+.openapi.properties Example Views Generation Swagger-UI, Redoc, Rapidoc
 [source]
 ----
-swagger-ui.enabled=true
-redoc.enabled=true
-rapidoc.enabled=true
-rapidoc.bg-color=#14191f
-rapidoc.text-color=#aec2e0
-rapidoc.sort-endpoints-by=method
-...
-..
-.
+micronaut.openapi.views.spec = swagger-ui.enabled=true,\
+    redoc.enabled=true, \
+    rapidoc.enabled=true, \
+    rapidoc.bg-color=#14191f, \
+    rapidoc.text-color=#aec2e0, \
+    rapidoc.sort-endpoints-by=method
 ----
-

src/main/docs/guide/openApiViews/viewsGenerationWithSystemProperties.adoc

@@ -1,8 +1,8 @@
-By default the generation of views is disabled. 
+By default, the generation of views is disabled.
 
 To turn it on you have to set the following system property `micronaut.openapi.views.spec`.
 
-The string syntax is a series of comma-separated key-value pairs, to enable and configure the views. 
+The string syntax is a series of comma-separated key-value pairs, to enable and configure the views.
 
 .System Property
 [source]
@@ -110,4 +110,4 @@ or in Maven with Groovy:
       </plugin>
     </plugins>
 </build>
-----
+----