You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2016/12/06 22:30:00 UTC
[05/24] incubator-freemarker git commit: more text clean up, typos
more text clean up, 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/b64ab137
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/b64ab137
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/b64ab137
Branch: refs/heads/2.3
Commit: b64ab13748c100ae9964e142d107d9fd9d42ea5c
Parents: a3fa4d2
Author: ratherblue <ra...@gmail.com>
Authored: Mon Jul 25 23:11:55 2016 -0700
Committer: ratherblue <ra...@gmail.com>
Committed: Mon Jul 25 23:11:55 2016 -0700
----------------------------------------------------------------------
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/b64ab137/src/manual/en_US/book.xml
----------------------------------------------------------------------
diff --git a/src/manual/en_US/book.xml b/src/manual/en_US/book.xml
index 18c486d..2938787 100644
--- a/src/manual/en_US/book.xml
+++ b/src/manual/en_US/book.xml
@@ -419,8 +419,8 @@
</itemizedlist>
<para>Anything not an FTL tag or an interpolation or comment is
- considered as static text, and will not be interpreted by FreeMarker;
- it is just printed to the output as is.</para>
+ considered static text and will not be interpreted by FreeMarker;
+ it is just printed to the output as-is.</para>
<para>With FTL tags you refer to so-called <emphasis
role="term">directives</emphasis>. This is the same kind of
@@ -428,8 +428,8 @@
<literal><table></literal> and
<literal></table></literal>) and HTML elements (e.g., the
<literal>table</literal> element) to which you refer to with the HTML
- tags. (If you don't feel this difference then just take "FTL tag" and
- "directive" as synonyms.)</para>
+ tags. (If you don't understand this difference then consider "FTL tag" and
+ "directive" synonyms.)</para>
<note>
<para>You can easily try writing templates on <link
@@ -498,8 +498,8 @@
<para>Similarly as earlier when a string was specified directly,
here a number is specified directly (<literal>0</literal>). Note
that the number is <emphasis>not</emphasis> quoted. If you quoted
- it (<literal>"0"</literal>), FreeMarker were misinterpret it as a
- string literal, and because the price to compare it to is number,
+ it (<literal>"0"</literal>), FreeMarker would misinterpret it as a
+ string literal, and because the price to compare it to is a number,
you get an error.</para>
<para>This will print "Pythons are not free today!" if their price
@@ -594,7 +594,7 @@
<literal></#list></literal> tags.</para>
<para>The <literal><replaceable>sequence</replaceable></literal>
- can be any kind of expression, like we could list the fruits of
+ can be any kind of expression. For example we could list the fruits of
the example data model like this:</para>
<programlisting role="template"><ul>
@@ -630,7 +630,7 @@
case.</para>
<para>Another frequent listing-related task: let's list the fruits
- separating them with something, like comma:</para>
+ separating them with something, like a comma:</para>
<programlisting role="template"><p>Fruits: <#list misc.fruits as fruit>${fruit}<emphasis><#sep>, </emphasis></#list></programlisting>
@@ -643,7 +643,7 @@
there will be a next item. Hence there's no comma after the last
fruit.</para>
- <para>Here again, what's if we have 0 fruits? Just printing
+ <para>Here again, what if we have 0 fruits? Just printing
<quote>Fruits:</quote> and then nothing is awkward. A
<literal>list</literal>, just like an <literal>if</literal>, can
have an <literal>else</literal>, which is executed if there were 0