From http://www.jwz.org/xscreensaver/xscreensaver-5.27.tar.gz

[xscreensaver] / driver / xscreensaver.man

diff --git a/driver/xscreensaver.man b/driver/xscreensaver.man
index 0b8699ac88ecb369bb3371fa5d173a6c0517425d..ee4982fcb080d778be1636a7d9ea411e9a1b8a88 100644 (file)
--- a/driver/xscreensaver.man
+++ b/driver/xscreensaver.man
@@ -11,9 +11,9 @@
 .if n .sp 1
 .if t .sp .5
 ..
-.TH XScreenSaver 1 "20-Mar-2005 (4.21)" "X Version 11"
+.TH XScreenSaver 1 "09-Nov-2013 (5.23)" "X Version 11"
 .SH NAME
-xscreensaver - extensible screen saver framework, plus locking
+xscreensaver - extensible screen saver and screen locking framework
 .SH SYNOPSIS
 .B xscreensaver
 [\-display \fIhost:display.screen\fP] \
@@ -72,7 +72,7 @@ database.  If the \fI.xscreensaver\fP file exists, it overrides any settings
 in the resource database.  
 
 The syntax of the \fI.xscreensaver\fP file is similar to that of
-the \fI.Xdefaults\fP file; for example, to set the \fItimeout\fP paramter
+the \fI.Xdefaults\fP file; for example, to set the \fItimeout\fP parameter
 in the \fI.xscreensaver\fP file, you would write the following:
 .EX
 timeout: 5
@@ -193,32 +193,16 @@ use it.
 To replace gnome-screensaver with xscreensaver:
 .RS 4
 .TP 3
-\fB1: Turn off gnome-screensaver.\fP
-Open the "\fISystem / Preferences / Screensaver\fP" panel and uncheck
-both boxes.
-.TP 3
-\fB2: Stop gnome-screensaver from launching at login.\fP
-Run the command:
+\fB1: Fully uninstall the gnome-screensaver package.\fP
 .EX
-
-gconftool-2 --type boolean -s \\
-/apps/gnome_settings_daemon/screensaver/start_screensaver \\
-false
-
+sudo apt-get remove gnome-screensaver
 .EE
-Or, just uninstall the "\fIgnome-screensaver\fP" package entirely.
-.TP 3
-\fB3: Launch xscreensaver at login.\fP
-Open the "\fISystem / Preferences / Sessions / Startup Programs\fP" panel.
-Click "\fIAdd\fP" and type "\fIxscreensaver\fP".
 .TP 3
-\fB4: Tell Preferences to use the xscreensaver configurator.\fP
-Edit \fI/usr/share/applications/gnome-screensaver-preferences.desktop\fP
-and change the \fIExec=\fP line to say
-    Exec=xscreensaver-demo
+\fB2: Launch xscreensaver at login.\fP
+Select "\fIStartup Applications\fP" from the menu (or manually
+launch "\fIgnome-session-properties\fP") and add "\fIxscreensaver\fP".
 .TP 3
-\fB5: Make "System / Quit / Lock Screen" use xscreensaver.\fP
-Run the command:
+\fB3: Make "Lock Screen" use xscreensaver.\fP
 .EX
 sudo ln -sf /usr/bin/xscreensaver-command \\
             /usr/bin/gnome-screensaver-command
@@ -254,7 +238,8 @@ X-KDE-StartupNotify=false
 \fB4: Make the various "lock session" buttons call xscreensaver.\fP
 The file you want to replace next has moved around over the years. It
 might be called \fI/usr/libexec/kde4/kscreenlocker\fP,
-or it might be called "\fIkdesktop_lock\fP" or "\fIkrunner_lock\fP", and
+or it might be called "\fIkdesktop_lock\fP" or "\fIkrunner_lock\fP"
+or "\fIkscreenlocker_greet\fP", and
 it might be in \fI/usr/lib/kde4/libexec/\fP
 or in \fI/usr/kde/3.5/bin/\fP or even in \fI/usr/bin/\fP,
 depending on the distro and phase of the moon.  Replace the contents
@@ -273,6 +258,12 @@ Now use xscreensaver normally, controlling it via the usual
 and
 .BR xscreensaver-command (1)
 mechanisms.
+.SH USING UNITY
+Guess what, they did it again!  Ubuntu Unity's screen-locking
+framework is \fIyet another\fP rewrite, and it is completely broken,
+bug-ridden and insecure. At this time I don't have any information on
+how to turn it off and use xscreensaver instead.  If you do, let me
+know.
 .SH USING GDM
 You can run \fIxscreensaver\fP from your 
 .BR gdm (1)
@@ -901,7 +892,7 @@ and a FAQ can always be found at http://www.jwz.org/xscreensaver/
 .BR xscreensaver\-getimage (1),
 .BR xscreensaver\-text (1).
 .SH COPYRIGHT
-Copyright \(co 1991-2011 by Jamie Zawinski.
+Copyright \(co 1991-2014 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