freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [1/2] incubator-freemarker git commit: (Minor JavaDoc improvements)
Date Mon, 17 Apr 2017 09:39:12 GMT
Repository: incubator-freemarker
Updated Branches:
  refs/heads/2.3-gae 62e267859 -> 7295c65f9


(Minor JavaDoc improvements)


Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/9a609744
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/9a609744
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/9a609744

Branch: refs/heads/2.3-gae
Commit: 9a609744e0494df0bd90c36f4bc9af926619e946
Parents: 62e2678
Author: ddekany <ddekany@apache.org>
Authored: Mon Apr 17 11:38:30 2017 +0200
Committer: ddekany <ddekany@apache.org>
Committed: Mon Apr 17 11:38:30 2017 +0200

----------------------------------------------------------------------
 src/main/java/freemarker/core/Configurable.java      | 4 ++--
 src/main/java/freemarker/template/Configuration.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/9a609744/src/main/java/freemarker/core/Configurable.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/Configurable.java b/src/main/java/freemarker/core/Configurable.java
index 3aff2a6..7262e4f 100644
--- a/src/main/java/freemarker/core/Configurable.java
+++ b/src/main/java/freemarker/core/Configurable.java
@@ -1427,7 +1427,7 @@ public class Configurable {
     }
     
     /**
-     * Sets the URL escaping charset. If not set ({@code null}), the output encoding
+     * Sets the URL escaping (URL encoding, percentage encoding) charset. If {@code null},
the output encoding
      * ({@link #setOutputEncoding(String)}) will be used for URL escaping.
      * 
      * Defaults to {@code null}.
@@ -1720,7 +1720,7 @@ public class Configurable {
      * set to 2.3.24 fixes a rarely surfacing bug with that).
      * 
      * <p>
-     * It's recommended to set the {@code auto_impots_lazy} setting ({@link Configuration#setLazyAutoImports(Boolean)})
+     * It's recommended to set the {@code lazy_auto_imports} setting ({@link Configuration#setLazyAutoImports(Boolean)})
      * to {@code true} when using this, so that auto-imports that are unused in a template
won't degrade performance by
      * unnecessary loading and initializing the imported library.
      * 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/9a609744/src/main/java/freemarker/template/Configuration.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/Configuration.java b/src/main/java/freemarker/template/Configuration.java
index ca5ee72..ca6729c 100644
--- a/src/main/java/freemarker/template/Configuration.java
+++ b/src/main/java/freemarker/template/Configuration.java
@@ -2983,7 +2983,7 @@ public class Configuration extends Configurable implements Cloneable,
ParserConf
                     if (!(item instanceof OutputFormat)) {
                         throw new _MiscTemplateException(getEnvironment(),
                                 "Invalid value for setting ", new _DelayedJQuote(name), ":
List items must be "
-                                + OutputFormat.class.getName() + " intances, in: ", value);
+                                + OutputFormat.class.getName() + " instances, in: ", value);
                     }
                 }
                 setRegisteredCustomOutputFormats(list);


Mime
View raw message