[Xfce4-commits] <xfce4-session:master> Generate documentation during dist check.

Nick Schermer noreply at xfce.org
Fri Aug 27 19:26:01 CEST 2010


Updating branch refs/heads/master
         to b3a1eb73bd2db7479cabfd34c049088efbe4efa3 (commit)
       from 9fb5bf5a6e628984ddcbdf90fbf078eb226e2954 (commit)

commit b3a1eb73bd2db7479cabfd34c049088efbe4efa3
Author: Nick Schermer <nick at xfce.org>
Date:   Fri Aug 27 18:10:06 2010 +0200

    Generate documentation during dist check.
    
    Build documentation with --enable-gen-doc. Included a dummy
    da.po file else the build fails.

 Makefile.am                                        |    3 +
 configure.in.in                                    |   52 ++-
 doc/C/Makefile.am                                  |   17 -
 doc/C/images/.cvsignore                            |    1 -
 doc/C/images/Makefile.am                           |    7 -
 doc/C/xfce4-session.html                           |  140 ------
 doc/Makefile.am                                    |    3 +-
 doc/fr/.cvsignore                                  |    1 -
 doc/fr/Makefile.am                                 |   17 -
 doc/fr/images/.cvsignore                           |    1 -
 doc/fr/images/Makefile.am                          |    7 -
 doc/fr/images/xfsm-advanced.png                    |  Bin 28318 -> 0 bytes
 doc/fr/images/xfsm-general.png                     |  Bin 23536 -> 0 bytes
 doc/fr/images/xfsm-splash.png                      |  Bin 30339 -> 0 bytes
 doc/fr/xfce4-session.html                          |  105 -----
 doc/fr/xfce4-session.xml                           |  468 --------------------
 doc/manual/Makefile.am                             |  126 ++++++
 doc/{C => manual/images}/.cvsignore                |    0
 doc/manual/images/Makefile.am                      |   11 +
 doc/{C => manual}/images/xfsm-advanced.png         |  Bin 24131 -> 24131 bytes
 doc/{C => manual}/images/xfsm-general.png          |  Bin 18114 -> 18114 bytes
 doc/{C => manual}/images/xfsm-splash.png           |  Bin 79996 -> 79996 bytes
 doc/manual/po/Makefile.am                          |    7 +
 doc/manual/po/da.po                                |  418 +++++++++++++++++
 doc/manual/po/xfce4-session.pot                    |  413 +++++++++++++++++
 .../xfce4-session-html.xsl}                        |   20 +-
 doc/{C => manual}/xfce4-session.xml                |  195 ++++-----
 27 files changed, 1120 insertions(+), 892 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index c3d084c..59f1896 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -53,4 +53,7 @@ ChangeLog: Makefile
 
 dist-hook: ChangeLog
 
+DISTCHECK_CONFIGURE_FLAGS =						\
+	--enable-gen-doc
+
 # vi:set ts=8 sw=8 noet ai nocindent:
diff --git a/configure.in.in b/configure.in.in
index 104bdab..40da529 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -204,7 +204,7 @@ fi
 dnl check for linux/ioprio.h, and also check that the header actually
 dnl works, as some kernels have bad headers.  using AC_CHECK_HEADERS()
 dnl prints a scary warning with a request to report a bug if it fails,
-dnl but we don't want that.
+dnl but we do not want that.
 AC_MSG_CHECKING([whether linux/ioprio.h exists and actually works])
 AC_COMPILE_IFELSE([
 AC_INCLUDES_DEFAULT
@@ -216,14 +216,41 @@ if test "x$linux_ioprio_works" = "xyes"; then
             [Defined if linux/ioprio.h not only exists, but works properly])
 fi
 
+
+dnl ***************************************************
+dnl *** Check if we need to build the documentation ***
+dnl ***************************************************
+AC_ARG_ENABLE([gen-doc], [AC_HELP_STRING([--enable-gen-doc], 
+              [Generate HTML documentation (requires xsltproc, xml2po and xmllint) [default=no]])],, [enable_gen_doc=no])
+if test x"$enable_gen_doc" = x"yes"; then
+    AC_PATH_PROG([XSLTPROC], [xsltproc], [no])
+    if test x"$XSLTPROC" = x"no"; then
+        enable_gen_doc=no
+    fi
+
+    AC_PATH_PROG([XML2PO], [xml2po], [no])
+    if test x"$XML2PO" = x"no"; then
+        enable_gen_doc=no
+    fi
+
+    AC_PATH_PROG([XMLLINT], [xmllint], [no])
+    if test x"$XML2PO" = x"no"; then
+        enable_gen_doc=no
+    fi
+
+    if test x"$enable_gen_doc" = x"no"; then
+        AC_MSG_ERROR([Compiling with --enable-gen-doc but one of xml2po, xsltproc or xmllint not found.])
+    fi
+fi
+AM_CONDITIONAL([GENERATE_DOCUMENTATION], [test x"$enable_gen_doc" = x"yes"])
+
 AC_OUTPUT([
 Makefile
 xfce4-session.spec
 doc/Makefile
-doc/C/Makefile
-doc/C/images/Makefile
-doc/fr/Makefile
-doc/fr/images/Makefile
+doc/manual/Makefile
+doc/manual/images/Makefile
+doc/manual/po/Makefile
 engines/Makefile
 engines/balou/Makefile
 engines/balou/scripts/Makefile
@@ -248,3 +275,18 @@ xfce4-tips/Makefile
 xfce4-tips/data/Makefile
 xfsm-shutdown-helper/Makefile
 ])
+
+dnl ***************************
+dnl *** Print configuration ***
+dnl ***************************
+echo
+echo "Build Configuration:"
+echo
+if test x"$enable_gen_doc" = x"yes"; then
+echo "* Documentation: yes (generate)"
+elif test -d "${srcdir}/docs/manual/html"; then
+echo "* Documentation: yes (in tarball)"
+else
+echo "* Documentation: no"
+fi
+echo
diff --git a/doc/C/Makefile.am b/doc/C/Makefile.am
deleted file mode 100644
index 54c52e1..0000000
--- a/doc/C/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-SUBDIRS = 								\
-	images
-
-noinst_DATA =								\
-	xfce4-session.xml
-
-docdir = $(datadir)/xfce4/doc/C
-doc_DATA =								\
-	xfce4-session.html
-
-EXTRA_DIST = 								\
-	$(noinst_DATA)							\
-	$(doc_DATA)
-
-html: $(srcdir)/xfce4-session.xml
-	xsltproc $(top_srcdir)/docs/xfce-nochunk.xsl			\
-		$(srcdir)/xfce4-session.xml
diff --git a/doc/C/images/.cvsignore b/doc/C/images/.cvsignore
deleted file mode 100644
index f3c7a7c..0000000
--- a/doc/C/images/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/doc/C/images/Makefile.am b/doc/C/images/Makefile.am
deleted file mode 100644
index 855026e..0000000
--- a/doc/C/images/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-imagesdir = $(datadir)/xfce4/doc/C/images
-images_DATA =								\
-	xfsm-advanced.png						\
-	xfsm-general.png						\
-	xfsm-splash.png
-
-EXTRA_DIST = $(images_DATA)
diff --git a/doc/C/xfce4-session.html b/doc/C/xfce4-session.html
deleted file mode 100644
index 8161885..0000000
--- a/doc/C/xfce4-session.html
+++ /dev/null
@@ -1,140 +0,0 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Xfce 4 Session Manager</title><link rel="stylesheet" href="../xfce.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.68.1"><link rel="start" href="#xfce4-session" title="Xfce 4 Session Manager"><link rel="next" href="#xfsm-intro" title="Introduction"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="article" lang="en"><div class="titlepage"><div><div><h1 class="title"><a name="xfce4-session"></a>Xfce 4 Session Manager</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Benedikt</span> <span class="surname">Meurer</span></h3><div class="affiliation"><div class="address"><p><code class="email"><<a href="mailto:benny at xfce.org">benny at xfce.org</a>></code></p></div><span class="orgname">os-cillation<br></span><span class="orgdiv">System development<br></sp
 an><span class="jobtitle">Software developer<br></span></div></div></div></div><div><span xmlns="http://www.w3.org/TR/xhtml1/transitional" class="releaseinfo">
-    This manual describes the <strong xmlns="" class="application"><code>xfce4-session</code></strong> package, version 4.3.
-  <br></br></span></div><div><p class="copyright">Copyright © 2003, 2004, 2005 Benedikt Meurer</p></div><div><div class="legalnotice"><a name="legalnotice"></a><p>
-      Permission is granted to copy, distribute and/or modify this document
-      under the terms of the GNU Free Documentation License, Version 1.1 or
-      any later version published by the Free Software Foundation; with no
-      Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
-      Texts. The complete license text is available from the <a href="http://www.gnu.org/" target="_top">Free Software Foundation</a>.
-    </p></div></div><div><p class="pubdate">July 2005</p></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="#xfsm-intro">Introduction</a></span></dt><dt><span class="sect1"><a href="#xfce4-session-settings">Session Manager settings</a></span></dt><dd><dl><dt><span class="sect2"><a href="#xfsm-general-settings">General preferences</a></span></dt><dt><span class="sect2"><a href="#xfsm-advanced%20settings">Advanced preferences</a></span></dt></dl></dd><dt><span class="sect1"><a href="#xfsm-customize">Customizing the Session Manager</a></span></dt><dd><dl><dt><span class="sect2"><a href="#xfsm-engines">Splash screen settings</a></span></dt><dt><span class="sect2"><a href="#xfsm-shutdown">Shutdown/reboot options</a></span></dt></dl></dd><dt><span class="sect1"><a href="#xfsm-advanced">Advanced</a></span></dt><dd><dl><dt><span class="sect2"><a href="#files-and-env-vars">Files and Environment Variables</a></span></dt><dt><span
  class="sect2"><a href="#xfsm-kiosk-mode">Kiosk Mode</a></span></dt></dl></dd><dt><span class="sect1"><a href="#xfsm-copyright">About <strong class="application"><code>xfce4-session</code></strong></a></span></dt></dl></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="xfsm-intro"></a>Introduction</h2></div></div></div><p><strong class="application"><code>xfce4-session</code></strong> is a session manager for Xfce 4. Its task is to save the state of 
-  your desktop (opened applications and their location) and restore it during a next 
-  startup. You can create several different sessions and choose one of them on 
-  startup.
-  </p><p><strong class="application"><code>xfce4-session</code></strong> provides session management for both X11R6 and 
-  legacy X11R5 protocols. If you don't need legacy session management 
-  support, you can disable it at compile time, giving 
-  --disable-legacy-sm to ./configure. Do <span class="emphasis"><em>NOT EVER</em></span> run <strong class="application"><code>smproxy</code></strong> in 
-  session that is managed by <strong class="application"><code>xfce4-session</code></strong>, or weird things will happen. 
-  The included legacy session management does everything that <strong class="application"><code>smproxy</code></strong>
-  would do, and besides that, it also supports multiscreen display.</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="xfce4-session-settings"></a>Session Manager settings</h2></div></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="xfsm-general-settings"></a>General preferences</h3></div></div></div><div class="figure"><a name="xfsm-general-fig"></a><p class="title"><b>Figure 1. <code class="application">xfce4-session</code> general preferences</b></p><div class="screenshot"><div class="mediaobject"><img src="images/xfsm-general.png" alt="Shows the General tab of the xfce4-session settings dialog."></div></div></div><div class="variablelist"><dl><dt><span class="term">Display chooser on login</span></dt><dd><p>If set, the session manager will ask you to choose a session every 
-            time you log in to Xfce.</p></dd><dt><span class="term">Automatically save session on logout</span></dt><dd><p>This option instructs the session manager to save the current 
-          session automatically when you log out. If you don't select this option 
-          you'll be prompted whether you want to save the current session on 
-          each logout.</p></dd><dt><span class="term">Prompt on logout</span></dt><dd><p>This option disables the logout confirmation dialog. Whether 
-          the session will be saved or not depends on whether you enabled the 
-          automatic saving of sessions on logout or not.</p></dd></dl></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="xfsm-advanced%20settings"></a>Advanced preferences</h3></div></div></div><div class="figure"><a name="xfsm-advanced-fig"></a><p class="title"><b>Figure 2. <code class="application">xfce4-session</code> advanced preferences</b></p><div class="screenshot"><div class="mediaobject"><img src="images/xfsm-advanced.png" alt="Shows Advanced tab of the xfce4-session settings dialog."></div></div></div><div class="variablelist"><dl><dt><span class="term">Launch Gnome services on startup</span></dt><dd><p>Enable this option if you need the GNOME keyring daemon to be run
-          on startup. This option also instructs <strong class="application"><code>xfce4-session</code></strong> to bring up the GNOME assistive
-          technologies at startup (if enabled in the GNOME control center). See the
-           GNOME documentation for more information on this topic.</p></dd><dt><span class="term">Launch KDE services on startup</span></dt><dd><p>Enable this option if you plan to run KDE applications as part of 
-          your Xfce Desktop session. This will notably increase the startup time, 
-          but on the other hand, KDE applications will startup faster. Some KDE 
-          applications may not work at all if you don't enable this option.</p></dd><dt><span class="term">Manage remote applications</span></dt><dd><p>Allow the session manager to manage applications running on 
-          remote hosts. Since this option may constitute a security risk, by listening to  
-          a TCP port on your system, do not enable it unless you know what you are
-          doing.</p><p>System administrators may want to disable this option globally using the
-          session managers <a href="#xfsm-kiosk-mode" target="_top">KIOSK
-          capabilities</a>.</p></dd></dl></div></div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="xfsm-customize"></a>Customizing the Session Manager</h2></div></div></div><p>You can customize the splash-screen that <strong class="application"><code>xfce4-session</code></strong> will use when you log in to
-	Xfce 4. There is a dedicated dialog available from the <span class="emphasis"><em>Xfce 4
-  Settings Manager</em></span>.</p><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="xfsm-engines"></a>Splash screen settings</h3></div></div></div><div class="figure"><a name="splash-screen-settings-fig"></a><p class="title"><b>Figure 3. Splash screen settings dialog</b></p><div class="screenshot"><div class="mediaobject"><img src="images/xfsm-splash.png" alt="Shows the xfce4-session splash screen settings dialog."></div></div></div><p>On the left, the dialog shows a list of all installed engines.
-    Select an engine, and you will see, if available, a preview and
-    information about it. You can click on the <span><strong class="guibutton">Test</strong></span>
-    button to see a demonstration of the selected splash screen
-    engine.</p><p><strong class="application"><code>xfce4-session</code></strong> provides three Splash themes engines by default. Their
-    respective configuration options - if any - are available from the
-    <span><strong class="guibutton">Configure</strong></span> button.</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="xfsm-shutdown"></a>Shutdown/reboot options</h3></div></div></div><p><strong class="application"><code>xfce4-session</code></strong> supports shutting down your computer when you log out
-    of your desktop session. To be able to shutdown the computer, you
-    have to be listed in the systems <code class="filename">sudoers</code> file,
-    in particular, you must be allowed to execute the command
-    <code class="filename">${libdir}/xfce4/session/xfsm-shutdown-helper</code>
-    (<code class="filename">/usr/sbin/xfsm-shutdown-helper</code> on Debian GNU/Linux)
-    as user root (where <code class="filename">${libdir}</code> is the <code class="filename">lib</code> sub directory in the prefix you
-    installed <strong class="application"><code>xfce4-session</code></strong>, for example
-    <code class="filename">/usr/local/lib</code>).</p><p>For example, lets say, you installed <strong class="application"><code>xfce4-session</code></strong> into <code class="filename">/usr/local</code>, your hostname is <span class="emphasis"><em>myhost</em></span>
-    and your user account is named <span class="emphasis"><em>myuser</em></span>, then you
-    would have to add the following line to your <code class="filename">sudoers</code>
-    file (remember to use <strong class="application"><code>visudo</code></strong> to edit
-    that file):</p><pre class="programlisting">
-myuser myhost=/usr/local/lib/xfce4/session/xfsm-shutdown-helper
-</pre></div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="xfsm-advanced"></a>Advanced</h2></div></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="files-and-env-vars"></a>Files and Environment Variables</h3></div></div></div><p>Xfce now uses the Basedir Specification as defined on <a href="http://freedesktop.org/" target="_top">Freedesktop.org</a> to
-    locate its data and configuration files. This means that file locations
-    will be specified as a path relative to the directories described in
-    the specification.</p><div class="variablelist"><dl><dt><span class="term">${XDG_CONFIG_HOME}</span></dt><dd><p>The first base directory to look for configuration 
-          files. By default this is set to <code class="filename">~/.config/</code>.</p></dd><dt><span class="term">${XDG_CONFIG_DIRS}</span></dt><dd><p>A list of system directories that contain configuration
-          data. By default the panel will look in <code class="filename">${sysconfdir}/xdg/</code> and 
-          <code class="filename">/etc/xdg/</code>. The value of
-          ${sysconfdir} depends on how the program was build and will often be
-          <code class="filename">/etc/</code> for binary
-          packages.</p></dd><dt><span class="term">${XDG_CACHE_HOME}</span></dt><dd><p>Specifies the root for all user-specific cache data. If
-          this environment variable is unset, it defaults to <code class="filename">~/.cache</code>.</p></dd><dt><span class="term">${XDG_CONFIG_DIRS}/autostart/</span></dt><dd><p>This is the location where the list of applications that
-          should be automatically run on login is stored. Each autostarted
-          application is represented by a <code class="filename">.desktop</code>
-          file (see the <a href="http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html" target="_top">Desktop
-          Entry Specification</a> for details).</p><p>Prior to Xfce 4.3, the list of autostarted applications
-          was stored in <code class="filename">~/Desktop/Autostart</code>,
-          which contained scripts and symbolic links to applications. If
-          you run <strong class="application"><code>xfce4-session</code></strong> 4.3 or above for the first time, it will
-          automatically migrate the autostart items from the old location
-          to the standard location and place a <code class="filename">LOCATION-CHANGED.txt</code>
-          file in the old directory, that describes the location change.</p></dd><dt><span class="term">${XDG_CONFIG_DIRS}/xfce4-session/xfce4-session.rc</span></dt><dd><p>This is the location of the configuration file that
-          includes the various settings for <strong class="application"><code>xfce4-session</code></strong>, which can be changed
-          from the settings dialog.</p></dd><dt><span class="term">${XDG_CONFIG_DIRS}/xfce4-session/xfce4-splash.rc</span></dt><dd><p>This is the location of the configuration file that
-          includes the configuration for the splash screen, which
-          can be changed from the settings dialog.</p></dd><dt><span class="term">${XDG_CACHE_HOME}/sessions/</span></dt><dd><p>The directory where <strong class="application"><code>xfce4-session</code></strong> and <strong class="application"><code>xfwm4</code></strong>
-          store the session data to.</p></dd><dt><span class="term">${sysconfdir}/xdg/xfce4/kiosk/kioskrc</span></dt><dd><p>Kiosk mode configuration file. See <a href="#xfsm-kiosk-mode" target="_top">next
-          section</a> for an explanation.</p></dd></dl></div><p>None of the configuration files, except the <code class="filename">kioskrc</code>,
-    are designed to be edited by hand during a Xfce session; in fact, the changes will
-    be overwritten if you edit them while the session manager or the settings managers
-    are running.</p><p>System administrators might want to customize the file
-    <code class="filename">${sysconfdir}/xdg/xfce4-session/xfce4-session.rc</code> to change
-    the default applications that are run on Xfce startup. For example, if you want to
-    start the <strong class="application"><code>xfce4-iconbox</code></strong> instead of the 
-    <strong class="application"><code>xftaskbar4</code></strong>, you would change the <span class="emphasis"><em>[Failsafe
-    Session]</em></span> section like to something like this:</p><pre class="programlisting">
-[Failsafe Session]
-Count=4
-Client0_Command=xfwm4
-Client0_PerScreen=False
-Client1_Command=xfce4-panel
-Client1_PerScreen=True
-Client2_Command=xfce4-iconbox
-Client2_PerScreen=True
-Client3_Command=xfdesktop
-Client3_PerScreen=False
-</pre></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="xfsm-kiosk-mode"></a>Kiosk Mode</h3></div></div></div><p>The session manager offers support for the Kiosk Mode, that helps to
-    prevent users from making changes to their session settings. To use it you
-    have to edit or create the file
-    <code class="filename">${sysconfdir}/xdg/xfce4/kiosk/kioskrc</code>.</p><p>The way to explain the format of this file is by using an example. The
-    xfce4-session section of your <code class="filename">kioskrc</code> might look like
-    this:</p><pre class="programlisting">
-[xfce4-session]
-CustomizeSplash=ALL
-CustomizeChooser=ALL
-CustomizeLogout=ALL
-CustomizeCompatibility=%wheel
-Shutdown=%wheel
-CustomizeSecurity=NONE
-</pre><p>This allows all users to change their splash, chooser and logout settings,
-    but allows only users in the group <span class="emphasis"><em>wheel</em></span> to customize the 
-    compatibility settings and shutdown the system. No one will be allowed to adjust
-    the security settings.</p><p>The session manager supports the following KIOSK capabilities:</p><div class="variablelist"><dl><dt><span class="term">CustomizeSplash</span></dt><dd><p>Whether or not the user is allowed to customize the splash screen.</p></dd><dt><span class="term">CustomizeChooser</span></dt><dd><p>Whether or not the user is allowed to customize the session chooser settings.</p></dd><dt><span class="term">CustomizeLogout</span></dt><dd><p>Whether or not the user is allowed to customize the logout settings.</p></dd><dt><span class="term">CustomizeCompatibility</span></dt><dd><p>Whether or not the user is allowed to customize the compatibility
-          settings (KDE/Gnome compat)</p></dd><dt><span class="term">CustomizeSecurity</span></dt><dd><p>Whether or not the user is allowed to customize the security settings.
-          This is one of the most <span class="emphasis"><em>IMPORTANT</em></span> settings, since it
-          prevents users (actually <code class="filename">libICE</code>) from binding to a TCP port.</p></dd><dt><span class="term">Shutdown</span></dt><dd><p>Whether or not the user is allowed to shutdown (reboot or poweroff) the system.
-          If a user lacks this capability the reboot and poweroff options in the shutdown
-          dialog will be greyed out.</p></dd></dl></div></div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="xfsm-copyright"></a>About <strong class="application"><code>xfce4-session</code></strong></h2></div></div></div><p><strong class="application"><code>xfce4-session</code></strong> was written by Benedikt Meurer 
-  (<code class="email"><<a href="mailto:benny at xfce.org">benny at xfce.org</a>></code>).
-    To find more information, please visit the 
-    <a href="http://www.xfce.org" target="_top">Xfce web site</a>. 
-  </p><p>To report a bug or make a suggestion regarding this application or
-    this manual, use the bug tracking system at <a href="http://bugzilla.xfce.org/" target="_top">http://bugzilla.xfce.org/</a>. 
-  </p><p>If you have questions about the use or installation of this package,
-    please ask on the <a href="http://lunar-linux.org/mailman/listinfo/xfce" target="_top">xfce</a> mailing list. Development discussion takes
-    place on the <a href="http://lunar-linux.org/mailman/listinfo/xfce4-dev" target="_top">xfce4-dev</a> mailing list.
-  </p><p> This program is distributed under the terms of the
-    GNU General Public License as published by the Free Software Foundation; 
-    either version 2 of the License, or (at your option) any later version.
-  </p><p>You should have received a copy of the GNU General Public License 
-    along with this program; if not, write to the Free Software 
-    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-    USA.
-  </p></div></div></body></html>
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 3eb4c99..eca067f 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,8 +1,7 @@
 @SET_MAKE@
 
 SUBDIRS =								\
-	C								\
-	fr
+	manual
 
 noinst_DATA =								\
 	FAQ								\
diff --git a/doc/fr/.cvsignore b/doc/fr/.cvsignore
deleted file mode 100644
index f3c7a7c..0000000
--- a/doc/fr/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/doc/fr/Makefile.am b/doc/fr/Makefile.am
deleted file mode 100644
index e6d8ea9..0000000
--- a/doc/fr/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-SUBDIRS = 								\
-	images
-
-noinst_DATA =								\
-	xfce4-session.xml
-
-docdir = $(datadir)/xfce4/doc/fr
-doc_DATA =								\
-	xfce4-session.html
-
-EXTRA_DIST = 								\
-	$(noinst_DATA)							\
-	$(doc_DATA)
-
-html: $(srcdir)/xfce4-session.xml
-	xsltproc $(top_srcdir)/docs/xfce-nochunk.xsl			\
-		$(srcdir)/xfce4-session.xml
diff --git a/doc/fr/images/.cvsignore b/doc/fr/images/.cvsignore
deleted file mode 100644
index f3c7a7c..0000000
--- a/doc/fr/images/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/doc/fr/images/Makefile.am b/doc/fr/images/Makefile.am
deleted file mode 100644
index 0f3c728..0000000
--- a/doc/fr/images/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-imagesdir = $(datadir)/xfce4/doc/fr/images
-images_DATA =								\
-	xfsm-advanced.png						\
-	xfsm-general.png						\
-	xfsm-splash.png
-
-EXTRA_DIST = $(images_DATA)
diff --git a/doc/fr/images/xfsm-advanced.png b/doc/fr/images/xfsm-advanced.png
deleted file mode 100644
index a61857d..0000000
Binary files a/doc/fr/images/xfsm-advanced.png and /dev/null differ
diff --git a/doc/fr/images/xfsm-general.png b/doc/fr/images/xfsm-general.png
deleted file mode 100644
index 035b2cd..0000000
Binary files a/doc/fr/images/xfsm-general.png and /dev/null differ
diff --git a/doc/fr/images/xfsm-splash.png b/doc/fr/images/xfsm-splash.png
deleted file mode 100644
index 34abc0a..0000000
Binary files a/doc/fr/images/xfsm-splash.png and /dev/null differ
diff --git a/doc/fr/xfce4-session.html b/doc/fr/xfce4-session.html
deleted file mode 100644
index e7b30e5..0000000
--- a/doc/fr/xfce4-session.html
+++ /dev/null
@@ -1,105 +0,0 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Xfce 4 Session Manager</title><link rel="stylesheet" href="../xfce.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.68.1"><link rel="start" href="#xfce4-session" title="Xfce 4 Session Manager"><link rel="next" href="#xfsm-intro" title="Introduction"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="article" lang="en"><div class="titlepage"><div><div><h1 class="title"><a name="xfce4-session"></a>Xfce 4 Session Manager</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Benedikt</span> <span class="surname">Meurer</span></h3><div class="affiliation"><div class="address"><p><code class="email"><<a href="mailto:benny at xfce.org">benny at xfce.org</a>></code></p></div><span class="orgname">os-cillation<br></span><span class="orgdiv">System development<br></sp
 an><span class="jobtitle">Software developer<br></span></div></div></div></div><div><span xmlns="http://www.w3.org/TR/xhtml1/transitional" class="releaseinfo">
-    <p xmlns=""> </p>
-   Ce manuel décrit la version 4.2 de <strong xmlns="" class="application"><code>xfce4-session</code></strong>. Dernière mise à jour: November 2004
-  <br></br></span></div><div><p class="copyright">Copyright © 2003, 2004 Benedikt Meurer</p></div><div><p class="copyright">Copyright © 2005 François Le Clainche (French 
-   translation)</p></div><div><div class="legalnotice"><a name="legalnotice"></a><p>
-      This document is provided under the terms of the GNU GPL, version
-      2 or (at your option) any later version.
-    </p></div></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="#xfsm-intro">Introduction</a></span></dt><dt><span class="sect1"><a href="#xfce4-session-settings">Préférences du gestionnaire de session</a></span></dt><dd><dl><dt><span class="sect2"><a href="#xfsm-general-settings">Préférences générales</a></span></dt><dt><span class="sect2"><a href="#xfsm-advanced%20settings">Préférences avancées</a></span></dt></dl></dd><dt><span class="sect1"><a href="#xfsm-customize">Personnaliser le gestionnaire de session</a></span></dt><dd><dl><dt><span class="sect2"><a href="#xfsm-engines">Paramètres de l'écran de démarrage</a></span></dt><dt><span class="sect2"><a href="#xfsm-shutdown">Les options d'arrêt/redémarrage</a></span></dt></dl></dd><dt><span class="sect1"><a href="#xfsm-advanced">Avancé</a></span></dt><dd><dl><dt><span class="sect2"><a href="#files-and-env-vars">Fichiers et variables d'environnement</a></span></dt><dt
 ><span class="sect2"><a href="#xfsm-kiosk-mode">Le mode Kiosk</a></span></dt></dl></dd><dt><span class="sect1"><a href="#xfsm-copyright">À propos de <strong class="application"><code>xfce4-session</code></strong></a></span></dt></dl></div><p> </p><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="xfsm-intro"></a>Introduction</h2></div></div></div><p><strong class="application"><code>xfce4-session</code></strong> est un gestionnaire de session pour Xfce 4. Son rôle est de sauvegarder l'état de votre environnement 
-  (les applications ouvertes et leur position) afin de les restaurer lors de la session suivante. Vous pouvez créer plusieurs 
-  sessions et choisir parmi elles au démarrage.
-  </p><p><strong class="application"><code>xfce4-session</code></strong> offre la gestion de session pour le protocole X11R6 ainsi que pour l'ancien protocole X11R5. 
-  Si vous n'avez pas besoin du second, vous pouvez le désactiver au moment de la compilation en passant l'option 
-  de configuration --disable-legacy-sm à ./configure. Ne lancez <span class="emphasis"><em>JAMAIS</em></span>  <strong class="application"><code>smproxy</code></strong> au cours d'une session gérée par <strong class="application"><code>xfce4-session</code></strong>, sinon des choses bizarres 
-  se produiront. La gestion de session selon le protocole X11R5 inclut tout ce que <strong class="application"><code>smproxy</code></strong>
-  ferait, avec en plus le support de l'affichage sur plusieurs moniteurs.</p></div><p> </p><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="xfce4-session-settings"></a>Préférences du gestionnaire de session</h2></div></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="xfsm-general-settings"></a>Préférences générales</h3></div></div></div><div class="figure"><a name="xfsm-general-fig"></a><p class="title"><b>Figure 1. Préférences générales de <code class="application">xfce4-session</code></b></p><div class="screenshot"><div class="mediaobject"><img src="images/xfsm-general.png" alt="Montre l'onglet des préférences générales de xfce4-session"></div></div></div><div class="variablelist"><dl><dt><span class="term">Afficher le sélecteur de session à chaque connexion</span></dt><dd><p>Si cette option est sélectionnée, le gestionnaire de session vous demandera de choisir une
  session 
-            à chacune des connexions à Xfce.</p></dd><dt><span class="term">Enregistrer automatiquement la session lors de la fermeture</span></dt><dd><p>Cette option indique au gestionnaire de session de sauvegarder automatiquement la session lors de 
-          la déconnexion. Si vous ne sélectionnez pas cette option, la question vous sera posée à chaque fois.</p></dd><dt><span class="term">Demander à la déconnexion</span></dt><dd><p>Cette option désactive la fenêtre de confirmation de la déconnexion. La sauvegarde de la session 
-          dépend alors du choix de l'option de sauvegarde automatique de la session.</p></dd></dl></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="xfsm-advanced settings"></a>Préférences avancées</h3></div></div></div><div class="figure"><a name="xfsm-advanced-fig"></a><p class="title"><b>Figure 2. Préférences avancées de <code class="application">xfce4-session</code></b></p><div class="screenshot"><div class="mediaobject"><img src="images/xfsm-advanced.png" alt="Montre l'onglet des préférences avancées de xfce4-session."></div></div></div><div class="variablelist"><dl><dt><span class="term">Charger les services Gnome au démarrage</span></dt><dd><p>Activer cette option si vous avez besoin d'exécuer le démon GNOME keyring au démarrage. Cette 
-          option indique également à <strong class="application"><code>xfce4-session</code></strong> de lancer les technologies d'assistance de GNOME au démarrage (si elles 
-          sont activées dans le centre de contrôle de GNOME). Consultez la documentation de GNOME pour plus 
-          d'informations à ce sujet.</p></dd><dt><span class="term">Charger les services KDE au démarrage</span></dt><dd><p>Activez cette option si vous prévoyer de lancer des applications KDE au sein de votre session Xfce. 
-          Cela augmentera sensiblement le temps de démarrage de Xfce, mais d'un autre côté, les applications KDE 
-          démarreront plus rapidement. Certaines applications KDE peuvent ne pas fonctionner du tout si vous 
-          n'activez pas cette option.</p></dd><dt><span class="term">Gérer le applications distantes</span></dt><dd><p>Autorise le gestionnaire de session à gérer les applications en cours de fonctionnement sur des 
-          hôtes distants. Cette option peut représenter un risque en termes de sécurité, en activant un port TCP sur 
-          votre système. Ne l'activez pas sans savoir ce que vous faites.</p><p>Les administrateurs système qui souhaitent désactiver cette option globalement peuvent pour cela 
-          utiliser le mode <a href="#xfsm-kiosk-mode" target="_top">KIOSK</a>.</p></dd></dl></div></div></div><p> </p><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="xfsm-customize"></a>Personnaliser le gestionnaire de session</h2></div></div></div><p>Vous pouvez personnaliser l'écran démarrage que <strong class="application"><code>xfce4-session</code></strong> affichera lors de la connexion à Xfce 4. Une fenêtre 
-	de configuration dédiée est disponible depuis le <span class="emphasis"><em>gestionnaire de paramètres de Xfce 4</em></span>.</p><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="xfsm-engines"></a>Paramètres de l'écran de démarrage</h3></div></div></div><div class="figure"><a name="splash-screen-settings-fig"></a><p class="title"><b>Figure 3. La fenêtre de paramétrage de l'écran de démarrage</b></p><div class="screenshot"><div class="mediaobject"><img src="images/xfsm-splash.png" alt="Montre la fenêtre de paramétrage de l'écran de démarrage de xfce4-session "></div></div></div><p>Sur la gauche, la fenêtre montre une liste de tous les moteurs de thème installés. Sélectionnez un moteur, 
-    et vous verrez, si elle est disponible, une prévisualisation et des informations le concernant. Vous pouvez cliquer sur 
-    le bouton <span><strong class="guibutton">Tester</strong></span> pour voir une démonstration du thème d'écran de démarrage 
-    sélectionné.</p><p><strong class="application"><code>xfce4-session</code></strong> fournit par défaut trois moteurs de thème d'écran de démarrage. Leurs options de configuration 
-    respectives - si disponibles - sont disponibles en cliquant sur le bouton <span><strong class="guibutton">Configurer</strong></span>.</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="xfsm-shutdown"></a>Les options d'arrêt/redémarrage</h3></div></div></div><p><strong class="application"><code>xfce4-session</code></strong> supporte l'arrêt de votre ordinateur lors de la déconnexion de la session. Pour cela, vous devez 
-    être listé dans le fichier <code class="filename">sudoers</code> du système, et vous devez en particulier être autorisé 
-    à exécuter la commande <code class="filename">${libdir}/xfce4/session/xfsm-shutdown-helper</code>
-    (<code class="filename">/usr/sbin/xfsm-shutdown-helper</code> sous Debian GNU/Linux)
-    en tant qu'utilisateur root (où <code class="filename">${libdir}</code> est le sous répertoire <code class="filename">lib</code> selon le préfixe utilisé pour installer <strong class="application"><code>xfce4-session</code></strong>, par exemple 
-    <code class="filename">/usr/local/lib/xfce4/session</code>).</p><p>pas exemple, si vous avez installé <strong class="application"><code>xfce4-session</code></strong> dans <code class="filename">/usr/local</code>, que votre nom d'hôte est <span class="emphasis"><em>myhost</em></span>
-    et que votre compte utilisateur est nommé<span class="emphasis"><em>myuser</em></span>, alors vous devez ajouter la ligne 
-    suivante au fichier <code class="filename">sudoers</code> (souvenez-vous d'utiliser <strong class="application"><code>visudo</code></strong> 
-    pour éditer ce fichier):</p><pre class="programlisting">
-myuser myhost=/usr/local/lib/xfce4/session/xfsm-shutdown-helper
-</pre></div></div><p> </p><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="xfsm-advanced"></a>Avancé</h2></div></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="files-and-env-vars"></a>Fichiers et variables d'environnement</h3></div></div></div><p>Xfce utilise maintenant la spécification Basedir telle que définie sur <a href="http://freedesktop.org/" target="_top">Freedesktop.org</a> pour chercher ses données et ses fichiers de 
-    configuration. Cela signifie que les emplacements de ces fichiers seront indiqués selon un chemin relatif aux 
-    répertoires décrits dans cette spécification.</p><div class="variablelist"><dl><dt><span class="term">${XDG_CONFIG_HOME}</span></dt><dd><p>Le premier répertoire où il faut rechercher les fichiers de configuration. Par défaut, c'est 
-          <code class="filename">~/.config/</code>.</p></dd><dt><span class="term">${XDG_CONFIG_DIRS}</span></dt><dd><p>Une liste des répertoires contenant des données de configuration. Par défaut, le panneau cherchera 
-          dans <code class="filename">${sysconfdir}/xdg/</code> et 
-          <code class="filename">/etc/xdg/</code>. La valeur de ${sysconfdir} dépend de la façon suivant 
-          laquelle le programme a été compilé et sera souvent <code class="filename">/etc/</code> 
-          pour les paquets binaires.
-          packages.</p></dd><dt><span class="term">${XDG_CACHE_HOME}</span></dt><dd><p>Indique la racine de toutes les données en cache des utilisateurs. Si cette variable d'environnement 
-          n'est pas renseignée, elle correspond par défaut à <code class="filename">~/.cache</code>.</p></dd><dt><span class="term">${XDG_CONFIG_DIRS}/xfce4-session/xfce4-session.rc</span></dt><dd><p>Ceci est l'emplacement du fichier de configuration qui contient les différents paramètres de <strong class="application"><code>xfce4-session</code></strong>, 
-          qui peuvent être modifiés depuis le gestionnaire de paramètres.</p></dd><dt><span class="term">${XDG_CONFIG_DIRS}/xfce4-session/xfce4-splash.rc</span></dt><dd><p>Ceci est l'emplacement du fichier de configuration de l'écran de démarrage, qui peut être modifié depuis 
-          le gestionnaire de paramètres.</p></dd><dt><span class="term">${XDG_CACHE_HOME}/sessions/</span></dt><dd><p>Le répertoire dans lequel <strong class="application"><code>xfce4-session</code></strong> et <strong class="application"><code>xfwm4</code></strong> enregistrent le données sur 
-          les sessions.</p></dd><dt><span class="term">${sysconfdir}/xdg/xfce4/kiosk/kioskrc</span></dt><dd><p>Le fichier de configuration du mode Kiosk. Consultez <a href="#xfsm-kiosk-mode" target="_top">la section 
-          suivante</a> pour une explication.</p></dd></dl></div><p>Aucun fichier de configuration, excepté le <code class="filename">kioskrc</code>,
-    ne sont conçus pour être édités à la main au cours d'une session Xfce; en fait, les changement apportés seraient 
-    écrasés par le gestionnaire de session ou le gestionnaire de paramètres s'ils sont en cours de fonctionnement.</p><p>les administrateurs système sont susceptibles de vouloir personnaliser le fichier 
-    <code class="filename">${sysconfdir}/xdg/xfce4-session/xfce4-session.rc</code> afin de changer les applications lancées 
-    par défaut au démarrage de Xfce. Par exemple, si vous souhautez lancer <strong class="application"><code>xfce4-iconbox</code></strong> 
-    au lieu de <strong class="application"><code>xftaskbar4</code></strong>, vous devrez modifier la section <span class="emphasis"><em>[Failsafe
-    Session]</em></span> pour qu'elle ressemble à cela:</p><pre class="programlisting">
-[Failsafe Session]
-Count=4
-Client0_Command=xfwm4
-Client0_PerScreen=False
-Client1_Command=xfce4-panel
-Client1_PerScreen=True
-Client2_Command=xfce4-iconbox
-Client2_PerScreen=True
-Client3_Command=xfdesktop
-Client3_PerScreen=False
-</pre></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="xfsm-kiosk-mode"></a>Le mode Kiosk</h3></div></div></div><p>Le gestionnaire de session supporte le mode Kiosk qui peut empêcher les utilisateurs de modifier les 
-    paramètres de session. Pour l'utiliser, vous devez éditer ou créer le fichier 
-    <code class="filename">${sysconfdir}/xdg/xfce4/kiosk/kioskrc</code>.</p><p>Le meilleur moyen d'expliquer le format utilisé dans ce fichier est de fournir un exemple. La section 
-    xfce4-session de votre <code class="filename">kioskrc</code> peut ressembler à cela:</p><pre class="programlisting">
-[xfce4-session]
-CustomizeSplash=ALL
-CustomizeChooser=ALL
-CustomizeLogout=ALL
-CustomizeCompatibility=%wheel
-Shutdown=%wheel
-CustomizeSecurity=NONE
-</pre><p>Cela autorise tous les utilisateurs à modifier leur écran de démarrage, les paramètres du sélecteur de session 
-    et de la fenêtre de déconnexion, mais n'autorise que les utilisateurs appartenant au goupe <span class="emphasis"><em>wheel</em></span> à modifier les paramètres de compatibilité et d'arrêt du système. Personne ne sera autorisé à modifier 
-    les paramètres de sécurité.</p><p>Le gestionnaire de session supporte les fonctionnalités KIOSK suivantes:</p><div class="variablelist"><dl><dt><span class="term">CustomizeSplash</span></dt><dd><p>Détermine si l'utilisateur est autorisé à personnaliser l'écran de démarrage.</p></dd><dt><span class="term">CustomizeChooser</span></dt><dd><p>Détermine si l'utilisateur est autorisé à personnaliser les paramètres du sélecteur de session.</p></dd><dt><span class="term">CustomizeLogout</span></dt><dd><p>Détermine si l'utilisateur est autorisé à modifier les paramètres de déconnexion.</p></dd><dt><span class="term">CustomizeCompatibility</span></dt><dd><p>Détermine si l'utilisateur est autorisé à modifier les paramètres de compatibilité 
-          (avec KDE/Gnome)</p></dd><dt><span class="term">CustomizeSecurity</span></dt><dd><p>Détermine si l'utilisateur est autorisé à modifier les paramètres de sécurité.
-          Ceci est l'un des paramètres les plus <span class="emphasis"><em>IMPORTANTS</em></span>, puisqu'il empêche 
-          les utilisateurs (en fait, <code class="filename">libICE</code>) à ouvrir un port TCP.</p></dd><dt><span class="term">Shutdown</span></dt><dd><p>Détermine si l'utilisateur est autorisé à éteindre (ou redémarrer) le système. Si un utilisateur n'y est 
-          pas autorisé, les options correspondantes seront grisées dans sa fenêtre de déconnexion.</p></dd></dl></div></div></div><p> </p><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="xfsm-copyright"></a>À propos de <strong class="application"><code>xfce4-session</code></strong></h2></div></div></div><p><strong class="application"><code>xfce4-session</code></strong> a été écrit par Benedikt Meurer 
-  (<code class="email"><<a href="mailto:benny at xfce.org">benny at xfce.org</a>></code>).
-    Pour obtenir plus d'informations, visitez le 
-    <a href="http://www.xfce.org" target="_top">site officiel de Xfce</a>. 
-  </p><p>Pour signaler un bogue ou faire une suggestion concernant cette application ou ce manuel, utilisez le 
-  gestionnaire de bogues à l'adresse suivante <a href="http://bugzilla.xfce.org/" target="_top">http://bugzilla.xfce.org/</a>. 
-  </p><p>Si vous avez des questions à propos de l'installation ou de l'utilisation de ce programme, merci de les poser 
-  sur la liste de diffusion de <a href="http://lunar-linux.org/mailman/listinfo/xfce" target="_top">xfce</a>. Les discussions sur le développement de Xfce ont lieu sur la liste de diffusion 
-      <a href="http://lunar-linux.org/mailman/listinfo/xfce4-dev" target="_top">xfce4-dev</a>.
-  </p><p> This program is distributed under the terms of the
-    GNU General Public License as published by the Free Software Foundation; 
-    either version 2 of the License, or (at your option) any later version.
-  </p><p>You should have received a copy of the GNU General Public License 
-    along with this program; if not, write to the Free Software 
-    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-    USA.
-  </p></div></div></body></html>
diff --git a/doc/fr/xfce4-session.xml b/doc/fr/xfce4-session.xml
deleted file mode 100644
index 1129fc3..0000000
--- a/doc/fr/xfce4-session.xml
+++ /dev/null
@@ -1,468 +0,0 @@
-<?xml version='1.0'?> 
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
-          "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-  <!ENTITY date "November 2004"> 
-  <!ENTITY appversion "4.2">
-  <!ENTITY app "<application>xfce4-session</application>"> 
-]>
-
-<article id="xfce4-session" lang="en">
-
-<!-- Header --> 
-<articleinfo>
-
-  <title>Xfce 4 Session Manager</title>
-  
-  <copyright>
-    <year>2003</year>
-    <year>2004</year>
-    <holder>Benedikt Meurer</holder>
-  </copyright>
-
-
-
-  <copyright>
-   <year>2005</year> <holder>François Le Clainche (French 
-   translation)</holder>
-  </copyright>
-
-
-
-  <legalnotice id="legalnotice">
-    <para>
-      This document is provided under the terms of the GNU GPL, version
-      2 or (at your option) any later version.
-    </para>
-  </legalnotice>
-  
-  <authorgroup>
-    <author>
-      <firstname>Benedikt</firstname>
-      <surname>Meurer</surname>
-      <affiliation>
-	      <address><email>benny at xfce.org</email></address>
-        <orgname>os-cillation</orgname>
-        <orgdiv>System development</orgdiv>
-        <jobtitle>Software developer</jobtitle>
-      </affiliation>
-    </author>
-
-<!-- This is appropriate place for other contributors: translators,
-maintainers, etc. Commented out by default.
-
-    <othercredit role="translator">
-      <firstname>Latin</firstname> <surname>Translator 1</surname>
-      <affiliation>
-	<orgname>Latin Translation Team</orgname>
-	<address><email>translator at gnome.org</email> </address>
-      </affiliation> <contrib>Latin translation</contrib>
-    </othercredit>
--->
-
-  </authorgroup>
-
-  <releaseinfo>
-    <para> </para>
-   Ce manuel décrit la version &appversion; de &app;. Dernière mise à jour: &date;
-  </releaseinfo>
-
-</articleinfo>
-
-<para> </para>
-
-<sect1 id="xfsm-intro">
-  <title>Introduction</title>
-
-  <para>&app; est un gestionnaire de session pour Xfce 4. Son rôle est de sauvegarder l'état de votre environnement 
-  (les applications ouvertes et leur position) afin de les restaurer lors de la session suivante. Vous pouvez créer plusieurs 
-  sessions et choisir parmi elles au démarrage.
-  </para>
-  
-  <para>&app; offre la gestion de session pour le protocole X11R6 ainsi que pour l'ancien protocole X11R5. 
-  Si vous n'avez pas besoin du second, vous pouvez le désactiver au moment de la compilation en passant l'option 
-  de configuration --disable-legacy-sm à ./configure. Ne lancez <emphasis>JAMAIS</emphasis>  <application>smproxy</application> au cours d'une session gérée par &app;, sinon des choses bizarres 
-  se produiront. La gestion de session selon le protocole X11R5 inclut tout ce que <application>smproxy</application>
-  ferait, avec en plus le support de l'affichage sur plusieurs moniteurs.</para>
-
-</sect1>
-
-<para> </para>
-
-<sect1 id="xfce4-session-settings">
-  <title>Préférences du gestionnaire de session</title>
-    
-  <sect2 id="xfsm-general-settings">
-  	<title>Préférences générales</title>
-  	
-    <figure id="xfsm-general-fig">
-      <title>Préférences générales de &app;</title>
-      <screenshot>
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="images/xfsm-general.png" format="PNG" />
-          </imageobject>
-
-          <textobject>
-            <phrase>Montre l'onglet des préférences générales de &app;</phrase>
-          </textobject>
-        </mediaobject>
-      </screenshot>
-    </figure>
-  	
-  	<variablelist>
-      <varlistentry>
-        <term>Afficher le sélecteur de session à chaque connexion</term> 
-        <listitem>
-            <para>Si cette option est sélectionnée, le gestionnaire de session vous demandera de choisir une session 
-            à chacune des connexions à Xfce.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>Enregistrer automatiquement la session lors de la fermeture</term> 
-        <listitem>
-          <para>Cette option indique au gestionnaire de session de sauvegarder automatiquement la session lors de 
-          la déconnexion. Si vous ne sélectionnez pas cette option, la question vous sera posée à chaque fois.</para>
-        </listitem>
-      </varlistentry>
-      
-      <varlistentry>
-        <term>Demander à la déconnexion</term> 
-        <listitem>
-          <para>Cette option désactive la fenêtre de confirmation de la déconnexion. La sauvegarde de la session 
-          dépend alors du choix de l'option de sauvegarde automatique de la session.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-	</sect2>
-		
-	<sect2 id="xfsm-advanced settings">
-	  <title>Préférences avancées</title>
-	
-    <figure id="xfsm-advanced-fig">
-      <title>Préférences avancées de &app;</title>
-      <screenshot>
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="images/xfsm-advanced.png" format="PNG" />
-          </imageobject>
-
-          <textobject>
-            <phrase>Montre l'onglet des préférences avancées de &app;.</phrase>
-          </textobject>
-        </mediaobject>
-      </screenshot>
-    </figure>
-	
-    <variablelist>
-      <varlistentry>
-        <term>Charger les services Gnome au démarrage</term> 
-        <listitem>
-          <para>Activer cette option si vous avez besoin d'exécuer le démon GNOME keyring au démarrage. Cette 
-          option indique également à &app; de lancer les technologies d'assistance de GNOME au démarrage (si elles 
-          sont activées dans le centre de contrôle de GNOME). Consultez la documentation de GNOME pour plus 
-          d'informations à ce sujet.</para>
-        </listitem>
-		  </varlistentry>
-
-      <varlistentry>
-        <term>Charger les services KDE au démarrage</term> 
-        <listitem>
-          <para>Activez cette option si vous prévoyer de lancer des applications KDE au sein de votre session Xfce. 
-          Cela augmentera sensiblement le temps de démarrage de Xfce, mais d'un autre côté, les applications KDE 
-          démarreront plus rapidement. Certaines applications KDE peuvent ne pas fonctionner du tout si vous 
-          n'activez pas cette option.</para>
-        </listitem>
-  		</varlistentry>
-
-      <varlistentry>
-        <term>Gérer le applications distantes</term> 
-        <listitem>
-          <para>Autorise le gestionnaire de session à gérer les applications en cours de fonctionnement sur des 
-          hôtes distants. Cette option peut représenter un risque en termes de sécurité, en activant un port TCP sur 
-          votre système. Ne l'activez pas sans savoir ce que vous faites.</para>
-          <para>Les administrateurs système qui souhaitent désactiver cette option globalement peuvent pour cela 
-          utiliser le mode <ulink url="#xfsm-kiosk-mode" type="html">KIOSK</ulink>.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-	
-	</sect2>
-</sect1>
-    
-<para> </para>
- 
-<sect1 id="xfsm-customize">
-	<title>Personnaliser le gestionnaire de session</title>
-	
-	<para>Vous pouvez personnaliser l'écran démarrage que &app; affichera lors de la connexion à Xfce 4. Une fenêtre 
-	de configuration dédiée est disponible depuis le <emphasis>gestionnaire de paramètres de Xfce 4</emphasis>.</para>
-	
-	<sect2 id="xfsm-engines">
-		<title>Paramètres de l'écran de démarrage</title>
-		
-    <figure id="splash-screen-settings-fig">
-      <title>La fenêtre de paramétrage de l'écran de démarrage</title>
-      <screenshot>
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="images/xfsm-splash.png" format="PNG" />
-          </imageobject>
-
-          <textobject>
-            <phrase>Montre la fenêtre de paramétrage de l'écran de démarrage de &app; </phrase>
-          </textobject>
-        </mediaobject>
-      </screenshot>
-    </figure>
-		
-    <para>Sur la gauche, la fenêtre montre une liste de tous les moteurs de thème installés. Sélectionnez un moteur, 
-    et vous verrez, si elle est disponible, une prévisualisation et des informations le concernant. Vous pouvez cliquer sur 
-    le bouton <guibutton>Tester</guibutton> pour voir une démonstration du thème d'écran de démarrage 
-    sélectionné.</para>
-				
-    <para>&app; fournit par défaut trois moteurs de thème d'écran de démarrage. Leurs options de configuration 
-    respectives - si disponibles - sont disponibles en cliquant sur le bouton <guibutton>Configurer</guibutton>.</para>
-	</sect2>
-	
-	<sect2 id="xfsm-shutdown">
-		<title>Les options d'arrêt/redémarrage</title>
-	
-    <para>&app; supporte l'arrêt de votre ordinateur lors de la déconnexion de la session. Pour cela, vous devez 
-    être listé dans le fichier <filename>sudoers</filename> du système, et vous devez en particulier être autorisé 
-    à exécuter la commande <filename>${libdir}/xfce4/session/xfsm-shutdown-helper</filename>
-    (<filename>/usr/sbin/xfsm-shutdown-helper</filename> sous Debian GNU/Linux)
-    en tant qu'utilisateur root (où <filename>${libdir}</filename> est le sous répertoire <filename
-    role="directory">lib</filename> selon le préfixe utilisé pour installer &app;, par exemple 
-    <filename role="directory">/usr/local/lib/xfce4/session</filename>).</para>
-
-    <para>pas exemple, si vous avez installé &app; dans <filename
-    role="directory">/usr/local</filename>, que votre nom d'hôte est <emphasis>myhost</emphasis>
-    et que votre compte utilisateur est nommé<emphasis>myuser</emphasis>, alors vous devez ajouter la ligne 
-    suivante au fichier <filename>sudoers</filename> (souvenez-vous d'utiliser <application>visudo</application> 
-    pour éditer ce fichier):</para>
-
-<programlisting>
-myuser myhost=/usr/local/lib/xfce4/session/xfsm-shutdown-helper
-</programlisting>
-	</sect2>
-	
-</sect1>
- 
-<para> </para>
-
-<sect1 id="xfsm-advanced">
-  <title>Avancé</title>
-
-  <sect2 id="files-and-env-vars">
-    <title>Fichiers et variables d'environnement</title>
-
-    <para>Xfce utilise maintenant la spécification Basedir telle que définie sur <ulink
-    url="http://freedesktop.org/" type="http">Freedesktop.org</ulink> pour chercher ses données et ses fichiers de 
-    configuration. Cela signifie que les emplacements de ces fichiers seront indiqués selon un chemin relatif aux 
-    répertoires décrits dans cette spécification.</para>
-
-    <variablelist>
-      <varlistentry>
-        <term>${XDG_CONFIG_HOME}</term>
-        <listitem>
-          <para>Le premier répertoire où il faut rechercher les fichiers de configuration. Par défaut, c'est 
-          <filename role="directory">~/.config/</filename>.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>${XDG_CONFIG_DIRS}</term>
-        <listitem>
-          <para>Une liste des répertoires contenant des données de configuration. Par défaut, le panneau cherchera 
-          dans <filename role="directory">${sysconfdir}/xdg/</filename> et 
-          <filename role="directory">/etc/xdg/</filename>. La valeur de ${sysconfdir} dépend de la façon suivant 
-          laquelle le programme a été compilé et sera souvent <filename role="directory">/etc/</filename> 
-          pour les paquets binaires.
-          packages.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>${XDG_CACHE_HOME}</term>
-        <listitem>
-          <para>Indique la racine de toutes les données en cache des utilisateurs. Si cette variable d'environnement 
-          n'est pas renseignée, elle correspond par défaut à <filename
-          role="directory">~/.cache</filename>.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>${XDG_CONFIG_DIRS}/xfce4-session/xfce4-session.rc</term>
-        <listitem>
-          <para>Ceci est l'emplacement du fichier de configuration qui contient les différents paramètres de &app;, 
-          qui peuvent être modifiés depuis le gestionnaire de paramètres.</para>
-        </listitem>
-      </varlistentry>
-    
-      <varlistentry>
-        <term>${XDG_CONFIG_DIRS}/xfce4-session/xfce4-splash.rc</term>
-        <listitem>
-          <para>Ceci est l'emplacement du fichier de configuration de l'écran de démarrage, qui peut être modifié depuis 
-          le gestionnaire de paramètres.</para>
-        </listitem>
-      </varlistentry>
-    
-      <varlistentry>
-        <term>${XDG_CACHE_HOME}/sessions/</term>
-        <listitem>
-          <para>Le répertoire dans lequel &app; et <application>xfwm4</application> enregistrent le données sur 
-          les sessions.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>${sysconfdir}/xdg/xfce4/kiosk/kioskrc</term>
-        <listitem>
-          <para>Le fichier de configuration du mode Kiosk. Consultez <ulink url="#xfsm-kiosk-mode">la section 
-          suivante</ulink> pour une explication.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-    <para>Aucun fichier de configuration, excepté le <filename>kioskrc</filename>,
-    ne sont conçus pour être édités à la main au cours d'une session Xfce; en fait, les changement apportés seraient 
-    écrasés par le gestionnaire de session ou le gestionnaire de paramètres s'ils sont en cours de fonctionnement.</para>
-
-    <para>les administrateurs système sont susceptibles de vouloir personnaliser le fichier 
-    <filename>${sysconfdir}/xdg/xfce4-session/xfce4-session.rc</filename> afin de changer les applications lancées 
-    par défaut au démarrage de Xfce. Par exemple, si vous souhautez lancer <application>xfce4-iconbox</application> 
-    au lieu de <application>xftaskbar4</application>, vous devrez modifier la section <emphasis>[Failsafe
-    Session]</emphasis> pour qu'elle ressemble à cela:</para>
-
-<programlisting>
-[Failsafe Session]
-Count=4
-Client0_Command=xfwm4
-Client0_PerScreen=False
-Client1_Command=xfce4-panel
-Client1_PerScreen=True
-Client2_Command=xfce4-iconbox
-Client2_PerScreen=True
-Client3_Command=xfdesktop
-Client3_PerScreen=False
-</programlisting>
-  </sect2>
-
-  <sect2 id="xfsm-kiosk-mode">
-    <title>Le mode Kiosk</title>
-
-    <para>Le gestionnaire de session supporte le mode Kiosk qui peut empêcher les utilisateurs de modifier les 
-    paramètres de session. Pour l'utiliser, vous devez éditer ou créer le fichier 
-    <filename>${sysconfdir}/xdg/xfce4/kiosk/kioskrc</filename>.</para>
-    
-    <para>Le meilleur moyen d'expliquer le format utilisé dans ce fichier est de fournir un exemple. La section 
-    xfce4-session de votre <filename>kioskrc</filename> peut ressembler à cela:</para>
-
-<programlisting>
-[xfce4-session]
-CustomizeSplash=ALL
-CustomizeChooser=ALL
-CustomizeLogout=ALL
-CustomizeCompatibility=%wheel
-Shutdown=%wheel
-CustomizeSecurity=NONE
-</programlisting>
-
-    <para>Cela autorise tous les utilisateurs à modifier leur écran de démarrage, les paramètres du sélecteur de session 
-    et de la fenêtre de déconnexion, mais n'autorise que les utilisateurs appartenant au goupe <emphasis>wheel</emphasis> à modifier les paramètres de compatibilité et d'arrêt du système. Personne ne sera autorisé à modifier 
-    les paramètres de sécurité.</para>
-
-    <para>Le gestionnaire de session supporte les fonctionnalités KIOSK suivantes:</para>
-
-    <variablelist>
-      <varlistentry>
-        <term>CustomizeSplash</term>
-        <listitem>
-          <para>Détermine si l'utilisateur est autorisé à personnaliser l'écran de démarrage.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>CustomizeChooser</term>
-        <listitem>
-          <para>Détermine si l'utilisateur est autorisé à personnaliser les paramètres du sélecteur de session.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>CustomizeLogout</term>
-        <listitem>
-          <para>Détermine si l'utilisateur est autorisé à modifier les paramètres de déconnexion.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>CustomizeCompatibility</term>
-        <listitem>
-          <para>Détermine si l'utilisateur est autorisé à modifier les paramètres de compatibilité 
-          (avec KDE/Gnome)</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>CustomizeSecurity</term>
-        <listitem>
-          <para>Détermine si l'utilisateur est autorisé à modifier les paramètres de sécurité.
-          Ceci est l'un des paramètres les plus <emphasis>IMPORTANTS</emphasis>, puisqu'il empêche 
-          les utilisateurs (en fait, <filename>libICE</filename>) à ouvrir un port TCP.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>Shutdown</term>
-        <listitem>
-          <para>Détermine si l'utilisateur est autorisé à éteindre (ou redémarrer) le système. Si un utilisateur n'y est 
-          pas autorisé, les options correspondantes seront grisées dans sa fenêtre de déconnexion.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
-
-<para> </para>
-
-<sect1 id="xfsm-copyright">
-  <title>À propos de &app;</title>
-
-  <para>&app; a été écrit par Benedikt Meurer 
-  (<email>benny at xfce.org</email>).
-    Pour obtenir plus d'informations, visitez le 
-    <ulink url="http://www.xfce.org" type="http">site officiel de Xfce</ulink>. 
-  </para>
-
-  <para>Pour signaler un bogue ou faire une suggestion concernant cette application ou ce manuel, utilisez le 
-  gestionnaire de bogues à l'adresse suivante <ulink 
-      url="http://bugzilla.xfce.org/" 
-      type="http">http://bugzilla.xfce.org/</ulink>. 
-  </para>
-
-  <para>Si vous avez des questions à propos de l'installation ou de l'utilisation de ce programme, merci de les poser 
-  sur la liste de diffusion de <ulink 
-      url="http://lunar-linux.org/mailman/listinfo/xfce"
-      type="http">xfce</ulink>. Les discussions sur le développement de Xfce ont lieu sur la liste de diffusion 
-      <ulink 
-      url="http://lunar-linux.org/mailman/listinfo/xfce4-dev"
-      type="http">xfce4-dev</ulink>.
-  </para>
-    
-  <para> This program is distributed under the terms of the
-    GNU General Public License as published by the Free Software Foundation; 
-    either version 2 of the License, or (at your option) any later version.
-  </para>
-
-  <para>You should have received a copy of the GNU General Public License 
-    along with this program; if not, write to the Free Software 
-    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-    USA.
-  </para>
-
-</sect1>
-
-</article>
-
diff --git a/doc/manual/Makefile.am b/doc/manual/Makefile.am
new file mode 100644
index 0000000..392252b
--- /dev/null
+++ b/doc/manual/Makefile.am
@@ -0,0 +1,126 @@
+SUBDIRS = \
+	images \
+	po
+
+STYLESHEET = $(PACKAGE)-html.xsl
+DOCUMENT = $(PACKAGE).xml
+LINGUAS = $(shell cd $(srcdir)/po && echo `/bin/ls *.po | sed 's,[.]po,,g'`)
+ALL_LINGUAS = C $(LINGUAS)
+
+# install the html files to the destdir
+install-data-local:
+	for lang in $(ALL_LINGUAS); do \
+		if test -d $(srcdir)/html/$$lang; then \
+			dest=$(DESTDIR)$(docdir)/html/$$lang; \
+			$(mkinstalldirs) $$dest; \
+			installfiles=`echo $(srcdir)/html/$$lang/*`; \
+			for file in $$installfiles; do \
+				echo "--- Installing "$$file; \
+				$(INSTALL_DATA) $$file $$dest; \
+			done; \
+			if test x"$$lang" != x"C" -a ! -d $(srcdir)/images/$$lang; then \
+				echo "--- Creating symlink to C images for $$lang"; \
+				ln -sf $(docdir)/html/C/images $(DESTDIR)$(docdir)/html/$$lang/images; \
+			fi \
+		fi \
+	done;
+
+# remove installed files from the destdir
+uninstall-local:
+	for lang in $(ALL_LINGUAS); do \
+		dest=$(DESTDIR)$(docdir)/html/$$lang; \
+		if test -d $$dest; then \
+			if test -L $$dest/images; then \
+				rm -rf $$dest; \
+			else \
+				rm -f $$dest/*.html; \
+			fi \
+		fi \
+	done
+
+# remove generate html from the srcdir
+clean-local:
+	rm -rf $(srcdir)/html
+
+if GENERATE_DOCUMENTATION
+
+# regenerate po(t) files
+update-po:
+	rm -f $(srcdir)/po/$(GETTEXT_PACKAGE).pot; \
+	$(XML2PO) -o $(srcdir)/po/$(GETTEXT_PACKAGE).pot $(srcdir)/$(DOCUMENT); \
+	for lang in $(LINGUAS); do \
+		pofile=$(srcdir)/po/$$lang.po; \
+		$(XML2PO) -u $(srcdir)/po/$$lang.po $(srcdir)/$(DOCUMENT); \
+	done
+
+# build the translated help files
+doc-build.stamp: $(srcdir)/$(DOCUMENT) $(srcdir)/$(STYLESHEET)
+	@chmod -R u+w $(srcdir); \
+	rm -rf $(srcdir)/html; \
+	echo; \
+	for lang in $(ALL_LINGUAS); do \
+		pofile=$(srcdir)/po/$$lang.po; \
+		echo "*** Generating $$lang documentation"; \
+		if test x"$$lang" = x"C"; then \
+			cp $(srcdir)/$(DOCUMENT) xgen-doc; \
+		else \
+			echo "Building the translated DocBook XML file"; \
+			$(XML2PO) -e -l $$lang -p $$pofile $(srcdir)/$(DOCUMENT) > xgen-doc; \
+			rm -f .xml2po.mo; \
+		fi; \
+		sed -e "s,\@PACKAGE_NAME\@,$(PACKAGE_NAME),g" \
+			-e "s,\@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g" \
+			-i xgen-doc; \
+		echo "Validating DocBook XML file"; \
+		$(XMLLINT) --noout --valid xgen-doc; \
+		echo "Creating the HTML pages"; \
+		$(XSLTPROC) --nonet -o $(srcdir)/html/$$lang/ $(srcdir)/$(STYLESHEET) xgen-doc; \
+		chmod -R u+w $(srcdir)/html/$$lang; \
+		rm -f xgen-doc; \
+		echo; \
+	done; \
+	touch doc-build.stamp
+
+dist-check-doc: all
+
+else
+
+update-po:
+	@echo "*** You need to compile with --enable-gen-doc in order to make update-po"
+	@false
+
+doc-build.stamp:
+	@if test ! -d $(srcdir)/html; then \
+		echo; \
+		echo "*** No generated documentation found. If you want to"; \
+		echo "*** generate the (translated) documentation, run configure"; \
+		echo "*** with --enable-gen-doc."; \
+		echo; \
+	fi
+
+dist-check-doc:
+	@echo "*** You need to compile with --enable-gen-doc in order to make dist"
+	@false
+
+endif
+
+# always try to build (if compiling with --enable-build-doc) or print
+# a message if no html files were found in the tarball
+all: doc-build.stamp
+
+# include the html and man files in the dist
+dist-hook: dist-check-doc doc-build.stamp
+	for lang in $(ALL_LINGUAS); do \
+		if test -d $(srcdir)/html/$$lang; then \
+			mkdir -p $(distdir)/html/$$lang; \
+			cp $(srcdir)/html/$$lang/* $(distdir)/html/$$lang/; \
+		fi \
+	done
+
+EXTRA_DIST = \
+	$(STYLESHEET) \
+	$(DOCUMENT)
+
+CLEANFILES = \
+	xgen-doc \
+	doc-build.stamp
diff --git a/doc/C/.cvsignore b/doc/manual/images/.cvsignore
similarity index 100%
rename from doc/C/.cvsignore
rename to doc/manual/images/.cvsignore
diff --git a/doc/manual/images/Makefile.am b/doc/manual/images/Makefile.am
new file mode 100644
index 0000000..e1c1151
--- /dev/null
+++ b/doc/manual/images/Makefile.am
@@ -0,0 +1,11 @@
+
+imagesdir = $(docdir)/html/C/images
+images_DATA = \
+	xfsm-splash.png \
+	xfsm-general.png \
+	xfsm-advanced.png
+
+EXTRA_DIST = \
+	$(images_DATA)
+
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/doc/C/images/xfsm-advanced.png b/doc/manual/images/xfsm-advanced.png
similarity index 100%
rename from doc/C/images/xfsm-advanced.png
rename to doc/manual/images/xfsm-advanced.png
diff --git a/doc/C/images/xfsm-general.png b/doc/manual/images/xfsm-general.png
similarity index 100%
rename from doc/C/images/xfsm-general.png
rename to doc/manual/images/xfsm-general.png
diff --git a/doc/C/images/xfsm-splash.png b/doc/manual/images/xfsm-splash.png
similarity index 100%
rename from doc/C/images/xfsm-splash.png
rename to doc/manual/images/xfsm-splash.png
diff --git a/doc/manual/po/Makefile.am b/doc/manual/po/Makefile.am
new file mode 100644
index 0000000..7cde12b
--- /dev/null
+++ b/doc/manual/po/Makefile.am
@@ -0,0 +1,7 @@
+
+PO_FILES=$(shell cd $(srcdir) && echo `/bin/ls *.po`)
+EXTRA_DIST = \
+	$(PO_FILES) \
+	$(GETTEXT_PACKAGE).pot
+
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/doc/manual/po/da.po b/doc/manual/po/da.po
new file mode 100644
index 0000000..da728ad
--- /dev/null
+++ b/doc/manual/po/da.po
@@ -0,0 +1,418 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: xfce4-session 4.7.0\n"
+"POT-Creation-Date: 2010-05-20 20:24+0200\n"
+"PO-Revision-Date: 2009-01-21 11:52+0100\n"
+"Last-Translator: Per Kongstad <p_kongstad at op.pl>\n"
+"Language-Team: Danish <dansk at dansk-gruppen.dk>\n"
+"Language: da\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Danish\n"
+"X-Poedit-Country: DENMARK\n"
+"X-Generator: KBabel 1.11.4\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: ./xfce4-session.xml:107(None)
+msgid "@@image: 'images/xfsm-general.png'; md5=f99eebd11a391ab3ecd0c038c0683b13"
+msgstr ""
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: ./xfce4-session.xml:155(None)
+msgid "@@image: 'images/xfsm-advanced.png'; md5=ce9a552111026488b3ae76233eaa69d4"
+msgstr ""
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: ./xfce4-session.xml:218(None)
+msgid "@@image: 'images/xfsm-splash.png'; md5=126a4b2c7239f53cfa475468eac8cd99"
+msgstr ""
+
+#: ./xfce4-session.xml:14(title)
+msgid "Xfce 4 Session Manager"
+msgstr ""
+
+#: ./xfce4-session.xml:17(year)
+msgid "2003"
+msgstr ""
+
+#: ./xfce4-session.xml:18(year)
+msgid "2004"
+msgstr ""
+
+#: ./xfce4-session.xml:19(year)
+msgid "2005"
+msgstr ""
+
+#: ./xfce4-session.xml:20(holder)
+msgid "Benedikt Meurer"
+msgstr ""
+
+#: ./xfce4-session.xml:33(para)
+msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or any later version published by the Free Software Foundation; with no Invariant Sections, with no Front-Cover Texts, and with no Back-Cover Texts. The complete license text is available from the <ulink type=\"http\" url=\"http://www.gnu.org/\">Free Software Foundation</ulink>."
+msgstr ""
+
+#: ./xfce4-session.xml:45(firstname)
+msgid "Benedikt"
+msgstr ""
+
+#: ./xfce4-session.xml:46(surname)
+msgid "Meurer"
+msgstr ""
+
+#: ./xfce4-session.xml:48(email)
+msgid "benny at xfce.org"
+msgstr ""
+
+#: ./xfce4-session.xml:49(orgname)
+msgid "os-cillation"
+msgstr ""
+
+#: ./xfce4-session.xml:50(orgdiv)
+msgid "System development"
+msgstr ""
+
+#: ./xfce4-session.xml:51(jobtitle)
+msgid "Software developer"
+msgstr ""
+
+#: ./xfce4-session.xml:69(releaseinfo)
+msgid "This manual describes the <application>@PACKAGE_NAME@</application> package, version @PACKAGE_VERSION at ."
+msgstr ""
+
+#: ./xfce4-session.xml:78(title)
+msgid "Introduction"
+msgstr ""
+
+#: ./xfce4-session.xml:80(para)
+msgid "<application>@PACKAGE_NAME@</application> is a session manager for Xfce 4. Its task is to save the state of your desktop (opened applications and their location) and restore it during a next startup. You can create several different sessions and choose one of them on startup."
+msgstr ""
+
+#: ./xfce4-session.xml:86(para)
+msgid "<application>@PACKAGE_NAME@</application> provides session management for both X11R6 and legacy X11R5 protocols. If you don't need legacy session management support, you can disable it at compile time, giving --disable-legacy-sm to ./configure. Do <emphasis>NOT EVER</emphasis> run <application>smproxy</application> in session that is managed by <application>@PACKAGE_NAME@</application>, or weird things will happen. The included legacy session management does everything that <application>smproxy</application> would do, and besides that, it also supports multiscreen display."
+msgstr ""
+
+#: ./xfce4-session.xml:97(title)
+msgid "Session Manager settings"
+msgstr ""
+
+#: ./xfce4-session.xml:100(title)
+msgid "General preferences"
+msgstr ""
+
+#: ./xfce4-session.xml:103(title)
+msgid "<application>@PACKAGE_NAME@</application> general preferences"
+msgstr ""
+
+#: ./xfce4-session.xml:111(phrase)
+msgid "Shows the General tab of the <application>@PACKAGE_NAME@</application> settings dialog."
+msgstr ""
+
+#: ./xfce4-session.xml:119(term)
+msgid "Display chooser on login"
+msgstr ""
+
+#: ./xfce4-session.xml:121(para)
+msgid "If set, the session manager will ask you to choose a session every time you log in to Xfce."
+msgstr ""
+
+#: ./xfce4-session.xml:127(term)
+msgid "Automatically save session on logout"
+msgstr ""
+
+#: ./xfce4-session.xml:129(para)
+msgid "This option instructs the session manager to save the current session automatically when you log out. If you don't select this option you'll be prompted whether you want to save the current session on each logout."
+msgstr ""
+
+#: ./xfce4-session.xml:137(term)
+msgid "Prompt on logout"
+msgstr ""
+
+#: ./xfce4-session.xml:139(para)
+msgid "This option disables the logout confirmation dialog. Whether the session will be saved or not depends on whether you enabled the automatic saving of sessions on logout or not."
+msgstr ""
+
+#: ./xfce4-session.xml:148(title)
+msgid "Advanced preferences"
+msgstr ""
+
+#: ./xfce4-session.xml:151(title)
+msgid "<application>@PACKAGE_NAME@</application> advanced preferences"
+msgstr ""
+
+#: ./xfce4-session.xml:159(phrase)
+msgid "Shows Advanced tab of the <application>@PACKAGE_NAME@</application> settings dialog."
+msgstr ""
+
+#: ./xfce4-session.xml:167(term)
+msgid "Launch Gnome services on startup"
+msgstr ""
+
+#: ./xfce4-session.xml:169(para)
+msgid "Enable this option if you need the GNOME keyring daemon to be run on startup. This option also instructs <application>@PACKAGE_NAME@</application> to bring up the GNOME assistive technologies at startup (if enabled in the GNOME control center). See the GNOME documentation for more information on this topic."
+msgstr ""
+
+#: ./xfce4-session.xml:177(term)
+msgid "Launch KDE services on startup"
+msgstr ""
+
+#: ./xfce4-session.xml:179(para)
+msgid "Enable this option if you plan to run KDE applications as part of your Xfce Desktop session. This will notably increase the startup time, but on the other hand, KDE applications will startup faster. Some KDE applications may not work at all if you don't enable this option."
+msgstr ""
+
+#: ./xfce4-session.xml:187(term)
+msgid "Manage remote applications"
+msgstr ""
+
+#: ./xfce4-session.xml:189(para)
+msgid "Allow the session manager to manage applications running on remote hosts. Since this option may constitute a security risk, by listening to a TCP port on your system, do not enable it unless you know what you are doing."
+msgstr ""
+
+#: ./xfce4-session.xml:193(para)
+msgid "System administrators may want to disable this option globally using the session managers <ulink url=\"#xfsm-kiosk-mode\" type=\"html\">KIOSK capabilities</ulink>."
+msgstr ""
+
+#: ./xfce4-session.xml:204(title)
+msgid "Customizing the Session Manager"
+msgstr ""
+
+#: ./xfce4-session.xml:206(para)
+msgid "You can customize the splash-screen that <application>@PACKAGE_NAME@</application> will use when you log in to Xfce 4. There is a dedicated dialog available from the <emphasis>Xfce 4 Settings Manager</emphasis>."
+msgstr ""
+
+#: ./xfce4-session.xml:211(title)
+msgid "Splash screen settings"
+msgstr ""
+
+#: ./xfce4-session.xml:214(title)
+msgid "Splash screen settings dialog"
+msgstr ""
+
+#: ./xfce4-session.xml:222(phrase)
+msgid "Shows the <application>@PACKAGE_NAME@</application> splash screen settings dialog."
+msgstr ""
+
+#: ./xfce4-session.xml:228(para)
+msgid "On the left, the dialog shows a list of all installed engines. Select an engine, and you will see, if available, a preview and information about it. You can click on the <guibutton>Test</guibutton> button to see a demonstration of the selected splash screen engine."
+msgstr ""
+
+#: ./xfce4-session.xml:234(para)
+msgid "<application>@PACKAGE_NAME@</application> provides three Splash themes engines by default. Their respective configuration options - if any - are available from the <guibutton>Configure</guibutton> button."
+msgstr ""
+
+#: ./xfce4-session.xml:240(title)
+msgid "Shutdown/reboot options"
+msgstr ""
+
+#: ./xfce4-session.xml:242(para)
+msgid "<application>@PACKAGE_NAME@</application> supports shutting down your computer when you log out of your desktop session. To be able to shutdown the computer, you have to be listed in the systems <filename>sudoers</filename> file, in particular, you must be allowed to execute the command <filename>${libdir}/xfce4/session/xfsm-shutdown-helper</filename> (<filename>/usr/sbin/xfsm-shutdown-helper</filename> on Debian GNU/Linux) as user root (where <filename>${libdir}</filename> is the <filename role=\"directory\">lib</filename> sub directory in the prefix you installed <application>@PACKAGE_NAME@</application>, for example <filename role=\"directory\">/usr/local/lib/xfce4/session</filename>)."
+msgstr ""
+
+#: ./xfce4-session.xml:253(para)
+msgid "For example, lets say, you installed <application>@PACKAGE_NAME@</application> into <filename role=\"directory\">/usr/local</filename>, your hostname is <emphasis>myhost</emphasis> and your user account is named <emphasis>myuser</emphasis>, then you would have to add the following line to your <filename>sudoers</filename> file (remember to use <application>visudo</application> to edit that file):"
+msgstr ""
+
+#: ./xfce4-session.xml:260(programlisting)
+#, no-wrap
+msgid "\nmyuser myhost=/usr/local/lib/xfce4/session/xfsm-shutdown-helper\n"
+msgstr ""
+
+#: ./xfce4-session.xml:268(title)
+msgid "Advanced"
+msgstr ""
+
+#: ./xfce4-session.xml:271(title)
+msgid "Files and Environment Variables"
+msgstr ""
+
+#: ./xfce4-session.xml:273(para)
+msgid "Xfce now uses the Basedir Specification as defined on <ulink url=\"http://freedesktop.org/\" type=\"http\">Freedesktop.org</ulink> to locate its data and configuration files. This means that file locations will be specified as a path relative to the directories described in the specification."
+msgstr ""
+
+#: ./xfce4-session.xml:281(term)
+msgid "${XDG_CONFIG_HOME}"
+msgstr ""
+
+#: ./xfce4-session.xml:283(para)
+msgid "The first base directory to look for configuration files. By default this is set to <filename role=\"directory\">~/.config/</filename>."
+msgstr ""
+
+#: ./xfce4-session.xml:290(term)
+msgid "${XDG_CONFIG_DIRS}"
+msgstr ""
+
+#: ./xfce4-session.xml:292(para)
+msgid "A list of system directories that contain configuration data. By default the panel will look in <filename role=\"directory\">${sysconfdir}/xdg/</filename> and <filename role=\"directory\">/etc/xdg/</filename>. The value of ${sysconfdir} depends on how the program was build and will often be <filename role=\"directory\">/etc/</filename> for binary packages."
+msgstr ""
+
+#: ./xfce4-session.xml:303(term)
+msgid "${XDG_CACHE_HOME}"
+msgstr ""
+
+#: ./xfce4-session.xml:305(para)
+msgid "Specifies the root for all user-specific cache data. If this environment variable is unset, it defaults to <filename role=\"directory\">~/.cache</filename>."
+msgstr ""
+
+#: ./xfce4-session.xml:312(term)
+msgid "${XDG_CONFIG_DIRS}/autostart/"
+msgstr ""
+
+#: ./xfce4-session.xml:314(para)
+msgid "This is the location where the list of applications that should be automatically run on login is stored. Each autostarted application is represented by a <filename>.desktop</filename> file (see the <ulink type=\"http\" url=\"http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html\">Desktop Entry Specification</ulink> for details)."
+msgstr ""
+
+#: ./xfce4-session.xml:320(para)
+msgid "Prior to Xfce 4.3, the list of autostarted applications was stored in <filename role=\"directory\">~/Desktop/Autostart</filename>, which contained scripts and symbolic links to applications. If you run <application>@PACKAGE_NAME@</application> @PACKAGE_VERSION@ or above for the first time, it will automatically migrate the autostart items from the old location to the standard location and place a <filename>LOCATION-CHANGED.txt</filename> file in the old directory, that describes the location change."
+msgstr ""
+
+#: ./xfce4-session.xml:331(term)
+msgid "${XDG_CONFIG_DIRS}/xfce4-session/xfce4-session.rc"
+msgstr ""
+
+#: ./xfce4-session.xml:333(para)
+msgid "This is the location of the configuration file that includes the various settings for <application>@PACKAGE_NAME@</application>, which can be changed from the settings dialog."
+msgstr ""
+
+#: ./xfce4-session.xml:340(term)
+msgid "${XDG_CONFIG_DIRS}/xfce4-session/xfce4-splash.rc"
+msgstr ""
+
+#: ./xfce4-session.xml:342(para)
+msgid "This is the location of the configuration file that includes the configuration for the splash screen, which can be changed from the settings dialog."
+msgstr ""
+
+#: ./xfce4-session.xml:349(term)
+msgid "${XDG_CACHE_HOME}/sessions/"
+msgstr ""
+
+#: ./xfce4-session.xml:351(para)
+msgid "The directory where <application>@PACKAGE_NAME@</application> and <application>xfwm4</application> store the session data to."
+msgstr ""
+
+#: ./xfce4-session.xml:357(term)
+msgid "${sysconfdir}/xdg/xfce4/kiosk/kioskrc"
+msgstr ""
+
+#: ./xfce4-session.xml:359(para)
+msgid "Kiosk mode configuration file. See <ulink url=\"#xfsm-kiosk-mode\">next section</ulink> for an explanation."
+msgstr ""
+
+#: ./xfce4-session.xml:365(para)
+msgid "None of the configuration files, except the <filename>kioskrc</filename>, are designed to be edited by hand during a Xfce session; in fact, the changes will be overwritten if you edit them while the session manager or the settings managers are running."
+msgstr ""
+
+#: ./xfce4-session.xml:370(para)
+msgid "System administrators might want to customize the file <filename>${sysconfdir}/xdg/xfce4-session/xfce4-session.rc</filename> to change the default applications that are run on Xfce startup. For example, if you want to start the <application>xfce4-iconbox</application> instead of the <application>xftaskbar4</application>, you would change the <emphasis>[Failsafe Session]</emphasis> section like to something like this:"
+msgstr ""
+
+#: ./xfce4-session.xml:377(programlisting)
+#, no-wrap
+msgid "\n[Failsafe Session]\nCount=4\nClient0_Command=xfwm4\nClient0_PerScreen=False\nClient1_Command=xfce4-panel\nClient1_PerScreen=True\nClient2_Command=xfce4-iconbox\nClient2_PerScreen=True\nClient3_Command=xfdesktop\nClient3_PerScreen=False\n"
+msgstr ""
+
+#: ./xfce4-session.xml:392(title)
+msgid "Kiosk Mode"
+msgstr ""
+
+#: ./xfce4-session.xml:394(para)
+msgid "The session manager offers support for the Kiosk Mode, that helps to prevent users from making changes to their session settings. To use it you have to edit or create the file <filename>${sysconfdir}/xdg/xfce4/kiosk/kioskrc</filename>."
+msgstr ""
+
+#: ./xfce4-session.xml:399(para)
+msgid "The way to explain the format of this file is by using an example. The xfce4-session section of your <filename>kioskrc</filename> might look like this:"
+msgstr ""
+
+#: ./xfce4-session.xml:403(programlisting)
+#, no-wrap
+msgid "\n[xfce4-session]\nCustomizeSplash=ALL\nCustomizeChooser=ALL\nCustomizeLogout=ALL\nCustomizeCompatibility=%wheel\nShutdown=%wheel\nCustomizeSecurity=NONE\n"
+msgstr ""
+
+#: ./xfce4-session.xml:413(para)
+msgid "This allows all users to change their splash, chooser and logout settings, but allows only users in the group <emphasis>wheel</emphasis> to customize the compatibility settings and shutdown the system. No one will be allowed to adjust the security settings."
+msgstr ""
+
+#: ./xfce4-session.xml:418(para)
+msgid "The session manager supports the following KIOSK capabilities:"
+msgstr ""
+
+#: ./xfce4-session.xml:422(term)
+msgid "CustomizeSplash"
+msgstr ""
+
+#: ./xfce4-session.xml:424(para)
+msgid "Whether or not the user is allowed to customize the splash screen."
+msgstr ""
+
+#: ./xfce4-session.xml:429(term)
+msgid "CustomizeChooser"
+msgstr ""
+
+#: ./xfce4-session.xml:431(para)
+msgid "Whether or not the user is allowed to customize the session chooser settings."
+msgstr ""
+
+#: ./xfce4-session.xml:436(term)
+msgid "CustomizeLogout"
+msgstr ""
+
+#: ./xfce4-session.xml:438(para)
+msgid "Whether or not the user is allowed to customize the logout settings."
+msgstr ""
+
+#: ./xfce4-session.xml:443(term)
+msgid "CustomizeCompatibility"
+msgstr ""
+
+#: ./xfce4-session.xml:445(para)
+msgid "Whether or not the user is allowed to customize the compatibility settings (KDE/Gnome compat)"
+msgstr ""
+
+#: ./xfce4-session.xml:451(term)
+msgid "CustomizeSecurity"
+msgstr ""
+
+#: ./xfce4-session.xml:453(para)
+msgid "Whether or not the user is allowed to customize the security settings. This is one of the most <emphasis>IMPORTANT</emphasis> settings, since it prevents users (actually <filename>libICE</filename>) from binding to a TCP port."
+msgstr ""
+
+#: ./xfce4-session.xml:460(term)
+msgid "Shutdown"
+msgstr ""
+
+#: ./xfce4-session.xml:462(para)
+msgid "Whether or not the user is allowed to shutdown (reboot or poweroff) the system. If a user lacks this capability the reboot and poweroff options in the shutdown dialog will be greyed out."
+msgstr ""
+
+#: ./xfce4-session.xml:472(title)
+msgid "About <application>@PACKAGE_NAME@</application>"
+msgstr ""
+
+#: ./xfce4-session.xml:474(para)
+msgid "<application>@PACKAGE_NAME@</application> was written by Benedikt Meurer (<email>benny at xfce.org</email>). To find more information, please visit the <ulink url=\"http://www.xfce.org\" type=\"http\">Xfce web site</ulink>."
+msgstr ""
+
+#: ./xfce4-session.xml:480(para)
+msgid "To report a bug or make a suggestion regarding this application or this manual, use the bug tracking system at <ulink url=\"http://bugzilla.xfce.org/\" type=\"http\">http://bugzilla.xfce.org/</ulink>."
+msgstr ""
+
+#: ./xfce4-session.xml:486(para)
+msgid "If you have questions about the use or installation of this package, please ask on the <ulink url=\"http://lunar-linux.org/mailman/listinfo/xfce\" type=\"http\">xfce</ulink> mailing list. Development discussion takes place on the <ulink url=\"http://lunar-linux.org/mailman/listinfo/xfce4-dev\" type=\"http\">xfce4-dev</ulink> mailing list."
+msgstr ""
+
+#: ./xfce4-session.xml:495(para)
+msgid "This program is distributed under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version."
+msgstr ""
+
+#: ./xfce4-session.xml:500(para)
+msgid "You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
+msgstr ""
+
+#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
+#: ./xfce4-session.xml:0(None)
+msgid "translator-credits"
+msgstr ""
+
diff --git a/doc/manual/po/xfce4-session.pot b/doc/manual/po/xfce4-session.pot
new file mode 100644
index 0000000..6c10e4b
--- /dev/null
+++ b/doc/manual/po/xfce4-session.pot
@@ -0,0 +1,413 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2010-08-27 18:11+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: ./xfce4-session.xml:107(None)
+msgid "@@image: 'images/xfsm-general.png'; md5=f99eebd11a391ab3ecd0c038c0683b13"
+msgstr ""
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: ./xfce4-session.xml:155(None)
+msgid "@@image: 'images/xfsm-advanced.png'; md5=ce9a552111026488b3ae76233eaa69d4"
+msgstr ""
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: ./xfce4-session.xml:218(None)
+msgid "@@image: 'images/xfsm-splash.png'; md5=126a4b2c7239f53cfa475468eac8cd99"
+msgstr ""
+
+#: ./xfce4-session.xml:14(title)
+msgid "Xfce 4 Session Manager"
+msgstr ""
+
+#: ./xfce4-session.xml:17(year)
+msgid "2003"
+msgstr ""
+
+#: ./xfce4-session.xml:18(year)
+msgid "2004"
+msgstr ""
+
+#: ./xfce4-session.xml:19(year)
+msgid "2005"
+msgstr ""
+
+#: ./xfce4-session.xml:20(holder)
+msgid "Benedikt Meurer"
+msgstr ""
+
+#: ./xfce4-session.xml:33(para)
+msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or any later version published by the Free Software Foundation; with no Invariant Sections, with no Front-Cover Texts, and with no Back-Cover Texts. The complete license text is available from the <ulink type=\"http\" url=\"http://www.gnu.org/\">Free Software Foundation</ulink>."
+msgstr ""
+
+#: ./xfce4-session.xml:45(firstname)
+msgid "Benedikt"
+msgstr ""
+
+#: ./xfce4-session.xml:46(surname)
+msgid "Meurer"
+msgstr ""
+
+#: ./xfce4-session.xml:48(email)
+msgid "benny at xfce.org"
+msgstr ""
+
+#: ./xfce4-session.xml:49(orgname)
+msgid "os-cillation"
+msgstr ""
+
+#: ./xfce4-session.xml:50(orgdiv)
+msgid "System development"
+msgstr ""
+
+#: ./xfce4-session.xml:51(jobtitle)
+msgid "Software developer"
+msgstr ""
+
+#: ./xfce4-session.xml:69(releaseinfo)
+msgid "This manual describes the <application>@PACKAGE_NAME@</application> package, version @PACKAGE_VERSION at ."
+msgstr ""
+
+#: ./xfce4-session.xml:78(title)
+msgid "Introduction"
+msgstr ""
+
+#: ./xfce4-session.xml:80(para)
+msgid "<application>@PACKAGE_NAME@</application> is a session manager for Xfce 4. Its task is to save the state of your desktop (opened applications and their location) and restore it during a next startup. You can create several different sessions and choose one of them on startup."
+msgstr ""
+
+#: ./xfce4-session.xml:86(para)
+msgid "<application>@PACKAGE_NAME@</application> provides session management for both X11R6 and legacy X11R5 protocols. If you don't need legacy session management support, you can disable it at compile time, giving --disable-legacy-sm to ./configure. Do <emphasis>NOT EVER</emphasis> run <application>smproxy</application> in session that is managed by <application>@PACKAGE_NAME@</application>, or weird things will happen. The included legacy session management does everything that <application>smproxy</application> would do, and besides that, it also supports multiscreen display."
+msgstr ""
+
+#: ./xfce4-session.xml:97(title)
+msgid "Session Manager settings"
+msgstr ""
+
+#: ./xfce4-session.xml:100(title)
+msgid "General preferences"
+msgstr ""
+
+#: ./xfce4-session.xml:103(title)
+msgid "<application>@PACKAGE_NAME@</application> general preferences"
+msgstr ""
+
+#: ./xfce4-session.xml:111(phrase)
+msgid "Shows the General tab of the <application>@PACKAGE_NAME@</application> settings dialog."
+msgstr ""
+
+#: ./xfce4-session.xml:119(term)
+msgid "Display chooser on login"
+msgstr ""
+
+#: ./xfce4-session.xml:121(para)
+msgid "If set, the session manager will ask you to choose a session every time you log in to Xfce."
+msgstr ""
+
+#: ./xfce4-session.xml:127(term)
+msgid "Automatically save session on logout"
+msgstr ""
+
+#: ./xfce4-session.xml:129(para)
+msgid "This option instructs the session manager to save the current session automatically when you log out. If you don't select this option you'll be prompted whether you want to save the current session on each logout."
+msgstr ""
+
+#: ./xfce4-session.xml:137(term)
+msgid "Prompt on logout"
+msgstr ""
+
+#: ./xfce4-session.xml:139(para)
+msgid "This option disables the logout confirmation dialog. Whether the session will be saved or not depends on whether you enabled the automatic saving of sessions on logout or not."
+msgstr ""
+
+#: ./xfce4-session.xml:148(title)
+msgid "Advanced preferences"
+msgstr ""
+
+#: ./xfce4-session.xml:151(title)
+msgid "<application>@PACKAGE_NAME@</application> advanced preferences"
+msgstr ""
+
+#: ./xfce4-session.xml:159(phrase)
+msgid "Shows Advanced tab of the <application>@PACKAGE_NAME@</application> settings dialog."
+msgstr ""
+
+#: ./xfce4-session.xml:167(term)
+msgid "Launch Gnome services on startup"
+msgstr ""
+
+#: ./xfce4-session.xml:169(para)
+msgid "Enable this option if you need the GNOME keyring daemon to be run on startup. This option also instructs <application>@PACKAGE_NAME@</application> to bring up the GNOME assistive technologies at startup (if enabled in the GNOME control center). See the GNOME documentation for more information on this topic."
+msgstr ""
+
+#: ./xfce4-session.xml:177(term)
+msgid "Launch KDE services on startup"
+msgstr ""
+
+#: ./xfce4-session.xml:179(para)
+msgid "Enable this option if you plan to run KDE applications as part of your Xfce Desktop session. This will notably increase the startup time, but on the other hand, KDE applications will startup faster. Some KDE applications may not work at all if you don't enable this option."
+msgstr ""
+
+#: ./xfce4-session.xml:187(term)
+msgid "Manage remote applications"
+msgstr ""
+
+#: ./xfce4-session.xml:189(para)
+msgid "Allow the session manager to manage applications running on remote hosts. Since this option may constitute a security risk, by listening to a TCP port on your system, do not enable it unless you know what you are doing."
+msgstr ""
+
+#: ./xfce4-session.xml:193(para)
+msgid "System administrators may want to disable this option globally using the session managers <ulink url=\"#xfsm-kiosk-mode\" type=\"html\">KIOSK capabilities</ulink>."
+msgstr ""
+
+#: ./xfce4-session.xml:204(title)
+msgid "Customizing the Session Manager"
+msgstr ""
+
+#: ./xfce4-session.xml:206(para)
+msgid "You can customize the splash-screen that <application>@PACKAGE_NAME@</application> will use when you log in to Xfce 4. There is a dedicated dialog available from the <emphasis>Xfce 4 Settings Manager</emphasis>."
+msgstr ""
+
+#: ./xfce4-session.xml:211(title)
+msgid "Splash screen settings"
+msgstr ""
+
+#: ./xfce4-session.xml:214(title)
+msgid "Splash screen settings dialog"
+msgstr ""
+
+#: ./xfce4-session.xml:222(phrase)
+msgid "Shows the <application>@PACKAGE_NAME@</application> splash screen settings dialog."
+msgstr ""
+
+#: ./xfce4-session.xml:228(para)
+msgid "On the left, the dialog shows a list of all installed engines. Select an engine, and you will see, if available, a preview and information about it. You can click on the <guibutton>Test</guibutton> button to see a demonstration of the selected splash screen engine."
+msgstr ""
+
+#: ./xfce4-session.xml:234(para)
+msgid "<application>@PACKAGE_NAME@</application> provides three Splash themes engines by default. Their respective configuration options - if any - are available from the <guibutton>Configure</guibutton> button."
+msgstr ""
+
+#: ./xfce4-session.xml:240(title)
+msgid "Shutdown/reboot options"
+msgstr ""
+
+#: ./xfce4-session.xml:242(para)
+msgid "<application>@PACKAGE_NAME@</application> supports shutting down your computer when you log out of your desktop session. To be able to shutdown the computer, you have to be listed in the systems <filename>sudoers</filename> file, in particular, you must be allowed to execute the command <filename>${libdir}/xfce4/session/xfsm-shutdown-helper</filename> (<filename>/usr/sbin/xfsm-shutdown-helper</filename> on Debian GNU/Linux) as user root (where <filename>${libdir}</filename> is the <filename role=\"directory\">lib</filename> sub directory in the prefix you installed <application>@PACKAGE_NAME@</application>, for example <filename role=\"directory\">/usr/local/lib/xfce4/session</filename>)."
+msgstr ""
+
+#: ./xfce4-session.xml:253(para)
+msgid "For example, lets say, you installed <application>@PACKAGE_NAME@</application> into <filename role=\"directory\">/usr/local</filename>, your hostname is <emphasis>myhost</emphasis> and your user account is named <emphasis>myuser</emphasis>, then you would have to add the following line to your <filename>sudoers</filename> file (remember to use <application>visudo</application> to edit that file):"
+msgstr ""
+
+#: ./xfce4-session.xml:260(programlisting)
+#, no-wrap
+msgid "\nmyuser myhost=/usr/local/lib/xfce4/session/xfsm-shutdown-helper\n"
+msgstr ""
+
+#: ./xfce4-session.xml:268(title)
+msgid "Advanced"
+msgstr ""
+
+#: ./xfce4-session.xml:271(title)
+msgid "Files and Environment Variables"
+msgstr ""
+
+#: ./xfce4-session.xml:273(para)
+msgid "Xfce now uses the Basedir Specification as defined on <ulink url=\"http://freedesktop.org/\" type=\"http\">Freedesktop.org</ulink> to locate its data and configuration files. This means that file locations will be specified as a path relative to the directories described in the specification."
+msgstr ""
+
+#: ./xfce4-session.xml:281(term)
+msgid "${XDG_CONFIG_HOME}"
+msgstr ""
+
+#: ./xfce4-session.xml:283(para)
+msgid "The first base directory to look for configuration files. By default this is set to <filename role=\"directory\">~/.config/</filename>."
+msgstr ""
+
+#: ./xfce4-session.xml:290(term)
+msgid "${XDG_CONFIG_DIRS}"
+msgstr ""
+
+#: ./xfce4-session.xml:292(para)
+msgid "A list of system directories that contain configuration data. By default the panel will look in <filename role=\"directory\">${sysconfdir}/xdg/</filename> and <filename role=\"directory\">/etc/xdg/</filename>. The value of ${sysconfdir} depends on how the program was build and will often be <filename role=\"directory\">/etc/</filename> for binary packages."
+msgstr ""
+
+#: ./xfce4-session.xml:303(term)
+msgid "${XDG_CACHE_HOME}"
+msgstr ""
+
+#: ./xfce4-session.xml:305(para)
+msgid "Specifies the root for all user-specific cache data. If this environment variable is unset, it defaults to <filename role=\"directory\">~/.cache</filename>."
+msgstr ""
+
+#: ./xfce4-session.xml:312(term)
+msgid "${XDG_CONFIG_DIRS}/autostart/"
+msgstr ""
+
+#: ./xfce4-session.xml:314(para)
+msgid "This is the location where the list of applications that should be automatically run on login is stored. Each autostarted application is represented by a <filename>.desktop</filename> file (see the <ulink type=\"http\" url=\"http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html\">Desktop Entry Specification</ulink> for details)."
+msgstr ""
+
+#: ./xfce4-session.xml:320(para)
+msgid "Prior to Xfce 4.3, the list of autostarted applications was stored in <filename role=\"directory\">~/Desktop/Autostart</filename>, which contained scripts and symbolic links to applications. If you run <application>@PACKAGE_NAME@</application> @PACKAGE_VERSION@ or above for the first time, it will automatically migrate the autostart items from the old location to the standard location and place a <filename>LOCATION-CHANGED.txt</filename> file in the old directory, that describes the location change."
+msgstr ""
+
+#: ./xfce4-session.xml:331(term)
+msgid "${XDG_CONFIG_DIRS}/xfce4-session/xfce4-session.rc"
+msgstr ""
+
+#: ./xfce4-session.xml:333(para)
+msgid "This is the location of the configuration file that includes the various settings for <application>@PACKAGE_NAME@</application>, which can be changed from the settings dialog."
+msgstr ""
+
+#: ./xfce4-session.xml:340(term)
+msgid "${XDG_CONFIG_DIRS}/xfce4-session/xfce4-splash.rc"
+msgstr ""
+
+#: ./xfce4-session.xml:342(para)
+msgid "This is the location of the configuration file that includes the configuration for the splash screen, which can be changed from the settings dialog."
+msgstr ""
+
+#: ./xfce4-session.xml:349(term)
+msgid "${XDG_CACHE_HOME}/sessions/"
+msgstr ""
+
+#: ./xfce4-session.xml:351(para)
+msgid "The directory where <application>@PACKAGE_NAME@</application> and <application>xfwm4</application> store the session data to."
+msgstr ""
+
+#: ./xfce4-session.xml:357(term)
+msgid "${sysconfdir}/xdg/xfce4/kiosk/kioskrc"
+msgstr ""
+
+#: ./xfce4-session.xml:359(para)
+msgid "Kiosk mode configuration file. See <ulink url=\"#xfsm-kiosk-mode\">next section</ulink> for an explanation."
+msgstr ""
+
+#: ./xfce4-session.xml:365(para)
+msgid "None of the configuration files, except the <filename>kioskrc</filename>, are designed to be edited by hand during a Xfce session; in fact, the changes will be overwritten if you edit them while the session manager or the settings managers are running."
+msgstr ""
+
+#: ./xfce4-session.xml:370(para)
+msgid "System administrators might want to customize the file <filename>${sysconfdir}/xdg/xfce4-session/xfce4-session.rc</filename> to change the default applications that are run on Xfce startup. For example, if you want to start the <application>xfce4-iconbox</application> instead of the <application>xftaskbar4</application>, you would change the <emphasis>[Failsafe Session]</emphasis> section like to something like this:"
+msgstr ""
+
+#: ./xfce4-session.xml:377(programlisting)
+#, no-wrap
+msgid "\n[Failsafe Session]\nCount=4\nClient0_Command=xfwm4\nClient0_PerScreen=False\nClient1_Command=xfce4-panel\nClient1_PerScreen=True\nClient2_Command=xfce4-iconbox\nClient2_PerScreen=True\nClient3_Command=xfdesktop\nClient3_PerScreen=False\n"
+msgstr ""
+
+#: ./xfce4-session.xml:392(title)
+msgid "Kiosk Mode"
+msgstr ""
+
+#: ./xfce4-session.xml:394(para)
+msgid "The session manager offers support for the Kiosk Mode, that helps to prevent users from making changes to their session settings. To use it you have to edit or create the file <filename>${sysconfdir}/xdg/xfce4/kiosk/kioskrc</filename>."
+msgstr ""
+
+#: ./xfce4-session.xml:399(para)
+msgid "The way to explain the format of this file is by using an example. The xfce4-session section of your <filename>kioskrc</filename> might look like this:"
+msgstr ""
+
+#: ./xfce4-session.xml:403(programlisting)
+#, no-wrap
+msgid "\n[xfce4-session]\nCustomizeSplash=ALL\nCustomizeChooser=ALL\nCustomizeLogout=ALL\nCustomizeCompatibility=%wheel\nShutdown=%wheel\nCustomizeSecurity=NONE\n"
+msgstr ""
+
+#: ./xfce4-session.xml:413(para)
+msgid "This allows all users to change their splash, chooser and logout settings, but allows only users in the group <emphasis>wheel</emphasis> to customize the compatibility settings and shutdown the system. No one will be allowed to adjust the security settings."
+msgstr ""
+
+#: ./xfce4-session.xml:418(para)
+msgid "The session manager supports the following KIOSK capabilities:"
+msgstr ""
+
+#: ./xfce4-session.xml:422(term)
+msgid "CustomizeSplash"
+msgstr ""
+
+#: ./xfce4-session.xml:424(para)
+msgid "Whether or not the user is allowed to customize the splash screen."
+msgstr ""
+
+#: ./xfce4-session.xml:429(term)
+msgid "CustomizeChooser"
+msgstr ""
+
+#: ./xfce4-session.xml:431(para)
+msgid "Whether or not the user is allowed to customize the session chooser settings."
+msgstr ""
+
+#: ./xfce4-session.xml:436(term)
+msgid "CustomizeLogout"
+msgstr ""
+
+#: ./xfce4-session.xml:438(para)
+msgid "Whether or not the user is allowed to customize the logout settings."
+msgstr ""
+
+#: ./xfce4-session.xml:443(term)
+msgid "CustomizeCompatibility"
+msgstr ""
+
+#: ./xfce4-session.xml:445(para)
+msgid "Whether or not the user is allowed to customize the compatibility settings (KDE/Gnome compat)"
+msgstr ""
+
+#: ./xfce4-session.xml:451(term)
+msgid "CustomizeSecurity"
+msgstr ""
+
+#: ./xfce4-session.xml:453(para)
+msgid "Whether or not the user is allowed to customize the security settings. This is one of the most <emphasis>IMPORTANT</emphasis> settings, since it prevents users (actually <filename>libICE</filename>) from binding to a TCP port."
+msgstr ""
+
+#: ./xfce4-session.xml:460(term)
+msgid "Shutdown"
+msgstr ""
+
+#: ./xfce4-session.xml:462(para)
+msgid "Whether or not the user is allowed to shutdown (reboot or poweroff) the system. If a user lacks this capability the reboot and poweroff options in the shutdown dialog will be greyed out."
+msgstr ""
+
+#: ./xfce4-session.xml:472(title)
+msgid "About <application>@PACKAGE_NAME@</application>"
+msgstr ""
+
+#: ./xfce4-session.xml:474(para)
+msgid "<application>@PACKAGE_NAME@</application> was written by Benedikt Meurer (<email>benny at xfce.org</email>). To find more information, please visit the <ulink url=\"http://www.xfce.org\" type=\"http\">Xfce web site</ulink>."
+msgstr ""
+
+#: ./xfce4-session.xml:480(para)
+msgid "To report a bug or make a suggestion regarding this application or this manual, use the bug tracking system at <ulink url=\"http://bugzilla.xfce.org/\" type=\"http\">http://bugzilla.xfce.org/</ulink>."
+msgstr ""
+
+#: ./xfce4-session.xml:486(para)
+msgid "If you have questions about the use or installation of this package, please ask on the <ulink url=\"http://lunar-linux.org/mailman/listinfo/xfce\" type=\"http\">xfce</ulink> mailing list. Development discussion takes place on the <ulink url=\"http://lunar-linux.org/mailman/listinfo/xfce4-dev\" type=\"http\">xfce4-dev</ulink> mailing list."
+msgstr ""
+
+#: ./xfce4-session.xml:495(para)
+msgid "This program is distributed under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version."
+msgstr ""
+
+#: ./xfce4-session.xml:500(para)
+msgid "You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
+msgstr ""
+
+#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
+#: ./xfce4-session.xml:0(None)
+msgid "translator-credits"
+msgstr ""
+
diff --git a/doc/xfce-nochunk.xsl b/doc/manual/xfce4-session-html.xsl
similarity index 92%
rename from doc/xfce-nochunk.xsl
rename to doc/manual/xfce4-session-html.xsl
index 3dae476..cf09bd0 100644
--- a/doc/xfce-nochunk.xsl
+++ b/doc/manual/xfce4-session-html.xsl
@@ -4,11 +4,6 @@
                 xmlns="http://www.w3.org/TR/xhtml1/transitional"
                 exclude-result-prefixes="#default">
 
-<!-- Load onechunk.xsl stylesheet 
-     TODO: how can I put a location independent link here?
-This should work. The url can be translated to a local one in the catalog
-file"
--->
 <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/onechunk.xsl"/>
 
 <xsl:param name="suppress.navigation">1</xsl:param>
@@ -28,6 +23,7 @@ file"
 
 <xsl:template match="releaseinfo" mode="titlepage.mode">
   <span class="{name(.)}">
+    <br/>
     <xsl:apply-templates mode="titlepage.mode"/>
     <br/>
   </span>
@@ -47,26 +43,16 @@ file"
 
 <xsl:param name="graphic.default.extension" select="png"/>
 
-<xsl:attribute-set name="shade.verbatim.style">
-	<xsl:attribute name="border">0</xsl:attribute>
-	<xsl:attribute name="bgcolor">#F3F4F8</xsl:attribute>
-	<xsl:attribute name="width">100%</xsl:attribute>
-</xsl:attribute-set>
-
-<!-- Addition by Jasper Huijsmans to be able to set background color -->
-<!-- and cell attributes. -->
 <!-- This requires an adapted template for tgroup (see end of stylesheet) -->
 <xsl:attribute-set name="table.style">
-  	<xsl:attribute name="bgcolor">#F8F9FD</xsl:attribute>
+	<xsl:attribute name="bgcolor">#fdf9f8</xsl:attribute>
 	<xsl:attribute name="cellspacing">0</xsl:attribute>
-	<xsl:attribute name="cellpadding">4</xsl:attribute> 
+	<xsl:attribute name="cellpadding">4</xsl:attribute>
 </xsl:attribute-set>
 
 
 <xsl:param name="generate.legalnotice.link" select="0"/>
 
-<xsl:param name="shade.verbatim" select="1"/>
-
 <!-- set font styles for various tags   -->
 <xsl:template match="guibutton">
 <xsl:call-template name="inline.boldseq"/>
diff --git a/doc/C/xfce4-session.xml b/doc/manual/xfce4-session.xml
similarity index 82%
rename from doc/C/xfce4-session.xml
rename to doc/manual/xfce4-session.xml
index afdb377..993bbba 100644
--- a/doc/C/xfce4-session.xml
+++ b/doc/manual/xfce4-session.xml
@@ -1,18 +1,18 @@
-<?xml version='1.0'?> 
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
+<?xml version='1.0'?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
           "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-  <!ENTITY date "July 2005"> 
-  <!ENTITY appversion "4.3">
-  <!ENTITY app "<application>xfce4-session</application>"> 
+  <!ENTITY date "July 2005">
+  <!ENTITY version "@PACKAGE_VERSION@">
+  <!ENTITY app "@PACKAGE_NAME@">
 ]>
 
 <article id="xfce4-session" lang="en">
 
-<!-- Header --> 
+<!-- Header -->
 <articleinfo>
 
   <title>Xfce 4 Session Manager</title>
-  
+
   <copyright>
     <year>2003</year>
     <year>2004</year>
@@ -39,35 +39,22 @@
       type="http" url="http://www.gnu.org/">Free Software Foundation</ulink>.
     </para>
   </legalnotice>
-  
+
   <authorgroup>
     <author>
       <firstname>Benedikt</firstname>
       <surname>Meurer</surname>
       <affiliation>
-	      <address><email>benny at xfce.org</email></address>
+        <jobtitle>Software developer</jobtitle>
         <orgname>os-cillation</orgname>
         <orgdiv>System development</orgdiv>
-        <jobtitle>Software developer</jobtitle>
+        <address><email>benny at xfce.org</email></address>
       </affiliation>
     </author>
-
-<!-- This is appropriate place for other contributors: translators,
-maintainers, etc. Commented out by default.
-
-    <othercredit role="translator">
-      <firstname>Latin</firstname> <surname>Translator 1</surname>
-      <affiliation>
-	<orgname>Latin Translation Team</orgname>
-	<address><email>translator at gnome.org</email> </address>
-      </affiliation> <contrib>Latin translation</contrib>
-    </othercredit>
--->
-
   </authorgroup>
 
   <releaseinfo>
-    This manual describes the &app; package, version &appversion;.
+    This manual describes the &app; package, version &version;.
   </releaseinfo>
 
   <pubdate>&date;</pubdate>
@@ -77,17 +64,17 @@ maintainers, etc. Commented out by default.
 <sect1 id="xfsm-intro">
   <title>Introduction</title>
 
-  <para>&app; is a session manager for Xfce 4. Its task is to save the state of 
-  your desktop (opened applications and their location) and restore it during a next 
-  startup. You can create several different sessions and choose one of them on 
+  <para><application>&app;</application> is a session manager for Xfce 4. Its task is to save the state of
+  your desktop (opened applications and their location) and restore it during a next
+  startup. You can create several different sessions and choose one of them on
   startup.
   </para>
-  
-  <para>&app; provides session management for both X11R6 and 
-  legacy X11R5 protocols. If you don't need legacy session management 
-  support, you can disable it at compile time, giving 
-  --disable-legacy-sm to ./configure. Do <emphasis>NOT EVER</emphasis> run <application>smproxy</application> in 
-  session that is managed by &app;, or weird things will happen. 
+
+  <para><application>&app;</application> provides session management for both X11R6 and
+  legacy X11R5 protocols. If you don't need legacy session management
+  support, you can disable it at compile time, giving
+  --disable-legacy-sm to ./configure. Do <emphasis>NOT EVER</emphasis> run <application>smproxy</application> in
+  session that is managed by <application>&app;</application>, or weird things will happen.
   The included legacy session management does everything that <application>smproxy</application>
   would do, and besides that, it also supports multiscreen display.</para>
 
@@ -95,12 +82,12 @@ maintainers, etc. Commented out by default.
 
 <sect1 id="xfce4-session-settings">
   <title>Session Manager settings</title>
-    
+
   <sect2 id="xfsm-general-settings">
   	<title>General preferences</title>
-  	
+
     <figure id="xfsm-general-fig">
-      <title>&app; general preferences</title>
+      <title><application>&app;</application> general preferences</title>
       <screenshot>
         <mediaobject>
           <imageobject>
@@ -108,47 +95,47 @@ maintainers, etc. Commented out by default.
           </imageobject>
 
           <textobject>
-            <phrase>Shows the General tab of the &app; settings dialog.</phrase>
+            <phrase>Shows the General tab of the <application>&app;</application> settings dialog.</phrase>
           </textobject>
         </mediaobject>
       </screenshot>
     </figure>
-  	
+
   	<variablelist>
       <varlistentry>
-        <term>Display chooser on login</term> 
+        <term>Display chooser on login</term>
         <listitem>
-            <para>If set, the session manager will ask you to choose a session every 
+            <para>If set, the session manager will ask you to choose a session every
             time you log in to Xfce.</para>
         </listitem>
       </varlistentry>
 
       <varlistentry>
-        <term>Automatically save session on logout</term> 
+        <term>Automatically save session on logout</term>
         <listitem>
-          <para>This option instructs the session manager to save the current 
-          session automatically when you log out. If you don't select this option 
-          you'll be prompted whether you want to save the current session on 
+          <para>This option instructs the session manager to save the current
+          session automatically when you log out. If you don't select this option
+          you'll be prompted whether you want to save the current session on
           each logout.</para>
         </listitem>
       </varlistentry>
-      
+
       <varlistentry>
-        <term>Prompt on logout</term> 
+        <term>Prompt on logout</term>
         <listitem>
-          <para>This option disables the logout confirmation dialog. Whether 
-          the session will be saved or not depends on whether you enabled the 
+          <para>This option disables the logout confirmation dialog. Whether
+          the session will be saved or not depends on whether you enabled the
           automatic saving of sessions on logout or not.</para>
         </listitem>
       </varlistentry>
     </variablelist>
 	</sect2>
-		
-	<sect2 id="xfsm-advanced settings">
+
+	<sect2 id="xfsm-advanced-settings">
 	  <title>Advanced preferences</title>
-	
+
     <figure id="xfsm-advanced-fig">
-      <title>&app; advanced preferences</title>
+      <title><application>&app;</application> advanced preferences</title>
       <screenshot>
         <mediaobject>
           <imageobject>
@@ -156,38 +143,38 @@ maintainers, etc. Commented out by default.
           </imageobject>
 
           <textobject>
-            <phrase>Shows Advanced tab of the &app; settings dialog.</phrase>
+            <phrase>Shows Advanced tab of the <application>&app;</application> settings dialog.</phrase>
           </textobject>
         </mediaobject>
       </screenshot>
     </figure>
-	
+
     <variablelist>
       <varlistentry>
-        <term>Launch Gnome services on startup</term> 
+        <term>Launch Gnome services on startup</term>
         <listitem>
           <para>Enable this option if you need the GNOME keyring daemon to be run
-          on startup. This option also instructs &app; to bring up the GNOME assistive
+          on startup. This option also instructs <application>&app;</application> to bring up the GNOME assistive
           technologies at startup (if enabled in the GNOME control center). See the
            GNOME documentation for more information on this topic.</para>
         </listitem>
 		  </varlistentry>
 
       <varlistentry>
-        <term>Launch KDE services on startup</term> 
+        <term>Launch KDE services on startup</term>
         <listitem>
-          <para>Enable this option if you plan to run KDE applications as part of 
-          your Xfce Desktop session. This will notably increase the startup time, 
-          but on the other hand, KDE applications will startup faster. Some KDE 
+          <para>Enable this option if you plan to run KDE applications as part of
+          your Xfce Desktop session. This will notably increase the startup time,
+          but on the other hand, KDE applications will startup faster. Some KDE
           applications may not work at all if you don't enable this option.</para>
         </listitem>
   		</varlistentry>
 
       <varlistentry>
-        <term>Manage remote applications</term> 
+        <term>Manage remote applications</term>
         <listitem>
-          <para>Allow the session manager to manage applications running on 
-          remote hosts. Since this option may constitute a security risk, by listening to  
+          <para>Allow the session manager to manage applications running on
+          remote hosts. Since this option may constitute a security risk, by listening to
           a TCP port on your system, do not enable it unless you know what you are
           doing.</para>
           <para>System administrators may want to disable this option globally using the
@@ -196,20 +183,20 @@ maintainers, etc. Commented out by default.
         </listitem>
       </varlistentry>
     </variablelist>
-	
+
 	</sect2>
 </sect1>
-    
+
 <sect1 id="xfsm-customize">
 	<title>Customizing the Session Manager</title>
-	
-	<para>You can customize the splash-screen that &app; will use when you log in to
+
+	<para>You can customize the splash-screen that <application>&app;</application> will use when you log in to
 	Xfce 4. There is a dedicated dialog available from the <emphasis>Xfce 4
   Settings Manager</emphasis>.</para>
-	
+
 	<sect2 id="xfsm-engines">
 		<title>Splash screen settings</title>
-		
+
     <figure id="splash-screen-settings-fig">
       <title>Splash screen settings dialog</title>
       <screenshot>
@@ -219,27 +206,27 @@ maintainers, etc. Commented out by default.
           </imageobject>
 
           <textobject>
-            <phrase>Shows the &app; splash screen settings dialog.</phrase>
+            <phrase>Shows the <application>&app;</application> splash screen settings dialog.</phrase>
           </textobject>
         </mediaobject>
       </screenshot>
     </figure>
-		
+
     <para>On the left, the dialog shows a list of all installed engines.
     Select an engine, and you will see, if available, a preview and
     information about it. You can click on the <guibutton>Test</guibutton>
     button to see a demonstration of the selected splash screen
     engine.</para>
-				
-    <para>&app; provides three Splash themes engines by default. Their
+
+    <para><application>&app;</application> provides three Splash themes engines by default. Their
     respective configuration options - if any - are available from the
     <guibutton>Configure</guibutton> button.</para>
 	</sect2>
-	
+
 	<sect2 id="xfsm-shutdown">
 		<title>Shutdown/reboot options</title>
-	
-    <para>&app; supports shutting down your computer when you log out
+
+    <para><application>&app;</application> supports shutting down your computer when you log out
     of your desktop session. To be able to shutdown the computer, you
     have to be listed in the systems <filename>sudoers</filename> file,
     in particular, you must be allowed to execute the command
@@ -247,10 +234,10 @@ maintainers, etc. Commented out by default.
     (<filename>/usr/sbin/xfsm-shutdown-helper</filename> on Debian GNU/Linux)
     as user root (where <filename>${libdir}</filename> is the <filename
     role="directory">lib</filename> sub directory in the prefix you
-    installed &app;, for example
+    installed <application>&app;</application>, for example
     <filename role="directory">/usr/local/lib/xfce4/session</filename>).</para>
 
-    <para>For example, lets say, you installed &app; into <filename
+    <para>For example, lets say, you installed <application>&app;</application> into <filename
     role="directory">/usr/local</filename>, your hostname is <emphasis>myhost</emphasis>
     and your user account is named <emphasis>myuser</emphasis>, then you
     would have to add the following line to your <filename>sudoers</filename>
@@ -261,9 +248,9 @@ maintainers, etc. Commented out by default.
 myuser myhost=/usr/local/lib/xfce4/session/xfsm-shutdown-helper
 </programlisting>
 	</sect2>
-	
+
 </sect1>
- 
+
 <sect1 id="xfsm-advanced">
   <title>Advanced</title>
 
@@ -280,7 +267,7 @@ myuser myhost=/usr/local/lib/xfce4/session/xfsm-shutdown-helper
       <varlistentry>
         <term>${XDG_CONFIG_HOME}</term>
         <listitem>
-          <para>The first base directory to look for configuration 
+          <para>The first base directory to look for configuration
           files. By default this is set to <filename
           role="directory">~/.config/</filename>.</para>
         </listitem>
@@ -290,8 +277,8 @@ myuser myhost=/usr/local/lib/xfce4/session/xfsm-shutdown-helper
         <term>${XDG_CONFIG_DIRS}</term>
         <listitem>
           <para>A list of system directories that contain configuration
-          data. By default the panel will look in <filename 
-          role="directory">${sysconfdir}/xdg/</filename> and 
+          data. By default the panel will look in <filename
+          role="directory">${sysconfdir}/xdg/</filename> and
           <filename role="directory">/etc/xdg/</filename>. The value of
           ${sysconfdir} depends on how the program was build and will often be
           <filename role="directory">/etc/</filename> for binary
@@ -320,7 +307,7 @@ myuser myhost=/usr/local/lib/xfce4/session/xfsm-shutdown-helper
           <para>Prior to Xfce 4.3, the list of autostarted applications
           was stored in <filename role="directory">~/Desktop/Autostart</filename>,
           which contained scripts and symbolic links to applications. If
-          you run &app; &appversion; or above for the first time, it will
+          you run <application>&app;</application> &version; or above for the first time, it will
           automatically migrate the autostart items from the old location
           to the standard location and place a <filename>LOCATION-CHANGED.txt</filename>
           file in the old directory, that describes the location change.</para>
@@ -331,11 +318,11 @@ myuser myhost=/usr/local/lib/xfce4/session/xfsm-shutdown-helper
         <term>${XDG_CONFIG_DIRS}/xfce4-session/xfce4-session.rc</term>
         <listitem>
           <para>This is the location of the configuration file that
-          includes the various settings for &app;, which can be changed
+          includes the various settings for <application>&app;</application>, which can be changed
           from the settings dialog.</para>
         </listitem>
       </varlistentry>
-    
+
       <varlistentry>
         <term>${XDG_CONFIG_DIRS}/xfce4-session/xfce4-splash.rc</term>
         <listitem>
@@ -344,11 +331,11 @@ myuser myhost=/usr/local/lib/xfce4/session/xfsm-shutdown-helper
           can be changed from the settings dialog.</para>
         </listitem>
       </varlistentry>
-    
+
       <varlistentry>
         <term>${XDG_CACHE_HOME}/sessions/</term>
         <listitem>
-          <para>The directory where &app; and <application>xfwm4</application>
+          <para>The directory where <application>&app;</application> and <application>xfwm4</application>
           store the session data to.</para>
         </listitem>
       </varlistentry>
@@ -370,7 +357,7 @@ myuser myhost=/usr/local/lib/xfce4/session/xfsm-shutdown-helper
     <para>System administrators might want to customize the file
     <filename>${sysconfdir}/xdg/xfce4-session/xfce4-session.rc</filename> to change
     the default applications that are run on Xfce startup. For example, if you want to
-    start the <application>xfce4-iconbox</application> instead of the 
+    start the <application>xfce4-iconbox</application> instead of the
     <application>xftaskbar4</application>, you would change the <emphasis>[Failsafe
     Session]</emphasis> section like to something like this:</para>
 
@@ -411,7 +398,7 @@ CustomizeSecurity=NONE
 </programlisting>
 
     <para>This allows all users to change their splash, chooser and logout settings,
-    but allows only users in the group <emphasis>wheel</emphasis> to customize the 
+    but allows only users in the group <emphasis>wheel</emphasis> to customize the
     compatibility settings and shutdown the system. No one will be allowed to adjust
     the security settings.</para>
 
@@ -469,37 +456,37 @@ CustomizeSecurity=NONE
 </sect1>
 
 <sect1 id="xfsm-copyright">
-  <title>About &app;</title>
+  <title>About <application>&app;</application></title>
 
-  <para>&app; was written by Benedikt Meurer 
+  <para><application>&app;</application> was written by Benedikt Meurer
   (<email>benny at xfce.org</email>).
-    To find more information, please visit the 
-    <ulink url="http://www.xfce.org" type="http">Xfce web site</ulink>. 
+    To find more information, please visit the
+    <ulink url="http://www.xfce.org" type="http">Xfce web site</ulink>.
   </para>
 
   <para>To report a bug or make a suggestion regarding this application or
-    this manual, use the bug tracking system at <ulink 
-      url="http://bugzilla.xfce.org/" 
-      type="http">http://bugzilla.xfce.org/</ulink>. 
+    this manual, use the bug tracking system at <ulink
+      url="http://bugzilla.xfce.org/"
+      type="http">http://bugzilla.xfce.org/</ulink>.
   </para>
 
   <para>If you have questions about the use or installation of this package,
-    please ask on the <ulink 
+    please ask on the <ulink
       url="http://lunar-linux.org/mailman/listinfo/xfce"
       type="http">xfce</ulink> mailing list. Development discussion takes
-    place on the <ulink 
+    place on the <ulink
       url="http://lunar-linux.org/mailman/listinfo/xfce4-dev"
       type="http">xfce4-dev</ulink> mailing list.
   </para>
-    
+
   <para> This program is distributed under the terms of the
-    GNU General Public License as published by the Free Software Foundation; 
+    GNU General Public License as published by the Free Software Foundation;
     either version 2 of the License, or (at your option) any later version.
   </para>
 
-  <para>You should have received a copy of the GNU General Public License 
-    along with this program; if not, write to the Free Software 
-    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
+  <para>You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
     USA.
   </para>
 



More information about the Xfce4-commits mailing list