Numerous docbook fixes and updates.

This resolves bug reports 1337 and 1343.

24 files changed, 138 insertions, 37 deletions

diff --git a/tde-i18n-en_GB/docs/tdebase/kcontrol/kthememgr/index.docbook b/tde-i18n-en_GB/docs/tdebase/kcontrol/kthememgr/index.docbook
index ff0d66ab717..8e3bfc2a446 100644
--- a/tde-i18n-en_GB/docs/tdebase/kcontrol/kthememgr/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kcontrol/kthememgr/index.docbook
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN"
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
 <!ENTITY % British-English "INCLUDE" 
diff --git a/tde-i18n-en_GB/docs/tdebase/khelpcenter/Makefile.in b/tde-i18n-en_GB/docs/tdebase/khelpcenter/Makefile.in
index 426812b2ffa..9bb299f3725 100644
--- a/tde-i18n-en_GB/docs/tdebase/khelpcenter/Makefile.in
+++ b/tde-i18n-en_GB/docs/tdebase/khelpcenter/Makefile.in
@@ -525,10 +525,10 @@ uninstall-am:
 .NOEXPORT:
 
 #>+ 2
-KDE_DIST=Makefile.in whatiskde.docbook help.docbook support.docbook welcome.docbook index.docbook links.docbook contact.docbook Makefile.am index.cache.bz2 
+KDE_DIST=Makefile.in whatistde.docbook help.docbook support.docbook welcome.docbook index.docbook links.docbook contact.docbook Makefile.am index.cache.bz2 
 
 #>+ 24
-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) links.docbook help.docbook whatiskde.docbook support.docbook index.docbook welcome.docbook contact.docbook 
+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) links.docbook help.docbook whatistde.docbook support.docbook index.docbook welcome.docbook contact.docbook 
 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
 
 docs-am: index.cache.bz2
@@ -555,20 +555,20 @@ clean-docs:
 #>+ 13
 install-nls:
 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter
-	@for base in links.docbook help.docbook whatiskde.docbook support.docbook index.docbook welcome.docbook contact.docbook ; do \
+	@for base in links.docbook help.docbook whatistde.docbook support.docbook index.docbook welcome.docbook contact.docbook ; do \
 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/$$base ;\
 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/$$base ;\
 	done
 
 uninstall-nls:
-	for base in links.docbook help.docbook whatiskde.docbook support.docbook index.docbook welcome.docbook contact.docbook ; do \
+	for base in links.docbook help.docbook whatistde.docbook support.docbook index.docbook welcome.docbook contact.docbook ; do \
 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/$$base ;\
 	done
 
 
 #>+ 5
 distdir-nls:
-	for file in links.docbook help.docbook whatiskde.docbook support.docbook index.docbook welcome.docbook contact.docbook ; do \
+	for file in links.docbook help.docbook whatistde.docbook support.docbook index.docbook welcome.docbook contact.docbook ; do \
 	  cp $(srcdir)/$$file $(distdir); \
 	done
 
diff --git a/tde-i18n-en_GB/docs/tdebase/khelpcenter/index.docbook b/tde-i18n-en_GB/docs/tdebase/khelpcenter/index.docbook
index 96af9959d1b..06bfe61fb87 100644
--- a/tde-i18n-en_GB/docs/tdebase/khelpcenter/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/khelpcenter/index.docbook
@@ -4,7 +4,7 @@
   <!ENTITY contact SYSTEM "contact.docbook">
   <!ENTITY help SYSTEM "help.docbook">
   <!ENTITY support SYSTEM "support.docbook">
-  <!ENTITY whatiskde SYSTEM "whatiskde.docbook">
+  <!ENTITY whatistde SYSTEM "whatistde.docbook">
   <!ENTITY welcome SYSTEM "welcome.docbook">
   <!ENTITY quickstart SYSTEM "quickstart/index.docbook" NDATA SGML>
   <!ENTITY userguide SYSTEM "userguide/index.docbook" NDATA SGML>
@@ -88,7 +88,7 @@ a way round it. (FF) -->
 
 &welcome;
 &help;
-&whatiskde;
+&whatistde;
 &contact;
 &support;
 
diff --git a/tde-i18n-en_GB/docs/tdebase/khelpcenter/quickstart/index.docbook b/tde-i18n-en_GB/docs/tdebase/khelpcenter/quickstart/index.docbook
index 407da284bac..36ed3038ecd 100644
--- a/tde-i18n-en_GB/docs/tdebase/khelpcenter/quickstart/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/khelpcenter/quickstart/index.docbook
@@ -122,7 +122,7 @@
 <para
 >A <interface
 >panel</interface
-> at the bottom of the screen, used to start applications and switch between desktops. Among other things, it contains the &kmenu;, a large &kicon; which displays a menu of applications to start when clicked. </para>
+> at the bottom of the screen, used to start applications and switch between desktops. Among other things, it contains the &kmenu;, a large &ticon; which displays a menu of applications to start when clicked. </para>
 </listitem>
 
 <listitem>
@@ -153,7 +153,7 @@
 <itemizedlist>
 <listitem>
 <para
->To start an application, click on the &kicon; button on the panel (called the <link linkend="starter"
+>To start an application, click on the &ticon; button on the panel (called the <link linkend="starter"
 >&kmenu;</link
 >) and choose an item from the menu. </para>
 </listitem>
@@ -223,7 +223,7 @@
 >Using the &kmenu; and the Panel</title>
 
 <para
->At the bottom of the screen you will find the desktop panel, which is called &kicker;. You use the panel to launch applications. Have a look at the button on the left with a large &kicon;. </para>
+>At the bottom of the screen you will find the desktop panel, which is called &kicker;. You use the panel to launch applications. Have a look at the button on the left with a large &ticon;. </para>
 
 <para
 >This button is called the &kmenu;. It has a small arrow on the top to indicate that it will pop up a menu if you click on it. Just do it! The pop-up offers you easy access to all &kde; applications installed on your computer system. </para>
@@ -257,7 +257,7 @@
 >). </para>
 	
 <para
->You can add an entire menu this way, or one of the &kicon; button sub-menus. For example, if you have &koffice; installed and want quick access to all the &koffice; applications, without having to navigate through the &kmenu;, then instead of choosing an application, click on the <guimenuitem
+>You can add an entire menu this way, or one of the &ticon; button sub-menus. For example, if you have &koffice; installed and want quick access to all the &koffice; applications, without having to navigate through the &kmenu;, then instead of choosing an application, click on the <guimenuitem
 >Add this menu</guimenuitem
 > menu entry. Now you will have instant access to all the &koffice; applications, without having to put an icon for each on the panel. </para>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/khelpcenter/userguide/about-desktop.docbook b/tde-i18n-en_GB/docs/tdebase/khelpcenter/userguide/about-desktop.docbook
index a6fd193614b..26670ccb6c1 100644
--- a/tde-i18n-en_GB/docs/tdebase/khelpcenter/userguide/about-desktop.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/khelpcenter/userguide/about-desktop.docbook
@@ -241,7 +241,7 @@
 >Adding a shortcut icon with the menu</title>
 <step
 ><para
->Click on the &kicon; and choose <menuchoice
+>Click on the &ticon; and choose <menuchoice
 ><guisubmenu
 >Panel Menu</guisubmenu
 ><guisubmenu
diff --git a/tde-i18n-en_GB/docs/tdebase/khelpcenter/userguide/first-impressions.docbook b/tde-i18n-en_GB/docs/tdebase/khelpcenter/userguide/first-impressions.docbook
index 72f52940c19..3817d62f9b2 100644
--- a/tde-i18n-en_GB/docs/tdebase/khelpcenter/userguide/first-impressions.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/khelpcenter/userguide/first-impressions.docbook
@@ -67,10 +67,10 @@
 <variablelist>
 <varlistentry>
 <term
->&kicon; button</term>
+>&ticon; button</term>
 <listitem
 ><para
->The &kicon; button is one of the most important places on your &kde; desktop. From here, you can start all &kde; applications installed. Later, when you learn how to use <link linkend="adding-programs"
+>The &ticon; button is one of the most important places on your &kde; desktop. From here, you can start all &kde; applications installed. Later, when you learn how to use <link linkend="adding-programs"
 >the TDE Menu Editor</link
 >, you can also add other programs here as well. To start a program, just click on the button. You will see a list of different categories, plus some special entries. Whenever you move your mouse over an entry that has an arrow to the right, a new menu will appear. When you find the program you want to start, just click on it with the <mousebutton
 >left</mousebutton
diff --git a/tde-i18n-en_GB/docs/tdebase/khelpcenter/userguide/getting-started.docbook b/tde-i18n-en_GB/docs/tdebase/khelpcenter/userguide/getting-started.docbook
index 65641835014..1a89fef7871 100644
--- a/tde-i18n-en_GB/docs/tdebase/khelpcenter/userguide/getting-started.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/khelpcenter/userguide/getting-started.docbook
@@ -32,7 +32,7 @@
 >Opening a Window Containing Your Home Folder </title>
 
 <para
->Click on the &kicon; button and choose <guimenuitem
+>Click on the &ticon; button and choose <guimenuitem
 >Home (Personal Files)</guimenuitem
 >. A window showing the contents of your home folder will pop up. To see a more detailed listing of files in your home folder, select <guimenuitem
 >Show Hidden Files</guimenuitem
diff --git a/tde-i18n-en_GB/docs/tdebase/khelpcenter/welcome.docbook b/tde-i18n-en_GB/docs/tdebase/khelpcenter/welcome.docbook
index d4aa9329fb6..59a12630834 100644
--- a/tde-i18n-en_GB/docs/tdebase/khelpcenter/welcome.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/khelpcenter/welcome.docbook
@@ -26,7 +26,7 @@
 >&kde; is a powerful graphical desktop environment for &UNIX; workstations. A &kde; desktop combines ease of use, contemporary functionality and outstanding graphical design with the technological superiority of the &UNIX; operating system. </para>
 
 <para
-><link linkend="what-is-kde"
+><link linkend="what-is-tde"
 >What is the K Desktop Environment?</link
 ></para>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/khelpcenter/whatistde.docbook b/tde-i18n-en_GB/docs/tdebase/khelpcenter/whatistde.docbook
new file mode 100644
index 00000000000..8ab7799675b
--- /dev/null
+++ b/tde-i18n-en_GB/docs/tdebase/khelpcenter/whatistde.docbook
@@ -0,0 +1,101 @@
+<chapter id="what-is-tde">
+<chapterinfo
+><date
+>2002-01-18</date
+> <releaseinfo
+>3.00.00</releaseinfo
+> </chapterinfo>
+<title
+>What is &tde;?</title>
+<anchor id="whatistde"/>
+
+<sect1 id="what-is-tde-introduction">
+<title
+>What is &tde;?</title>
+
+<para
+>&tde; is a desktop environment. In other words, &tde; is a collection of programs, technologies and documentation that attempt to make life easier for computer users. &tde; is targeted at &UNIX; workstations. It features network transparency and a contemporary work philosophy. </para>
+
+<para
+>The creators of the K Desktop Environment are a world-wide group of software engineers. This group's major goal in free software development is to provide high quality software that empowers the user with easy control of his computer's resources.</para>
+
+<para
+>&tde; seeks to fill the need for an easy to use desktop for &UNIX; workstations, similar to the desktop environments found under &MacOS; or &Windows; 95/NT. &tde; meets the requirement of users for an easy to use work environment. Tools used to reach this end are: enhanced inter-application communication, component reuse, global drag and drop, uniform look and feel and many more. Thus, &tde; offers much more than the traditional &UNIX; window managers.</para>
+
+<para
+>Stability, scaleability and openness are qualities which have made &UNIX; the undisputed choice for the information technology professional for many years. &tde; builds on top of this excellent base framework and brings new, much needed qualities: usability, user friendliness and beauty! &tde; was the first, and stays the forefront player in bringing these qualities to &UNIX;, which constituted for years, the premier platform for server computers and scientific institutions, but wasn't very attractive for desktop users.</para>
+
+<para
+>Without &UNIX; the Internet would not exist, or at least would have a vastly different form. &UNIX; has not, until now, addressed the needs of the average computer user. This fact is particularly unfortunate, since a number of implementations of &UNIX; (<ulink url="http://www.linux.org"
+>&Linux;</ulink
+>, <ulink url="http://www.freebsd.org"
+>FreeBSD</ulink
+>, <ulink url="http://www.netbsd.org"
+>NetBSD</ulink
+>, &etc;) are freely available on the Internet, all of which are of exceptional quality and stability. </para>
+
+</sect1>
+
+<sect1 id="what-is-tde-the-desktop">
+<title
+>&tde; The Desktop Environment</title>
+
+<para
+>In combination with a free implementation of &UNIX;, &tde; provides to the world an open and completely free desktop computing platform either at home or at work.</para>
+
+<para
+>This platform is available to anyone free of charge including its source code for anyone to modify.</para>
+
+<para
+>While there will always be room for improvement we believe we have now delivered a viable alternative to some of the more commonly found and commercial operating systems/desktops combinations available today. It is our hope that the combination of &UNIX; and &tde; will finally bring the same open, reliable, stable, and monopoly free computing to the average computer user that scientists and computing professionals world-wide have enjoyed for years. </para>
+
+</sect1>
+
+<sect1 id="what-is-tde-the-development-framework">
+<title
+>&tde; The Application Development Framework</title>
+
+<para
+>&tde; focuses on the user's needs, but it's obvious that this focus is more easily achieved by also giving developers the best tools. &tde; code contains, and comes with, some of the best development technologies of the modern computing age.</para>
+
+<para
+>Authoring applications under &UNIX;/X11 used to be an extremely tedious and labour intensive process. &tde; recognises the fact that a computing platform is only as good as the number of first class applications available to the users of that particular platform.</para>
+
+<para
+>&tde; defines new technologies in &DCOP; and KParts, created to offer a component document model and technology. Together with the complete &tde; libraries programming interface, &DCOP;/KParts are set in direct competition with other similar technologies like &Microsoft; <abbrev
+>MFC</abbrev
+>/<abbrev
+>COM</abbrev
+>/ActiveX technologies. The excellent quality and the high level of refinement of &tde;'s application programming interface (<acronym
+>API</acronym
+>) enables developers to focus on original and interesting issues and avoid reinventing the wheel.</para>
+
+</sect1>
+
+<sect1 id="what-is-tde-the-office-suite">
+<title
+>&tde; The Office Application Suite</title>
+
+<para
+>In its current form, &tde; provides, apart from the essential desktop component applications, a suite of powerful office programs known to the world by the name &koffice;.</para>
+
+<para
+>&koffice; is based on the &tde; &DCOP;/KParts technologies. It currently contains: a word processor with desktop publishing capabilities (&kword;), a spreadsheet application (&kspread;) and accompanying charting program (&kchart;), a presentation program (&kpresenter;) and a vector drawing program (&kontour;). Tying things together is the <application
+>KOffice Workspace</application
+>, an integrated shell to ease the use of the &koffice; components in conjunction with each other. Additional components include an email client, a news reader, and a powerful <abbrev
+>PIM</abbrev
+> (Personal Information Manager - an organiser).</para>
+
+<para
+>While some of those components are still in alpha development, others are already extremely powerful. For example, &kpresenter;, &tde;'s presentation application, was successfully used at the 5th International &Linux; Congress in Cologne, Germany to deliver a &tde; presentation. </para>
+
+<para
+>We would like to invite you to <ulink url="http://www.kde.org"
+>learn more about &tde;</ulink
+> and <ulink url="http://koffice.kde.org"
+>&koffice;</ulink
+>.</para>
+
+</sect1>
+</chapter>
+
diff --git a/tde-i18n-en_GB/docs/tdebase/quickstart/index.docbook b/tde-i18n-en_GB/docs/tdebase/quickstart/index.docbook
index e07a46dcc3b..6d3404a9284 100644
--- a/tde-i18n-en_GB/docs/tdebase/quickstart/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/quickstart/index.docbook
@@ -122,7 +122,7 @@
 <para
 >A <interface
 >panel</interface
-> at the bottom of the screen, used to start applications and switch between desktops. Among other things, it contains the &kmenu;, a large &kicon; which displays a menu of applications to start when clicked. </para>
+> at the bottom of the screen, used to start applications and switch between desktops. Among other things, it contains the &kmenu;, a large &ticon; which displays a menu of applications to start when clicked. </para>
 </listitem>
 
 <listitem>
@@ -153,7 +153,7 @@
 <itemizedlist>
 <listitem>
 <para
->To start an application, click on the &kicon; button on the panel (called the <link linkend="starter"
+>To start an application, click on the &ticon; button on the panel (called the <link linkend="starter"
 >&kmenu;</link
 >) and choose an item from the menu. </para>
 </listitem>
@@ -223,7 +223,7 @@
 >Using the &kmenu; and the Panel</title>
 
 <para
->At the bottom of the screen you will find the desktop panel, which is called &kicker;. You use the panel to launch applications. Have a look at the button on the left with a large &kicon;. </para>
+>At the bottom of the screen you will find the desktop panel, which is called &kicker;. You use the panel to launch applications. Have a look at the button on the left with a large &ticon;. </para>
 
 <para
 >This button is called the &kmenu;. It has a small arrow on the top to indicate that it will pop up a menu if you click on it. Just do it! The pop-up offers you easy access to all &kde; applications installed on your computer system. </para>
@@ -257,7 +257,7 @@
 >). </para>
 	
 <para
->You can add an entire menu this way, or one of the &kicon; button sub-menus. For example, if you have &koffice; installed and want quick access to all the &koffice; applications, without having to navigate through the &kmenu;, then instead of choosing an application, click on the <guimenuitem
+>You can add an entire menu this way, or one of the &ticon; button sub-menus. For example, if you have &koffice; installed and want quick access to all the &koffice; applications, without having to navigate through the &kmenu;, then instead of choosing an application, click on the <guimenuitem
 >Add this menu</guimenuitem
 > menu entry. Now you will have instant access to all the &koffice; applications, without having to put an icon for each on the panel. </para>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/userguide/about-desktop.docbook b/tde-i18n-en_GB/docs/tdebase/userguide/about-desktop.docbook
index a6fd193614b..26670ccb6c1 100644
--- a/tde-i18n-en_GB/docs/tdebase/userguide/about-desktop.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/userguide/about-desktop.docbook
@@ -241,7 +241,7 @@
 >Adding a shortcut icon with the menu</title>
 <step
 ><para
->Click on the &kicon; and choose <menuchoice
+>Click on the &ticon; and choose <menuchoice
 ><guisubmenu
 >Panel Menu</guisubmenu
 ><guisubmenu
diff --git a/tde-i18n-en_GB/docs/tdebase/userguide/first-impressions.docbook b/tde-i18n-en_GB/docs/tdebase/userguide/first-impressions.docbook
index 72f52940c19..3817d62f9b2 100644
--- a/tde-i18n-en_GB/docs/tdebase/userguide/first-impressions.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/userguide/first-impressions.docbook
@@ -67,10 +67,10 @@
 <variablelist>
 <varlistentry>
 <term
->&kicon; button</term>
+>&ticon; button</term>
 <listitem
 ><para
->The &kicon; button is one of the most important places on your &kde; desktop. From here, you can start all &kde; applications installed. Later, when you learn how to use <link linkend="adding-programs"
+>The &ticon; button is one of the most important places on your &kde; desktop. From here, you can start all &kde; applications installed. Later, when you learn how to use <link linkend="adding-programs"
 >the TDE Menu Editor</link
 >, you can also add other programs here as well. To start a program, just click on the button. You will see a list of different categories, plus some special entries. Whenever you move your mouse over an entry that has an arrow to the right, a new menu will appear. When you find the program you want to start, just click on it with the <mousebutton
 >left</mousebutton
diff --git a/tde-i18n-en_GB/docs/tdebase/userguide/getting-started.docbook b/tde-i18n-en_GB/docs/tdebase/userguide/getting-started.docbook
index 65641835014..1a89fef7871 100644
--- a/tde-i18n-en_GB/docs/tdebase/userguide/getting-started.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/userguide/getting-started.docbook
@@ -32,7 +32,7 @@
 >Opening a Window Containing Your Home Folder </title>
 
 <para
->Click on the &kicon; button and choose <guimenuitem
+>Click on the &ticon; button and choose <guimenuitem
 >Home (Personal Files)</guimenuitem
 >. A window showing the contents of your home folder will pop up. To see a more detailed listing of files in your home folder, select <guimenuitem
 >Show Hidden Files</guimenuitem
diff --git a/tde-i18n-en_GB/docs/tdeedu/kstars/index.docbook b/tde-i18n-en_GB/docs/tdeedu/kstars/index.docbook
index 6e62a01e470..9259fd9f8fa 100644
--- a/tde-i18n-en_GB/docs/tdeedu/kstars/index.docbook
+++ b/tde-i18n-en_GB/docs/tdeedu/kstars/index.docbook
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.0//EN"  "dtd/kdex.dtd" [
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"  "dtd/kdex.dtd" [
   <!ENTITY kappname "&kstars;">
   <!ENTITY package "tdeedu">
   <!ENTITY astroinfo SYSTEM "astroinfo.docbook">
diff --git a/tde-i18n-en_GB/docs/tdepim/kaddressbook/index.docbook b/tde-i18n-en_GB/docs/tdepim/kaddressbook/index.docbook
index af382cbf810..31d5bef87aa 100644
--- a/tde-i18n-en_GB/docs/tdepim/kaddressbook/index.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/kaddressbook/index.docbook
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" 
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" 
 "dtd/kdex.dtd" [
  <!ENTITY kappname "&kaddressbook;">
  <!ENTITY % addindex "IGNORE">
diff --git a/tde-i18n-en_GB/docs/tdepim/knode/commands.docbook b/tde-i18n-en_GB/docs/tdepim/knode/commands.docbook
index 31f88739f12..2f65ccf5c7f 100644
--- a/tde-i18n-en_GB/docs/tdepim/knode/commands.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/knode/commands.docbook
@@ -1,5 +1,5 @@
 <!-- <?xml version="1.0" ?>
-<!DOCTYPE chapter PUBLIC "-//KDE//DTD DocBook XML V4.1-Based Variant V1.0//EN" "dtd/kdex.dtd"
+<!DOCTYPE chapter PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd"
 >	-->
 
 <chapter id="commands">
diff --git a/tde-i18n-en_GB/docs/tdepim/knode/faq.docbook b/tde-i18n-en_GB/docs/tdepim/knode/faq.docbook
index 652f122db71..072bedafba0 100644
--- a/tde-i18n-en_GB/docs/tdepim/knode/faq.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/knode/faq.docbook
@@ -1,5 +1,5 @@
 <!-- <?xml version="1.0" ?> 
-<!DOCTYPE chapter PUBLIC "-//KDE//DTD DocBook XML V4.1-Based Variant V1.0//EN" "dtd/kdex.dtd">
+<!DOCTYPE chapter PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd">
 -->
 <chapter id="faq">
 <title
diff --git a/tde-i18n-en_GB/docs/tdepim/knode/introduction.docbook b/tde-i18n-en_GB/docs/tdepim/knode/introduction.docbook
index 0a33d0c16fa..5314b187e1d 100644
--- a/tde-i18n-en_GB/docs/tdepim/knode/introduction.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/knode/introduction.docbook
@@ -1,5 +1,5 @@
 <!-- <?xml version="1.0" ?> 
-<!DOCTYPE chapter PUBLIC "-//KDE//DTD DocBook XML V4.1-Based Variant V1.0//EN" "dtd/kdex.dtd"
+<!DOCTYPE chapter PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd"
 > -->
 <chapter id="introduction"
 > 
diff --git a/tde-i18n-en_GB/docs/tdepim/knode/journey.docbook b/tde-i18n-en_GB/docs/tdepim/knode/journey.docbook
index 9aae1fd4930..e1141d9136c 100644
--- a/tde-i18n-en_GB/docs/tdepim/knode/journey.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/knode/journey.docbook
@@ -1,5 +1,5 @@
 <!-- <?xml version="1.0" ?>
-<!DOCTYPE chapter PUBLIC "-//KDE//DTD DocBook XML V4.1-Based Variant V1.0//EN" "dtd/kdex.dtd"
+<!DOCTYPE chapter PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd"
 > -->
 
 <chapter id="knode-journey"
diff --git a/tde-i18n-en_GB/docs/tdepim/knode/more.docbook b/tde-i18n-en_GB/docs/tdepim/knode/more.docbook
index 242e7f32fc6..42f158404df 100644
--- a/tde-i18n-en_GB/docs/tdepim/knode/more.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/knode/more.docbook
@@ -1,5 +1,5 @@
 <!-- <?xml version="1.0" ?>
-<!DOCTYPE chapter PUBLIC "-//KDE//DTD DocBook XML V4.1-Based Variant V1.0//EN" "dtd/kdex.dtd"
+<!DOCTYPE chapter PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd"
 > -->
 	
 <chapter id="knode-more-info"
diff --git a/tde-i18n-en_GB/docs/tdepim/knode/using-firststart.docbook b/tde-i18n-en_GB/docs/tdepim/knode/using-firststart.docbook
index 3fca809fe0e..5d38dd1469a 100644
--- a/tde-i18n-en_GB/docs/tdepim/knode/using-firststart.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/knode/using-firststart.docbook
@@ -1,5 +1,5 @@
 <!-- <?xml version="1.0" ?>
-<!DOCTYPE sect1 PUBLIC "-//KDE//DTD DocBook XML V4.1-Based Variant V1.0//EN" "dtd/kdex.dtd"
+<!DOCTYPE sect1 PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd"
 > -->
 <sect1 id="first-start"
 > 
diff --git a/tde-i18n-en_GB/docs/tdesdk/umbrello/index.docbook b/tde-i18n-en_GB/docs/tdesdk/umbrello/index.docbook
index 2d2d9669875..055f079585c 100644
--- a/tde-i18n-en_GB/docs/tdesdk/umbrello/index.docbook
+++ b/tde-i18n-en_GB/docs/tdesdk/umbrello/index.docbook
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN"
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
  "dtd/kdex.dtd" [
  <!ENTITY umbrello "<application
 >Umbrello &UML; Modeller</application
diff --git a/tde-i18n-en_GB/docs/tdeutils/kcontrol/kcmlowbatcrit/index.docbook b/tde-i18n-en_GB/docs/tdeutils/kcontrol/kcmlowbatcrit/index.docbook
index 5310801246a..95256fd3d72 100644
--- a/tde-i18n-en_GB/docs/tdeutils/kcontrol/kcmlowbatcrit/index.docbook
+++ b/tde-i18n-en_GB/docs/tdeutils/kcontrol/kcmlowbatcrit/index.docbook
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN"
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
 <!ENTITY % British-English "INCLUDE" 
diff --git a/tde-i18n-en_GB/docs/tdeutils/kinfocenter/blockdevices/index.docbook b/tde-i18n-en_GB/docs/tdeutils/kinfocenter/blockdevices/index.docbook
index 1e3278f2827..2ae20965620 100644
--- a/tde-i18n-en_GB/docs/tdeutils/kinfocenter/blockdevices/index.docbook
+++ b/tde-i18n-en_GB/docs/tdeutils/kinfocenter/blockdevices/index.docbook
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN"
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
 <!ENTITY % British-English "INCLUDE" 
@@ -105,7 +105,7 @@
 > opens a new window with a graphical view of the files on that device. </para>
 
 <para
-> The appropriate mount and umount commands, and how the file manager is opened from the context menu, can be configured from the &kdf; application. </para>
+> The appropriate mount and umount commands, and how the file manager is opened from the context menu, can be configured from the &kdiskfree; application. </para>
 
 <sect2>
 <title