diff --git a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
index 8ceeb8818d..82a76b9d28 100644
--- a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
+++ b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
@@ -106,7 +106,7 @@ content into your application; rather pick only the properties that you need.
 	# APPLICATION SETTINGS ({sc-spring-boot}/SpringApplication.{sc-ext}[SpringApplication])
 	spring.main.banner-mode=console # Mode used to display the banner when the application runs.
 	spring.main.sources= # Sources (class name, package name or XML resource location) to include in the ApplicationContext.
-	spring.main.web-environment= # Run the application in a web environment (auto-detected by default).
+	spring.main.web-application-type= # Flag to explicitly request a specific type of web application. Auto-detected based on the classpath if not set.
 
 	# FILE ENCODING ({sc-spring-boot}/context/FileEncodingApplicationListener.{sc-ext}[FileEncodingApplicationListener])
 	spring.mandatory-file-encoding= # Expected character encoding the application must use.
diff --git a/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index 3480b8f7c2..a85424356b 100644
--- a/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -170,11 +170,19 @@
     "sourceType": "org.springframework.boot.SpringApplication",
     "description": "Sources (class name, package name or XML resource location) to include in the ApplicationContext."
   },
+  {
+    "name": "spring.main.web-application-type",
+    "type": "org.springframework.boot.WebApplicationType",
+    "sourceType": "org.springframework.boot.SpringApplication",
+    "description": "Flag to explicitly request a specific type of web application. Auto-detected based on the classpath if not set."
+  },
   {
     "name": "spring.main.web-environment",
     "type": "java.lang.Boolean",
     "sourceType": "org.springframework.boot.SpringApplication",
-    "description": "Run the application in a web environment (auto-detected by default)."
+    "description": "Run the application in a web environment (auto-detected by default).",
+    "deprecated": true,
+    "deprecation": {"replacement": "spring.main.web-application-type"}
   },
   {
     "name": "spring.output.ansi.enabled",