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/01/06 20:56:53 UTC
[1/7] incubator-freemarker git commit: (Addition to
editors-readme.txt)
Repository: incubator-freemarker
Updated Branches:
refs/heads/2.3 870b42825 -> 402d66744
(Addition to editors-readme.txt)
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/d0ce4ffb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/d0ce4ffb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/d0ce4ffb
Branch: refs/heads/2.3
Commit: d0ce4ffbfa132252af8c27e2cd42dd316e9b9b69
Parents: 6dea2fa
Author: ddekany <dd...@apache.org>
Authored: Thu Jan 5 10:23:22 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Thu Jan 5 10:23:22 2017 +0100
----------------------------------------------------------------------
src/manual/en_US/docgen-help/editors-readme.txt | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/d0ce4ffb/src/manual/en_US/docgen-help/editors-readme.txt
----------------------------------------------------------------------
diff --git a/src/manual/en_US/docgen-help/editors-readme.txt b/src/manual/en_US/docgen-help/editors-readme.txt
index d556d12..a270269 100644
--- a/src/manual/en_US/docgen-help/editors-readme.txt
+++ b/src/manual/en_US/docgen-help/editors-readme.txt
@@ -122,3 +122,9 @@ Technical
then it's deduced from the titles.
- The "book" element must have this attribute: conformance="docgen"
+
+- It sometimes happens that you want to change some content that you see in
+ the generated output, which you can't find in the DocBook XML. In such case,
+ check the contents docgen.cjson, which should be in the same directory as
+ the XML. If it's not there either, it's perhaps hard-wired into the
+ templates in docgen.
[5/7] incubator-freemarker git commit: closes
apache/incubator-freemarker#3: .gitignore was extended since then,
and it seems to cover these cases
Posted by dd...@apache.org.
closes apache/incubator-freemarker#3: .gitignore was extended since then, and it seems to cover these cases
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/e6365092
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/e6365092
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/e6365092
Branch: refs/heads/2.3
Commit: e63650928e7fb4668e11e727799a32c920da852f
Parents: e80d25b
Author: ddekany <dd...@apache.org>
Authored: Fri Jan 6 21:51:51 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Fri Jan 6 21:51:51 2017 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------
[6/7] incubator-freemarker git commit: closes
apache/incubator-freemarker#10: I guess this PR was meant to be a question.
Closed PR without merging.
Posted by dd...@apache.org.
closes apache/incubator-freemarker#10: I guess this PR was meant to be a question. Closed PR without merging.
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/2a58032e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/2a58032e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/2a58032e
Branch: refs/heads/2.3
Commit: 2a58032ecfa250d48fa6e19e05d52741fd5301fa
Parents: e636509
Author: ddekany <dd...@apache.org>
Authored: Fri Jan 6 21:55:30 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Fri Jan 6 21:55:30 2017 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------
[4/7] incubator-freemarker git commit: Adjusted gitignore to match
some more files
Posted by dd...@apache.org.
Adjusted gitignore to match some more files
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/e80d25b8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/e80d25b8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/e80d25b8
Branch: refs/heads/2.3
Commit: e80d25b8c2e0a3aa66ba2cf2f72f9fe19d24a567
Parents: f0fd0d5
Author: ddekany <dd...@apache.org>
Authored: Fri Jan 6 21:32:23 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Fri Jan 6 21:32:23 2017 +0100
----------------------------------------------------------------------
.gitignore | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/e80d25b8/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index a3c82cd..f30cd69 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,9 +27,9 @@
.gradle
-.DS_Store
+.DS_Store*
.AppleDouble
.LSOverride
.directory
-.Trash-*
+.Trash*
[2/7] incubator-freemarker git commit: Added trademark notes to the
copyright header.
Posted by dd...@apache.org.
Added trademark notes to the copyright header.
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/d7d02af3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/d7d02af3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/d7d02af3
Branch: refs/heads/2.3
Commit: d7d02af3fb95948926a649d42bcea37ab288981c
Parents: d0ce4ff
Author: ddekany <dd...@apache.org>
Authored: Fri Jan 6 20:46:56 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Fri Jan 6 20:46:56 2017 +0100
----------------------------------------------------------------------
src/manual/en_US/docgen.cjson | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/d7d02af3/src/manual/en_US/docgen.cjson
----------------------------------------------------------------------
diff --git a/src/manual/en_US/docgen.cjson b/src/manual/en_US/docgen.cjson
index 088469e..c0196e5 100644
--- a/src/manual/en_US/docgen.cjson
+++ b/src/manual/en_US/docgen.cjson
@@ -34,6 +34,7 @@ generateEclipseTOC
removeNodesWhenOnline: [ "preface" ]
copyrightHolder: "The Apache Software Foundation"
+copyrightSuffix: "Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation."
copyrightStartYear: 1999
copyrightCommentFile: "docgen-misc/copyrightComment.txt"
[7/7] incubator-freemarker git commit: Merge remote-tracking branch
'origin/2.3-gae' into 2.3
Posted by dd...@apache.org.
Merge remote-tracking branch 'origin/2.3-gae' into 2.3
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/402d6674
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/402d6674
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/402d6674
Branch: refs/heads/2.3
Commit: 402d66744f84a66b5a328613fce751e359d05165
Parents: 870b428 2a58032
Author: ddekany <dd...@apache.org>
Authored: Fri Jan 6 21:56:34 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Fri Jan 6 21:56:34 2017 +0100
----------------------------------------------------------------------
.gitignore | 4 ++--
src/manual/en_US/docgen-help/editors-readme.txt | 6 ++++++
src/manual/en_US/docgen.cjson | 1 +
3 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[3/7] incubator-freemarker git commit: closes
apache/incubator-freemarker#11 *Closing certainly accidental PR without
merging*
Posted by dd...@apache.org.
closes apache/incubator-freemarker#11 *Closing certainly accidental PR without merging*
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/f0fd0d58
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/f0fd0d58
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/f0fd0d58
Branch: refs/heads/2.3
Commit: f0fd0d58042060767e25dc3cc444b282b0ac7b42
Parents: d7d02af
Author: ddekany <dd...@apache.org>
Authored: Fri Jan 6 21:27:04 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Fri Jan 6 21:27:04 2017 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------