From 9a9cd8f6a96718432a2c712b24ec03e1d426258a Mon Sep 17 00:00:00 2001
From: ddekany <ddekany@apache.org>
Date: Fri, 22 Dec 2023 18:30:54 +0100
Subject: [PATCH] (Some javadoc typo fixes)

---
 .../org/apache/freemarker/core/model/ArgumentArrayLayout.java   | 2 +-
 .../org/apache/freemarker/core/model/TemplateCallableModel.java | 2 +-
 .../apache/freemarker/core/model/TemplateDirectiveModel.java    | 2 +-
 .../org/apache/freemarker/core/model/TemplateFunctionModel.java | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/model/ArgumentArrayLayout.java b/freemarker-core/src/main/java/org/apache/freemarker/core/model/ArgumentArrayLayout.java
index c64ae02fb..c9358b049 100644
--- a/freemarker-core/src/main/java/org/apache/freemarker/core/model/ArgumentArrayLayout.java
+++ b/freemarker-core/src/main/java/org/apache/freemarker/core/model/ArgumentArrayLayout.java
@@ -35,7 +35,7 @@
  * usually stored in a static final field of the {@link TemplateCallableModel} implementation class. Said constant
  * indexes are also usually defined in the {@link TemplateCallableModel} implementation as static final constants
  * (then feed into the {@link ArgumentArrayLayout}). Some {@link TemplateCallableModel} implementations, such as those
- * stand for macros and functions defined in the template, decide the layout on runtime instead. None the less, once
+ * stand for macros and functions defined in the template, decide the layout on runtime instead. Nonetheless, once
  * the {@link TemplateCallableModel} was created, the layout is fixed.
  * <p>
  * The layout of the array is as follows:
diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateCallableModel.java b/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateCallableModel.java
index d28775700..eef795025 100644
--- a/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateCallableModel.java
+++ b/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateCallableModel.java
@@ -22,7 +22,7 @@
 import org.apache.freemarker.core.util.CallableUtils;
 
 /**
- * Super interface (marker interface) of {@link TemplateFunctionModel} and {@link TemplateDirectiveModel}; don' extended
+ * Super interface (marker interface) of {@link TemplateFunctionModel}, and {@link TemplateDirectiveModel}; don't extend
  * (or implement) it yourself!
  * <p>
  * You can find utilities for implementing {@link TemplateCallableModel}-s in {@link CallableUtils}.
diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateDirectiveModel.java b/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateDirectiveModel.java
index 2427706d9..7ce20982a 100644
--- a/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateDirectiveModel.java
+++ b/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateDirectiveModel.java
@@ -101,7 +101,7 @@ void execute(TemplateModel[] args, CallPlace callPlace, Writer out, Environment
     /**
      * Returns the argument array layout to use when calling the {@code {@link #execute(TemplateModel[], CallPlace,
      * Writer, Environment)}} method, or rarely {@code null}. If it's {@code null} then there can only be positional
-     * arguments, any number of them (though of course the {@code execute} method implementation itself may restricts
+     * arguments, any number of them (though of course the {@code execute} method implementation itself may restrict
      * the acceptable argument count), and the argument array will be simply as long as the number of arguments
      * specified at the call place.
      */
diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateFunctionModel.java b/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateFunctionModel.java
index 4a50c2fac..ea197db68 100644
--- a/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateFunctionModel.java
+++ b/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateFunctionModel.java
@@ -60,7 +60,7 @@ public interface TemplateFunctionModel extends TemplateCallableModel {
     /**
      * Returns the argument array layout to use when calling the {@code {@link #execute(TemplateModel[], CallPlace,
      * Environment)}} method, or rarely {@code null}. If it's {@code null} then there can only be positional
-     * arguments, any number of them (though of course the {@code execute} method implementation itself may restricts
+     * arguments, any number of them (though of course the {@code execute} method implementation itself may restrict
      * the acceptable argument count), and the argument array will be simply as long as the number of arguments
      * specified at the call place. This layoutless mode is for example used by {@link JavaMethodModel}-s.
      */