Documentation fixes etc (backported from master)

spring-context/src/main/java/org/springframework/context/event/SourceFilteringListener.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -81,7 +81,7 @@ public class SourceFilteringListener implements GenericApplicationListener, Smar
 
 	@Override
 	public boolean supportsEventType(Class<? extends ApplicationEvent> eventType) {
-		return supportsEventType(ResolvableType.forType(eventType));
+		return supportsEventType(ResolvableType.forClass(eventType));
 	}
 
 	@Override

spring-webmvc/src/main/java/org/springframework/web/servlet/handler/MatchableHandlerMapping.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,7 +33,7 @@ import org.springframework.web.servlet.HandlerMapping;
 public interface MatchableHandlerMapping extends HandlerMapping {
 
 	/**
-	 * Determine whether the given request matches the request criteria.
+	 * Determine whether the request matches the given pattern.
 	 * @param request the current request
 	 * @param pattern the pattern to match
 	 * @return the result from request matching, or {@code null} if none

src/docs/asciidoc/core/core-beans.adoc

@@ -10803,7 +10803,7 @@ The following example shows how our notifier can be rewritten to be invoked only
 .Java
 ----
 	@EventListener(condition = "#blEvent.content == 'my-event'")
-	public void processBlockedListEvent(BlockedListEvent blockedListEvent) {
+	public void processBlockedListEvent(BlockedListEvent blEvent) {
 		// notify appropriate parties via notificationAddress...
 	}
 ----
@@ -10811,7 +10811,7 @@ The following example shows how our notifier can be rewritten to be invoked only
 .Kotlin
 ----
 	@EventListener(condition = "#blEvent.content == 'my-event'")
-	fun processBlockedListEvent(blockedListEvent: BlockedListEvent) {
+	fun processBlockedListEvent(blEvent: BlockedListEvent) {
 		// notify appropriate parties via notificationAddress...
 	}
 ----

src/docs/asciidoc/core/core-validation.adoc

@@ -1085,8 +1085,8 @@ on the target field, or you might want to run a `Converter` only if a specific m
 	interface ConditionalGenericConverter : GenericConverter, ConditionalConverter
 ----
 
-A good example of a `ConditionalGenericConverter` is an `EntityConverter` that converts
+A good example of a `ConditionalGenericConverter` is an `IdToEntityConverter` that converts
-between a persistent entity identifier and an entity reference. Such an `EntityConverter`
+between a persistent entity identifier and an entity reference. Such an `IdToEntityConverter`
 might match only if the target entity type declares a static finder method (for example,
 `findAccount(Long)`). You might perform such a finder method check in the implementation of
 `matches(TypeDescriptor, TypeDescriptor)`.