Merged: Change links to https for freemarker website Merge commit 'refs/pull/38/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/93c9ce3b Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/93c9ce3b Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/93c9ce3b Branch: refs/heads/2.3 Commit: 93c9ce3b0ba849abcb8e861065da43f49bf5d40d Parents: 97cdfb9 747d207 Author: ddekany <ddek...@apache.org> Authored: Sat Nov 11 17:10:11 2017 +0100 Committer: ddekany <ddek...@apache.org> Committed: Sat Nov 11 18:46:00 2017 +0100 ---------------------------------------------------------------------- README.md | 8 +++--- RELEASE-NOTES | 2 +- build.xml | 4 +-- ivy.xml | 6 ++--- src/dist/bin/documentation/index.html | 4 +-- src/main/java/freemarker/core/BuiltIn.java | 2 +- src/main/java/freemarker/ext/dom/package.html | 2 +- .../java/freemarker/ext/servlet/package.html | 2 +- src/main/java/freemarker/template/Template.java | 2 +- .../freemarker/template/TemplateNodeModel.java | 2 +- src/main/java/freemarker/template/package.html | 2 +- src/manual/en_US/book.xml | 26 ++++++++++---------- src/manual/en_US/docgen.cjson | 22 ++++++++--------- src/manual/zh_CN/book.xml | 20 +++++++-------- src/manual/zh_CN/docgen.cjson | 20 +++++++-------- 15 files changed, 62 insertions(+), 62 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/93c9ce3b/src/manual/en_US/book.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/93c9ce3b/src/manual/zh_CN/book.xml ----------------------------------------------------------------------
