merge

1 files changed, 5 insertions, 5 deletions

diff --git a/ubuntu/maverick/tdebase/debian/tdebase-trinity.README.Debian b/ubuntu/maverick/tdebase/debian/tdebase-trinity.README.Debian
index 9944d8af8..2d03bb326 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-trinity.README.Debian
+++ b/ubuntu/maverick/tdebase/debian/tdebase-trinity.README.Debian
@@ -4,10 +4,10 @@ Kdm
 For notes on tdm, read: /opt/trinity/share/doc/tdm/README.Debian
 
 
-KDE and media tdeioslave support
+TDE and media tdeioslave support
 ==============================
 
-The media tdeioslave, new in KDE 3.4, supports the automatic mounting of
+The media tdeioslave, new from KDE 3.4, supports the automatic mounting of
 removable devices, such as CD-ROM and DVD drives, USB pen drives, digital
 cameras, and many other types of equipment.
 
@@ -40,16 +40,16 @@ thing.
 Installing konsole's bitmap fonts
 =================================
 
-Formerly, the few bitmap fonts KDE included, designed for use with Konsole,
+Formerly, the few bitmap fonts TDE included, designed for use with Konsole,
 were shipped as part of the xfonts-konsole package. However, as Konsole no
 longer uses these fonts by default, and most users no longer use bitmap
-fonts at all, KDE now includes these fonts with Konsole itself, and Debian
+fonts at all, TDE now includes these fonts with Konsole itself, and Debian
 has followed this practice, including the fonts in the konsole package, and
 eliminating the xfonts-konsole package entirely.
 
 To make use of these legacy fonts, start Konsole, and under Settings --> Font
 select "Install Bitmap...". This will allow you to copy the legacy Konsole
-fonts to $HOME/.fonts, where, after restarting KDE, all applications run by
+fonts to $HOME/.fonts, where, after restarting TDE, all applications run by
 that user, including Konsole, will be able to find them. Also make sure that
 fontconfig is configured to allow the use of bitmap fonts. If you're not sure,
 run, as root, 'dpkg-reconfigure fontconfig' from Konsole.