Return-Path: X-Original-To: apmail-freemarker-notifications-archive@minotaur.apache.org Delivered-To: apmail-freemarker-notifications-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C27EE17D6F for ; Fri, 18 Sep 2015 13:59:54 +0000 (UTC) Received: (qmail 48240 invoked by uid 500); 18 Sep 2015 13:59:54 -0000 Delivered-To: apmail-freemarker-notifications-archive@freemarker.apache.org Received: (qmail 48224 invoked by uid 500); 18 Sep 2015 13:59:54 -0000 Mailing-List: contact notifications-help@freemarker.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@freemarker.incubator.apache.org Delivered-To: mailing list notifications@freemarker.incubator.apache.org Received: (qmail 48215 invoked by uid 99); 18 Sep 2015 13:59:54 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 Sep 2015 13:59:54 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 1BC35180976 for ; Fri, 18 Sep 2015 13:59:54 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.775 X-Spam-Level: * X-Spam-Status: No, score=1.775 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.006, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id AxQzKKo-vaBu for ; Fri, 18 Sep 2015 13:59:49 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id A043142B9A for ; Fri, 18 Sep 2015 13:59:48 +0000 (UTC) Received: (qmail 47018 invoked by uid 99); 18 Sep 2015 13:59:48 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 Sep 2015 13:59:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0F185E02FF; Fri, 18 Sep 2015 13:59:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ddekany@apache.org To: notifications@freemarker.incubator.apache.org Message-Id: <15bb7ab1b26248f88dcd4163b1543637@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-freemarker-site git commit: Added link to the updated Chiense Manual (from https://github.com/nanlei/freemarker/tree/manual-zh-2.3-gae). Date: Fri, 18 Sep 2015 13:59:48 +0000 (UTC) Repository: incubator-freemarker-site Updated Branches: refs/heads/master bd21d7d59 -> 44ceeefbb Added link to the updated Chiense Manual (from https://github.com/nanlei/freemarker/tree/manual-zh-2.3-gae). Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/commit/44ceeefb Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/tree/44ceeefb Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/diff/44ceeefb Branch: refs/heads/master Commit: 44ceeefbb6e985b0de7a48de46d4bb398d17a8c6 Parents: bd21d7d Author: ddekany Authored: Fri Sep 18 15:59:05 2015 +0200 Committer: ddekany Committed: Fri Sep 18 15:59:05 2015 +0200 ---------------------------------------------------------------------- src/main/docgen/book.xml | 7 +++++++ src/main/docgen/docgen.cjson | 1 + 2 files changed, 8 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/44ceeefb/src/main/docgen/book.xml ---------------------------------------------------------------------- diff --git a/src/main/docgen/book.xml b/src/main/docgen/book.xml index 5c977b8..5d61d2c 100644 --- a/src/main/docgen/book.xml +++ b/src/main/docgen/book.xml @@ -259,6 +259,13 @@ two freemarker.jar-s and unpredictable behavior! + +
+ <olink targetdoc="chienseManual">Manual Chinese + translation</olink> + + +
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/44ceeefb/src/main/docgen/docgen.cjson ---------------------------------------------------------------------- diff --git a/src/main/docgen/docgen.cjson b/src/main/docgen/docgen.cjson index bc165eb..0476d08 100644 --- a/src/main/docgen/docgen.cjson +++ b/src/main/docgen/docgen.cjson @@ -34,6 +34,7 @@ olinks: { // Manual links: manual: "docs/index.html" api: "docs/api/index.html" + chienseManual: "https://sourceforge.net/projects/freemarker/files/chinese-manual/" templateAuthorsGuide: "docs/dgui_quickstart_basics.html" license: "docs/app_license.html" versionHistory: "docs/app_versions.html"