Partially revert my last commit. As blackend@ said, the KDE people call

their display manager "kdm"; so should we.  To avoid starting a sentence
with a lowercase "kdm" word, I had to reword a bit one of the changes.
This commit is contained in:
Giorgos Keramidas 2004-07-18 15:12:26 +00:00
parent ba48780ff8
commit b1e19f4405
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/head/; revision=21566

View file

@ -1159,9 +1159,9 @@ DisplayManager.requestPort: 0</screen>
<para>Several replacements for the default <para>Several replacements for the default
<application>XDM</application> program exist. One of them, <application>XDM</application> program exist. One of them,
<application>KDM</application> (bundled with <application>kdm</application> (bundled with
<application>KDE</application>) is described later in this <application>KDE</application>) is described later in this
chapter. <application>KDM</application> offers many visual chapter. The <application>kdm</application> display manager offers many visual
improvements and cosmetic frills, as well as the improvements and cosmetic frills, as well as the
functionality to allow users to choose their window manager functionality to allow users to choose their window manager
of choice at login time.</para> of choice at login time.</para>
@ -1266,7 +1266,7 @@ DisplayManager.requestPort: 0</screen>
<para>Another option is to configure the display manager to <para>Another option is to configure the display manager to
allow choosing the window manager at login time; the section on allow choosing the window manager at login time; the section on
<link linkend="x11-wm-kde-details">KDE details</link> <link linkend="x11-wm-kde-details">KDE details</link>
explains how to do this for <application>KDM</application>, the explains how to do this for <application>kdm</application>, the
display manager of <application>KDE</application>.</para> display manager of <application>KDE</application>.</para>
</sect3> </sect3>
@ -1406,7 +1406,7 @@ DisplayManager.requestPort: 0</screen>
<application>XDM</application> is being used, the <application>XDM</application> is being used, the
configuration is slightly different. Edit the configuration is slightly different. Edit the
<filename>.xsession</filename> file instead. Instructions <filename>.xsession</filename> file instead. Instructions
for <application>KDM</application> are described later in for <application>kdm</application> are described later in
this chapter.</para> this chapter.</para>
</sect3> </sect3>
</sect2> </sect2>
@ -1437,7 +1437,7 @@ DisplayManager.requestPort: 0</screen>
<link linkend="x-xdm"><application>XDM</application></link> can be <link linkend="x-xdm"><application>XDM</application></link> can be
used, as described earlier. However, used, as described earlier. However,
<application>KDE</application> includes an <application>KDE</application> includes an
alternative, <application>KDM</application>, which is designed alternative, <application>kdm</application>, which is designed
to look more attractive and include more login-time options. to look more attractive and include more login-time options.
In particular, users can easily choose (via a menu) which In particular, users can easily choose (via a menu) which
desktop environment (<application>KDE</application>, desktop environment (<application>KDE</application>,
@ -1476,12 +1476,12 @@ DisplayManager.requestPort: 0</screen>
<guibutton>Apply</guibutton> at the bottom, and quit the <guibutton>Apply</guibutton> at the bottom, and quit the
control center.</para> control center.</para>
<para>To make sure <application>KDM</application> understands <para>To make sure <application>kdm</application> understands
what the labels (<application>KDE</application>, what the labels (<application>KDE</application>,
<application>GNOME</application> etc) mean, edit the files used <application>GNOME</application> etc) mean, edit the files used
by <link linkend="x-xdm">XDM</link>. by <link linkend="x-xdm">XDM</link>.
<note><para>In <application>KDE 2.2</application> this has <note><para>In <application>KDE 2.2</application> this has
changed: <application>KDM</application> now uses its own changed: <application>kdm</application> now uses its own
configuration files. Please see the <application>KDE configuration files. Please see the <application>KDE
2.2</application> documentation for details.</para> 2.2</application> documentation for details.</para>
</note> </note>
@ -1526,7 +1526,7 @@ esac</screen>
<screen>/usr/local/bin/kdmdesktop</screen> <screen>/usr/local/bin/kdmdesktop</screen>
<para>Now, make sure <application>KDM</application> is listed in <para>Now, make sure <application>kdm</application> is listed in
<filename>/etc/ttys</filename> to be started at the next bootup. <filename>/etc/ttys</filename> to be started at the next bootup.
To do this, simply follow the instructions from the previous To do this, simply follow the instructions from the previous
section on <link linkend="x-xdm">xdm</link> and replace section on <link linkend="x-xdm">xdm</link> and replace
@ -1641,7 +1641,7 @@ esac</screen>
with the <filename>/usr/X11R6/bin/startxfce4</filename> with the <filename>/usr/X11R6/bin/startxfce4</filename>
command; or, configure the display manager to allow command; or, configure the display manager to allow
choosing a desktop at login time, as explained in choosing a desktop at login time, as explained in
the section on <link linkend="x11-wm-kde-kdm">KDM</link>.</para> the section on <link linkend="x11-wm-kde-kdm">kdm</link>.</para>
</sect3> </sect3>
</sect2> </sect2>
</sect1> </sect1>