Mailing-List: contact notifications-help@freemarker.incubator.apache.org;
 run by ezmlm
Precedence: bulk
Reply-To: dev@freemarker.incubator.apache.org
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: Mon, 14 Mar 2016 13:53:15 -0000
Message-Id: <bd1c7a99d3de4a21afdddf9ea06bb8be@git.apache.org>
In-Reply-To: <4ed7d1c849ed4243beeb7c3354ceb0c9@git.apache.org>
References: <4ed7d1c849ed4243beeb7c3354ceb0c9@git.apache.org>
Subject: [2/2] 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.24-gae-stabilization
Commit: a925da5dafec3db731bf41a75e755c42a3de00fb
Parents: da3b1a6
Author: ddekany <ddekany@apache.org>
Authored: Mon Mar 14 14:52:58 2016 +0100
Committer: ddekany <ddekany@apache.org>
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;
  * <p>
  * 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.
  * 
  * <p>
- * Note on encoding setting {@code encoding}: See {@link #setEncoding(String)}.
+ * Note on the encoding setting {@code encoding}: See {@link #setEncoding(String)}.
  * 
  * <p>
  * 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)}.