[sdk/kdesrc-build/docbook_historied_per_file] doc/getting-started: Merge branch 'xsession-support'

[Michael Pyne]

Git commit 2f2eaf55bef19b22284c08439d0dfbc168f7ce70 by Michael Pyne.
Committed on 20/11/2012 at 02:36.
Pushed by ashark into branch 'docbook_historied_per_file'.

Merge branch 'xsession-support'

Feature seems to work in my testing, time to push out to master and verify it
doesn't break anything. I will also post the revised documentation to the
website.

If you don't like the idea of kdesrc-build adding a .xsession for you, then
you can set 'install-session-driver' to false in your kdesrc-buildrc.

Original commit: 7dd4484d
https://invent.kde.org/sdk/kdesrc-build/-/commit/7dd4484dd182f932c5330b9a65a35c3035ea7ba4

M  +1    -1    doc/getting-started/kde-modules-and-selection.docbook

https://invent.kde.org/sdk/kdesrc-build/-/commit/2f2eaf55bef19b22284c08439d0dfbc168f7ce70

diff --git a/doc/getting-started/kde-modules-and-selection.docbook b/doc/getting-started/kde-modules-and-selection.docbook
index 67142d47..11d1b0f4 100644
--- a/doc/getting-started/kde-modules-and-selection.docbook
+++ b/doc/getting-started/kde-modules-and-selection.docbook
@@ -11,7 +11,7 @@ select the software modules that you want built.
 </para>
 
 <orderedlist>
-<listitem><para>At the lowest level comes Nokia's &Qt; library, which is a
+<listitem><para>At the lowest level comes Digia's &Qt; library, which is a
 very powerful, cross-platform <quote>toolkit</quote> library. &kde; is based on
 &Qt;, and some of the non-&kde; libraries required by &kde; are also based on
 &Qt;. &kdesrc-build; can build &Qt;, or use the one already installed on your