[freemarker] branch 2.3-gae updated: Manual: Fix HTLM typos

[dd...@apache.org]

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

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


The following commit(s) were added to refs/heads/2.3-gae by this push:
     new 75f3996  Manual: Fix HTLM typos
     new 201533e  Merge pull request #73 from agriffis/fix-htlm-typos
75f3996 is described below

commit 75f39963c3ee93a7a131ecbe23601a527d71a9e5
Author: Aron Griffis <ar...@scampersand.com>
AuthorDate: Sat Feb 20 16:38:21 2021 -0500

    Manual: Fix HTLM typos
---
 src/manual/en_US/book.xml                                           | 6 +++---
 .../resources/freemarker/manual/AutoEscapingExample-convert.ftlh    | 2 +-
 .../freemarker/manual/AutoEscapingExample-convert.ftlh.out          | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/manual/en_US/book.xml b/src/manual/en_US/book.xml
index 0bfcbb0..da60e43 100644
--- a/src/manual/en_US/book.xml
+++ b/src/manual/en_US/book.xml
@@ -5905,7 +5905,7 @@ Foo &amp;amp;amp; bar</programlisting>
             <programlisting role="template">&lt;#-- We assume that we have "HTML" output format by default. --&gt;
 
 &lt;#assign mo1 = "Foo's bar {}"?esc&gt;
-HTLM: ${mo1}
+HTML: ${mo1}
 XML:  &lt;#outputformat 'XML'&gt;${mo1}&lt;/#outputformat&gt;
 RTF:  &lt;#outputformat 'RTF'&gt;${mo1}&lt;/#outputformat&gt;
 
@@ -5914,7 +5914,7 @@ HTML: ${mo2}
 XML:  &lt;#attempt&gt;&lt;#outputformat 'XML'&gt;${mo2}&lt;/#outputformat&gt;&lt;#recover&gt;Failed&lt;/#attempt&gt;
 RTF:  &lt;#attempt&gt;&lt;#outputformat 'RTF'&gt;${mo2}&lt;/#outputformat&gt;&lt;#recover&gt;Failed&lt;/#attempt&gt;</programlisting>
 
-            <programlisting role="output">HTLM: Foo&amp;#39;s bar {}
+            <programlisting role="output">HTML: Foo&amp;#39;s bar {}
 XML:  Foo&amp;apos;s bar {}
 RTF:  Foo's bar \{\}
 
@@ -23691,7 +23691,7 @@ ${"'{}"}
             <literal>"HTML"</literal> and then with <literal>"XML"</literal>.
             These are called combined output formats, and can be referred by
             names like <literal>"XML{HTML}"</literal> and
-            <literal>"XML{HTLM{RTF}}"</literal>, respectively. We could use
+            <literal>"XML{HTML{RTF}}"</literal>, respectively. We could use
             these names in the earlier two <literal>outputformat</literal>
             calls, however, there's a shorthand where you inherit the part
             outside the <literal>{<replaceable>...</replaceable>}</literal>
diff --git a/src/test/resources/freemarker/manual/AutoEscapingExample-convert.ftlh b/src/test/resources/freemarker/manual/AutoEscapingExample-convert.ftlh
index e0d3348..f23a608 100644
--- a/src/test/resources/freemarker/manual/AutoEscapingExample-convert.ftlh
+++ b/src/test/resources/freemarker/manual/AutoEscapingExample-convert.ftlh
@@ -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/src/test/resources/freemarker/manual/AutoEscapingExample-convert.ftlh.out b/src/test/resources/freemarker/manual/AutoEscapingExample-convert.ftlh.out
index 65be2a0..1edf403 100644
--- a/src/test/resources/freemarker/manual/AutoEscapingExample-convert.ftlh.out
+++ b/src/test/resources/freemarker/manual/AutoEscapingExample-convert.ftlh.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 \{\}