Merge branch 'master' of git://github.com/derf/feh

1 files changed, 50 insertions, 14 deletions

diff --git a/man/feh.pre b/man/feh.pre
index e047286..c60e15a 100644
--- a/man/feh.pre
+++ b/man/feh.pre
@@ -31,7 +31,7 @@ $MAN_XINERAMA$, builtin EXIF support $MAN_EXIF$$MAN_DEBUG$
 .Sh DESCRIPTION
 .
 .Nm
-is a mode-based image viewer.  It is especially aimed at commandline users who
+is a mode-based image viewer.  It is especially aimed at command line users who
 need a fast image viewer without huge GUI dependencies, though it can also be
 started by
 .Pq graphical
@@ -61,7 +61,7 @@ However, if you compile feh with exif=1, you can also display it directly.
 .Sh MODES
 .
 .Nm
-is based on various modes, which are selected at startup by comandline
+is based on various modes, which are selected at startup by command line
 options.
 .
 .Pp
@@ -158,7 +158,7 @@ multiwindow mode, the window will be closed.
 .
 .It Cm --action1 No .. Cm --action9
 .
-Extra actions which can be set and triggered using the appropiate number key.
+Extra actions which can be set and triggered using the appropriate number key.
 .
 .It Cm -Z , --auto-zoom
 .
@@ -192,7 +192,7 @@ the caption will be looked for in
 Don't display images, print image info according to
 .Ar format
 instead.  See
-.Sx FORMAT SPECIFIEDRS .
+.Sx FORMAT SPECIFIERS .
 .
 .It Cm --cycle-once
 .
@@ -246,7 +246,7 @@ will be saved to
 .Ar file
 when
 .Nm
-exits.  You can add files to filelists by specifying them on the commandline
+exits.  You can add files to filelists by specifying them on the command line
 when also specifying the list.
 .
 .Pp
@@ -287,7 +287,7 @@ Enables
 .
 Note: This option needs to load all images to calculate the dimensions of the
 .Nm
-window, so when using it with many files it will ake a while before a
+window, so when using it with many files it will take a while before a
 .Nm
 window is visible.  Use
 .Cm --preload
@@ -329,7 +329,7 @@ Accepted values: checks (default), white, black.
 .It Cm -i , --index
 .
 Enable Index mode.  Index mode is similar to montage mode, and accepts the
-same options.  It creates an index print of thumbails, printing the image
+same options.  It creates an index print of thumbnails, printing the image
 name beneath each thumbnail.  Index mode enables certain other options, see
 .Sx INDEX MODE OPTIONS
 and
@@ -377,7 +377,7 @@ in the name.
 .
 .It Cm -l , --list
 .
-Don't display images.  Analyse them and display an
+Don't display images.  Analyze them and display an
 .Xr ls 1 - No style
 listing.  Useful in scripts to hunt out images of a certain
 size/resolution/type etc.
@@ -397,6 +397,15 @@ of zero causes
 .Nm
 to try indefinitely. By default, magick support is disabled.
 .
+.It Cm --max-dimension Ar width No x Ar height
+.
+Only show images with width <=
+.Ar width
+and height <=
+.Ar height .
+If you only care about one parameter, set the other to either something large
+or -1.
+.
 .It Cm -M , --menu-font Ar font
 .
 Use
@@ -404,6 +413,14 @@ Use
 .Pq truetype, with size, like Qq yudit/12
 as menu font.
 .
+.It Cm --min-dimension Ar width No x Ar height
+.
+Only show images with width >=
+.Ar width
+and height >=
+.Ar height .
+If you only care about one parameter, set the other to 0.
+.
 .It Cm -m , --montage
 .
 Enable montage mode.  Montage mode creates a new image consisting of a grid of
@@ -541,8 +558,10 @@ theme.
 Same as Index mode, but the thumbnails are clickable image launchers.
 Note that
 .Cm --fullscreen
-does not affect the thumbnail window. It does, however, work for the image
-windows launched from thumbnail mode.
+and
+.Cm --scale-down
+do not affect the thumbnail window. They do, however, work for image windows
+launched from thumbnail mode.
 Also supports
 .Sx MONTAGE MODE OPTIONS .
 .
@@ -662,7 +681,7 @@ without displaying it.
 .
 Normally, if an image is smaller than the specified thumbnail size, it will
 not be enlarged.  If this option is set, the image will be scaled up to fit
-the thumnail size.  Aspect ratio will be maintained unles
+the thumbnail size.  Aspect ratio will be maintained unless
 .Cm --ignore-aspect
 is specified.
 .
@@ -715,7 +734,7 @@ can also be used as a background setter.  Unless you pass the
 .Cm --no-fehbg
 option, it will store the command line necessary to set the background in
 .Pa ~/.fehbg ,
-so to have your background restored everytime you start X, you can add
+so to have your background restored every time you start X, you can add
 .Qq eval $(cat ~/.fehbg)
 to your X startup script
 .Pq like Pa ~/.xinitrc .
@@ -821,7 +840,7 @@ Number of image pixels
 .
 .It \&%P
 .
-Numbor of image pixels
+Number of image pixels
 .Pq kilopixels / megapixels
 .
 .It %r
@@ -1106,6 +1125,16 @@ away.  See
 .Xr jpegtran 1
 for more about lossless JPEG rotation.
 .
+.Em Note:
+jpegtran does not update EXIF orientation tags. However,
+.Nm
+assumes that you use the feature to normalize image orientation and want it to
+be displayed this way everywhere. After every rotation, it will unconditionally
+set the EXIF orientation to 1
+.Pq Qq 0,0 is top left .
+Should you need to reverse this, see
+.Xr jpegexiforient 1 .
+.
 .It _ Bq flip
 .
 In place editing - vertical flip
@@ -1453,6 +1482,11 @@ Same as above
 .
 Show some EXIF information, extracted by exifprobe/exifgrep
 .
+.It feh --action 'rm %F' -rl --max-dim 1000x800
+.
+Resursively remove all images with dimensions below or equal to 1000x800 pixels
+from the current directory.
+.
 .El
 .
 .
@@ -1487,7 +1521,9 @@ but without the flickering.
 .Nm
 requires the
 .Cm jpegtran
-binary
+and
+.Cm jpegexiforient
+binaries
 .Pq usually distributed in Qo libjpeg-progs Qc or similar
 for lossless rotation.
 .