path: root/man
diff options
authorDaniel Friesel <>2018-08-05 13:58:09 +0200
committerDaniel Friesel <>2018-08-05 13:58:09 +0200
commitfd66a0f2a1352de36fa81004325df1040d1cde98 (patch)
treeab8e47b39f8f1cee46e6c0fa0ec4822ae2a9d85b /man
parent607374d4c7f7a133d3d1c5c012a6a5af9e2e60bf (diff)
Update magick/dcraw/timeout documentation in feh(1)
Diffstat (limited to 'man')
1 files changed, 9 insertions, 6 deletions
diff --git a/man/feh.pre b/man/feh.pre
index 28c1132..a1698e1 100644
--- a/man/feh.pre
+++ b/man/feh.pre
@@ -142,8 +142,12 @@ If the convert binary
.Pq supplied by ImageMagick
is available, it also has limited support for many other filetypes, such as
svg, xcf and otf.
+If dcraw is available,
+also supports RAW files provided by cameras and will display the embedded
-.Cm --magick-timeout Ar num
+.Cm --conversion-timeout Ar num
with a non-negative value to enable it.
@@ -483,16 +487,15 @@ Don't display images.
Just print out their names if imlib2 can successfully load them.
Returns false if at least one image failed to load.
-.It Cm --magick-timeout Ar timeout
+.It Cm --conversion-timeout Ar timeout
Stop trying to convert unloadable files after
.Ar timeout
-A negative value disables covert / magick support altogether, a value
-of zero causes
+Negative values disable conversion altogether, zero causes
to try indefinitely.
-By default, magick support is disabled.
+By default, conversion is disabled.
.It Cm --max-dimension Ar width No x Ar height
@@ -1902,7 +1905,7 @@ see
for details.
Workaround: Use
-.Cm --magick-timeout 5
+.Cm --conversion-timeout 5
.Pq or some other positive value
to load gifs with imagemagick instead, or downgrade to giflib 5.1.1, or
upgrade to giflib 5.1.4.