Commit Diff
Diff:
6d362b355629b136ab2192a64b3deb1c3d28d99b
93cab6dc784ac671f7d536deb0a16b9abcfdf420
Commit:
93cab6dc784ac671f7d536deb0a16b9abcfdf420
Tree:
911135d3574c60e837452e96738663cf18436191
Author:
Omar Polo <op@omarpolo.com>
Date:
Fri Apr 8 15:36:59 2022 UTC
Message:
document the implicit mapping for text/gemini

and remove the explicit mapping from the documentation and test files.
commit - 6d362b355629b136ab2192a64b3deb1c3d28d99b
commit + 93cab6dc784ac671f7d536deb0a16b9abcfdf420
blob - e8515be6898353af6edb57b1c923c1105f11963d
blob + 1a5dc2af67cf0a50c60e4f9a91fd1b9efae451a6
--- gmid.conf.5
+++ gmid.conf.5
@@ -532,7 +532,7 @@ block is used:
.Nm gmid
uses the following mapping if no
.Ic types
-block is used:
+block is defined:
.Bl -tag -offset indent -width 15m -compact
.It application/pdf
pdf
@@ -553,6 +553,16 @@ xml
.It text/xml
xml
.El
+.Pp
+As an exception,
+.Nm gmid
+uses the MIME type
+.Ar text/gemini
+for file extensions
+.Ar gemini
+or
+.Ar gmi
+if no mapping was found.
.Sh EXAMPLES
The following is an example of a possible configuration for a site
that enables only TLSv1.3, adds the MIME types mapping from
@@ -564,8 +574,6 @@ types {
protocols "tlsv1.3"
types {
- text/gemini gemini gmi
-
include "/usr/share/misc/mime.types"
}
blob - c7b68338a9d42fbd88574f09ecebbdc3d4f7ab2d
blob + b7c8e2acae6559b6aa7dff15cadcc97fae95ad2d
--- regress/example.mime.types
+++ regress/example.mime.types
@@ -7,7 +7,3 @@ text/x-mandoc 3bsd
text/x-mandoc 1 2 3 4 5 6 7 8 9
text/x-mandoc 3bsd
-
-# this needs to be present because `types' overrides
-# the built-in list.
-text/gemini gemini gmi
blob - b73ed30f4b0518718901607261f3758853ba6da5
blob + 87a0067bd3e982ad802f6cdc93b4e6ff61ba9e29
--- site/faq.gmi
+++ site/faq.gmi
@@ -13,8 +13,6 @@ types {
``` example of how to use the type rule in the configuration file
types {
- text/gemini gemini gmi
-
application/postscript ps eps ai
application/rss+xml rss
Omar Polo