Merge branch '2.11' into 2.12

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/databind/ObjectMapper.java

@@ -188,7 +188,7 @@ public enum DefaultTyping {
 
         /**
          * Value that means that default typing will be used for
-         * all non-final types, with exception of small number of
+         * all types, with exception of small number of
          * "natural" types (String, Boolean, Integer, Double) that
          * can be correctly inferred from JSON, and primitives (which
          * can not be polymorphic either).
@@ -200,7 +200,10 @@ public enum DefaultTyping {
          * if declared value type of a property is {@code final} -- for example,
          * properties of type {@code long} (or wrapper {@code Long}).
          *<p>
-         * Note that the only known use case for this setting is for serialization
+         * Note that this is rarely the option you should use as it results
+         * in adding type information in many places where it should not be needed:
+         * make sure you understand its behavior.
+         * The only known use case for this setting is for serialization
          * when passing instances of final class, and base type is not
          * separately specified.
          *