summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Real <github@tildepipe.org>2012-03-22 19:01:38 +0100
committerDennis Real <github@tildepipe.org>2012-03-22 19:01:38 +0100
commitad5aea8cb853cc9d1b322c69f4812ad0bcb08ef3 (patch)
treedc55d15f516c2e6b95b4539f5c8c94a3180091cb
parentcc6de20061eaa7172aa0184e03df947da14d713e (diff)
parent9c43b648f398bc03706f0e077ee9301a7772ce66 (diff)
Merge remote branch 'upstream/master'
-rw-r--r--man/feh.pre15
1 files changed, 15 insertions, 0 deletions
diff --git a/man/feh.pre b/man/feh.pre
index f97434d..a1cee80 100644
--- a/man/feh.pre
+++ b/man/feh.pre
@@ -122,6 +122,15 @@ svg, xcf and otf.
.
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
.
.Bl -tag -width indent
@@ -1469,6 +1478,12 @@ to the correct screen number or toggle fullscreen off, then on as a workaround.
Thumbnail mode is somewhat inefficient, and because of that not nearly as fast
as it could be.
.
+.Pp
+.
+.Cm --scale-down
+does not take window decorations into account and may therefore make the
+window slightly too large.
+.
.
.Ss REPORTING BUGS
.