(Documentation typo fixes and small adjustments.)
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/d3654bc3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/d3654bc3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/d3654bc3 Branch: refs/heads/2.3 Commit: d3654bc3eea27c2a9c7b2fbe43c7ec0a793df14b Parents: ea39153 Author: ddekany <[email protected]> Authored: Sat Dec 26 21:50:27 2015 +0100 Committer: ddekany <[email protected]> Committed: Sat Dec 26 21:50:27 2015 +0100 ---------------------------------------------------------------------- src/main/java/freemarker/core/Configurable.java | 5 +++-- src/manual/en_US/book.xml | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/d3654bc3/src/main/java/freemarker/core/Configurable.java ---------------------------------------------------------------------- diff --git a/src/main/java/freemarker/core/Configurable.java b/src/main/java/freemarker/core/Configurable.java index adba746..5594ba0 100644 --- a/src/main/java/freemarker/core/Configurable.java +++ b/src/main/java/freemarker/core/Configurable.java @@ -1536,8 +1536,9 @@ public class Configurable { /** * Sets a FreeMarker setting by a name and string value. If you can configure FreeMarker directly with Java (or * other programming language), you should use the dedicated setter methods instead (like - * {@link #setObjectWrapper(ObjectWrapper)}. This meant to be used if you get the settings from somewhere - * as text. Regardless, below you will find an overview of the settings available no matter how you set them. + * {@link #setObjectWrapper(ObjectWrapper)}. This meant to be used only when you get settings from somewhere + * as {@link String}-{@link String} name-value pairs (typically, as a {@link Properties} object). Below you find an + * overview of the settings available. * * <p>Note: As of FreeMarker 2.3.23, setting names can be written in camel case too. For example, instead of * {@code date_format} you can also use {@code dateFormat}. It's likely that camel case will become to the http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/d3654bc3/src/manual/en_US/book.xml ---------------------------------------------------------------------- diff --git a/src/manual/en_US/book.xml b/src/manual/en_US/book.xml index 51fae1f..555c8e4 100644 --- a/src/manual/en_US/book.xml +++ b/src/manual/en_US/book.xml @@ -8069,7 +8069,7 @@ myCfg.setDefaultEncoding("UTF-8");</programlisting> </listitem> <listitem> - <para><literal>Environment </literal>layer: There are two ways + <para><literal>Environment </literal>layer: There are two ways of doing it:</para> <itemizedlist> @@ -17617,7 +17617,7 @@ Sorted by name.last: <primary>interpret built-in</primary> </indexterm> - <para>This built-in parser a string as an FTL template, and returns + <para>This built-in parses a string as an FTL template, and returns an user-defined directive that executes that template, just as if a template with that content were <link linkend="ref_directive_include"><literal>include</literal>-d</link> @@ -17642,7 +17642,7 @@ Sorted by name.last: <literal>Configuration</literal> object, not from template that calls <literal>interpret</literal>. This also means that the previously auto-detected tag syntax or auto-detected naming - convention don't effect the parsing of the interpreted template. + convention doesn't effect the parsing of the interpreted template. This is consistent with how the <link linkend="ref_directive_include"><literal>include</literal> directive</link> works.</para>
