X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fwebcollage.man;h=335aa3f65133fcec4fd971ad4adc635c2222c8fb;hb=aa75c7476aeaa84cf3abc192b376a8b03c325213;hp=ab146cfac02eb01a87ed2a35cc54d9a7d15d70da;hpb=2d04c4f22466851aedb6ed0f2919d148f726b889;p=xscreensaver

diff --git a/hacks/webcollage.man b/hacks/webcollage.man
index ab146cfa..335aa3f6 100644
--- a/hacks/webcollage.man
+++ b/hacks/webcollage.man
@@ -33,6 +33,8 @@ webcollage - decorate the screen with random images from the web
 [\-http\-proxy host[:port]]
 [\-dictionary \fIdictionary-file\fP]
 [\-driftnet [\fIcmd\fP]]
+[\-directory \fIdir\fP]
+[\-fps]
 .SH DESCRIPTION
 The \fIwebcollage\fP program pulls random image off of the World Wide Web
 and scatters them on the root window.  One satisfied customer described it
@@ -56,7 +58,7 @@ on your local subnet, instead of getting images from search engines.
 accepts the following options:
 .TP 8
 .B \-root
-Draw on the root window.  This option is manditory, if output is being
+Draw on the root window.  This option is mandatory, if output is being
 produced: drawing to a window other than the root window is not yet
 supported.
 
@@ -119,7 +121,7 @@ If this option is specified, then instead of writing an image to the
 root window, two files will be created: "\fIbase\fP.html" and "\fIbase\fP.jpg".
 The JPEG will be the collage; the HTML file will include that image, and
 an image-map making the sub-images be linked to the pages on which they
-were found (just like \fIhttp://www.jwz.org/webcollage/\fP.)
+were found (just like \fIhttps://www.jwz.org/webcollage/\fP.)
 .TP 8
 .B \-filter \fIcommand\fP
 Filter all source images through this command.  The command must take
@@ -169,6 +171,13 @@ Driftnet version 0.1.5 or later is required.  Note that
 the \fIdriftnet\fP program requires root access, so you'll have
 to make \fIdriftnet\fP be setuid-root for this to work.
 Please exercise caution.
+.TP 8
+.B \-directory \fIdir\fP
+Instead of searching the web for images, use the contents of
+the given directory.
+.TP 8
+.B \-fps
+Display the current frame rate and CPU load (MacOS only).
 .SH ENVIRONMENT
 .PP
 .TP 8
@@ -201,9 +210,9 @@ Animating GIFs are not supported: only the first frame will be used.
 .SH UPGRADES
 The latest version of webcollage can be found as a part of
 xscreensaver, at 
-.B http://www.jwz.org/xscreensaver/,
+.B https://www.jwz.org/xscreensaver/,
 or on the WebCollage page at 
-.B http://www.jwz.org/webcollage/.
+.B https://www.jwz.org/webcollage/.
 
 DriftNet:
 .B http://www.ex-parrot.com/~chris/driftnet/
@@ -221,7 +230,7 @@ DriftNet:
 .BR cjpeg (1),
 .BR xdpyinfo (1),
 .BR perl (1),
-.BR vidwhacker (1),
+.BR vidwhacker (MANSUFFIX),
 .BR dadadodo (1),
 .BR driftnet (1)
 .BR EtherPEG ,