summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Cameron <Brian.Cameron@sun.com>2009-11-18 18:25:58 -0600
committerBrian Cameron <Brian.Cameron@sun.com>2009-11-18 18:25:58 -0600
commit463987d4cb24afd1d71cbdd1db7d7d4a92504c05 (patch)
tree8018102477245f7a1604b533e3c1222af7e51a40
parent0b8766f3d96526fb3cf733f56768749ecf61292c (diff)
downloadgdm-463987d4cb24afd1d71cbdd1db7d7d4a92504c05.tar.gz
Move the new paragraph from the Autostart Configuration section to the
GDM Session Configuration section, which makes more sense.
-rw-r--r--docs/C/gdm.xml35
1 files changed, 18 insertions, 17 deletions
diff --git a/docs/C/gdm.xml b/docs/C/gdm.xml
index 9315e6f9..3ed6a78d 100644
--- a/docs/C/gdm.xml
+++ b/docs/C/gdm.xml
@@ -1056,22 +1056,6 @@ PostSession/
various AT programs if the configuration values specified in the
Accessibility Configuration section below are set.
</para>
-
- <para>
- Desktop files support a GDM specific key
- &quot;X-GDM-BypassXsession&quot;. If the key is not specified in a
- desktop file, the value defaults to &quot;false&quot;. If this key is
- specified to be &quot;true&quot; in a desktop file, then GDM will
- launch the program specified by the desktop file &quotExec&quot; key
- directly when starting the user session. It will not run the program
- via the <filename>&lt;etc&gt;/gdm/Xsession</filename> script, which is
- the normal behavior. Since bypassing the
- <filename>&lt;etc&gt;/gdm/Xsession</filename> script avoids setting up
- the user session with the normal system and user settings, sessions
- started this way can be useful for debugging problems in the system or
- user scripts that might be preventing a user from being able to start
- a session.
- </para>
</sect2>
<sect2 id="xsessionscript">
@@ -2007,8 +1991,25 @@ AutostartCondition=GNOME /desktop/gnome/applications/at/screen_keyboard_enabled
<para>
A session can be disabled by editing the desktop file and adding a line
- that says <filename>Hidden=true</filename>.
+ as follows: <filename>Hidden=true</filename>.
</para>
+
+ <para>
+ Desktop files support a GDM specific key
+ &quot;X-GDM-BypassXsession&quot;. If the key is not specified in a
+ desktop file, the value defaults to &quot;false&quot;. If this key is
+ specified to be &quot;true&quot; in a desktop file, then GDM will
+ launch the program specified by the desktop file &quotExec&quot; key
+ directly when starting the user session. It will not run the program
+ via the <filename>&lt;etc&gt;/gdm/Xsession</filename> script, which is
+ the normal behavior. Since bypassing the
+ <filename>&lt;etc&gt;/gdm/Xsession</filename> script avoids setting up
+ the user session with the normal system and user settings, sessions
+ started this way can be useful for debugging problems in the system or
+ user scripts that might be preventing a user from being able to start
+ a session.
+ </para>
+
</sect2>
<sect2 id="userconfig">