merge

5 files changed, 10 insertions, 10 deletions

diff --git a/ubuntu/maverick/applications/tde-guidance/debian/control b/ubuntu/maverick/applications/tde-guidance/debian/control
index 30f06b28e..75557e68c 100644
--- a/ubuntu/maverick/applications/tde-guidance/debian/control
+++ b/ubuntu/maverick/applications/tde-guidance/debian/control
@@ -17,7 +17,7 @@ Replaces: kde-guidance-kde3 (<< 4:14.0.0~), kde-guidance-trinity (<< 4:14.0.0~)
 Breaks: kde-guidance-kde3 (<< 4:14.0.0~), kde-guidance-trinity (<< 4:14.0.0~)
 Conflicts: guidance-power-manager, kde-guidance-powermanager
 Provides: ${python:Provides}
-Description: collection of KDE system administration tools for GNU/Linux [Trinity]
+Description: collection of TDE system administration tools for GNU/Linux [Trinity]
  Guidance currently consists of four programs designed to help you
  look after your system:
   o  userconfig - User and Group administration
@@ -26,7 +26,7 @@ Description: collection of KDE system administration tools for GNU/Linux [Trinit
   o  displayconfig - Screen and display configuration
   o  wineconfig - Wine configuration
  .
- These tools are available in KDE Control Center, System Settings 
+ These tools are available in Trinity Control Center, System Settings 
  or can be run as standalone applications.
  .
   Homepage: http://www.simonzone.com/software/guidance
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/displayconfig-trinity.1 b/ubuntu/maverick/applications/tde-guidance/debian/displayconfig-trinity.1
index 3670902b8..304d8e8df 100644
--- a/ubuntu/maverick/applications/tde-guidance/debian/displayconfig-trinity.1
+++ b/ubuntu/maverick/applications/tde-guidance/debian/displayconfig-trinity.1
@@ -42,8 +42,8 @@ Show summary of options.
 .B \-\-help\-qt
 Show QT specific help (common for all QT apps).
 .TP 
-.B \-\-help\-kde
-Show KDE specific help (common for all KDE apps).
+.B \-\-help\-tde
+Show TDE specific help (common for all TDE apps).
 .TP 
 .B \-\-help\-all
 Show the complete help.
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/mountconfig-trinity.1 b/ubuntu/maverick/applications/tde-guidance/debian/mountconfig-trinity.1
index 7f1fb728c..d3076cc3c 100644
--- a/ubuntu/maverick/applications/tde-guidance/debian/mountconfig-trinity.1
+++ b/ubuntu/maverick/applications/tde-guidance/debian/mountconfig-trinity.1
@@ -42,8 +42,8 @@ Show summary of options.
 .B \-\-help\-qt
 Show QT specific help (common for all QT apps).
 .TP 
-.B \-\-help\-kde
-Show KDE specific help (common for all KDE apps).
+.B \-\-help\-tde
+Show TDE specific help (common for all TDE apps).
 .TP 
 .B \-\-help\-all
 Show the complete help.
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/serviceconfig-trinity.1 b/ubuntu/maverick/applications/tde-guidance/debian/serviceconfig-trinity.1
index 776a01998..8ef180de8 100644
--- a/ubuntu/maverick/applications/tde-guidance/debian/serviceconfig-trinity.1
+++ b/ubuntu/maverick/applications/tde-guidance/debian/serviceconfig-trinity.1
@@ -42,8 +42,8 @@ Show summary of options.
 .B \-\-help\-qt
 Show QT specific help (common for all QT apps).
 .TP 
-.B \-\-help\-kde
-Show KDE specific help (common for all KDE apps).
+.B \-\-help\-tde
+Show TDE specific help (common for all TDE apps).
 .TP 
 .B \-\-help\-all
 Show the complete help.
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/userconfig-trinity.1 b/ubuntu/maverick/applications/tde-guidance/debian/userconfig-trinity.1
index 3b950add1..1fda3dd19 100644
--- a/ubuntu/maverick/applications/tde-guidance/debian/userconfig-trinity.1
+++ b/ubuntu/maverick/applications/tde-guidance/debian/userconfig-trinity.1
@@ -42,8 +42,8 @@ Show summary of options.
 .B \-\-help\-qt
 Show QT specific help (common for all QT apps).
 .TP 
-.B \-\-help\-kde
-Show KDE specific help (common for all KDE apps).
+.B \-\-help\-tde
+Show TDE specific help (common for all TDE apps).
 .TP 
 .B \-\-help\-all
 Show the complete help.