summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
Diffstat (limited to 'man')
-rw-r--r--man/Makefile1
-rw-r--r--man/feh.pre64
2 files changed, 54 insertions, 11 deletions
diff --git a/man/Makefile b/man/Makefile
index 9209de1..acf8629 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -12,6 +12,7 @@ all: ${TARGETS}
-e 's/\$$MAN_CURL\$$/${MAN_CURL}/' \
-e 's/\$$MAN_DEBUG\$$/${MAN_DEBUG}/' \
-e 's/\$$MAN_EXIF\$$/${MAN_EXIF}/' \
+ -e 's/\$$MAN_INOTIFY\$$/${MAN_INOTIFY}/' \
-e 's/\$$MAN_VERSCMP\$$/${MAN_VERSCMP}/' \
-e 's/\$$MAN_XINERAMA\$$/${MAN_XINERAMA}/' \
< ${@:.1=.pre} > $@
diff --git a/man/feh.pre b/man/feh.pre
index 913b9b3..a313fd4 100644
--- a/man/feh.pre
+++ b/man/feh.pre
@@ -24,9 +24,28 @@ $VERSION$
.
.Pp
.
-Compile-time switches: libcurl support $MAN_CURL$, natural sorting support
-$MAN_VERSCMP$, Xinerama support
-$MAN_XINERAMA$, builtin EXIF support $MAN_EXIF$$MAN_DEBUG$
+Compile-time switches in this build:
+.
+.Bl -bullet -compact
+.
+.It
+remote file support: libcurl $MAN_CURL$
+.
+.It
+natural sorting option $MAN_VERSCMP$
+.
+.It
+Xinerama multi-monitor support $MAN_XINERAMA$
+.
+.It
+builtin EXIF reader $MAN_EXIF$
+.
+.It
+inotify-based auto-reload of changed files $MAN_INOTIFY$
+.
+.El
+.
+$MAN_DEBUG$
.
.
.Sh DESCRIPTION
@@ -208,6 +227,18 @@ Example usage:
.
Extra actions which can be set and triggered using the appropriate number key.
.
+.It Cm --auto-reload
+.
+.Pq optional feature, $MAN_INOTIFY$ in this build
+automatically reload image when the underlying file changes.
+Note that auto-reload
+.Pq if enabled in the build
+is on by default.
+This option is only useful to re-enable auto-reload after it has been
+disabled by a preceding
+.Cm --reload=0
+option.
+.
.It Cm --auto-rotate
.
.Pq optional feature, $MAN_EXIF$ in this build
@@ -303,7 +334,8 @@ on a semi-transparent background to improve their readability
.
.It Cm --edit
.
-Enable basic editing of files. This makes rotation and mirroring
+Enable basic editing of files.
+This makes rotation and mirroring
.Pq bound to Qo < Qc , Qo > Qc , Qo | Qc , and Qo _ Qc by default
change the underlying file and not just its displayed content.
.
@@ -465,9 +497,9 @@ toggle_info key.
.
.It Cm --insecure
.
-When viewing files with HTTPS, this option disables all certificate checks. It
-allows images on sites with self-signed or expired certificates to be opened,
-but is no more secure than plain HTTP.
+When viewing files with HTTPS, this option disables all certificate checks.
+It allows images on sites with self-signed or expired certificates to be
+opened, but is no more secure than plain HTTP.
.
.It Cm -k , --keep-http
.
@@ -643,6 +675,7 @@ Reload filelist and current image after
seconds.
Useful for viewing HTTP webcams or frequently changing directories.
.Pq Note that filelist reloading is still experimental.
+Set to zero to disable any kind of automatic reloading.
.
.Pp
.
@@ -653,6 +686,10 @@ However, if an image still exists, but can no longer be loaded,
.Nm
will continue to try loading it.
.
+.Pp
+.
+Setting this option causes inotify-based auto-reload to be disabled.
+.
.It Cm -n , --reverse
.
Reverse the sort order.
@@ -679,7 +716,8 @@ Scroll
.Ar count
pixels whenever scroll_up, scroll_down, scroll_left or scroll_right is pressed.
Note that this option accepts negative numbers in case you need to reverse the
-scroll direction. See
+scroll direction.
+See
.Sx KEYS CONFIG SYNTAX
for how to reverse it permanently.
Default: 20
@@ -1856,7 +1894,7 @@ So, to enlarge a specific part of an image, click the zoom button on that part.
.
.Sh SIGNALS
.
-In slideshow mode,
+In slideshow and multiwindow mode,
.Nm
handles the following signals:
.
@@ -1864,11 +1902,15 @@ handles the following signals:
.
.It Dv SIGUSR1
.
-Switch to next image
+Slideshow mode: switch to next image;
+reload current image if the slideshow consists of a single file.
+Multiwindow mode: reload all images.
.
.It Dv SIGUSR2
.
-Switch to previous image
+Slideshow mode: switch to previous image;
+reload current image if the slideshow consists of a single file.
+Multiwindow mode: reload all images.
.
.El
.