summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorDennis Real <github@tildepipe.org>2012-08-28 12:45:57 +0200
committerDennis Real <github@tildepipe.org>2012-08-28 12:45:57 +0200
commit0f6d9518b5a12538e4064ef1c397b62e6be61f3b (patch)
tree1bb349f1f28cb3be9c8c51569aad862f811c259c /man
parent840474a293c3230383afc9e7822ae94a93379f1c (diff)
parent25d2a1c0e9c76fa9c37a697147cba2f944ffbb62 (diff)
Merge branch 'master' of git://github.com/derf/feh
Diffstat (limited to 'man')
-rw-r--r--man/feh.pre16
1 files changed, 5 insertions, 11 deletions
diff --git a/man/feh.pre b/man/feh.pre
index a50a66a..e047286 100644
--- a/man/feh.pre
+++ b/man/feh.pre
@@ -118,18 +118,12 @@ can open any format supported by Imlib2, most notably jpeg and png.
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.
+svg, xcf and otf. Use
+.Cm --magick-timeout Ar num
+with a non-negative value to enable it.
.
For animated images, only the first frame is shown.
.
-.Pp
-.
-If you don't like the results produced by convert, disable it with
-.Qq --magick-timeout -1 .
-Also, note that
-.Nm
-will only try to convert a file for up to five seconds by default.
-.
.
.Sh OPTIONS
.
@@ -401,7 +395,7 @@ Stop trying to convert unloadable files after
seconds. A negative value disables covert / magick support altogether, a value
of zero causes
.Nm
-to try indefinitely. Default timeout is 5 seconds.
+to try indefinitely. By default, magick support is disabled.
.
.It Cm -M , --menu-font Ar font
.
@@ -1527,7 +1521,7 @@ window slightly too large.
.Ss REPORTING BUGS
.
If you find a bug, please report it to
-.Aq derf@finalrewind.org
+.Aq derf+feh@finalrewind.org
or via
.Aq http://github.com/derf/feh/issues .
You are also welcome to direct any feh-related comments/questions/... to #feh