http://ftp.x.org/contrib/applications/xscreensaver-3.20.tar.gz

[xscreensaver] / hacks / webcollage.man

diff --git a/hacks/webcollage.man b/hacks/webcollage.man
index 6004c45531fb9c1869270f33cf8cf723a115c51b..4b41df383ce3058f586a7798184b76aec09f983c 100644 (file)
--- a/hacks/webcollage.man
+++ b/hacks/webcollage.man
@@ -19,22 +19,22 @@ webcollage - decorate the screen with random images from the web
 [\-display \fIhost:display.screen\fP] [\-root] [\-verbose]
 [\-delay \fIsecs\fP] [\-timeout \fIsecs\fP] [\-background \fIbg\fP]
 [\-filter \fIcommand\fP] [\-filter2 \fIcommand\fP]
+[\-http\-proxy host[:port]]
 .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
 as "a nonstop pop culture brainbath."  This program finds its images by
 doing random web searches, and extracting images from the returned pages.
 It places the images on the root window by using the
-.BR xv (1),
 .BR giftopnm (1),
+.BR djpeg (1),
 and
-.BR djpeg (1)
+.BR xli (1),
+.BR xv (1),
+or
+.BR xloadimage (1)
 tools.
 
-\fIwebcollage\fP also works as a CGI program, that will add images to the
-collage on a web page each time the page is loaded.  See the comments at 
-the top of the source code for installation instructions.
-
 \fIwebcollage\fP is written in
 .BR perl (1)
 and requires Perl 5.
@@ -78,6 +78,11 @@ webcollage -root -filter 'vidwhacker -stdin -stdout'
 Filter the \fIcomposite\fP image through this command.  The \fI-filter\fP
 option applies to the sub-images; the \fI-filter2\fP applies to the
 final, full-screen image.
+.TP 8
+.B \-http\-proxy \fIhost:port\fP
+If you must go through a proxy to connect to the web, you can specify it 
+with this option, or with the \fB$http_proxy\fP or \fB$HTTP_PROXY\fP 
+environment variables.
 .SH ENVIRONMENT
 .PP
 .TP 8
@@ -87,6 +92,9 @@ to get the default host and display number.
 .B XENVIRONMENT
 to get the name of a resource file that overrides the global resources
 stored in the RESOURCE_MANAGER property.
+.TP 8
+.B http_proxy\fR or \fPHTTP_PROXY
+to get the default HTTP proxy host and port.
 .SH FILES AND URLS
 .TP
 .I /usr/dict/words \fRor\fP /usr/share/lib/dict/words
@@ -113,7 +121,9 @@ because most of the web is pictures of text.  Which is pretty sad.
 .SH SEE ALSO
 .BR X (1),
 .BR xscreensaver (1),
+.BR xli (1),
 .BR xv (1),
+.BR xloadimage (1),
 .BR ppmmake (1),
 .BR giftopnm (1),
 .BR pnmpaste (1),