summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVille Skyttä <ville.skytta@iki.fi>2014-12-21 00:26:45 +0200
committerVille Skyttä <ville.skytta@iki.fi>2014-12-21 00:26:45 +0200
commitf28c188f7dd568081f8738d62f645c56a1bf8219 (patch)
tree47f18581fd67393c37f283c60a492079f7406108
parentb1bb71cf1de79a877a29bb9aff22a367e8768381 (diff)
downloadshared-mime-info-f28c188f7dd568081f8738d62f645c56a1bf8219.tar.gz
Use IANA registered text/markdown for Markdown
http://www.iana.org/assignments/media-types/text/markdown
-rw-r--r--freedesktop.org.xml.in3
-rw-r--r--tests/list2
2 files changed, 3 insertions, 2 deletions
diff --git a/freedesktop.org.xml.in b/freedesktop.org.xml.in
index ee4bf5aa..263b0ff5 100644
--- a/freedesktop.org.xml.in
+++ b/freedesktop.org.xml.in
@@ -5430,12 +5430,13 @@ command to generate the output files.
<match type="string" value="#! /usr/bin/make" offset="0"/>
</magic>
</mime-type>
- <mime-type type="text/x-markdown">
+ <mime-type type="text/markdown">
<_comment>Markdown document</_comment>
<sub-class-of type="text/plain"/>
<glob pattern="*.md"/>
<glob pattern="*.mkd"/>
<glob pattern="*.markdown"/>
+ <alias type="text/x-markdown"/>
</mime-type>
<mime-type type="text/x-moc">
<_comment>Qt MOC file</_comment>
diff --git a/tests/list b/tests/list
index 57020389..d0628ee7 100644
--- a/tests/list
+++ b/tests/list
@@ -425,7 +425,7 @@ googleearth.kml application/vnd.google-earth.kml+xml ox
# Copied from http://bugs.freedesktop.org/show_bug.cgi?id=15260
test.gnd application/gnunet-directory
# Copied from https://bugs.freedesktop.org/show_bug.cgi?id=27441
-markdown.md text/x-markdown oxo
+markdown.md text/markdown oxo
text.ps application/postscript
text.ps.gz application/x-gzpostscript ox
text.PS.gz application/x-gzpostscript oxo