summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Cameron <brian.cameron@sun.com>2006-05-02 22:43:41 +0000
committerBrian Cameron <bcameron@src.gnome.org>2006-05-02 22:43:41 +0000
commit16f41eb2912fbdcf8e229e48df219aeadfd254e9 (patch)
tree0cc504fbac8ade3e3b09e689e1739fa5598c561b
parent119de9bb572b0eccf525c77b3a56890fab6c519a (diff)
downloadgdm-16f41eb2912fbdcf8e229e48df219aeadfd254e9.tar.gz
Added comment before [servers] section to address bug #340333.
2006-05-02 Brian Cameron <brian.cameron@sun.com> * config/gdm.conf-custom: Added comment before [servers] section to address bug #340333.
-rw-r--r--ChangeLog7
-rw-r--r--config/gdm.conf-custom9
2 files changed, 15 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f27dcea2..0f5f2450 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-02 Brian Cameron <brian.cameron@sun.com>
+
+ * config/gdm.conf-custom: Added comment before [servers] section
+ to address bug #340333.
+
2006-05-01 Julio M. Merino Vidal <jmmv@NetBSD.org>
* daemon/slave.c: Explicitly adjust the effective GID before
@@ -985,7 +990,7 @@
Fix so that timed/automatic enable is checked and
automatic/timed login is only turned on if they are
enabled. Fix so greeters restart if timed login is
- changed in gdmsetup. Fixes bug #324337.
+ Changed in gdmsetup. Fixes bug #324337.
* gui/gdmcommon.c, gui/gdmlogin.c, gui/greeter/greeter.c,
gui/greeter/greeter_item.c, gui/greeter/greeter_parser.c:
Now gdmlogin and gdmcommon use the same character sequences
diff --git a/config/gdm.conf-custom b/config/gdm.conf-custom
index 1d39fda0..b8471e57 100644
--- a/config/gdm.conf-custom
+++ b/config/gdm.conf-custom
@@ -49,5 +49,14 @@
[debug]
+# Note that to disable servers defined in the defaults.conf file (such as
+# 0=Standard, you must put a line in this file that says 0=inactive, as
+# described in the Configuration section of the GDM documentation.
+#
[servers]
+# Also note, that if you redefine a [server-foo] section, then GDM will
+# use the definition in this file, not the defaults.conf file. It is
+# currently not possible to disable a [server-foo] section defined
+# in the defaults.conf file.
+#