Merge remote-tracking branch 'origin/2.3-gae' into 2.3
diff --git a/src/main/resources/freemarker/version.properties b/src/main/resources/freemarker/version.properties
index e2f2e1f..3c7c45d 100644
--- a/src/main/resources/freemarker/version.properties
+++ b/src/main/resources/freemarker/version.properties
@@ -39,7 +39,7 @@
# continue working without modification or recompilation.
# - When the major version number is increased, major backward
# compatibility violations are allowed, but still should be avoided.
-version=2.3.24-nightly_@timestampInVersion@
+version=2.3.24-pre01
# This exists as oss.sonatype only allows SNAPSHOT and final releases,
# so instead 2.3.21-rc01 and such we have to use 2.3.21-SNAPSHOT.
# For final releases it's the same as "version".
@@ -56,7 +56,7 @@
# 2.4.0.rc01
# 2.4.0.pre01
# 2.4.0.nightly_@timestampInVersion@
-versionForOSGi=2.3.24.nightly_@timestampInVersion@
+versionForOSGi=2.3.24.pre01
# Version string that conforms to legacy MF
# -----------------------------------------
@@ -74,7 +74,7 @@
# "97 denotes "nightly", 98 denotes "pre", 99 denotes "rc" build.
# In general, for the nightly/preview/rc Y of version 2.X, the versionForMf is
# 2.X-1.(99|98).Y. Note the X-1.
-versionForMf=2.3.23.97
+versionForMf=2.3.23.98.1
# The date of the build.
# This should be automatically filled by the building tool (Ant).
diff --git a/src/manual/book.xml b/src/manual/book.xml
index 53808ab..3de5d30 100644
--- a/src/manual/book.xml
+++ b/src/manual/book.xml
@@ -11,7 +11,7 @@
<titleabbrev>Manual</titleabbrev>
- <productname>Freemarker 2.3.24</productname>
+ <productname>Freemarker 2.3.24 Preview 1</productname>
</info>
<preface role="index.html" xml:id="preface">
@@ -25378,9 +25378,15 @@
<title>Version history</title>
<section xml:id="versions_2_3_24">
- <title>2.3.24</title>
+ <title>2.3.24 Preview 1</title>
- <para>Date of release: FIXME</para>
+ <para>Date of release: 2015-09-01 for preview release 1</para>
+
+ <para>Date of release for final is not yet known (end of
+ October?).</para>
+
+ <para>Please test for backward compatibility, and help polishing the
+ new features!</para>
<section>
<title>Changes on the FTL side</title>
