Copy the KDE 3.5 branch to branches/trinity for new KDE 3.5 features.

BUG:215923


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1054174 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

2 files changed, 111 insertions, 0 deletions

diff --git a/doc/kcontrol/kcmsmserver/Makefile.am b/doc/kcontrol/kcmsmserver/Makefile.am
new file mode 100644
index 000000000..cf4388a52
--- /dev/null
+++ b/doc/kcontrol/kcmsmserver/Makefile.am
@@ -0,0 +1,2 @@
+KDE_LANG  = en
+KDE_DOCS = kcontrol/kcmsmserver
diff --git a/doc/kcontrol/kcmsmserver/index.docbook b/doc/kcontrol/kcmsmserver/index.docbook
new file mode 100644
index 000000000..65cb9423f
--- /dev/null
+++ b/doc/kcontrol/kcmsmserver/index.docbook
@@ -0,0 +1,109 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
+"dtd/kdex.dtd" [
+<!ENTITY % addindex "IGNORE">
+<!ENTITY % English "INCLUDE" > <!-- change language only here -->
+]>
+
+<article lang="&language;">
+<articleinfo>
+
+<authorgroup>
+<author>&Jost.Schenck; &Jost.Schenck.mail;</author>
+<!-- TRANS:ROLES_OF_TRANSLATORS -->
+</authorgroup>
+
+<date>2003-10-13</date>
+<releaseinfo>3.2</releaseinfo>
+
+<keywordset>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>session</keyword>
+</keywordset>
+</articleinfo>
+
+<sect1 id="sessions">
+<title>Session Manager</title>
+
+<sect2 id="sessions-use">
+<title>Use</title>
+
+<para>In this control module you can configure &kde;'s session
+manager.</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
+when you log back in.</para>
+
+<variablelist>
+<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
+whether you want to restore your current session when you login the next
+time.</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term><guilabel>Offer shutdown options</guilabel></term>
+<listitem>
+<para>If this option is checked, &kde; 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>
+</listitem>
+</varlistentry>
+</variablelist>
+
+<para>You may choose one of three options on what should happen when
+you log into &kde;:</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
+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
+you logged out last, it will be restored to a specific state that you
+have saved manually. <!-- FIXME: How do you *save* the session in the
+first place? --></para></listitem>
+</varlistentry>
+<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>
+</listitem>
+</varlistentry>
+</variablelist>
+
+<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>
+
+<para>The options available are self explanatory, if you are in doubt,
+leave the default settings.  They are:</para>
+
+<itemizedlist>
+<listitem><para><guilabel>End current session</guilabel> (this is the default)</para></listitem>
+<listitem><para><guilabel>Turn off computer</guilabel></para></listitem>
+<listitem><para><guilabel>Restart computer</guilabel></para></listitem>
+</itemizedlist>
+
+<para>Finally, you can enter a colon (<literal>:</literal>)
+separated list of applications that should not be saved in sessions,
+and therefore won't be started when restoring a session.  For example
+<userinput>xterm:konsole</userinput>.</para>
+
+</sect2>
+
+</sect1>
+
+</article>
\ No newline at end of file