This is an automated email from the ASF dual-hosted git repository.
ddekany pushed a commit to branch 3
in repository https://gitbox.apache.org/repos/asf/freemarker.git
The following commit(s) were added to refs/heads/3 by this push:
new 9a9cd8f6 (Some javadoc typo fixes)
9a9cd8f6 is described below
commit 9a9cd8f6a96718432a2c712b24ec03e1d426258a
Author: ddekany <[email protected]>
AuthorDate: Fri Dec 22 18:30:54 2023 +0100
(Some javadoc typo fixes)
---
.../main/java/org/apache/freemarker/core/model/ArgumentArrayLayout.java | 2 +-
.../java/org/apache/freemarker/core/model/TemplateCallableModel.java | 2 +-
.../java/org/apache/freemarker/core/model/TemplateDirectiveModel.java | 2 +-
.../java/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 c64ae02f..c9358b04 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 @@ import org.apache.freemarker.core.util.StringToIndexMap;
* 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 d2877570..eef79502 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 @@ package org.apache.freemarker.core.model;
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 2427706d..7ce20982 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 @@ public interface TemplateDirectiveModel extends
TemplateCallableModel {
/**
* 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 4a50c2fa..ea197db6 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.
*/
