From notifications-return-4935-archive-asf-public=cust-asf.ponee.io@freemarker.incubator.apache.org Thu Jan 25 10:50:45 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id DADF9180651 for ; Thu, 25 Jan 2018 10:50:45 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id CABE5160C3D; Thu, 25 Jan 2018 09:50:45 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 1F87E160C13 for ; Thu, 25 Jan 2018 10:50:44 +0100 (CET) Received: (qmail 6802 invoked by uid 500); 25 Jan 2018 09:50:44 -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 6793 invoked by uid 99); 25 Jan 2018 09:50:44 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Jan 2018 09:50:44 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id EB357C10F0 for ; Thu, 25 Jan 2018 09:50:43 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -11.731 X-Spam-Level: X-Spam-Status: No, score=-11.731 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-0.01, USER_IN_DEF_SPF_WL=-7.5] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id viOkBRJKqydY for ; Thu, 25 Jan 2018 09:50:41 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with SMTP id 6C3D85F2C3 for ; Thu, 25 Jan 2018 09:50:41 +0000 (UTC) Received: (qmail 6729 invoked by uid 99); 25 Jan 2018 09:50:41 -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; Thu, 25 Jan 2018 09:50:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 20F6BE04DB; Thu, 25 Jan 2018 09:50:40 +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 Date: Thu, 25 Jan 2018 09:50:41 -0000 Message-Id: <4ccfda7e931a453b82c3fa61be95541b@git.apache.org> In-Reply-To: <67cc9409e3ce4ce9aa2d217c3dc99aba@git.apache.org> References: <67cc9409e3ce4ce9aa2d217c3dc99aba@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] incubator-freemarker git commit: Merged: Manual: emphasize difference between eval and interpret built-ins Merged: Manual: emphasize difference between eval and interpret built-ins Merge commit 'refs/pull/45/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/70e5607f Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/70e5607f Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/70e5607f Branch: refs/heads/2.3-gae Commit: 70e5607f7f79aecd779caff66bdb63e86ee5a538 Parents: 794ce9a 90fc687 Author: ddekany Authored: Thu Jan 25 10:48:32 2018 +0100 Committer: ddekany Committed: Thu Jan 25 10:50:28 2018 +0100 ---------------------------------------------------------------------- src/manual/en_US/book.xml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/70e5607f/src/manual/en_US/book.xml ----------------------------------------------------------------------