Permalink
Browse files

Merge remote branch 'upstream/master'

  • Loading branch information...
2 parents cc6de20 + 9c43b64 commit ad5aea8cb853cc9d1b322c69f4812ad0bcb08ef3 @reald reald committed Mar 22, 2012
Showing with 15 additions and 0 deletions.
  1. +15 −0 man/feh.pre
View
15 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
.

0 comments on commit ad5aea8

Please sign in to comment.