Merge branch '2.7.x' into 3.0.x

Closes gh-35689
2023-05-31 17:11:41 -05:00
parent a58e98af05 c847db77e6
commit 6a763f9be4
1 changed files with 2 additions and 2 deletions
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoProperties.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoProperties.java
@@ -69,12 +69,12 @@ public class MongoProperties {
 	private List<String> additionalHosts;

 	/**
-	 * Mongo database URI. Overrides host, port, username, password, and database.
+	 * Mongo database URI. Overrides host, port, username, and password.
 	 */
 	private String uri;

 	/**
-	 * Database name.
+	 * Database name. Overrides database in URI.
 	 */
 	private String database;