Package: debian-handbook
Severity: normal
Tags: patch
Dear Maintainer,
the occurrences to "KDE" in the current version of the handbook refer to
the desktop, and in general to the old idea of KDE of being a monolithic
block. This has not been the case for many years: KDE is the community
and Plasma, the desktop environment, is "just" one the projects (albeit
really relevant). Applications, on the other side, are supposed to work
on every desktop environment (and also on additional operating systems).
For more details, please see:
https://dot.kde.org/2009/11/24/repositioning-kde-brand
https://dot.kde.org/2013/09/04/kde-release-structure-evolves
https://dot.kde.org/2014/06/26/where-kde-going-part-1
https://dot.kde.org/2014/07/02/where-kde-going-part-2
I attached a patch which uses the proper terminology.
There are really two patches because I'm not sure which is the branch
still active. A quick look at the git history shows that jessie/master
is still active, so please check the the jessie-master-... patch. The
other one is still useful as reference when merging that branch into
master.
-- System Information:
Debian Release: 9.0
APT prefers testing
APT policy: (850, 'testing'), (800, 'unstable'), (750, 'experimental'), (750,
'stable'), (500, 'unstable-debug'), (500, 'testing-debug'), (500,
'stable-updates'), (1, 'experimental-debug')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.9.0-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=it_IT.UTF-8, LC_CTYPE=it_IT.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
From b24c27d4cd5331c272e5a985fa13d20c27df9ece Mon Sep 17 00:00:00 2001
From: Luigi Toscano <luigi.tosc...@tiscali.it>
Date: Sun, 16 Apr 2017 16:58:41 +0200
Subject: [PATCH] Fix: KDE is the community
- use the correct name (Plasma) for the desktop environment;
- soften the dependency of applications by KDE on the desktop (there
is none);
- highlights that KDE is the "producer" when required.
---
en-US/01_the-debian-project.xml | 14 ++++++-------
en-US/07_solving-problems.xml | 5 +++--
en-US/08_basic-configuration.xml | 6 +++---
en-US/09_unix-services.xml | 4 ++--
en-US/13_workstation.xml | 37 +++++++++++++++++++----------------
en-US/90_derivative-distributions.xml | 6 +++---
en-US/92_short-remedial-course.xml | 2 +-
7 files changed, 39 insertions(+), 35 deletions(-)
diff --git a/en-US/01_the-debian-project.xml b/en-US/01_the-debian-project.xml
index 66018740..655603a0 100644
--- a/en-US/01_the-debian-project.xml
+++ b/en-US/01_the-debian-project.xml
@@ -235,7 +235,7 @@
software projects, especially the PostgreSQL database,
Freedesktop.org (project for standardization of various parts
of modern graphical desktop environments, such as GNOME and
- KDE), and the Libre Office office suite.
+ KDE Plasma), and the Libre Office office suite.
<ulink type="block" url="http://www.spi-inc.org/"/></para>
<para>In addition to SPI, various local associations
@@ -2022,7 +2022,7 @@
servers, don't need the latest and greatest version of GNOME; they can
choose Debian
<emphasis role="distribution">Stable</emphasis>, and they will be
satisfied. End users, more interested in the latest versions of GNOME
- or KDE than in rock-solid stability, will find Debian <emphasis
+ or KDE Plasma than in rock-solid stability, will find Debian <emphasis
role="distribution">Testing</emphasis> to be a good compromise
between a lack of serious problems and relatively up to date
software. Finally, developers and more experienced users may blaze
@@ -2032,18 +2032,18 @@
of a program. To each their own Debian!</para>
<sidebar>
- <title><emphasis>CULTURE</emphasis> GNOME and KDE, graphical desktop
environments</title>
+ <title><emphasis>CULTURE</emphasis> GNOME and KDE Plasma, graphical
desktop environments</title>
- <para>GNOME (GNU Network Object Model Environment) and KDE (K
- Desktop Environment) are the two most popular graphical desktop
+ <para>GNOME (GNU Network Object Model Environment) and Plasma by KDE
+ are the two most popular graphical desktop
environments in the free software world. A desktop environment is a
set of programs grouped together to allow easy management of the
most common operations through a graphical interface. They
generally include a file manager, office suite, web browser, e-mail
program, multimedia accessories, etc. The most visible difference
resides in the choice of the graphical library used: GNOME has
- chosen GTK+ (free software licensed under the LGPL), and KDE has
- selected Qt (a company-backed project, available nowadays both
+ chosen GTK+ (free software licensed under the LGPL), and the KDE
community
+ has selected Qt (a company-backed project, available nowadays both
under the GPL and a commercial license).
<ulink type="block" url="http://www.gnome.org/"/>
<ulink type="block" url="http://www.kde.org/"/></para>
diff --git a/en-US/07_solving-problems.xml b/en-US/07_solving-problems.xml
index 4a864d6b..9b39f2b6 100644
--- a/en-US/07_solving-problems.xml
+++ b/en-US/07_solving-problems.xml
@@ -205,8 +205,9 @@ ntfscp (8) - copy file to an NTFS volume.
</sidebar>
<para>The <command>man</command> command is not the only means of
- consulting the manual pages, since <command>konqueror</command> (in
- KDE) and <command>yelp</command> (under GNOME) programs also offer
+ consulting the manual pages, since <command>khelpcenter</command>
+ and <command>konqueror</command> (by KDE) and
+ <command>yelp</command> (under GNOME) programs also offer
this possibility. There is also a web interface, provided by the
<command>man2html</command> package, which allows you to view manual
pages in a web browser. On a computer where this package is
diff --git a/en-US/08_basic-configuration.xml b/en-US/08_basic-configuration.xml
index e71161d0..4c61fd2f 100644
--- a/en-US/08_basic-configuration.xml
+++ b/en-US/08_basic-configuration.xml
@@ -211,7 +211,7 @@
<indexterm><primary>key</primary><secondary><literal>Compose</literal></secondary></indexterm>
<para>Note that the keyboard configuration for graphical mode
- described here only affects the default layout; the GNOME and KDE
+ described here only affects the default layout; the GNOME and KDE Plasma
environments, among others, provide a keyboard control panel in their
preferences allowing each user to have their own configuration. Some
additional options regarding the behavior of some particular keys are
@@ -2122,7 +2122,7 @@ macosx=/dev/sda5
<indexterm><primary><command>mount</command></primary></indexterm>
<para>Some removable devices are automatically mounted when
- connected, especially when using the GNOME, KDE or other graphical
+ connected, especially when using the GNOME, Plasma or other graphical
desktop environments. Others have to be mounted manually by the
user. Likewise, they must be unmounted (removed from the file
tree). Normal users do not usually have permission to execute the
@@ -2304,7 +2304,7 @@ arrakis:/shared /shared nfs defaults 0
0
<command>automount</command> in the <emphasis>autofs</emphasis>
package.</para>
- <para>Note also that GNOME, KDE, and other graphical desktop
+ <para>Note also that GNOME, Plasma, and other graphical desktop
environments work together with <emphasis>udisks</emphasis>,
and can automatically mount removable media when they are
connected.</para>
</sidebar>
diff --git a/en-US/09_unix-services.xml b/en-US/09_unix-services.xml
index cc5651b4..6d0b59fc 100644
--- a/en-US/09_unix-services.xml
+++ b/en-US/09_unix-services.xml
@@ -974,7 +974,7 @@ up. </para></listitem>
role="distribution">Jessie</emphasis> includes that option in
its configuration panel (contrary to previous versions of
Debian, where the user had to install and run
- <command>vino</command>). KDE still requires using
+ <command>vino</command>). KDE Plasma still requires using
<command>krfb</command> to allow sharing an existing session
over VNC. For other graphical desktop environments, the
<command>x11vnc</command> command (from the Debian package of
@@ -989,7 +989,7 @@ up. </para></listitem>
<para>When the graphical session is made available by VNC, the
administrator must connect to it with a VNC client. GNOME has
<command>vinagre</command> and <command>remmina</command> for that,
- while KDE includes <command>krdc</command> (in the menu at
+ while the KDE project provides <command>krdc</command> (in the menu at
<menuchoice> <guimenu>K</guimenu> <guisubmenu>Internet</guisubmenu>
<guimenuitem>Remote Desktop Client</guimenuitem></menuchoice>). There
are other VNC clients that use the command line, such as
diff --git a/en-US/13_workstation.xml b/en-US/13_workstation.xml
index ae5c07e7..b48d4829 100644
--- a/en-US/13_workstation.xml
+++ b/en-US/13_workstation.xml
@@ -292,7 +292,7 @@
The applications menus can be further customized by administrators
through
system-wide configuration files as described by the “Desktop Menu
Specification”.
End-users can also customize the menus with graphical tools such
- as <emphasis role="pkg">kmenuedit</emphasis> (in KDE),
+ as <emphasis role="pkg">kmenuedit</emphasis> (in Plasma),
<emphasis role="pkg">alacarte</emphasis> (in GNOME) or
<emphasis role="pkg">menulibre</emphasis>.
<ulink type="block"
url="http://standards.freedesktop.org/menu-spec/latest/"/>
@@ -319,7 +319,7 @@
<title>Graphical Desktops</title>
<para>The free graphical desktop field is dominated by two large
- software collections: GNOME and KDE. Both of them are very popular.
+ software collections: GNOME and Plasma by KDE. Both of them are very
popular.
This is rather a rare instance in the free software world; the Apache
web server, for instance, has very few peers.</para>
<indexterm><primary>graphical desktop</primary></indexterm>
@@ -328,14 +328,15 @@
<indexterm><primary>GTK+</primary></indexterm>
<indexterm><primary>Qt</primary></indexterm>
- <para>This diversity is rooted in history. KDE was the first graphical
- desktop project, but it chose the Qt graphical toolkit and that choice
+ <para>This diversity is rooted in history. Plasma (initially only KDE,
+ which is not the name of the community) was the first graphical desktop
+ project, but it chose the Qt graphical toolkit and that choice
wasn't acceptable for a large number of developers. Qt was not free
software at the time, and GNOME was started based on the GTK+ toolkit.
Qt became free software in the interval, but the projects haven't
merged and evolved in parallel instead.</para>
- <para>GNOME and KDE still work together: under the FreeDesktop.org
+ <para>The GNOME and KDE communities still work together: under the
FreeDesktop.org
umbrella, the projects collaborated in defining standards for
interoperability across applications.</para>
<indexterm><primary>FreeDesktop.org</primary></indexterm>
@@ -388,20 +389,20 @@
<indexterm><primary><command>dconf</command></primary></indexterm>
</section>
<section>
- <title>KDE</title>
+ <title>KDE and Plasma</title>
<para>Debian <emphasis role="distribution">Jessie</emphasis>
- includes version 4.14 of KDE, which can be installed with
+ includes version 4.11 of KDE Plasma, which can be installed with
<command>apt-get install kde-standard</command>.</para>
- <para>KDE has had a rapid evolution based on a very hands-on
+ <para>Plasma has had a rapid evolution based on a very hands-on
approach. Its authors quickly got very good results, which allowed
them to grow a large user-base. These factors contributed to the
- overall project quality. KDE is a perfectly mature desktop
+ overall project quality. Plasma is a perfectly mature desktop
environment with a wide range of applications.</para>
<figure>
- <title>The KDE desktop</title>
+ <title>The Plasma desktop</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/kde.png" scalefit="1" width="70%"/>
@@ -412,8 +413,8 @@
<para>Since the Qt 4.0 release, the last remaining license problem
with KDE is no more. This version was released under the GPL both for
Linux and Windows (whereas the Windows version was previously
- released under a non-free license). Note that KDE applications must
- be developed using the C++ language.</para>
+ released under a non-free license). KDE applications are primary
+ developed using the C++ language.</para>
</section>
<section>
<title>Xfce and Others</title>
@@ -425,7 +426,7 @@
across both desktops.</para>
<indexterm><primary>Xfce</primary></indexterm>
- <para>Unlike GNOME and KDE, Xfce does not aim at being a vast
+ <para>Unlike GNOME and Plasma, Xfce does not aim at being a vast
project. Beyond the basic components of a modern desktop (file
manager, window manager, session manager, a panel for application
launchers and so on), it only provides a few specific applications:
@@ -578,7 +579,7 @@
<indexterm><primary>WebKit</primary></indexterm>
<indexterm><primary>Epiphany</primary></indexterm>
- <para>Konqueror, the KDE file manager, also behaves as a web browser.
+ <para>Konqueror, one of the file managers by KDE, also behaves as a web
browser.
It uses the KDE-specific KHTML rendering engine; KHTML is an
excellent engine, as witnessed by the fact that Apple's WebKit is
based on KHTML. Konqueror is available in the <emphasis
@@ -687,11 +688,13 @@
<section>
<title>Tools for Qt on KDE</title>
- <para>The equivalent applications for KDE are KDevelop (in the
+ <para>The equivalent applications for Qt applications are KDevelop by
KDE (in the
<emphasis role="pkg">kdevelop</emphasis> package) for the
development environment, and Qt Designer (in the <emphasis
role="pkg">qttools5-dev-tools</emphasis> package) for the design of
- graphical interfaces for Qt applications on KDE.</para>
+ graphical interfaces for Qt applications.</para>
+ <para>KDevelop is also a generic IDE and provides plugin for other
+ languages like Python and PHP and different build systems</para>
<indexterm><primary>KDevelop</primary></indexterm>
<indexterm><primary>Qt</primary><secondary>Designer</secondary></indexterm>
@@ -1009,7 +1012,7 @@
<para>The default GNOME desktop includes the Empathy communications
client. Empathy can support both SIP and XMPP. It supports instant
- messaging (IM), voice and video. The KDE desktop provides KDE Telepathy,
+ messaging (IM), voice and video. The KDE project provides KDE Telepathy,
a communications client based on the same underlying Telepathy APIs
used by the GNOME Empathy client.</para>
<indexterm><primary>Empathy</primary></indexterm>
diff --git a/en-US/90_derivative-distributions.xml
b/en-US/90_derivative-distributions.xml
index d4e1c2c7..9b983f9d 100644
--- a/en-US/90_derivative-distributions.xml
+++ b/en-US/90_derivative-distributions.xml
@@ -58,7 +58,7 @@
<para>These objectives necessarily involve a reduction in scope; Ubuntu
focuses on a smaller number of packages than Debian, and relies
primarily on the GNOME desktop (although an official Ubuntu derivative,
- called “Kubuntu”, relies on KDE). Everything is internationalized and
+ called “Kubuntu”, relies on KDE Plasma). Everything is internationalized
and
made available in a great many languages.</para>
<indexterm><primary>Kubuntu</primary></indexterm>
@@ -121,7 +121,7 @@
technologies, and provides specific graphical user interfaces on
top of the usual software. For instance, Linux Mint relies on Cinnamon
instead of GNOME by default (but it also includes MATE as well
- as KDE and Xfce); similarly, the package management
+ as Plasma and Xfce); similarly, the package management
interface, although based on APT, provides a specific interface
with an evaluation of the risk from each package update.</para>
@@ -152,7 +152,7 @@
files with you, and to work on any computer without leaving a
trace — remember that the distribution doesn't use the hard-disk
at all. Knoppix uses LXDE (a lightweight graphical desktop) by
- default, but the DVD version also includes GNOME and KDE. Many
+ default, but the DVD version also includes GNOME and Plasma. Many
other distributions provide other combinations of desktops and
software. This is, in part, made possible thanks to the <emphasis
role="pkg">live-build</emphasis> Debian package that makes it
diff --git a/en-US/92_short-remedial-course.xml
b/en-US/92_short-remedial-course.xml
index 1b94896d..9a604317 100644
--- a/en-US/92_short-remedial-course.xml
+++ b/en-US/92_short-remedial-course.xml
@@ -38,7 +38,7 @@
desktop, by an application known as a “terminal”. In GNOME,
you can start it from the “Activities” overview (that you get
when you move the mouse in the top-left corner of the screen) by
- typing the first letters of the application name. In KDE, you will
+ typing the first letters of the application name. In Plasma, you will
find it in the <menuchoice><guimenu>K</guimenu>
<guisubmenu>Applications</guisubmenu>
<guisubmenu>System</guisubmenu></menuchoice> menu.</para>
--
2.11.0
From b91a3484d0bb2d7f6aaf2de474530808ab92106e Mon Sep 17 00:00:00 2001
From: Luigi Toscano <luigi.tosc...@tiscali.it>
Date: Sun, 16 Apr 2017 16:58:41 +0200
Subject: [PATCH] Fix: KDE is the community
- use the correct name (Plasma) for the desktop environment;
- soften the dependency of applications by KDE on the desktop (there
is none);
- highlights that KDE is the "producer" when required.
---
en-US/01_the-debian-project.xml | 14 ++++++-------
en-US/07_solving-problems.xml | 5 +++--
en-US/08_basic-configuration.xml | 6 +++---
en-US/09_unix-services.xml | 4 ++--
en-US/13_workstation.xml | 37 +++++++++++++++++++----------------
en-US/90_derivative-distributions.xml | 6 +++---
en-US/92_short-remedial-course.xml | 2 +-
7 files changed, 39 insertions(+), 35 deletions(-)
diff --git a/en-US/01_the-debian-project.xml b/en-US/01_the-debian-project.xml
index 66018740..655603a0 100644
--- a/en-US/01_the-debian-project.xml
+++ b/en-US/01_the-debian-project.xml
@@ -235,7 +235,7 @@
software projects, especially the PostgreSQL database,
Freedesktop.org (project for standardization of various parts
of modern graphical desktop environments, such as GNOME and
- KDE), and the Libre Office office suite.
+ KDE Plasma), and the Libre Office office suite.
<ulink type="block" url="http://www.spi-inc.org/"/></para>
<para>In addition to SPI, various local associations
@@ -2022,7 +2022,7 @@
servers, don't need the latest and greatest version of GNOME; they can
choose Debian
<emphasis role="distribution">Stable</emphasis>, and they will be
satisfied. End users, more interested in the latest versions of GNOME
- or KDE than in rock-solid stability, will find Debian <emphasis
+ or KDE Plasma than in rock-solid stability, will find Debian <emphasis
role="distribution">Testing</emphasis> to be a good compromise
between a lack of serious problems and relatively up to date
software. Finally, developers and more experienced users may blaze
@@ -2032,18 +2032,18 @@
of a program. To each their own Debian!</para>
<sidebar>
- <title><emphasis>CULTURE</emphasis> GNOME and KDE, graphical desktop
environments</title>
+ <title><emphasis>CULTURE</emphasis> GNOME and KDE Plasma, graphical
desktop environments</title>
- <para>GNOME (GNU Network Object Model Environment) and KDE (K
- Desktop Environment) are the two most popular graphical desktop
+ <para>GNOME (GNU Network Object Model Environment) and Plasma by KDE
+ are the two most popular graphical desktop
environments in the free software world. A desktop environment is a
set of programs grouped together to allow easy management of the
most common operations through a graphical interface. They
generally include a file manager, office suite, web browser, e-mail
program, multimedia accessories, etc. The most visible difference
resides in the choice of the graphical library used: GNOME has
- chosen GTK+ (free software licensed under the LGPL), and KDE has
- selected Qt (a company-backed project, available nowadays both
+ chosen GTK+ (free software licensed under the LGPL), and the KDE
community
+ has selected Qt (a company-backed project, available nowadays both
under the GPL and a commercial license).
<ulink type="block" url="http://www.gnome.org/"/>
<ulink type="block" url="http://www.kde.org/"/></para>
diff --git a/en-US/07_solving-problems.xml b/en-US/07_solving-problems.xml
index 4a864d6b..9b39f2b6 100644
--- a/en-US/07_solving-problems.xml
+++ b/en-US/07_solving-problems.xml
@@ -205,8 +205,9 @@ ntfscp (8) - copy file to an NTFS volume.
</sidebar>
<para>The <command>man</command> command is not the only means of
- consulting the manual pages, since <command>konqueror</command> (in
- KDE) and <command>yelp</command> (under GNOME) programs also offer
+ consulting the manual pages, since <command>khelpcenter</command>
+ and <command>konqueror</command> (by KDE) and
+ <command>yelp</command> (under GNOME) programs also offer
this possibility. There is also a web interface, provided by the
<command>man2html</command> package, which allows you to view manual
pages in a web browser. On a computer where this package is
diff --git a/en-US/08_basic-configuration.xml b/en-US/08_basic-configuration.xml
index e71161d0..4c61fd2f 100644
--- a/en-US/08_basic-configuration.xml
+++ b/en-US/08_basic-configuration.xml
@@ -211,7 +211,7 @@
<indexterm><primary>key</primary><secondary><literal>Compose</literal></secondary></indexterm>
<para>Note that the keyboard configuration for graphical mode
- described here only affects the default layout; the GNOME and KDE
+ described here only affects the default layout; the GNOME and KDE Plasma
environments, among others, provide a keyboard control panel in their
preferences allowing each user to have their own configuration. Some
additional options regarding the behavior of some particular keys are
@@ -2122,7 +2122,7 @@ macosx=/dev/sda5
<indexterm><primary><command>mount</command></primary></indexterm>
<para>Some removable devices are automatically mounted when
- connected, especially when using the GNOME, KDE or other graphical
+ connected, especially when using the GNOME, Plasma or other graphical
desktop environments. Others have to be mounted manually by the
user. Likewise, they must be unmounted (removed from the file
tree). Normal users do not usually have permission to execute the
@@ -2304,7 +2304,7 @@ arrakis:/shared /shared nfs defaults 0
0
<command>automount</command> in the <emphasis>autofs</emphasis>
package.</para>
- <para>Note also that GNOME, KDE, and other graphical desktop
+ <para>Note also that GNOME, Plasma, and other graphical desktop
environments work together with <emphasis>udisks</emphasis>,
and can automatically mount removable media when they are
connected.</para>
</sidebar>
diff --git a/en-US/09_unix-services.xml b/en-US/09_unix-services.xml
index cc5651b4..6d0b59fc 100644
--- a/en-US/09_unix-services.xml
+++ b/en-US/09_unix-services.xml
@@ -974,7 +974,7 @@ up. </para></listitem>
role="distribution">Jessie</emphasis> includes that option in
its configuration panel (contrary to previous versions of
Debian, where the user had to install and run
- <command>vino</command>). KDE still requires using
+ <command>vino</command>). KDE Plasma still requires using
<command>krfb</command> to allow sharing an existing session
over VNC. For other graphical desktop environments, the
<command>x11vnc</command> command (from the Debian package of
@@ -989,7 +989,7 @@ up. </para></listitem>
<para>When the graphical session is made available by VNC, the
administrator must connect to it with a VNC client. GNOME has
<command>vinagre</command> and <command>remmina</command> for that,
- while KDE includes <command>krdc</command> (in the menu at
+ while the KDE project provides <command>krdc</command> (in the menu at
<menuchoice> <guimenu>K</guimenu> <guisubmenu>Internet</guisubmenu>
<guimenuitem>Remote Desktop Client</guimenuitem></menuchoice>). There
are other VNC clients that use the command line, such as
diff --git a/en-US/13_workstation.xml b/en-US/13_workstation.xml
index 05b98f24..2f106b76 100644
--- a/en-US/13_workstation.xml
+++ b/en-US/13_workstation.xml
@@ -291,7 +291,7 @@
The applications menus can be further customized by administrators
through
system-wide configuration files as described by the “Desktop Menu
Specification”.
End-users can also customize the menus with graphical tools such
- as <emphasis role="pkg">kmenuedit</emphasis> (in KDE),
+ as <emphasis role="pkg">kmenuedit</emphasis> (in Plasma),
<emphasis role="pkg">alacarte</emphasis> (in GNOME) or
<emphasis role="pkg">menulibre</emphasis>.
<ulink type="block"
url="http://standards.freedesktop.org/menu-spec/latest/"/>
@@ -318,7 +318,7 @@
<title>Graphical Desktops</title>
<para>The free graphical desktop field is dominated by two large
- software collections: GNOME and KDE. Both of them are very popular.
+ software collections: GNOME and Plasma by KDE. Both of them are very
popular.
This is rather a rare instance in the free software world; the Apache
web server, for instance, has very few peers.</para>
<indexterm><primary>graphical desktop</primary></indexterm>
@@ -327,14 +327,15 @@
<indexterm><primary>GTK+</primary></indexterm>
<indexterm><primary>Qt</primary></indexterm>
- <para>This diversity is rooted in history. KDE was the first graphical
- desktop project, but it chose the Qt graphical toolkit and that choice
+ <para>This diversity is rooted in history. Plasma (initially only KDE,
+ which is not the name of the community) was the first graphical desktop
+ project, but it chose the Qt graphical toolkit and that choice
wasn't acceptable for a large number of developers. Qt was not free
software at the time, and GNOME was started based on the GTK+ toolkit.
Qt has since become free software, but the projects still evolved in
parallel.</para>
- <para>GNOME and KDE still work together: under the FreeDesktop.org
+ <para>The GNOME and KDE communities still work together: under the
FreeDesktop.org
umbrella, the projects collaborated in defining standards for
interoperability across applications.</para>
<indexterm><primary>FreeDesktop.org</primary></indexterm>
@@ -387,20 +388,20 @@
<indexterm><primary><command>dconf</command></primary></indexterm>
</section>
<section>
- <title>KDE</title>
+ <title>KDE and Plasma</title>
<para>Debian <emphasis role="distribution">Jessie</emphasis>
- includes version 4.14 of KDE, which can be installed with
+ includes version 4.11 of KDE Plasma, which can be installed with
<command>apt-get install kde-standard</command>.</para>
- <para>KDE has had a rapid evolution based on a very hands-on
+ <para>Plasma has had a rapid evolution based on a very hands-on
approach. Its authors quickly got very good results, which allowed
them to grow a large user-base. These factors contributed to the
- overall project quality. KDE is a mature desktop
+ overall project quality. Plasma is a mature desktop
environment with a wide range of applications.</para>
<figure>
- <title>The KDE desktop</title>
+ <title>The Plasma desktop</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/kde.png" scalefit="1" width="70%"/>
@@ -411,8 +412,8 @@
<para>Since the Qt 4.0 release, the last remaining license problem
with KDE has been solved. This version was released under the GPL both
for Linux and Windows (the Windows version was previously
- released under a non-free license). Note that KDE applications must
- be developed using the C++ language.</para>
+ released under a non-free license). KDE applications are primary
+ developed using the C++ language.</para>
</section>
<section>
<title>Xfce and Others</title>
@@ -424,7 +425,7 @@
across both desktops.</para>
<indexterm><primary>Xfce</primary></indexterm>
- <para>Unlike GNOME and KDE, Xfce does not aim to become a vast
+ <para>Unlike GNOME and Plasma, Xfce does not aim to become a vast
project. Beyond the basic components of a modern desktop (file
manager, window manager, session manager, a panel for application
launchers and so on), it only provides a few specific applications:
@@ -576,7 +577,7 @@
<indexterm><primary>Epiphany</primary></indexterm>
<para>Konqueror, available in the <emphasis role="pkg">konqueror</emphasis>
- package, is the KDE file manager, which also functions as a web browser.
+ package, is one of the file managers by KDE, which also functions as a web
browser.
It uses the KDE-specific KHTML rendering engine; KHTML is an
excellent engine, as witnessed by the fact that Apple's WebKit is
based on KHTML.
@@ -685,11 +686,13 @@
<section>
<title>Tools for Qt on KDE</title>
- <para>The equivalent applications for KDE are KDevelop (in the
+ <para>The equivalent applications for Qt applications are KDevelop by
KDE (in the
<emphasis role="pkg">kdevelop</emphasis> package) for the
development environment, and Qt Designer (in the <emphasis
role="pkg">qttools5-dev-tools</emphasis> package) for the design of
- graphical interfaces for Qt applications on KDE.</para>
+ graphical interfaces for Qt applications.</para>
+ <para>KDevelop is also a generic IDE and provides plugin for other
+ languages like Python and PHP and different build systems</para>
<indexterm><primary>KDevelop</primary></indexterm>
<indexterm><primary>Qt</primary><secondary>Designer</secondary></indexterm>
@@ -1003,7 +1006,7 @@
<para>The default GNOME desktop includes the Empathy communications
client. Empathy can support both SIP and XMPP. It supports instant
- messaging (IM), voice and video. The KDE desktop provides KDE Telepathy,
+ messaging (IM), voice and video. The KDE project provides KDE Telepathy,
a communications client based on the same underlying Telepathy APIs
used by the GNOME Empathy client.</para>
<indexterm><primary>Empathy</primary></indexterm>
diff --git a/en-US/90_derivative-distributions.xml
b/en-US/90_derivative-distributions.xml
index d4e1c2c7..9b983f9d 100644
--- a/en-US/90_derivative-distributions.xml
+++ b/en-US/90_derivative-distributions.xml
@@ -58,7 +58,7 @@
<para>These objectives necessarily involve a reduction in scope; Ubuntu
focuses on a smaller number of packages than Debian, and relies
primarily on the GNOME desktop (although an official Ubuntu derivative,
- called “Kubuntu”, relies on KDE). Everything is internationalized and
+ called “Kubuntu”, relies on KDE Plasma). Everything is internationalized
and
made available in a great many languages.</para>
<indexterm><primary>Kubuntu</primary></indexterm>
@@ -121,7 +121,7 @@
technologies, and provides specific graphical user interfaces on
top of the usual software. For instance, Linux Mint relies on Cinnamon
instead of GNOME by default (but it also includes MATE as well
- as KDE and Xfce); similarly, the package management
+ as Plasma and Xfce); similarly, the package management
interface, although based on APT, provides a specific interface
with an evaluation of the risk from each package update.</para>
@@ -152,7 +152,7 @@
files with you, and to work on any computer without leaving a
trace — remember that the distribution doesn't use the hard-disk
at all. Knoppix uses LXDE (a lightweight graphical desktop) by
- default, but the DVD version also includes GNOME and KDE. Many
+ default, but the DVD version also includes GNOME and Plasma. Many
other distributions provide other combinations of desktops and
software. This is, in part, made possible thanks to the <emphasis
role="pkg">live-build</emphasis> Debian package that makes it
diff --git a/en-US/92_short-remedial-course.xml
b/en-US/92_short-remedial-course.xml
index 1b94896d..9a604317 100644
--- a/en-US/92_short-remedial-course.xml
+++ b/en-US/92_short-remedial-course.xml
@@ -38,7 +38,7 @@
desktop, by an application known as a “terminal”. In GNOME,
you can start it from the “Activities” overview (that you get
when you move the mouse in the top-left corner of the screen) by
- typing the first letters of the application name. In KDE, you will
+ typing the first letters of the application name. In Plasma, you will
find it in the <menuchoice><guimenu>K</guimenu>
<guisubmenu>Applications</guisubmenu>
<guisubmenu>System</guisubmenu></menuchoice> menu.</para>
--
2.11.0
