summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Cameron <Brian.Cameron@sun.com>2009-09-10 19:20:24 -0500
committerBrian Cameron <Brian.Cameron@sun.com>2009-09-10 19:20:24 -0500
commit8610b7b4a608d758b8bb99b906304f6bc87d092c (patch)
tree7538a847de6236cb2c8826691f6f8fd4d9ae0b6e
parent2df153a444c7123bd6b2fbafe7ed7e2f33791dab (diff)
downloadgdm-8610b7b4a608d758b8bb99b906304f6bc87d092c.tar.gz
Update documentation so the information about how desktop files are installed
and searched is accurate.
-rw-r--r--docs/C/gdm.xml20
1 files changed, 9 insertions, 11 deletions
diff --git a/docs/C/gdm.xml b/docs/C/gdm.xml
index 17ce2a8c..0d573567 100644
--- a/docs/C/gdm.xml
+++ b/docs/C/gdm.xml
@@ -927,12 +927,6 @@ gdm: .your.domain
When the user chooses to log out, or if GDM or the session quit
unexpectedly the user session will be unregistered from ConsoleKit.
</para>
-
- <para>
- If support for ConsoleKit is not desired it can be disabled at build
- time using the "--with-console-kit=no" option when running
- configure.
- </para>
</sect1>
<!-- ============= Configuration ============================= -->
@@ -1959,12 +1953,16 @@ AutostartCondition=GNOME /desktop/gnome/applications/at/screen_keyboard_enabled
</para>
<para>
- These files are installed, by default, to
- <filename>&lt;etc&gt;/X11/sessions/</filename>. For backwards
- compatibility any desktop files in the
- <filename>&lt;etc&gt;/Sessions</filename>,
+ By default, GDM will install desktop files in the
+ <filename>&lt;share&gt;/xsessions</filename> directory. GDM will
+ search the following directories in this order to find desktop files:
+ <filename>&lt;etc&gt;/X11/sessions/</filename>,
+ <filename>&lt;dmconfdir&gt;/Sessions</filename>,
<filename>&lt;share&gt;/xsessions</filename>, and
- <filename>&lt;share/gdm/BuiltInSessions</filename> directories are also recognized by GDM.
+ <filename>&lt;share/gdm/BuiltInSessions</filename>. By default the
+ <filename>&lt;dmconfdir&gt;</filename> is set to
+ <filename>&lt;etc&gt;/dm/</filename> unless GDM is configured to use
+ a different directory via the "--with-dmconfdir" option.
</para>
<para>