freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject freemarker git commit: (Manual and JavaDoc typos and small improvements)
Date Wed, 11 Apr 2018 18:43:22 GMT
Repository: freemarker
Updated Branches:
  refs/heads/2.3-gae 21bf6aeed -> 0bdc181a1


(Manual and JavaDoc typos and small improvements)


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

Branch: refs/heads/2.3-gae
Commit: 0bdc181a13c1979695d7120b6cd664e3b7eef74e
Parents: 21bf6ae
Author: ddekany <ddekany@apache.org>
Authored: Wed Apr 11 20:42:59 2018 +0200
Committer: ddekany <ddekany@apache.org>
Committed: Wed Apr 11 20:42:59 2018 +0200

----------------------------------------------------------------------
 src/main/java/freemarker/template/Configuration.java | 12 ++++++++----
 src/main/java/freemarker/template/Template.java      |  1 -
 src/manual/en_US/book.xml                            |  8 ++++----
 3 files changed, 12 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/freemarker/blob/0bdc181a/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 fa9eead..0709191 100644
--- a/src/main/java/freemarker/template/Configuration.java
+++ b/src/main/java/freemarker/template/Configuration.java
@@ -2038,10 +2038,14 @@ public class Configuration extends Configurable implements Cloneable,
ParserConf
 
     /**
      * Sets when auto-escaping should be enabled depending on the current {@linkplain OutputFormat
output format};
-     * default is {@link #ENABLE_IF_DEFAULT_AUTO_ESCAPING_POLICY}. Note that the default
output format,
-     * {@link UndefinedOutputFormat}, is a non-escaping format, so there auto-escaping will
be off.
-     * Note that the templates can turn auto-escaping on/off locally with directives like
{@code <#ftl auto_esc=...>},
-     * which will ignore the policy.
+     * default is {@link #ENABLE_IF_DEFAULT_AUTO_ESCAPING_POLICY}.
+     * 
+     * <p>Note that the default output format, {@link UndefinedOutputFormat}, is a
non-escaping format, so there
+     * auto-escaping will be off.
+     * 
+     * <p>Note that the templates can turn auto-escaping on/off locally with directives
like
+     * {@code <#ftl auto_esc=...>}, {@code <#autoesc>...</#autoesc>}, and
{@code <#noautoesc>...</#noautoesc>}, which
+     * are ignoring the auto-escaping policy.
      * 
      * <p><b>About auto-escaping</b></p>
      * 

http://git-wip-us.apache.org/repos/asf/freemarker/blob/0bdc181a/src/main/java/freemarker/template/Template.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/Template.java b/src/main/java/freemarker/template/Template.java
index f21fffc..aa70c0b 100644
--- a/src/main/java/freemarker/template/Template.java
+++ b/src/main/java/freemarker/template/Template.java
@@ -57,7 +57,6 @@ import freemarker.core._CoreAPI;
 import freemarker.debug.impl.DebuggerService;
 
 /**
- * <p>
  * Stores an already parsed template, ready to be processed (rendered) for unlimited times,
possibly from multiple
  * threads.
  * 

http://git-wip-us.apache.org/repos/asf/freemarker/blob/0bdc181a/src/manual/en_US/book.xml
----------------------------------------------------------------------
diff --git a/src/manual/en_US/book.xml b/src/manual/en_US/book.xml
index 38373f4..3f43b0b 100644
--- a/src/manual/en_US/book.xml
+++ b/src/manual/en_US/book.xml
@@ -2664,14 +2664,14 @@ baz
             contain letters (including non-Latin letters), digits (including
             non-Latin digits), underline (<literal>_</literal>), dollar
             (<literal>$</literal>), at sign (<literal>@</literal>).
-            Furthermore, the first character can't be a ASCII digit
+            Furthermore, the first character can't be an ASCII digit
             (<literal>0</literal>-<literal>9</literal>). Starting
from
             FreeMarker 2.3.22, the variable name can also contain minus
             (<literal>-</literal>), dot (<literal>.</literal>), and
colon
             (<literal>:</literal>) at any position, but these must be escaped
-            with a preceding backslash (<literal>\</literal>), or else they
-            would be interpreted as operators. For example, to read the
-            variable whose name is <quote>data-id</quote>, the expression is
+            with a preceding backslash (<literal>\</literal>), otherwise they
+            are interpreted as operators. For example, to read the variable
+            whose name is <quote>data-id</quote>, the expression is
             <literal>data\-id</literal>, as <literal>data-id</literal>
would
             be interpreted as <quote>data minus id</quote>. (Note that these
             escapes only work in identifiers, not in string literals.)</para>


Mime
View raw message