14 files changed, 53 insertions, 46 deletions
diff --git a/doc/faq/filemng.docbook b/doc/faq/filemng.docbook
index 9f1df73b6..268d86e65 100644
--- a/doc/faq/filemng.docbook
+++ b/doc/faq/filemng.docbook
@@ -22,7 +22,7 @@ url="http://www.konqueror.org">http://www.konqueror.org</ulink> where a
 <para>Right-click the folder, select <guimenuitem>Properties</guimenuitem>,
 click on the large icon in the dialog which appears, and choose another
 icon.</para> <para>To change the icon displayed for entries in the
-<guimenu>K Menu</guimenu>, use the <application>Menu Editor</application>,
+<guimenu>TDE Menu</guimenu>, use the <application>Menu Editor</application>,
 located at <menuchoice><guisubmenu>Settings</guisubmenu><guimenuitem>Menu
 Editor</guimenuitem></menuchoice>.
 </para>
diff --git a/doc/faq/index.docbook b/doc/faq/index.docbook
index 2ab721d3e..17b577d36 100644
--- a/doc/faq/index.docbook
+++ b/doc/faq/index.docbook
@@ -12,7 +12,7 @@
   <!ENTITY faq-desktop SYSTEM "desktop.docbook">
   <!ENTITY faq-winmng SYSTEM "winmng.docbook">
   <!ENTITY faq-filemng SYSTEM "filemng.docbook">
-  <!ENTITY faq-webbrowse SYSTEM "webbrowse.docbook"> 
+  <!ENTITY faq-webbrowse SYSTEM "webbrowse.docbook">
   <!ENTITY faq-configkde SYSTEM "configkde.docbook">
   <!ENTITY faq-kdeapps SYSTEM "kdeapps.docbook">
   <!ENTITY faq-nonkdeapps SYSTEM "nonkdeapps.docbook">
@@ -50,6 +50,10 @@
 <year>2003</year>
 <year>2004</year>
 <year>2005</year>
+<holder>The &kde; Team</holder>
+</copyright>
+<copyright>
+<year>2012</year>
 <holder>The &tde; Team</holder>
 </copyright>
 
diff --git a/doc/faq/nonkdeapps.docbook b/doc/faq/nonkdeapps.docbook
index 1a8ea25f7..f6e234406 100644
--- a/doc/faq/nonkdeapps.docbook
+++ b/doc/faq/nonkdeapps.docbook
@@ -4,13 +4,13 @@
  "dtd/kdex.dtd">
 -->
 
-<chapter id="non-kde-apps">
+<chapter id="non-tde-apps">
 <title>&tde; with non-&tde; applications</title>
 
 <!-- FIXME: This seems to be obsolete. The only similar option is "Apply
 *colors* to -->
 
-<!-- non-kde apps" -->
+<!-- non-tde apps" -->
 <qandaset>
 <qandaentry>
 <question>
@@ -22,7 +22,7 @@ colors!</para>
 <para>Start the <application>&tde; Control Center</application> and in
 <menuchoice><guimenu>Appearance &amp; Themes</guimenu><guimenuitem>
 Colors</guimenuitem></menuchoice> uncheck the <guilabel>Apply colors to
-non-KDE applications</guilabel> checkbox and click
+non-TDE applications</guilabel> checkbox and click
 <guibutton>Apply</guibutton>.</para>
 </answer>
 </qandaentry>
diff --git a/doc/kappfinder/man-kappfinder.1.docbook b/doc/kappfinder/man-kappfinder.1.docbook
index 2552bd28e..11ef00f96 100644
--- a/doc/kappfinder/man-kappfinder.1.docbook
+++ b/doc/kappfinder/man-kappfinder.1.docbook
@@ -24,7 +24,7 @@
 <cmdsynopsis>
 <command>kappfinder</command>
 <group><option>--dir</option> <replaceable> directory</replaceable></group>
-<group><option>KDE Generic Options</option></group>
+<group><option>TDE Generic Options</option></group>
 <group><option>Qt Generic Options</option></group>
 
 </cmdsynopsis>
@@ -33,9 +33,9 @@
 <refsect1>
 <title>Description</title>
 
-<para>The KDE application findern (&kappfinder;) looks for legacy and
+<para>The TDE application finder (&kappfinder;) looks for legacy and
 third party applications that are installed on your system and adds
-them to the KDE menu system. </para>
+them to the TDE menu system. </para>
 
 </refsect1>
 
diff --git a/doc/kcontrol/colors/index.docbook b/doc/kcontrol/colors/index.docbook
index 9200cb2fd..914c59d7f 100644
--- a/doc/kcontrol/colors/index.docbook
+++ b/doc/kcontrol/colors/index.docbook
@@ -121,7 +121,7 @@ downloaded from a website.</para>
 
 <para>You can choose if you want &tde; to apply the color scheme even
 to non-&tde; applications by enabling the <guilabel>Apply colors to
-non-KDE applications</guilabel>.  Not all applications will allow
+non-TDE applications</guilabel>.  Not all applications will allow
 this, but most do.</para>
 
 </sect3>
diff --git a/doc/kcontrol/panel/index.docbook b/doc/kcontrol/panel/index.docbook
index 7fad4f775..3dcc1a31a 100644
--- a/doc/kcontrol/panel/index.docbook
+++ b/doc/kcontrol/panel/index.docbook
@@ -175,7 +175,7 @@ menu's behavior. This affects the K menu you will often use to launch
 applications, the browser menus you can use to access folders and other
 menus like the recent documents menu.</para>
 
-<para>The <guilabel>K Menu</guilabel> frame offers you some options to
+<para>The <guilabel>TDE Menu</guilabel> frame offers you some options to
 configure the <guimenu>K</guimenu> menu's functionality. This frame consists 
 of 4 items:</para>
 
@@ -215,7 +215,7 @@ terminal programs (command line interfaces).</para>
 <listitem><para><guilabel>Show side image</guilabel> will add a small
 image to the side of the menu.  This is purely decorative.</para></listitem>
 
-<listitem><para>The <guibutton>Edit K Menu</guibutton> button launches the &tde; 
+<listitem><para>The <guibutton>Edit TDE Menu</guibutton> button launches the &tde; 
 menu editor.</para></listitem>
 </itemizedlist>
 
diff --git a/doc/khelpcenter/contact.docbook b/doc/khelpcenter/contact.docbook
index a63b370ad..598ebd8d5 100644
--- a/doc/khelpcenter/contact.docbook
+++ b/doc/khelpcenter/contact.docbook
@@ -3,9 +3,11 @@
 <date>2012-02-01</date>
 <releaseinfo>R14.0.0</releaseinfo>
 </chapterinfo>
-<title>Contact the &tde; team</title>
+<title>Contact the &tde; Team</title>
 <anchor id="contact"/>
 
+<para>The Trinity team invites you to contact members.</para>
+
 <sect1 id="contact-mailinglists">
 <title>Mailing lists</title>
 
@@ -36,10 +38,11 @@ url="http://www.trinitydesktop.org/mailinglist.php">mailing list archive</ulink>
 
 <sect1 id="contact-developers">
 <title>Contacting the &tde; developers</title>
+<anchor id="links" />
 
-<para>On this page, you can find links to &tde; related web sites.</para>
+<para>On this page are links to &tde; related web sites.</para>
 
-<para>The Trinity Desktop Environment is developed by a large group of people
+<para>The Trinity Desktop Environment is developed by many people
 around the world. Our main communication channel is the Internet. For
 general questions, you will be best served by asking on the mailing
 lists mentioned in the <link linkend="contact-mailinglists">previous
@@ -48,7 +51,7 @@ found in the documentation of their individual application.</para>
 
 <para>More information about &tde; is available at &tde-http;.</para>
 
-<para><anchor id="links" />Other &tde; websites include:</para>
+<para>Other &tde; websites include:</para>
 
 <variablelist>
 <varlistentry>
diff --git a/doc/khelpcenter/welcome.docbook b/doc/khelpcenter/welcome.docbook
index 0edb6e9ae..e32c9d88b 100644
--- a/doc/khelpcenter/welcome.docbook
+++ b/doc/khelpcenter/welcome.docbook
@@ -1,10 +1,10 @@
 <chapter id="welcome-to-tde">
 <chapterinfo>
-<date>2002-01-18</date>
-<releaseinfo>3.00.00</releaseinfo>
+<date>2012-02-01</date>
+<releaseinfo>R14.0.0</releaseinfo>
 </chapterinfo>
 <title>Welcome to the Trinity Desktop Environment (&tde;)</title>
-<!-- <anchor id="welcome"/> -->
+<anchor id="welcome"/>
 
 <para>The Trinity team welcomes you to user-friendly &UNIX;desktop computing.</para>
 
diff --git a/doc/kicker/index.docbook b/doc/kicker/index.docbook
index b17b983cc..6c8d0ab93 100644
--- a/doc/kicker/index.docbook
+++ b/doc/kicker/index.docbook
@@ -306,7 +306,7 @@ Non-&tde;-applications &eg;
 <para>
 Click the &RMB; on any free space
 in &kicker; and choose <guisubmenu>Add Application to
-Panel</guisubmenu> and then <guimenuitem>Add Non-KDE
+Panel</guisubmenu> and then <guimenuitem>Add Non-TDE
 Application</guimenuitem>. In the newly appearing window, enter <guilabel>Button title</guilabel> 
 and a <guilabel>Description</guilabel> of the application in the first two text boxes. Then fill 
 in the command of the application you
@@ -331,7 +331,7 @@ and then choosing <menuchoice><guimenu>Remove from Panel</guimenu>
 removed.
 </para>
 
-<!-- NOTE: Lauri: I'd say it would confuse users if I'd mention Non-KDE-Apps -->
+<!-- NOTE: Lauri: I'd say it would confuse users if I'd mention Non-TDE-Apps -->
 <!-- explicitly here. Please add them if you think there's a need. -->
 
 </sect2>
@@ -412,13 +412,13 @@ then <guilabel>Special Buttons</guilabel> on the right top of the
 
 <variablelist>
 <varlistentry>
-<term>The <guilabel>K Menu</guilabel> Icon</term>
+<term>The <guilabel>TDE Menu</guilabel> Icon</term>
 <listitem>
 <para>
 <guiicon><inlinemediaobject><imageobject><imagedata
 fileref="k_menu_icon.png"
 format="PNG"/></imageobject></inlinemediaobject></guiicon> The
-<guiicon>K Menu icon</guiicon> is one of the most necessary icons in
+<guiicon>TDE Menu icon</guiicon> is one of the most necessary icons in
 &kicker;. As you might guess, it opens the <guimenu>K</guimenu> Menu,
 which you can learn more about in <link linkend="k-menu">The K
 Menu</link>.
@@ -1040,7 +1040,7 @@ folders and other menus like the recent documents menu.
 </para>
 
 <para>
-The <guilabel>K Menu</guilabel> frame offers you some options to
+The <guilabel>TDE Menu</guilabel> frame offers you some options to
 configure the <guimenu>K</guimenu> menu's functionality. The
 <guilabel>Bookmarks</guilabel> and <guilabel>Recent Documents</guilabel> options
 will enable submenus showing your <application>konqueror</application>
@@ -1121,10 +1121,10 @@ The different kinds of buttons are:
 
 <variablelist>
 <varlistentry>
-<term><guilabel>K Menu</guilabel> tiles</term>
+<term><guilabel>TDE Menu</guilabel> tiles</term>
 <listitem>
 <para>
-The icon for the <guiicon>K Menu</guiicon> will be displayed as a tile
+The icon for the <guiicon>TDE Menu</guiicon> will be displayed as a tile
 </para>
 </listitem>
 </varlistentry>
diff --git a/doc/kmenuedit/index.docbook b/doc/kmenuedit/index.docbook
index 809b2b400..bb5eddb60 100644
--- a/doc/kmenuedit/index.docbook
+++ b/doc/kmenuedit/index.docbook
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" 
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
   <!ENTITY package "tdebase">
   <!ENTITY firefox "<application>Firefox</application>">
@@ -33,12 +33,12 @@
 <date>2006-11-23</date>
 <releaseinfo>0.7 (&tde; 3.5.5)</releaseinfo>
 
-<abstract><para>&kmenuedit; allows editing of the &tde; &kmenu;. 
+<abstract><para>&kmenuedit; allows editing of the &tde; &kmenu;.
 </para></abstract>
 
 <keywordset>
-<keyword>KDE</keyword>
-<keyword>KDE Menu Editor</keyword>
+<keyword>TDE</keyword>
+<keyword>TDE Menu Editor</keyword>
 <keyword>kmenuedit</keyword>
 <keyword>application</keyword>
 <keyword>program</keyword>
@@ -80,7 +80,7 @@ and <guimenuitem>Paste</guimenuitem> menu items</para></listitem>
 <title>A Quick Start Guide to Adding an Entry to the &kmenu;</title>
 
   <para>In this example, we will add &firefox; to the <guisubmenu>Internet</guisubmenu> submenu. <note><para>Most applications can be added with &kappfinder;, &firefox; can usually be added that way, but was used for lack of a better example.</para></note></para>
-  <para>To start off, we need to open &kmenuedit;, so &RMB; on the &kmenu;, click <guimenuitem>Menu Editor</guimenuitem> to start &kmenuedit;. After &kmenuedit; has started, select <guisubmenu>Internet</guisubmenu> as shown in picture below. 
+  <para>To start off, we need to open &kmenuedit;, so &RMB; on the &kmenu;, click <guimenuitem>Menu Editor</guimenuitem> to start &kmenuedit;. After &kmenuedit; has started, select <guisubmenu>Internet</guisubmenu> as shown in picture below.
 <screenshot>
 <screeninfo>Select <guisubmenu>Internet</guisubmenu></screeninfo>
 <mediaobject>
@@ -93,7 +93,7 @@ and <guimenuitem>Paste</guimenuitem> menu items</para></listitem>
 </mediaobject>
 </screenshot></para>
   <para>
-    Once you have selected <guisubmenu>Internet</guisubmenu>, click on <menuchoice><guimenu>File</guimenu><guimenuitem>New Item...</guimenuitem></menuchoice>, opening the <guilabel>New Item</guilabel> dialog, as shown below. Type the name of the program you want to add, in this case, type <userinput>firefox</userinput>. 
+    Once you have selected <guisubmenu>Internet</guisubmenu>, click on <menuchoice><guimenu>File</guimenu><guimenuitem>New Item...</guimenuitem></menuchoice>, opening the <guilabel>New Item</guilabel> dialog, as shown below. Type the name of the program you want to add, in this case, type <userinput>firefox</userinput>.
 <screenshot>
 <screeninfo><guilabel>New Item</guilabel> dialog</screeninfo>
 <mediaobject>
@@ -119,7 +119,7 @@ Press return, and you should see something like the picture below in the main wi
 </textobject>
 </mediaobject>
 </screenshot></para>
-  
+
 <para>
     Now lets fill in the <guilabel>Description:</guilabel>, in this case type <userinput>Web Browser</userinput>. <note><para>The description and name will be displayed on the &kmenu; as <quote>Web Browser (Firefox)</quote>.</para></note> We will need to fill in the executable name in the <guilabel>Command:</guilabel> field, in this instance we will type <userinput><command>firefox</command></userinput>.</para>
 <note><para>Following the command, you can have several place holders which will be replaced with actual values when the program is run:
@@ -148,7 +148,7 @@ Press return, and you should see something like the picture below in the main wi
 </mediaobject>
 </screenshot></para>
 
-  <para>We choose the firefox icon from the list, and press return. Your finished screen should probably look something like the screenshot below. 
+  <para>We choose the firefox icon from the list, and press return. Your finished screen should probably look something like the screenshot below.
 <screenshot>
 <screeninfo>Done screenshot</screeninfo>
 <mediaobject>
@@ -229,7 +229,7 @@ executable location.</para></listitem>
 <term><guilabel>Run in terminal</guilabel></term>
 <listitem><para>You must check this if your program requires terminal emulator
 in order to run. This mainly applies to <link
-linkend="gloss-console-application">console 
+linkend="gloss-console-application">console
 applications</link>.</para></listitem>
 </varlistentry>
 <varlistentry>
@@ -264,7 +264,7 @@ want to assign a shortcut that uses more than one key.</para>
 <para>The dialog will close when you have selected a keybinding.
 </para>
 
-</sect1> 
+</sect1>
 
 </chapter>
 
@@ -273,7 +273,7 @@ want to assign a shortcut that uses more than one key.</para>
 
 <variablelist>
 <varlistentry id="file-new-item">
-<term><menuchoice> 
+<term><menuchoice>
 <shortcut><keycombo
 action="simul">&Ctrl;<keycap>N</keycap></keycombo></shortcut>
 <guimenu>File</guimenu> <guimenuitem>New Item...</guimenuitem>
@@ -331,7 +331,7 @@ Edit</guimenu> <guimenuitem>Cut</guimenuitem>
 you want to move menu item, you should first cut it to the clipboard, move to
 the destination place using the left panel, and use the
 <guimenuitem>Paste</guimenuitem> function to paste the menu item from the
-clipboard.</para></listitem> 
+clipboard.</para></listitem>
 </varlistentry>
 
 <varlistentry id="edit-copy">
@@ -414,7 +414,7 @@ Toolbars...</guimenuitem></menuchoice></term>
 <para>Contributors:</para>
 <itemizedlist>
 <listitem><para>&Matthias.Elter; &Matthias.Elter.mail; - Original
-Author</para> 
+Author</para>
 </listitem>
 <listitem><para>&Matthias.Ettrich; &Matthias.Ettrich.mail;</para>
 </listitem>
@@ -437,7 +437,7 @@ Author</para>
 </chapter>
 
 <glossary id="glossary">
-<title>Glossary</title> 
+<title>Glossary</title>
 
 <glossentry id="gloss-terminal-emulator">
 <glossterm>Terminal emulator</glossterm>
@@ -457,7 +457,7 @@ information or provides a control shortcut. For instance the
 <application>Clock</application> applet shows current time and date
 (and even a month diary if you click it), and <application>System
 Monitor</application> applet shows how busy your machine currently is
-in real-time.</para> </glossdef> 
+in real-time.</para> </glossdef>
 </glossentry>
 
 <glossentry id="gloss-legacy-application">
@@ -508,7 +508,7 @@ work.</para></footnote>.</para>
 
 </glossary>
 
-&documentation.index; 
+&documentation.index;
 
 </book>
 <!--
diff --git a/doc/tdeprint/getting-started.docbook b/doc/tdeprint/getting-started.docbook
index d1ed5bfd8..9ac3dec25 100644
--- a/doc/tdeprint/getting-started.docbook
+++ b/doc/tdeprint/getting-started.docbook
@@ -18,7 +18,7 @@ where you can define this: either in &kcontrol; (The <guilabel>Printing
 Manager</guilabel> section), or directly and <quote>on the fly</quote>
 from the print dialog.</para>
 
-<para>Navigate to <menuchoice><guimenu>K Menu</guimenu>
+<para>Navigate to <menuchoice><guimenu>TDE Menu</guimenu>
 <guisubmenu>Preferences</guisubmenu> <guisubmenu>System</guisubmenu>
 <guimenuitem>Printing Manager</guimenuitem></menuchoice>.  At the bottom
 you can see a button that lets you select which printing subsystem you
@@ -99,7 +99,7 @@ the &kprinter; dialog box.</para>
 you are ready to investigate, configure administer and work with this
 system through the &tdeprint; framework.</para>
 
-<para>Navigate to <menuchoice><guimenu>K Menu</guimenu>
+<para>Navigate to <menuchoice><guimenu>TDE Menu</guimenu>
 <guisubmenu>Preferences</guisubmenu> <guisubmenu>System</guisubmenu>
 <guimenuitem>Printing Manager</guimenuitem></menuchoice>.  In the right
 part of the window you will see at least 4 printers predefined.  These
diff --git a/doc/userguide/control-center.docbook b/doc/userguide/control-center.docbook
index 96b409fe9..715fcaa02 100644
--- a/doc/userguide/control-center.docbook
+++ b/doc/userguide/control-center.docbook
@@ -85,7 +85,7 @@ with &tde; or you can supply your own.</para>
 There are a variety of color schemes installed with &tde; by default, and
 you can find others at kde-look.org. You can also create your own. Here you
 can also modify the contrast and choose whether you want your &tde; colors
-to be applied to non-kde applications, for a more consistant overall
+to be applied to non-TDE applications, for a more consistant overall
 appearance.</para>
 </listitem>
 </varlistentry>
diff --git a/doc/userguide/font-installation.docbook b/doc/userguide/font-installation.docbook
index b321b0295..683c878bd 100644
--- a/doc/userguide/font-installation.docbook
+++ b/doc/userguide/font-installation.docbook
@@ -17,7 +17,7 @@
 <indexterm><primary>Fonts</primary></indexterm>
 
 <para>Fonts are really easy to configure in &tde;. Open up the Control
-Center (with <menuchoice><guimenu>K-Menu</guimenu><guimenuitem>Control
+Center (with <menuchoice><guimenu>TDE Menu</guimenu><guimenuitem>Control
 Center</guimenuitem></menuchoice>) and choose
 <guilabel>Font Installer</guilabel> in <guilabel>System
 Administration</guilabel>in the tree view.</para>
diff --git a/doc/userguide/printing-from-apps.docbook b/doc/userguide/printing-from-apps.docbook
index eafbcb516..213942114 100644
--- a/doc/userguide/printing-from-apps.docbook
+++ b/doc/userguide/printing-from-apps.docbook
@@ -17,7 +17,7 @@
 
 <para>Printing from &tde; apps</para>
 
-<para>Printing from non-kde apps</para>
+<para>Printing from non-TDE apps</para>
 
 </sect1>