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 2017/11/10 13:48:21 UTC
[1/2] incubator-freemarker git commit: Fix typo
Repository: incubator-freemarker
Updated Branches:
refs/heads/2.3-gae 95671a5ea -> 97cdfb986
Fix typo
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/292f3ffd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/292f3ffd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/292f3ffd
Branch: refs/heads/2.3-gae
Commit: 292f3ffd73631a78fd28ccaed7b19fe8bf2315b5
Parents: 95671a5
Author: Yanming Zhou <zh...@gmail.com>
Authored: Fri Nov 10 12:11:28 2017 +0800
Committer: Yanming Zhou <zh...@gmail.com>
Committed: Fri Nov 10 12:11:28 2017 +0800
----------------------------------------------------------------------
src/manual/en_US/book.xml | 2 +-
src/manual/zh_CN/book.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/292f3ffd/src/manual/en_US/book.xml
----------------------------------------------------------------------
diff --git a/src/manual/en_US/book.xml b/src/manual/en_US/book.xml
index 4e25ad3..77f9002 100644
--- a/src/manual/en_US/book.xml
+++ b/src/manual/en_US/book.xml
@@ -13719,7 +13719,7 @@ String BEAN_NAME = "${beanName?j_string}";</programlisting>
but keeps the part before the last occurrence of the parameter,
rather than after the first. Example:</para>
- <programlisting role="template">${"foo.bar.txt"?keep_after_last(".")}</programlisting>
+ <programlisting role="template">${"foo.bar.txt"?keep_before_last(".")}</programlisting>
<para>will print</para>
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/292f3ffd/src/manual/zh_CN/book.xml
----------------------------------------------------------------------
diff --git a/src/manual/zh_CN/book.xml b/src/manual/zh_CN/book.xml
index 59b19d4..6dba49a 100644
--- a/src/manual/zh_CN/book.xml
+++ b/src/manual/zh_CN/book.xml
@@ -10207,7 +10207,7 @@ String BEAN_NAME = "${beanName?j_string}";</programlisting>
linkend="ref_builtin_keep_before"><literal>keep_before</literal></link> 相同,
但是保留参数最后一次出现之前的部分,而不是第一次出现之前。比如:</para>
- <programlisting role="template">${"foo.bar.txt"?keep_after_last(".")}</programlisting>
+ <programlisting role="template">${"foo.bar.txt"?keep_before_last(".")}</programlisting>
<para>将会输出</para>
[2/2] incubator-freemarker git commit: Merged PR: Manual typos
Posted by dd...@apache.org.
Merged PR: Manual typos
Merge commit 'refs/pull/39/head' of https://github.com/apache/incubator-freemarker into 2.3-gae
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/97cdfb98
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/97cdfb98
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/97cdfb98
Branch: refs/heads/2.3-gae
Commit: 97cdfb9861d69784ca7e59439396a26bee567b94
Parents: 95671a5 292f3ff
Author: ddekany <dd...@apache.org>
Authored: Fri Nov 10 14:42:50 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Fri Nov 10 14:48:09 2017 +0100
----------------------------------------------------------------------
src/manual/en_US/book.xml | 2 +-
src/manual/zh_CN/book.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------