X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fwebcollage.man;h=82bf5d71070f234251146994f76abacd41204181;hb=78add6e627ee5f10e1fa6f3852602ea5066eee5a;hp=ef696e24e8a1e0449f8ad88335d9923d343d2037;hpb=c1b9b55ad8d59dc05ef55e316aebf5863e7dfa56;p=xscreensaver

diff --git a/hacks/webcollage.man b/hacks/webcollage.man
index ef696e24..82bf5d71 100644
--- a/hacks/webcollage.man
+++ b/hacks/webcollage.man
@@ -33,6 +33,7 @@ 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
@@ -120,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
@@ -171,8 +172,12 @@ 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.
+Display the current frame rate and CPU load (MacOS only).
 .SH ENVIRONMENT
 .PP
 .TP 8
@@ -205,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/
@@ -231,7 +236,7 @@ DriftNet:
 .BR EtherPEG ,
 .BR EtherPeek
 .SH COPYRIGHT
-Copyright \(co 1998-2005 by Jamie Zawinski.  Permission to use, copy, modify,
+Copyright \(co 1998-2018 by Jamie Zawinski.  Permission to use, copy, modify,
 distribute, and sell this software and its documentation for any purpose is
 hereby granted without fee, provided that the above copyright notice appear
 in all copies and that both that copyright notice and this permission notice