X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2Fxscreensaver-command.man;h=ff5d0bd7887bf5a150ee4944dd04d99c15420736;hb=de460e831dc8578acfa8b72251ab9346c99c1f96;hp=ad417b38a8984165d0814d4ba95e229de0884ad1;hpb=447db08c956099b3b183886729108bf5b364c4b8;p=xscreensaver diff --git a/driver/xscreensaver-command.man b/driver/xscreensaver-command.man index ad417b38..ff5d0bd7 100644 --- a/driver/xscreensaver-command.man +++ b/driver/xscreensaver-command.man @@ -117,10 +117,8 @@ this to activate the screensaver with a particular graphics demo. (The first element in the list is numbered 1, not 0.) .TP 8 .B \-exit -Causes the xscreensaver process to exit gracefully. This is roughly the same -as killing the process with -.BR kill (1), -but it is easier, since you don't need to first figure out the pid. +Causes the xscreensaver process to exit gracefully. +This does nothing if the display is currently locked. .B Warning: never use \fIkill -9\fP with \fIxscreensaver\fP while the screensaver is @@ -154,18 +152,9 @@ un-blanked.) .TP 8 .B \-restart Causes the screensaver process to exit and then restart with the same command -line arguments as last time. Do this after you've changed the resource -database, to cause xscreensaver to notice the changes. - -.B Warning: -if you have a \fI.xscreensaver\fP file, this might not do what you -expect. You're probably better off killing the existing -xscreensaver (with \fIxscreensaver\-command -exit\fP) and then -launching it again. - -The important point is, you need to make sure that the xscreensaver -process is running as you. If it's not, it won't be reading the -right \fI.xscreensaver\fP file. +line arguments as last time. You shouldn't really need to do this, +since xscreensaver notices when the \fI.xscreensaver\fP file has +changed and re-reads it as needed. .TP 8 .B \-watch Prints a line each time the screensaver changes state: when the screen @@ -210,7 +199,7 @@ while () { } } .EE -Note that LOCK might come either with or without a preceeding BLANK +Note that LOCK might come either with or without a preceding BLANK (depending on whether the lock-timeout is non-zero), so the above program keeps track of both of them. .SH STOPPING GRAPHICS