Merge remote-tracking branch 'upstream/master' into wip/6.0_merge_44

documentation/src/main/asciidoc/userguide/appendices/Configurations.adoc

@@ -832,7 +832,7 @@ See https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibern
 +
 If no value is specified, a default is assumed as follows:
 +
-* if source scripts are specified (per `javax.persistence.schema-generation.create-script-source`), then the `script` option is assumed
+* if source scripts are specified (per `javax.persistence.schema-generation.drop-script-source`), then the `script` option is assumed
 * otherwise, `metadata` is assumed
 
 `*javax.persistence.schema-generation.create-script-source*`::

hibernate-core/src/main/java/org/hibernate/tool/schema/SourceType.java

@@ -33,7 +33,7 @@ public enum SourceType {
 	 */
 	SCRIPT( "script" ),
 	/**
-	 * "metadata-then-scripts" - Both the O/RM metadata and external DDL scripts are used as sources for generation,
+	 * "metadata-then-script" - Both the O/RM metadata and external DDL scripts are used as sources for generation,
 	 * with the O/RM metadata being applied first.
 	 *
 	 * @see #METADATA
@@ -41,7 +41,7 @@ public enum SourceType {
 	 */
 	METADATA_THEN_SCRIPT( "metadata-then-script" ),
 	/**
-	 * "scripts-then-metadata" - Both the O/RM metadata and external DDL scripts are used as sources for generation,
+	 * "script-then-metadata" - Both the O/RM metadata and external DDL scripts are used as sources for generation,
 	 * with the commands from the external DDL script(s) being applied first
 	 *
 	 * @see #SCRIPT