Update packages and docs

README.md

@@ -224,7 +224,7 @@ on the fields available. Exceptions will be raised if subtypes do not have a dis
 not resolve to single known signature.
 
 Note that `@JsonTypeInfo` has lots of configuration possibilities: for more information check out
-[Intro to polymorphic type handling](http://www.cowtowncoder.com/blog/archives/2010/03/entry_372.html)
+[Intro to polymorphic type handling](../../../jackson-docs/wiki/JacksonPolymorphicDeserialization)
 
 ### Changing property auto-detection
 

src/main/java/com/fasterxml/jackson/annotation/JsonFilter.java

@@ -9,12 +9,12 @@
  * Annotation used to indicate which logical filter is to be used
  * for filtering out properties of type (class) annotated;
  * association made by this annotation declaring ids of filters,
- * and  <code>com.fasterxml.jackson.databind.ObjectMapper</code> (or objects
+ * and  <code>ObjectMapper</code> (or objects
  * it delegates to) providing matching filters by id.
  *<p>
  * Filters to use are usually of type
- * <code>com.fasterxml.jackson.databind.ser.PropertyFilter</code> and
- * are registered through <code>com.fasterxml.jackson.databind.ObjectMapper</code>
+ * <code>PropertyFilter</code> and
+ * are registered through <code>ObjectMapper</code>
  *<p>
  * Since 2.3, this annotation can also be used on properties (fields, methods,
  * constructor parameters).

src/main/java/com/fasterxml/jackson/annotation/JsonFormat.java

@@ -111,7 +111,8 @@
      * Datatype-specific additional piece of configuration that may be used
      * to further refine formatting aspects. This may, for example, determine
      * low-level format String used for {@link java.util.Date} serialization;
-     * however, exact use is determined by specific <code>JsonSerializer</code>
+     * however, exact use is determined by specific <code>JsonSerializer</code> (2.x)
+     * / <code>ValueSerializer</code> (3.x)
      */
     public String pattern() default "";
 
@@ -309,7 +310,8 @@ public static boolean isStructured(Shape shapeOrNull) {
      * or <code>DeserializationFeature</code>, as noted by entries.
      *<p>
      * Note that whether specific setting has an effect depends on whether
-     * <code>JsonSerializer</code> / <code>JsonDeserializer</code> being used
+     * <code>JsonSerializer</code> (2.x) / <code>ValueSerializer</code> (3.x)
+     * or <code>JsonDeserializer</code> (2.x) / <code>ValueDeserializer</code> (3.x) being used
      * takes the format setting into account. If not, please file an issue
      * for adding support via issue tracker for package that has handlers
      * (if you know which one; if not, just use `jackson-databind`).

src/main/java/com/fasterxml/jackson/annotation/JsonInclude.java

@@ -183,7 +183,8 @@ public enum Include
          *  and for other types, null values are excluded but other exclusions (if any).
          *<p>
          * Note that this default handling can be overridden by custom
-         * <code>JsonSerializer</code> implementation: if method <code>isEmpty()</code>
+         * <code>JsonSerializer</code> (2.x) / <code>ValueSerializer</code> (3.x)
+         * implementation: if method <code>isEmpty()</code>
          * is overridden, it will be called to see if non-null values are
          * considered empty (null is always considered empty).
          *<p>

src/main/java/com/fasterxml/jackson/annotation/JsonMerge.java

@@ -22,8 +22,8 @@
  * but no obvious and non-ambiguous way to merge state.
  *<p>
  * Merging is applied by using a deserialization method that accepts existing state
- * as an argument: it is then up to <code>JsonDeserializer</code> implementation
- * to use that base state in a way that makes sense without further configuration.
+ * as an argument: it is then up to <code>JsonDeserializer</code> (2.x) / <code>ValueDeserializer</code> (3.x)
+ * implementation to use that base state in a way that makes sense without further configuration.
  * For structured types this is usually obvious; and for scalar types not -- if
  * no obvious method exists, merging is not allowed; deserializer may choose to
  * either quietly ignore it, or throw an exception.

src/main/java/com/fasterxml/jackson/annotation/JsonTypeInfo.java

@@ -333,7 +333,7 @@ public enum As {
      *<p>
      * Default value is false, meaning that Jackson handles and removes
      * the type identifier from JSON content that is passed to
-     * <code>JsonDeserializer</code>.
+     * <code>JsonDeserializer</code> (2.x) / <code>ValueDeserializer</code> (3.x).
      *
      * @since 2.0
      */

src/main/java/com/fasterxml/jackson/annotation/ObjectIdGenerator.java

@@ -84,12 +84,12 @@ public boolean isValidReferencePropertyName(String name, Object parser) {
      * (next id to produce).
      *<p>
      * Note that actual type of 'context' is
-     * <code>com.fasterxml.jackson.databind.SerializerProvider</code>,
+     * <code>SerializerProvider</code> (2.x) / <code>SerializationContext</code> (3.x),
      * but can not be declared here as type itself (as well as call
      * to this object) comes from databind package.
      *
      * @param context Serialization context object used (of type
-     *    <code>com.fasterxml.jackson.databind.SerializerProvider</code>);
+     *    <code>SerializerProvider</code> (2.x) / <code>SerializationContext</code> (3.x));
      *    may be needed by more complex generators to access contextual
      *    information such as configuration.
      */

src/main/java/com/fasterxml/jackson/annotation/ObjectIdResolver.java

@@ -34,13 +34,13 @@ public interface ObjectIdResolver {
      * objects).
      * <p>
      * Note that actual type of 'context' is
-     * <code>com.fasterxml.jackson.databind.DeserializationContext</code>, but
+     * <code>DeserializationContext</code>, but
      * can not be declared here as type itself (as well as call to this object)
      * comes from databind package.
      *
      * @param context
      *            Deserialization context object used (of type
-     *            <code>com.fasterxml.jackson.databind.DeserializationContext</code>)
+     *            <code>DeserializationContext</code>)
      *            ; may be needed by more complex resolvers to access contextual
      *            information such as configuration.
      */