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 38F3B197E3 for ; Sat, 26 Mar 2016 15:41:20 +0000 (UTC) Received: (qmail 30176 invoked by uid 500); 26 Mar 2016 15:41:20 -0000 Delivered-To: apmail-freemarker-notifications-archive@freemarker.apache.org Received: (qmail 30165 invoked by uid 500); 26 Mar 2016 15:41:19 -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 30156 invoked by uid 99); 26 Mar 2016 15:41:19 -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; Sat, 26 Mar 2016 15:41:19 +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 68147C018D for ; Sat, 26 Mar 2016 15:41:19 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.216 X-Spam-Level: X-Spam-Status: No, score=-4.216 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.996] 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 lAkAyJrTFgRT for ; Sat, 26 Mar 2016 15:41:18 +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 B2B9D5FB31 for ; Sat, 26 Mar 2016 15:41:17 +0000 (UTC) Received: (qmail 29777 invoked by uid 99); 26 Mar 2016 15:41:16 -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, 26 Mar 2016 15:41:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 22018E9813; Sat, 26 Mar 2016 15:41:16 +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, 26 Mar 2016 15:41:33 -0000 Message-Id: In-Reply-To: <8c7376f324c743db965a0b1f464bdb3b@git.apache.org> References: <8c7376f324c743db965a0b1f464bdb3b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [19/32] incubator-freemarker git commit: (JavaDoc typos) (JavaDoc typos) Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/a925da5d Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/a925da5d Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/a925da5d Branch: refs/heads/2.3 Commit: a925da5dafec3db731bf41a75e755c42a3de00fb Parents: da3b1a6 Author: ddekany Authored: Mon Mar 14 14:52:58 2016 +0100 Committer: ddekany Committed: Mon Mar 14 14:52:58 2016 +0100 ---------------------------------------------------------------------- src/main/java/freemarker/core/TemplateConfiguration.java | 4 ++-- src/main/java/freemarker/template/DefaultObjectWrapper.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a925da5d/src/main/java/freemarker/core/TemplateConfiguration.java ---------------------------------------------------------------------- diff --git a/src/main/java/freemarker/core/TemplateConfiguration.java b/src/main/java/freemarker/core/TemplateConfiguration.java index 2c89d01..50ebc8f 100644 --- a/src/main/java/freemarker/core/TemplateConfiguration.java +++ b/src/main/java/freemarker/core/TemplateConfiguration.java @@ -38,11 +38,11 @@ import freemarker.template.utility.NullArgumentException; *

* Note on the {@code locale} setting: When used with the standard template loading/caching mechanism ( * {@link Configuration#getTemplate(String)} and its overloads), localized lookup happens before the {@code locale} - * specified here could have effect. The {@code locale} will be only set in the template that the localized looks has + * specified here could have effect. The {@code locale} will be only set in the template that the localized lookup has * already found. * *

- * Note on encoding setting {@code encoding}: See {@link #setEncoding(String)}. + * Note on the encoding setting {@code encoding}: See {@link #setEncoding(String)}. * *

* Note that the result value of the reader methods (getter and "is" methods) is usually not useful unless the value of http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a925da5d/src/main/java/freemarker/template/DefaultObjectWrapper.java ---------------------------------------------------------------------- diff --git a/src/main/java/freemarker/template/DefaultObjectWrapper.java b/src/main/java/freemarker/template/DefaultObjectWrapper.java index bda6f32..8753ebb 100644 --- a/src/main/java/freemarker/template/DefaultObjectWrapper.java +++ b/src/main/java/freemarker/template/DefaultObjectWrapper.java @@ -226,7 +226,7 @@ public class DefaultObjectWrapper extends freemarker.ext.beans.BeansWrapper { } /** - * Called for an object that aren't considered to be of a "basic" Java type, like for an application specific type, + * Called for an object that isn't considered to be of a "basic" Java type, like for an application specific type, * or for a W3C DOM node. In its default implementation, W3C {@link Node}-s will be wrapped as {@link NodeModel}-s * (allows DOM tree traversal), Jython objects will be delegated to the {@code JythonWrapper}, others will be * wrapped using {@link BeansWrapper#wrap(Object)}.