X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=driver%2Fxscreensaver.man;h=ee4982fcb080d778be1636a7d9ea411e9a1b8a88;hp=0f80e9f468cd004905007139a8e8406c3e63558b;hb=8afc01a67be4fbf3f1cc0fce9adf01b5289a21c6;hpb=3f1091236d800c43a3124c44c7da54e53f205b13

diff --git a/driver/xscreensaver.man b/driver/xscreensaver.man
index 0f80e9f4..ee4982fc 100644
--- a/driver/xscreensaver.man
+++ b/driver/xscreensaver.man
@@ -199,7 +199,8 @@ sudo apt-get remove gnome-screensaver
 .EE
 .TP 3
 \fB2: Launch xscreensaver at login.\fP
-Open "\fIStartup Applications\fP" and add "\fIxscreensaver\fP".
+Select "\fIStartup Applications\fP" from the menu (or manually
+launch "\fIgnome-session-properties\fP") and add "\fIxscreensaver\fP".
 .TP 3
 \fB3: Make "Lock Screen" use xscreensaver.\fP
 .EX
@@ -237,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
@@ -256,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)
@@ -884,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-2013 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