Manual: Adjusted version history, and some typo
diff --git a/src/manual/en_US/book.xml b/src/manual/en_US/book.xml
index 8faa1a7..ed9ea25 100644
--- a/src/manual/en_US/book.xml
+++ b/src/manual/en_US/book.xml
@@ -6058,7 +6058,7 @@
if the value you print is missing/<literal>null</literal>. The
convenient shortcut for that is using the <literal>cn</literal>
built-in (the <quote>n</quote> stands for Nullable), as in
- <literal>${<replaceable>someValue</replaceable>?cn}</literal>. It's
+ <literal>${<replaceable>someValue</replaceable>?cn}</literal>. It
behaves like the <literal>c</literal> built-in, except that if
<literal><replaceable>someValue</replaceable></literal> evaluates to
<literal>null</literal>/missing, it outputs the
@@ -30191,17 +30191,11 @@
<itemizedlist>
<listitem>
- <para><link
- xlink:href="https://issues.apache.org/jira/browse/FREEMARKER-198">FREEMARKER-198</link>:
- Fixed possible deadlock when the
- <literal>Configuration</literal> and
- <literal>DefaultObjectWrapper</literal> class
- <emphasis>static</emphasis> initialization is triggered in
- different threads around the same time. (In the very unlikely
- case your application can run into this, this will hang the code
- that initializes FreeMarker before it has processed any
- templates, and it can't happen anymore if any template
- processing managed to start.)</para>
+ <para>Added <literal>Configurable.setCFormat(CFormat)</literal>,
+ with the usual accompanying setting API methods/constants. See
+ the <literal>c_format</literal>-, and the
+ <literal>?c</literal>-related changes earlier in the FTL
+ section.</para>
</listitem>
<listitem>
@@ -30219,6 +30213,20 @@
<listitem>
<para><link
+ xlink:href="https://issues.apache.org/jira/browse/FREEMARKER-198">FREEMARKER-198</link>:
+ Fixed possible deadlock when the
+ <literal>Configuration</literal> and
+ <literal>DefaultObjectWrapper</literal> class
+ <emphasis>static</emphasis> initialization is triggered in
+ different threads around the same time. (In the very unlikely
+ case your application can run into this, this will hang the code
+ that initializes FreeMarker before it has processed any
+ templates, and it can't happen anymore if any template
+ processing managed to start.)</para>
+ </listitem>
+
+ <listitem>
+ <para><link
xlink:href="https://issues.apache.org/jira/browse/FREEMARKER-190">FREEMARKER-190</link>:
Updated dom4j version used during FreeMarker project compilation
from 1.3 to 2.1.3. Users can still use FreeMarker with dom4j 1.3