This is an automated email from the ASF dual-hosted git repository. ddekany pushed a commit to branch 2.3-gae in repository https://gitbox.apache.org/repos/asf/freemarker.git
commit 125b8e65a7b451fd55ec06417bdcfc01fb7ef9a7 Author: ddekany <[email protected]> AuthorDate: Tue Oct 13 17:13:10 2020 +0200 (JavaDoc typo fixes) --- src/main/java/freemarker/core/TemplateNullModel.java | 4 ++-- src/main/java/freemarker/template/_TemplateAPI.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/freemarker/core/TemplateNullModel.java b/src/main/java/freemarker/core/TemplateNullModel.java index b3ac0de..b9af584 100644 --- a/src/main/java/freemarker/core/TemplateNullModel.java +++ b/src/main/java/freemarker/core/TemplateNullModel.java @@ -24,9 +24,9 @@ import freemarker.template.TemplateModel; /** * Represents a {@code null} value; if we get this as the value of a variable from a scope, we do not fall back * to a higher scope to get the same variable again. If instead we get a {@code null}, that means that the variable - * doesn't exist at all in the current scope, and so we fall back to a higher scope. This distinction wasn is only + * doesn't exist at all in the current scope, and so we fall back to a higher scope. This distinction is only * used for (and expected from) certain scopes, so be careful where you are using it. (As of this - * writing, it's onlt for local variables, including loop variables). The user should never meet a + * writing, it's only for local variables, including loop variables). The user should never meet a * {@link TemplateNullModel}, it must not be returned from public API-s. * * @see Environment#getNullableLocalVariable(String) diff --git a/src/main/java/freemarker/template/_TemplateAPI.java b/src/main/java/freemarker/template/_TemplateAPI.java index 71feecb..5ff74de 100644 --- a/src/main/java/freemarker/template/_TemplateAPI.java +++ b/src/main/java/freemarker/template/_TemplateAPI.java @@ -60,13 +60,13 @@ public class _TemplateAPI { /** * Kind of a dummy {@link ObjectWrapper} used at places where the internal code earlier used the * {@link ObjectWrapper#DEFAULT_WRAPPER} singleton, because it wasn't supposed to wrap/unwrap anything with it; - * never use this {@link ObjectWrapper}r in situations where values of arbitrary types need to be wrapped! + * never use this {@link ObjectWrapper} in situations where values of arbitrary types need to be wrapped! * The typical situation is that we are using {@link SimpleSequence}, or {@link SimpleHash}, which always has an * {@link ObjectWrapper} field, even if we don't care in the given situation, and so we didn't set it explicitly. * The concern with the old way is that the {@link ObjectWrapper} set in the {@link Configuration} is possibly * more restrictive than the default, so if the template author can somehow make FreeMarker wrap something with the * default {@link ObjectWrapper}, then we got a security problem. So we try not to have that around, if possible. - * The obvious fix, and the better engineering would be just use a such {@link TemplateSequenceModel} or + * The obvious fix, and the better engineering would be just use a {@link TemplateSequenceModel} or * {@link TemplateHashModelEx2} implementation at those places, which doesn't have an {@link ObjectWrapper} (and * doesn't have the overhead of said implementations either). But, some user code might casts the values it * receives (as directive argument for example) to {@link SimpleSequence} or {@link SimpleHash}, instead of to
