RTFOutputFormat uses application/rtf instead of text/rtf
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/d9f6b444 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/d9f6b444 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/d9f6b444 Branch: refs/heads/master Commit: d9f6b4444c1bf8d910b5ff54f7b8b5cb07606abf Parents: 62f03d8 Author: ddekany <[email protected]> Authored: Tue Dec 22 11:32:16 2015 +0100 Committer: ddekany <[email protected]> Committed: Tue Dec 22 11:32:16 2015 +0100 ---------------------------------------------------------------------- src/main/java/freemarker/core/RTFOutputFormat.java | 2 +- src/manual/en_US/book.xml | 7 ++++++- src/test/java/freemarker/core/RTFOutputFormatTest.java | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/d9f6b444/src/main/java/freemarker/core/RTFOutputFormat.java ---------------------------------------------------------------------- diff --git a/src/main/java/freemarker/core/RTFOutputFormat.java b/src/main/java/freemarker/core/RTFOutputFormat.java index 2d613e0..86eb103 100644 --- a/src/main/java/freemarker/core/RTFOutputFormat.java +++ b/src/main/java/freemarker/core/RTFOutputFormat.java @@ -47,7 +47,7 @@ public final class RTFOutputFormat extends CommonMarkupOutputFormat<TemplateRTFO @Override public String getMimeType() { - return "text/rtf"; + return "application/rtf"; } @Override http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/d9f6b444/src/manual/en_US/book.xml ---------------------------------------------------------------------- diff --git a/src/manual/en_US/book.xml b/src/manual/en_US/book.xml index 18d3f9e..4f6340a 100644 --- a/src/manual/en_US/book.xml +++ b/src/manual/en_US/book.xml @@ -5360,7 +5360,7 @@ [email protected], [email protected], [email protected]</programlisting> <literal>\</literal> as <literal>\{</literal>, <literal>\}</literal>, <literal>\\</literal></td> - <td><literal>text/rtf</literal></td> + <td><literal>application/rtf</literal></td> <td><literal>RTFOutputFormat.INSTANCE</literal></td> </tr> @@ -26477,6 +26477,11 @@ TemplateModel x = env.getVariable("x"); // get variable x</programlisting> </listitem> <listitem> + <para><literal>RTFOutputFormat</literal> now uses + application/rtf MIME type instead of text/rtf</para> + </listitem> + + <listitem> <para>Added new built-in: <literal>is_markup_output</literal>, returns <literal>true</literal> if the value is of type <quote>markup output</quote>.</para> http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/d9f6b444/src/test/java/freemarker/core/RTFOutputFormatTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/freemarker/core/RTFOutputFormatTest.java b/src/test/java/freemarker/core/RTFOutputFormatTest.java index 21e1be5..96d01d0 100644 --- a/src/test/java/freemarker/core/RTFOutputFormatTest.java +++ b/src/test/java/freemarker/core/RTFOutputFormatTest.java @@ -123,7 +123,7 @@ public class RTFOutputFormatTest { @Test public void testGetMimeType() { - assertEquals("text/rtf", INSTANCE.getMimeType()); + assertEquals("application/rtf", INSTANCE.getMimeType()); } }
