You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2019/09/22 21:48:52 UTC
[freemarker] 03/05: (Minor JavaDoc improvement)
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 985560b862124f83e4519de462b034e4f03fcc0f
Author: ddekany <dd...@apache.org>
AuthorDate: Sat Sep 21 13:48:51 2019 +0200
(Minor JavaDoc improvement)
---
src/main/java/freemarker/core/Environment.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/freemarker/core/Environment.java b/src/main/java/freemarker/core/Environment.java
index 5838646..6136583 100644
--- a/src/main/java/freemarker/core/Environment.java
+++ b/src/main/java/freemarker/core/Environment.java
@@ -2092,9 +2092,10 @@ public final class Environment extends Configurable {
}
/**
- * Returns the globally visible variable of the given name (or null). This is correspondent to FTL
+ * Returns the globally visible variable of the given name (or null). This is corresponds to FTL
* <code>.globals.<i>name</i></code>. This will first look at variables that were assigned globally via: <#global
- * ...> and then at the data model exposed to the template.
+ * ...> and then at the data model exposed to the template, and then at the
+ * {@linkplain Configuration#setSharedVariables(Map)} shared variables} in the {@link Configuration}.
*/
public TemplateModel getGlobalVariable(String name) throws TemplateModelException {
TemplateModel result = globalNamespace.get(name);