Merge remote-tracking branch 'origin/2.3-gae' into 2.3
diff --git a/LICENSE.txt b/LICENSE.txt
index 991abbc..1a410cc 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -41,5 +41,5 @@
With FreeMarker 2.3.21 the license has changed to Apache License,
Version 2.0, and the owner has changed from Visigoth Software Society
-to three of the FreeMarker 2.X developers, Attila Szegedi, Daniel
+to three of the FreeMarker 2.x developers, Attila Szegedi, Daniel
Dekany, and Jonathan Revusky.
diff --git a/src/manual/book.xml b/src/manual/book.xml
index e09ad25..f30ae34 100644
--- a/src/manual/book.xml
+++ b/src/manual/book.xml
@@ -32155,12 +32155,8 @@
freemarker/ext/jsp/web-app_2_2.dtd
freemarker/ext/jsp/web-app_2_3.dtd
- freemarker/ext/jsp/web-app_2_4.xsd
- freemarker/ext/jsp/web-app_2_5.xsd
freemarker/ext/jsp/web-jsptaglibrary_1_1.dtd
freemarker/ext/jsp/web-jsptaglibrary_1_2.dtd
- freemarker/ext/jsp/web-jsptaglibrary_2_0.xsd
- freemarker/ext/jsp/web-jsptaglibrary_2_1.xsd
Historical notes
@@ -32173,7 +32169,7 @@
With FreeMarker 2.3.21 the license has changed to Apache License,
Version 2.0, and the owner has changed from Visigoth Software Society
-to three of the FreeMarker 2.X developers, Attila Szegedi, Daniel
+to three of the FreeMarker 2.x developers, Attila Szegedi, Daniel
Dekany, and Jonathan Revusky.</programlisting>
</section>
