This is an automated email from the ASF dual-hosted git repository.

ddekany pushed a commit to branch 3
in repository https://gitbox.apache.org/repos/asf/freemarker.git

commit cfb0651b2cf80a2d1572c9a12a9331ac0ca6cf91
Author: ddekany <ddek...@apache.org>
AuthorDate: Sun Jan 1 00:13:12 2023 +0100

    Forward ported from 2.3-gae: Fix HTLM typos (PR #73)
---
 FM3-CHANGE-LOG.txt                                                      | 2 +-
 .../apache/freemarker/manual/examples/AutoEscapingExample-convert.f3ah  | 2 +-
 .../freemarker/manual/examples/AutoEscapingExample-convert.f3ah.out     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/FM3-CHANGE-LOG.txt b/FM3-CHANGE-LOG.txt
index 8db37885..3b655a96 100644
--- a/FM3-CHANGE-LOG.txt
+++ b/FM3-CHANGE-LOG.txt
@@ -317,7 +317,7 @@ Core / Configuration
   to UNRESTRICTED and ALLOW_NOTHING. Also the String setting name 
"allows_nothing" and
   "allowsNothing" were renamed to "allowNothing".
 - TemplateExceptionHandler.IGNORE_HANDLER, RETHROW_HANDLER, DEBUG_HANDLER and
-  HTLM_DEBUG_HANDLER was renamed to IGNORE, RETHROW, DEBUG and HTML_DEBUG
+  HTML_DEBUG_HANDLER was renamed to IGNORE, RETHROW, DEBUG and HTML_DEBUG
 - AttemptExceptionReporter.LOG_ERROR_REPORTER and LOG_WARN_REPORTER was 
renamed to
   LOG_ERROR and LOG_WARN (to be consistent with the new 
TemplateExceptionHandler names)
 - Removed TemplateClassResolver.SAFER_RESOLVER, because the classes it has 
blocked were removed from FreeMarker, so it's
diff --git 
a/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/AutoEscapingExample-convert.f3ah
 
b/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/AutoEscapingExample-convert.f3ah
index 5d608794..b23e56f5 100644
--- 
a/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/AutoEscapingExample-convert.f3ah
+++ 
b/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/AutoEscapingExample-convert.f3ah
@@ -17,7 +17,7 @@
   under the License.
 -->
 <#assign mo1 = "Foo's bar {}"?esc>
-HTLM: ${mo1}
+HTML: ${mo1}
 XML:  <#outputFormat 'XML'>${mo1}</#outputFormat>
 RTF:  <#outputFormat 'RTF'>${mo1}</#outputFormat>
 
diff --git 
a/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/AutoEscapingExample-convert.f3ah.out
 
b/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/AutoEscapingExample-convert.f3ah.out
index 65be2a00..1edf4033 100644
--- 
a/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/AutoEscapingExample-convert.f3ah.out
+++ 
b/freemarker-manual/src/test/resources/org/apache/freemarker/manual/examples/AutoEscapingExample-convert.f3ah.out
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-HTLM: Foo&#39;s bar {}
+HTML: Foo&#39;s bar {}
 XML:  Foo&apos;s bar {}
 RTF:  Foo's bar \{\}
 

Reply via email to