Merge branch '5.1.x'

spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/server/RouterFunctionDsl.kt

@@ -26,7 +26,7 @@ import java.net.URI
 
 /**
  * Allow to create easily a `RouterFunction<ServerResponse>` from a Kotlin router DSL based
- * on the same building blocks than the Java one ([RouterFunction], [RequestPredicate],
+ * on the same building blocks as the Java one ([RouterFunction], [RequestPredicate],
  * [HandlerFunction]).
  *
  * Example:
@@ -554,4 +554,4 @@ open class RouterFunctionDsl(private val init: RouterFunctionDsl.() -> Unit) : (
 		}
 	}
 
-}
+}
\ No newline at end of file

src/docs/asciidoc/languages/kotlin.adoc

@@ -324,11 +324,14 @@ refactoring support in a supported IDE, as the following example shows:
 	"""
 ----
 
+NOTE: Kotlin Script Templates are not compatible yet with Spring Boot fatjar mechanism, see related
+https://youtrack.jetbrains.com/issue/KT-21443[KT-21443] and https://youtrack.jetbrains.com/issue/KT-27956[KT-27956]
+issues.
+
 See the https://github.com/sdeleuze/kotlin-script-templating[kotlin-script-templating] example
 project for more details.
 
 
-
 [[kotlin-spring-projects-in-kotlin]]
 == Spring Projects in Kotlin
 
@@ -497,6 +500,16 @@ and https://github.com/spring-projects/spring-boot/issues/1254[`@ConfigurationPr
 for more details.
 
 
+=== Checked Exceptions
+
+Java and https://kotlinlang.org/docs/reference/exceptions.html[Kotlin exception handling] are pretty close, with the main
+difference being that Kotlin treats all exceptions as unchecked exceptions. However, when using proxied objects
+(for example classes or methods annotated with `@Transactional`), checked exceptions thrown will be wrapped by default in
+an `UndeclaredThrowableException`.
+
+To get the original exception thrown like in Java, methods should be annotated with https://kotlinlang.org/api/latest/jvm/stdlib/kotlin.jvm/-throws/index.html[`@Throws`]
+to specify explicitly the checked exceptions thrown (for example `@Throws(IOException::class)`).
+
 
 === Annotation Array Attributes