Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs

3 files changed, 12 insertions, 12 deletions

diff --git a/tdecore/README.kiosk b/tdecore/README.kiosk
index 54ab60d2d..826fc6da6 100644
--- a/tdecore/README.kiosk
+++ b/tdecore/README.kiosk
@@ -31,7 +31,7 @@ In KDE2 resource management has been largely abstracted by the introduction
 of the TDEStandardDirs class and has become much more flexible. The user /
 administrator can now specify a variable number of locations where resources
 can be found. A list of locations can either be specified via $TDEDIRS
-(notice the extra 'S'), via /etc/kderc and even via the kdeglobals config 
+(notice the extra 'S'), via /etc/tderc and even via the kdeglobals config 
 file. The location where user-specific resources can be found can be
 set with $TDEHOME (The default is $HOME/.trinity). Changes made by the user
 are always written back to $TDEHOME.
diff --git a/tdecore/README.user_profiles b/tdecore/README.user_profiles
index 4fb43b757..4f9f8f592 100644
--- a/tdecore/README.user_profiles
+++ b/tdecore/README.user_profiles
@@ -12,7 +12,7 @@ Mapping profiles to users
 =========================
 
 A mapping file determines which profile(s) should be used for which user.
-The mapping file can be configured in /etc/kderc in the [Directories] group:
+The mapping file can be configured in /etc/tderc in the [Directories] group:
 
 	[Directories]
 	userProfileMapFile=/etc/kde-user-profile
@@ -99,7 +99,7 @@ user will be assigned the "default" profile.
 The Profile determines the directory prefixes
 =============================================
 
-The global KDE configuration file (e.g. kdeglobals or /etc/kderc) can
+The global KDE configuration file (e.g. kdeglobals or /etc/tderc) can
 contain config-groups that are associated with a certain user profile. 
 Such a config-group is treated similar as the [Directories] config-group.
 
@@ -109,7 +109,7 @@ The name of a such config-group is [Directories-<ProfileName>]
 Integration with KIOSK Admin Tool
 =================================
 
-The KIOSK Admin Tool uses /etc/kderc as source for all its profile
+The KIOSK Admin Tool uses /etc/tderc as source for all its profile
 information. For this it uses the following keys in the
 [Directories-<ProfileName>] config-group:
 
@@ -126,7 +126,7 @@ as default installation directory for this profile.
 Default setting as example
 ==========================
 
-The following snipped could be added to /etc/kderc to define a "default" profile:
+The following snipped could be added to /etc/tderc to define a "default" profile:
 
 	[Directories-default]
 	ProfileDescription=Default profile
diff --git a/tdecore/tdeconfigbackend.cpp b/tdecore/tdeconfigbackend.cpp
index 6d5197ff7..06939551a 100644
--- a/tdecore/tdeconfigbackend.cpp
+++ b/tdecore/tdeconfigbackend.cpp
@@ -350,24 +350,24 @@ bool TDEConfigINIBackEnd::parseConfigFiles()
 
   // Parse the general config files
   if (useKDEGlobals) {
-    TQStringList kdercs = TDEGlobal::dirs()->
+    TQStringList tdercs = TDEGlobal::dirs()->
       findAllResources("config", TQString::fromLatin1("kdeglobals"));
 
 #ifdef Q_WS_WIN
-    TQString etc_kderc = TQFile::decodeName( TQCString(getenv("WINDIR")) + "\\kderc" );
+    TQString etc_tderc = TQFile::decodeName( TQCString(getenv("WINDIR")) + "\\tderc" );
 #else
-    TQString etc_kderc = TQString::fromLatin1("/etc/kderc");
+    TQString etc_tderc = TQString::fromLatin1("/etc/tderc");
 #endif
 
-    if (checkAccess(etc_kderc, R_OK))
-      kdercs += etc_kderc;
+    if (checkAccess(etc_tderc, R_OK))
+      tdercs += etc_tderc;
 
-    kdercs += TDEGlobal::dirs()->
+    tdercs += TDEGlobal::dirs()->
       findAllResources("config", TQString::fromLatin1("system.kdeglobals"));
 
     TQStringList::ConstIterator it;
 
-    for (it = kdercs.fromLast(); it != kdercs.end(); --it) {
+    for (it = tdercs.fromLast(); it != tdercs.end(); --it) {
 
       TQFile aConfigFile( *it );
       if (!aConfigFile.open( IO_ReadOnly ))