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 2018/01/25 09:44:57 UTC
[1/2] incubator-freemarker git commit: remove duplicate 'you cannot'
Repository: incubator-freemarker
Updated Branches:
refs/heads/2.3-gae 7a94e59d9 -> 794ce9a14
remove duplicate 'you cannot'
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/9caed4a6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/9caed4a6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/9caed4a6
Branch: refs/heads/2.3-gae
Commit: 9caed4a6760855cdd0fa285d362e3a2c577d2445
Parents: 7a94e59
Author: 靳阳 <ya...@dianping.com>
Authored: Wed Jan 24 19:45:55 2018 +0800
Committer: 靳阳 <ya...@dianping.com>
Committed: Wed Jan 24 19:45:55 2018 +0800
----------------------------------------------------------------------
src/manual/en_US/book.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/9caed4a6/src/manual/en_US/book.xml
----------------------------------------------------------------------
diff --git a/src/manual/en_US/book.xml b/src/manual/en_US/book.xml
index c61f02e..97f824e 100644
--- a/src/manual/en_US/book.xml
+++ b/src/manual/en_US/book.xml
@@ -117,7 +117,7 @@
<para>But the user's name ("John Doe" above) depends on who the
logged-in user is, and the latest product information should come from
- a database. Because this data changes, you cannot you cannot use
+ a database. Because this data changes, you cannot use
static HTML. Instead, you can use a <emphasis
role="term">template</emphasis> of the desired output. The template is
the same as the static HTML would be, except that it contains some
[2/2] incubator-freemarker git commit: Merged: Manual typo
Posted by dd...@apache.org.
Merged: Manual typo
Merge commit 'refs/pull/44/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/794ce9a1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/794ce9a1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/794ce9a1
Branch: refs/heads/2.3-gae
Commit: 794ce9a14d6ce263f61d075ff714fc0cd5eafe9b
Parents: 7a94e59 9caed4a
Author: ddekany <dd...@apache.org>
Authored: Thu Jan 25 10:43:03 2018 +0100
Committer: ddekany <dd...@apache.org>
Committed: Thu Jan 25 10:44:47 2018 +0100
----------------------------------------------------------------------
src/manual/en_US/book.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------