Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 58DED200C4E for ; Wed, 1 Mar 2017 15:21:04 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 57785160B5E; Wed, 1 Mar 2017 14:21:04 +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 9D3DA160B78 for ; Wed, 1 Mar 2017 15:21:03 +0100 (CET) Received: (qmail 4697 invoked by uid 500); 1 Mar 2017 14:21:02 -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 4641 invoked by uid 99); 1 Mar 2017 14:21:02 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Mar 2017 14:21:02 +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 20D1218E0ED for ; Wed, 1 Mar 2017 14:21:02 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -6.567 X-Spam-Level: X-Spam-Status: No, score=-6.567 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, RP_MATCHES_RCVD=-2.999, SPF_NEUTRAL=0.652] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id sAR1o8OWuzU4 for ; Wed, 1 Mar 2017 14:21:01 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 712B35FBE2 for ; Wed, 1 Mar 2017 14:21:00 +0000 (UTC) Received: (qmail 4498 invoked by uid 99); 1 Mar 2017 14:20:59 -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; Wed, 01 Mar 2017 14:20:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A36E2DFCA1; Wed, 1 Mar 2017 14:20:59 +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: Wed, 01 Mar 2017 14:20:59 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [01/50] [abbrv] incubator-freemarker git commit: (JavaDoc typo fix) archived-at: Wed, 01 Mar 2017 14:21:04 -0000 Repository: incubator-freemarker Updated Branches: refs/heads/2.3 402d66744 -> 617ad6fc0 (JavaDoc 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/81613498 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/81613498 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/81613498 Branch: refs/heads/2.3 Commit: 816134989482e95cbb1f14c7e119b275e02ab610 Parents: 43ae3de Author: ddekany Authored: Tue Jan 24 23:50:17 2017 +0100 Committer: ddekany Committed: Tue Jan 24 23:50:17 2017 +0100 ---------------------------------------------------------------------- src/main/java/freemarker/core/Environment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/81613498/src/main/java/freemarker/core/Environment.java ---------------------------------------------------------------------- diff --git a/src/main/java/freemarker/core/Environment.java b/src/main/java/freemarker/core/Environment.java index 3e454d6..876fbba 100644 --- a/src/main/java/freemarker/core/Environment.java +++ b/src/main/java/freemarker/core/Environment.java @@ -2672,7 +2672,7 @@ public final class Environment extends Configurable { * {@link TemplateNameFormat#DEFAULT_2_4_0}, the rules are as follows. If you want to specify a base * directory here, it must end with {@code "/"}. If it doesn't end with {@code "/"}, it's parent * directory will be used as the base path. Might starts with a scheme part (like {@code "foo://"}, or - * with {@link TemplateNameFormat#DEFAULT_2_4_0} even just {@code "foo:"}). + * with {@link TemplateNameFormat#DEFAULT_2_4_0} even just with {@code "foo:"}). * @param targetName * The name of the template, which is either a relative or absolute name. Assuming * {@link TemplateNameFormat#DEFAULT_2_3_0} or {@link TemplateNameFormat#DEFAULT_2_4_0}, the rules are as