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 BB280185F7 for ; Sat, 19 Dec 2015 16:51:17 +0000 (UTC) Received: (qmail 62887 invoked by uid 500); 19 Dec 2015 16:51:17 -0000 Delivered-To: apmail-freemarker-notifications-archive@freemarker.apache.org Received: (qmail 62866 invoked by uid 500); 19 Dec 2015 16:51:17 -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 62857 invoked by uid 99); 19 Dec 2015 16:51:17 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 19 Dec 2015 16:51:17 +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 1B31FC80EC for ; Sat, 19 Dec 2015 16:51:17 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.77 X-Spam-Level: * X-Spam-Status: No, score=1.77 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, T_RP_MATCHES_RCVD=-0.01] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id aNiI61TCqNOp for ; Sat, 19 Dec 2015 16:51:16 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id 706D721488 for ; Sat, 19 Dec 2015 16:51:15 +0000 (UTC) Received: (qmail 62848 invoked by uid 99); 19 Dec 2015 16:51:14 -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; Sat, 19 Dec 2015 16:51:14 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3E9C1E09DE; Sat, 19 Dec 2015 16:51:14 +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: Sat, 19 Dec 2015 16:51:20 -0000 Message-Id: <993079ae88004780921ed0c7d638192f@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [7/8] incubator-freemarker git commit: (Error message typo fix) (Error message typo fix) Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/41b6f834 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/41b6f834 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/41b6f834 Branch: refs/heads/2.3 Commit: 41b6f8342b3d6252d4927cd5729d2917934e500b Parents: ea5c47d Author: ddekany Authored: Sat Dec 19 17:42:40 2015 +0100 Committer: ddekany Committed: Sat Dec 19 17:42:40 2015 +0100 ---------------------------------------------------------------------- src/main/java/freemarker/core/Items.java | 2 +- src/main/java/freemarker/core/Sep.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/41b6f834/src/main/java/freemarker/core/Items.java ---------------------------------------------------------------------- diff --git a/src/main/java/freemarker/core/Items.java b/src/main/java/freemarker/core/Items.java index 38bc5a6..f588093 100644 --- a/src/main/java/freemarker/core/Items.java +++ b/src/main/java/freemarker/core/Items.java @@ -41,7 +41,7 @@ class Items extends TemplateElement { if (iterCtx == null) { // The parser should prevent this situation throw new _MiscTemplateException(env, - getNodeTypeSymbol(), " without iteraton in context"); + getNodeTypeSymbol(), " without iteration in context"); } iterCtx.loopForItemsElement(env, getChildBuffer(), loopVarName); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/41b6f834/src/main/java/freemarker/core/Sep.java ---------------------------------------------------------------------- diff --git a/src/main/java/freemarker/core/Sep.java b/src/main/java/freemarker/core/Sep.java index 0ae5de2..848bcd8 100644 --- a/src/main/java/freemarker/core/Sep.java +++ b/src/main/java/freemarker/core/Sep.java @@ -38,7 +38,7 @@ class Sep extends TemplateElement { if (iterCtx == null) { // The parser should prevent this situation throw new _MiscTemplateException(env, - getNodeTypeSymbol(), " without iteraton in context"); + getNodeTypeSymbol(), " without iteration in context"); } if (iterCtx.hasNext()) {