Git commit 4c627632a92cbea5a22176f3e9d3c39b9c6fb5f7 by Burkhard Lück. Committed on 04/04/2018 at 19:00. Pushed by lueck into branch 'master'.
Update kcmsmserver docbook to 5.12 proofread + update bump date + releaseinfo replace kddm with sddm replace kde with plasma Differential Revision: https://phabricator.kde.org/D11817 M +16 -17 doc/kcontrol/kcmsmserver/index.docbook https://commits.kde.org/plasma-desktop/4c627632a92cbea5a22176f3e9d3c39b9c6fb5f7 diff --git a/doc/kcontrol/kcmsmserver/index.docbook b/doc/kcontrol/kcmsmserver/index.docbook index d554a2c8..f6805e14 100644 --- a/doc/kcontrol/kcmsmserver/index.docbook +++ b/doc/kcontrol/kcmsmserver/index.docbook @@ -13,8 +13,8 @@ <!-- TRANS:ROLES_OF_TRANSLATORS --> </authorgroup> -<date>2015-04-08</date> -<releaseinfo>Plasma 5.3</releaseinfo> +<date>2018-03-30</date> +<releaseinfo>Plasma 5.12</releaseinfo> <keywordset> <keyword>KDE</keyword> @@ -25,16 +25,16 @@ </articleinfo> <sect1 id="sessions"> -<title>Session Management</title> +<title>Desktop Session</title> <sect2 id="sessions-use"> <title>Use</title> -<para>In this &systemsettings; module you can configure &kde;'s session +<para>In this &systemsettings; module you can configure &plasma;'s session manager and logout settings.</para> -<para>Session management refers to &kde;'s ability to save the state -of applications and windows when you log out of &kde; and restore them +<para>Session management refers to &plasma;'s ability to save the state +of applications and windows when you log out of &plasma; and restore them when you log back in.</para> <sect3 id="sessions-general"> @@ -43,8 +43,8 @@ when you log back in.</para> <varlistentry> <term><guilabel>Confirm logout</guilabel></term> <listitem> -<para>If this option is checked, when logging out, &kde; will display a -dialog asking for confirmation. In this dialog you can also choose +<para>If this option is checked, when logging out, &plasma; will display a +dialog with a default timeout of 30 seconds asking for confirmation. In this dialog you can also choose whether you want to restore your current session when you login the next time.</para> </listitem> @@ -52,7 +52,7 @@ time.</para> <varlistentry> <term><guilabel>Offer shutdown options</guilabel></term> <listitem> -<para>If this option is checked, &kde; will offer a choice of actions during +<para>If this option is checked, &plasma; will offer a choice of actions during logout. These include simply ending the current session (the action performed if shutdown options are not enabled) turning off the computer, or restarting the computer.</para> @@ -64,9 +64,8 @@ computer, or restarting the computer.</para> <sect3 id="sessions-default-leave-options"> <title>Default Leave Option</title> <para>You can configure what should happen by default when you log out of -&kde;. These options are not possible on all operating systems, and some of -them may not appear unless you are using &kdm; as your login manager.</para> - +&plasma;. These options are not possible on all operating systems, and some of +them may not appear unless you are using <application>SDDM</application> as your login manager.</para> <para>The options available are self explanatory, if you are in doubt, leave the default settings. They are:</para> @@ -80,20 +79,20 @@ leave the default settings. They are:</para> <sect3 id="sessions-on-login"> <title>On Login</title> <para>You may choose one of three options on what should happen when -you log into &kde;:</para> +you log into &plasma;:</para> <variablelist> <varlistentry> <term><guilabel>Restore previous session</guilabel></term> -<listitem><para>If this option is checked, &kde; will save your current -session's state when you logout. &kde; will restore your session on the +<listitem><para>If this option is checked, &plasma; will save your current +session's state when you logout. &plasma; will restore your session on the next login, so you can continue to work with a desktop just like you left it.</para> </listitem> </varlistentry> <varlistentry> <term><guilabel>Restore manually saved session</guilabel></term> -<listitem><para>Instead of restoring &kde; to the state it was when +<listitem><para>Instead of restoring &plasma; to the state it was when you logged out last, it will be restored to a specific state that you have saved manually.</para> <para>If this option is checked, the start menu offers an additional item @@ -103,7 +102,7 @@ have saved manually.</para> <varlistentry> <term><guilabel>Start with an empty session</guilabel></term> <listitem> -<para>If you choose this option, &kde; will never restore sessions that it has saved.</para> +<para>If you choose this option, &plasma; will never restore sessions that it has saved.</para> </listitem> </varlistentry> </variablelist>
