update comments to reflect that the vt stuff works on freebsd as well asGDM2_2_6_0_6

Tue Oct 26 15:51:58 2004  George Lebl <jirka@5z.com>

	* config/gdm.conf.in: update comments to reflect that the vt stuff
	  works on freebsd as well as linux

4 files changed, 41 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 3c71f048..4ec16f20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Oct 26 15:51:58 2004  George Lebl <jirka@5z.com>
+
+	* config/gdm.conf.in: update comments to reflect that the vt stuff
+	  works on freebsd as well as linux
+
 Tue Oct 26 15:24:21 2004  George Lebl <jirka@5z.com>
 
 	* daemon/gdm.[ch]: Add a global cookie in <ServAuthDir>/.cookie which
diff --git a/NEWS b/NEWS
index 76d94edf..dee21565 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,32 @@
 Ahh news...
 
+2.6.0.6 stuff:
+
+- Allow flexi x servers to be launched from the fifo script with
+  "echo FLEXI_XSERVER > <ServAuthDir>/.gdmfifo" (Tuukka Hastrup, me)
+
+- Autologin works on the first handled display not just first local
+  display
+
+- There is a global cookie for the SUP protocol in <ServAuthDir>/.cookie
+
+- Xnest is set up properly on Solaris (Brian)
+
+- Fixup comments in the config file (Brian, me)
+
+- Fix language selection (Ray Strode)
+
+- Set the GDM_XSERVER_LOCATION env var on the session so that the
+  user can find out what they can do.
+
+- Fix logindevperm stuff to allow a11y access to sound (Brian Cameron)
+
+- Solaris build fixes for Solaris 9 and earlier (Brian Cameron)
+
+- Translation updates (Kjartan Maraas, Christophe Merlet, Changwoo Ryu,
+  Laszlo Dvornik, Adam Weinberger, Zygimantas Berucka, Alessio Frusciante,
+  Francesco Marletta)
+
 2.6.0.5 stuff:
 
 - Doc update (Brian Cameron)
diff --git a/config/gdm.conf.in b/config/gdm.conf.in
index 5a3d538d..35d97e54 100644
--- a/config/gdm.conf.in
+++ b/config/gdm.conf.in
@@ -137,7 +137,7 @@ Xnest=@X_XNEST_PATH@/Xnest @X_XNEST_CONFIG_OPTIONS@
 #FirstVT=7
 #VTAllocation=true
 # Should double login be treated with a warning (and possibility to change
-# vts on linux systems for console logins)
+# vts on linux and freebsd systems for console logins)
 #DoubleLoginWarning=true
 
 # If true then the last login information is printed to the user before
@@ -399,13 +399,13 @@ Enable=false
 # the 0 server is used.
 0=Standard
 #1=Standard
-# Note the VTAllocation and FirstVT keys on linux.  Don't add any vt<number>
-# arguments if VTAllocation is on, and set FirstVT to be the first vt
-# available that your gettys don't grab (gettys are usually dumb and grab
-# even a vt that has already been taken).  Using 7 will work pretty much for
-# all linux distributions.  VTAllocation is not currently implemented on
-# anything but linux since I don't own any non-linux systems.  Feel free to
-# send patches.  X servers will just not get any extra arguments then.
+# Note the VTAllocation and FirstVT keys on linux and freebsd.
+# Don't add any vt<number> arguments if VTAllocation is on, and set FirstVT to
+# be the first vt available that your gettys don't grab (gettys are usually
+# dumb and grab even a vt that has already been taken).  Using 7 will work
+# pretty much for all linux distributions.  VTAllocation is not currently
+# implemented on anything but linux and freebsd.  Feel free to send patches.
+# X servers will just not get any extra arguments then.
 #
 # If you want to run an X terminal you could add an X server such as this
 #0=Terminal -query serverhostname
diff --git a/configure.in b/configure.in
index 20cb3f85..a88e325f 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ AC_PREREQ(2.52)
 AC_INIT(daemon/gdm.h)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(gdm,2.6.0.5)
+AM_INIT_AUTOMAKE(gdm,2.6.0.6)
 AM_MAINTAINER_MODE
 
 AC_PROG_INTLTOOL([0.28])