From ac975df448eed9cad620b895f4999a10237df1f0 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@pivotal.io>
Date: Thu, 5 Nov 2015 20:02:37 -0500
Subject: [PATCH] Fix javadoc ambiguity

Issue: SPR-13642
---
 .../ContentNegotiationManagerFactoryBean.java | 26 ++++++++++++-------
 .../ContentNegotiationConfigurer.java         | 24 ++++++++++-------
 2 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/web/accept/ContentNegotiationManagerFactoryBean.java b/spring-web/src/main/java/org/springframework/web/accept/ContentNegotiationManagerFactoryBean.java
index e5cfb97ef14..b035b079acf 100644
--- a/spring-web/src/main/java/org/springframework/web/accept/ContentNegotiationManagerFactoryBean.java
+++ b/spring-web/src/main/java/org/springframework/web/accept/ContentNegotiationManagerFactoryBean.java
@@ -40,29 +40,34 @@ import org.springframework.web.context.ServletContextAware;
  *
  * <table>
  * <tr>
- *     <td>{@link #setFavorPathExtension favorPathExtension}</td>
- *     <td>{@link PathExtensionContentNegotiationStrategy}</td>
- *     <td>Yes</td>
+ *     <th>Property Setter</th>
+ *     <th>Underlying Strategy</th>
+ *     <th>Default Setting</th>
+ * </tr>
+ * <tr>
+ *     <td>{@link #setFavorPathExtension}</td>
+ *     <td>{@link PathExtensionContentNegotiationStrategy Path Extension strategy}</td>
+ *     <td>On</td>
  * </tr>
  * <tr>
  *     <td>{@link #setFavorParameter favorParameter}</td>
- *     <td>{@link ParameterContentNegotiationStrategy}</td>
- *     <td>-</td>
+ *     <td>{@link ParameterContentNegotiationStrategy Parameter strategy}</td>
+ *     <td>Off</td>
  * </tr>
  * <tr>
  *     <td>{@link #setIgnoreAcceptHeader ignoreAcceptHeader}</td>
- *     <td>{@link HeaderContentNegotiationStrategy}</td>
- *     <td>Yes</td>
+ *     <td>{@link HeaderContentNegotiationStrategy Header strategy}</td>
+ *     <td>On</td>
  * </tr>
  * <tr>
  *     <td>{@link #setDefaultContentType defaultContentType}</td>
- *     <td>{@link FixedContentNegotiationStrategy}</td>
- *     <td>-</td>
+ *     <td>{@link FixedContentNegotiationStrategy Fixed content strategy}</td>
+ *     <td>Not set</td>
  * </tr>
  * <tr>
  *     <td>{@link #setDefaultContentTypeStrategy defaultContentTypeStrategy}</td>
  *     <td>{@link ContentNegotiationStrategy}</td>
- *     <td>-</td>
+ *     <td>Not set</td>
  * </tr>
  * </table>
  *
@@ -226,6 +231,7 @@ public class ContentNegotiationManagerFactoryBean
 	/**
 	 * Set a custom {@link ContentNegotiationStrategy} to use to determine
 	 * the content type to use when no content type is requested.
+	 * <p>By default this is not set.
 	 * @see #setDefaultContentType
 	 * @since 4.1.2
 	 */
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ContentNegotiationConfigurer.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ContentNegotiationConfigurer.java
index 1c6b911af8d..c22dda7312d 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ContentNegotiationConfigurer.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ContentNegotiationConfigurer.java
@@ -36,29 +36,34 @@ import org.springframework.web.accept.PathExtensionContentNegotiationStrategy;
  *
  * <table>
  * <tr>
+ *     <th>Configurer Property</th>
+ *     <th>Underlying Strategy</th>
+ *     <th>Default Setting</th>
+ * </tr>
+ * <tr>
  *     <td>{@link #favorPathExtension}</td>
- *     <td>{@link PathExtensionContentNegotiationStrategy}</td>
- *     <td>Yes</td>
+ *     <td>{@link PathExtensionContentNegotiationStrategy Path Extension strategy}</td>
+ *     <td>On</td>
  * </tr>
  * <tr>
  *     <td>{@link #favorParameter}</td>
- *     <td>{@link ParameterContentNegotiationStrategy}</td>
- *     <td>-</td>
+ *     <td>{@link ParameterContentNegotiationStrategy Parameter strategy}</td>
+ *     <td>Off</td>
  * </tr>
  * <tr>
  *     <td>{@link #ignoreAcceptHeader}</td>
- *     <td>{@link HeaderContentNegotiationStrategy}</td>
- *     <td>Yes</td>
+ *     <td>{@link HeaderContentNegotiationStrategy Header strategy}</td>
+ *     <td>On</td>
  * </tr>
  * <tr>
  *     <td>{@link #defaultContentType}</td>
- *     <td>{@link FixedContentNegotiationStrategy}</td>
- *     <td>-</td>
+ *     <td>{@link FixedContentNegotiationStrategy Fixed content strategy}</td>
+ *     <td>Not set</td>
  * </tr>
  * <tr>
  *     <td>{@link #defaultContentTypeStrategy}</td>
  *     <td>{@link ContentNegotiationStrategy}</td>
- *     <td>-</td>
+ *     <td>Not set</td>
  * </tr>
  * </table>
  *
@@ -215,6 +220,7 @@ public class ContentNegotiationConfigurer {
 	/**
 	 * Set a custom {@link ContentNegotiationStrategy} to use to determine
 	 * the content type to use when no content type is requested.
+	 * <p>By default this is not set.
 	 * @see #defaultContentType
 	 * @since 4.1.2
 	 */