about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--doc/mailcap.md18
-rw-r--r--res/config.toml5
2 files changed, 15 insertions, 8 deletions
diff --git a/doc/mailcap.md b/doc/mailcap.md
index cd1feabb..cdc52a8c 100644
--- a/doc/mailcap.md
+++ b/doc/mailcap.md
@@ -20,10 +20,20 @@ For an exact description of the mailcap format, see
 The search path for mailcap files can be overridden using the configuration
 variable `external.mailcap`.
 
-The default search path for mailcap files is:
-
-```
-$HOME/.mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/local/etc/mailcap
+By default, the only file checked by Chawan is `$HOME/.mailcap`.
+
+In the past, the full path from the specification was used. This was changed
+because mailcap files shipped with various systems are usually incompatible
+with the assumptions Chawan makes about mailcap file contents. You can restore
+the old/standard-recommended behavior by adding this to your config.toml:
+
+```toml
+mailcap = [
+	"~/.mailcap",
+	"/etc/mailcap",
+	"/usr/etc/mailcap",
+	"/usr/local/etc/mailcap"
+]
 ```
 
 ## Format
diff --git a/res/config.toml b/res/config.toml
index afac386c..962d5e22 100644
--- a/res/config.toml
+++ b/res/config.toml
@@ -14,10 +14,7 @@ display-charset = "auto"
 
 [external]
 mailcap = [
-	"~/.mailcap",
-	"/etc/mailcap",
-	"/usr/etc/mailcap",
-	"/usr/local/etc/mailcap"
+	"~/.mailcap"
 ]
 mime-types = [
 	"~/.mime.types",