Repository: incubator-freemarker Updated Branches: refs/heads/2.3-gae 35f9d6cf5 -> 1250faf0b
Minor fixes in the manual Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/e6aec2c0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/e6aec2c0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/e6aec2c0 Branch: refs/heads/2.3-gae Commit: e6aec2c05513d9d97cb770b84dbeff27df53241e Parents: 15d5fd5 Author: pyxide <[email protected]> Authored: Tue Apr 4 18:50:49 2017 +0200 Committer: pyxide <[email protected]> Committed: Tue Apr 4 18:50:49 2017 +0200 ---------------------------------------------------------------------- src/manual/en_US/book.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/e6aec2c0/src/manual/en_US/book.xml ---------------------------------------------------------------------- diff --git a/src/manual/en_US/book.xml b/src/manual/en_US/book.xml index 84c513e..30cd427 100644 --- a/src/manual/en_US/book.xml +++ b/src/manual/en_US/book.xml @@ -1012,7 +1012,7 @@ All Rights Reserved. | | | +- (1st) = 20 | | - | +- (2st) = 14 + | +- (2nd) = 14 | | | +- (3rd) = 42 | | @@ -20852,7 +20852,7 @@ All rights reserved.</emphasis></programlisting> <literal>list</literal> accepts a scalar too and treats it as a single-element sequence.</phrase></para> - <para><phrase role="forProgrammers">If you pass an collection that + <para><phrase role="forProgrammers">If you pass a collection that wraps an <literal>java.util.Iterator</literal> to the <literal>list</literal>, you can iterate over its elements only once, since <literal>Iterator</literal>s are by their nature @@ -22975,7 +22975,7 @@ There was no specific handler for node y <primary>incomplatible_improvements</primary> </indexterm><literal>incompatible_improvements</literal> (since FreeMarker 2.3.24): The <link - linkend="pgui_config_incompatible_improvements"><literal>incompatbile_improvements</literal> + linkend="pgui_config_incompatible_improvements"><literal>incompatible_improvements</literal> setting</link> of the current FreeMarker configuration, as a string.</para> </listitem> @@ -23783,12 +23783,12 @@ or linkend="ref.setting.number_format"><literal>number_format</literal> setting</link>. This is actually a backward compatibility quirk, but it can be useful when you print numbers in situations like - <literal><a href="quertyDatabase?id=#{id}"></literal>, where + <literal><a href="queryDatabase?id=#{id}"></literal>, where you surely don't want grouping separators or something fancy like that. However, starting from FreeMarker 2.3.3 rather use the <link linkend="ref_builtin_c"><literal>?c</literal> built-in</link> for this purpose, like <literal><a - href="quertyDatabase?id=${id?c}"></literal>.</para> + href="queryDatabase?id=${id?c}"></literal>.</para> <para>Examples. Assume that <literal>x</literal> is <literal>2.582</literal> and <literal>y</literal> is @@ -24944,7 +24944,7 @@ Test Book</programlisting> level, and there's no other element or non-whitespace character data (text or CDATA) between the two elements. For example in <literal><a/><!-- comment - -->#&x20;<b/></literal> the two elements are + -->&#x20;<b/></literal> the two elements are siblings, but not in <literal><a/>text<b/></literal> or <literal><a/><x/><b/></literal>.</para> </listitem> @@ -25067,7 +25067,7 @@ Test Book</programlisting> in the previous chapter -- you write an FTL program that walks the tree to find the different kind of nodes. With the declarative approach, you rather define how to handle the different kind of nodes, - and then let FreeMarker walk the tree an call the handlers you have + and then let FreeMarker walk the tree and call the handlers you have defined. This approach is useful for complex XML schemas, where the same element can occur as the child of many other elements. Examples of such schemas are XHTML and XDocBook.</para> @@ -27464,7 +27464,7 @@ TemplateModel x = env.getVariable("x"); // get variable x</programlisting> <para>Added new special variable: <literal>.incompatible_improvements</literal>, which returns the <link - linkend="pgui_config_incompatible_improvements"><literal>incompatbile_improvements</literal> + linkend="pgui_config_incompatible_improvements"><literal>incompatible_improvements</literal> setting</link> of the current FreeMarker configuration, as a string.</para> </listitem> @@ -30749,7 +30749,7 @@ TemplateModel x = env.getVariable("x"); // get variable x</programlisting> <literal>f(Object[])</literal>, the last will always win. This might sounds controversial, but as we can't efficiently tell the common type of all the items in a - sequence or <literal>List</literal>, an so we don't know + sequence or <literal>List</literal>, and so we don't know if both arrays are indeed valid targets, we go for the safest choice.</para> </listitem>
