Polish Javadoc for FreeMarker support

Author: sbrannen

spring-webflux/src/main/java/org/springframework/web/reactive/result/view/RequestContext.java

@@ -44,10 +44,10 @@
  * use, current locale, binding errors, etc. Provides easy access to localized
  * messages and Errors instances.
  *
- * <p>Suitable for exposition to views, and usage within FreeMarker templates,
+ * <p>Suitable for exposition to views, and usage within FreeMarker templates
  * and tag libraries.
  *
- * <p>Can be instantiated manually, or automatically exposed to views as model
+ * <p>Can be instantiated manually or automatically exposed to views as a model
  * attribute via AbstractView's "requestContextAttribute" property.
  *
  * @author Rossen Stoyanchev

spring-webflux/src/main/java/org/springframework/web/reactive/result/view/UrlBasedViewResolver.java

@@ -188,7 +188,7 @@ public void setRequestContextAttribute(@Nullable String requestContextAttribute)
 	}
 
 	/**
-	 * Return the name of the @link RequestContext} attribute for all views, if any.
+	 * Return the name of the {@link RequestContext} attribute for all views, if any.
 	 */
 	@Nullable
 	protected String getRequestContextAttribute() {

spring-webflux/src/main/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerConfigurer.java

@@ -40,7 +40,7 @@
  * using {@link FreeMarkerView}. It exists purely to configure FreeMarker.
  * It is not meant to be referenced by application components but just internally
  * by {@code FreeMarkerView}. Implements {@link FreeMarkerConfig} to be found by
- * {@code FreeMarkerView} without depending on the bean name the configurer.
+ * {@code FreeMarkerView} without depending on the bean name of the configurer.
  *
  * <p>Note that you can also refer to a pre-configured FreeMarker Configuration
  * instance via the "configuration" property. This allows to share a FreeMarker

spring-webflux/src/main/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerView.java

@@ -54,7 +54,7 @@
  *
  * <p>Depends on a single {@link FreeMarkerConfig} object such as
  * {@link FreeMarkerConfigurer} being accessible in the application context.
- * Alternatively set the FreeMarker configuration can be set directly on this
+ * Alternatively the FreeMarker configuration can be set directly on this
  * class via {@link #setConfiguration}.
  *
  * <p>The {@link #setUrl(String) url} property is the location of the FreeMarker

spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurer.java

@@ -48,7 +48,7 @@
  * using Spring's FreeMarkerView for web MVC. It exists purely to configure FreeMarker.
  * It is not meant to be referenced by application components but just internally
  * by FreeMarkerView. Implements FreeMarkerConfig to be found by FreeMarkerView without
- * depending on the bean name the configurer. Each DispatcherServlet can define its
+ * depending on the bean name of the configurer. Each DispatcherServlet can define its
  * own FreeMarkerConfigurer if desired.
  *
  * <p>Note that you can also refer to a preconfigured FreeMarker Configuration
@@ -57,8 +57,7 @@
  * for web and email usage, for example.
  *
  * <p>This configurer registers a template loader for this package, allowing to
- * reference the "spring.ftl" macro library (contained in this package and thus
- * in spring.jar) like this:
+ * reference the "spring.ftl" macro library contained in this package:
  *
  * <pre class="code">
  * &lt;#import "/spring.ftl" as spring/&gt;

spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerView.java

@@ -70,8 +70,9 @@
  *
  * <p>Depends on a single {@link FreeMarkerConfig} object such as {@link FreeMarkerConfigurer}
  * being accessible in the current web application context, with any bean name.
- * Alternatively, you can set the FreeMarker {@link Configuration} object as bean property.
- * See {@link #setConfiguration} for more details on the impacts of this approach.
+ * Alternatively, you can set the FreeMarker {@link Configuration} object as a
+ * bean property. See {@link #setConfiguration} for more details on the impacts
+ * of this approach.
  *
  * <p>Note: Spring's FreeMarker support requires FreeMarker 2.3 or higher.
  *

spring-webmvc/src/main/resources/org/springframework/web/servlet/view/freemarker/spring.ftl

@@ -11,7 +11,7 @@
  * FreeMarkerConfigurer.
  *
  * To take advantage of these macros, the "exposeSpringMacroHelpers" property
- * of the FreeMarker class needs to be set to "true". This will expose a
+ * of the FreeMarkerView class needs to be set to "true". This will expose a
  * RequestContext under the name "springMacroRequestContext", as needed by
  * the macros in this library.
  *