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 13d378b..7e2ea71 100644
--- a/src/main/resources/freemarker/version.properties
+++ b/src/main/resources/freemarker/version.properties
@@ -56,11 +56,11 @@
# 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.31-nightly_@timestampInVersion@
+version=2.3.31
# This exists as for Maven we use "-SNAPSHOT" for nightly releases,
# and no _nightly_@timestampInVersion@. For final releases it's the
# same as "version".
-mavenVersion=2.3.31-SNAPSHOT
+mavenVersion=2.3.31
# Version string that conforms to OSGi
# ------------------------------------
@@ -73,7 +73,7 @@
# 2.4.0.rc01
# 2.4.0.pre01
# 2.4.0.nightly_@timestampInVersion@
-versionForOSGi=2.3.31.nightly_@timestampInVersion@
+versionForOSGi=2.3.31.stable
# Version string that conforms to legacy MF
# -----------------------------------------
@@ -92,7 +92,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.30.97
+versionForMf=2.3.31
# The date of the build.
# This should be automatically filled by the building tool (Ant).
diff --git a/src/manual/en_US/book.xml b/src/manual/en_US/book.xml
index 8ef2763..3465335 100644
--- a/src/manual/en_US/book.xml
+++ b/src/manual/en_US/book.xml
@@ -29416,7 +29416,7 @@
<section xml:id="versions_2_3_31">
<title>2.3.31</title>
- <para>Release date: FIXME</para>
+ <para>Release date: 2021-02-09 + release process</para>
<section>
<title>Changes on the FTL side</title>
