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

author: Timothy Pearson <[email protected]> 2013-04-18 19:01:11 -0500
committer: Timothy Pearson <[email protected]> 2013-04-18 19:01:11 -0500
commit: 2b31f11f979f3ffc3dd060072b85559a832bfab5 (patch)
tree: 081358a0df37f88e89a3e2fa4e137810681ab480 /doc/common
parent: 30b0af1f01cdbfcc51a56943e8c091bc8991f83a (diff)
parent: 1c68d332fd7e08a190daedbaa6ace857b575b7c4 (diff)
download: tdelibs-2b31f11f979f3ffc3dd060072b85559a832bfab5.tar.gz
tdelibs-2b31f11f979f3ffc3dd060072b85559a832bfab5.zip
16 files changed, 14 insertions, 14 deletions
diff --git a/doc/common/CMakeLists.txt b/doc/common/CMakeLists.txt
index a54894234..80a459fc2 100644
--- a/doc/common/CMakeLists.txt
+++ b/doc/common/CMakeLists.txt
@@ -15,7 +15,7 @@ install( FILES
     artistic-license.html bottom1.png bottom2.png
     bsd-license.html doctop1.png doctop2.png fdl-license
     fdl-license.html gpl-license gpl-license.html
-    kde-common.css kde-default.css kde-web.css kde-localised.css.template
+    tde-common.css tde-default.css tde-web.css tde-localised.css.template
     lgpl-license lgpl-license.html qpl-license.html shadow.png
     web-docbottom.png x11-license.html xml.dcl web-doctop.png
     doctop1a.png doctop1b.png 1.png 2.png 3.png 4.png
diff --git a/doc/common/Makefile.am b/doc/common/Makefile.am
index dade6749e..d1c9e7e35 100644
--- a/doc/common/Makefile.am
+++ b/doc/common/Makefile.am
@@ -1,4 +1,4 @@
-# logotp3.png, logotp3-small.png and kde-localised.css.template
+# logotp3.png, logotp3-small.png and tde-localised.css.template
 # are not included in the language-specific common directory
 # They serve only as `reference' versions.
 
@@ -6,8 +6,8 @@ commondir = $(kde_htmldir)/en/common
 
 common_DATA = artistic-license.html bottom1.png bottom2.png bsd-license.html \
 	doctop1.png doctop2.png fdl-license fdl-license.html gpl-license \
-	gpl-license.html kde-common.css kde-default.css kde-web.css \
-	kde-localised.css.template lgpl-license lgpl-license.html \
+	gpl-license.html tde-common.css tde-default.css tde-web.css \
+	tde-localised.css.template lgpl-license lgpl-license.html \
 	qpl-license.html shadow.png web-docbottom.png \
 	x11-license.html xml.dcl web-doctop.png \
 	doctop1a.png doctop1b.png 1.png 2.png 3.png 4.png 5.png 6.png \
diff --git a/doc/common/artistic-license.html b/doc/common/artistic-license.html
index 2069b4ed0..65aaedf0c 100644
--- a/doc/common/artistic-license.html
+++ b/doc/common/artistic-license.html
@@ -9,7 +9,7 @@
     <META NAME="keywords" CONTENT="Artistic, artistic, Artistic License, Artistic license, Artisticlicense, artistic license, artisticlicense, Artistic Licence, Artistic licence, Artisticlicence, artistic licence, artisticlicence, license, licence, software, softwarelicense">
     <META NAME="robots" CONTENT="none">
     <META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-    <LINK REL="stylesheet" HREF="kde-default.css" TYPE="text/css">
+    <LINK REL="stylesheet" HREF="tde-default.css" TYPE="text/css">
   </HEAD>
   <BODY CLASS="license">
     <H1>The "Artistic License"</H1>
diff --git a/doc/common/bsd-license.html b/doc/common/bsd-license.html
index 422bb339f..216c91f21 100644
--- a/doc/common/bsd-license.html
+++ b/doc/common/bsd-license.html
@@ -9,7 +9,7 @@
     <META NAME="keywords" CONTENT="BSD, bsd, Bsd, license, licence, software, free software, softwarelicense, BSD Software license">
     <META NAME="robots" CONTENT="none">
     <META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-    <LINK REL="stylesheet" HREF="kde-default.css" TYPE="text/css">
+    <LINK REL="stylesheet" HREF="tde-default.css" TYPE="text/css">
   </HEAD>
   <BODY CLASS="license">
     <H1>BSD License</H1>
diff --git a/doc/common/fdl-license.html b/doc/common/fdl-license.html
index 9ce378a30..2a94311f4 100644
--- a/doc/common/fdl-license.html
+++ b/doc/common/fdl-license.html
@@ -9,7 +9,7 @@
     <META NAME="keywords" CONTENT="gnu, Gnu, GNU, license, licence, software, free software, software license, software licence, GNU general public license, GNU General Public License, documentation licence, documentation license, documentation, GNU free documentation license, GNU Free Documentation License">
     <META NAME="robots" CONTENT="none">
     <META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-    <LINK REL="stylesheet" HREF="kde-default.css" TYPE="text/css">
+    <LINK REL="stylesheet" HREF="tde-default.css" TYPE="text/css">
   </HEAD>
   <BODY CLASS="license">
 <h3>GNU Free Documentation License</h3>
diff --git a/doc/common/gpl-license.html b/doc/common/gpl-license.html
index 26ae3af1f..68a63d56d 100644
--- a/doc/common/gpl-license.html
+++ b/doc/common/gpl-license.html
@@ -9,7 +9,7 @@
     <META NAME="keywords" CONTENT="gnu, Gnu, GNU, license, licence, software, free software, software license, software licence, GNU general public license, GNU General Public License">
     <META NAME="robots" CONTENT="none">
     <META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-    <LINK REL="stylesheet" HREF="kde-default.css" TYPE="text/css">
+    <LINK REL="stylesheet" HREF="tde-default.css" TYPE="text/css">
   </HEAD>
   <BODY CLASS="license">
 <H1>GNU General Public License</H1>
diff --git a/doc/common/header.html b/doc/common/header.html
index b57fb0a04..8b133a3b2 100644
--- a/doc/common/header.html
+++ b/doc/common/header.html
@@ -20,7 +20,7 @@
   <link rel="shortcut icon" href="@topdir@/favicon.ico" /><link rel="icon" href="@topdir@/favicon.ico" />
   <link rel="stylesheet" type="text/css" href="@topdir@/doxygen.css" />
   <link rel="stylesheet" type="text/css" href="@topdir@/tabs.css" />
-  <link rel="stylesheet" media="screen" type="text/css" title="Trinity Colors" href="@topdir@/kde.css" />
+  <link rel="stylesheet" media="screen" type="text/css" title="Trinity Colors" href="@topdir@/tde.css" />
   <link rel="stylesheet" media="print, embossed" type="text/css" href="@topdir@/print.css" />
   <link rel="stylesheet" media="screen, aural, handheld, tty, braille" type="text/css" title="Flat" href="@topdir@/flat.css" />
 </head>
diff --git a/doc/common/lgpl-license.html b/doc/common/lgpl-license.html
index 343576dfb..d99591beb 100644
--- a/doc/common/lgpl-license.html
+++ b/doc/common/lgpl-license.html
@@ -9,7 +9,7 @@
     <META NAME="keywords" CONTENT="gnu, Gnu, GNU, license, licence, software, free software, software license, software licence, GNU general public license, GNU General Public License, library licence, library license, software library, software libraries, GNU lesser general public license, GNU Lesser General Public License">
     <META NAME="robots" CONTENT="none">
     <META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-    <LINK REL="stylesheet" HREF="kde-default.css" TYPE="text/css">
+    <LINK REL="stylesheet" HREF="tde-default.css" TYPE="text/css">
   </HEAD>
   <BODY CLASS="license">
 <H1>GNU LESSER GENERAL PUBLIC LICENSE</H1>
diff --git a/doc/common/mainheader.html b/doc/common/mainheader.html
index a7e2adca6..a730e325d 100644
--- a/doc/common/mainheader.html
+++ b/doc/common/mainheader.html
@@ -20,7 +20,7 @@
   <link rel="shortcut icon" href="@topdir@/favicon.ico" /><link rel="icon" href="@topdir@/favicon.ico" />
   <link rel="stylesheet" type="text/css" href="@topdir@/doxygen.css" />
   <link rel="stylesheet" type="text/css" href="@topdir@/tabs.css" />
-  <link rel="stylesheet" media="screen" type="text/css" title="Trinity Colors" href="@topdir@/kde.css" />
+  <link rel="stylesheet" media="screen" type="text/css" title="Trinity Colors" href="@topdir@/tde.css" />
   <link rel="stylesheet" media="print, embossed" type="text/css" href="@topdir@/print.css" />
   <link rel="stylesheet" media="screen, aural, handheld, tty, braille" type="text/css" title="Flat" href="@topdir@/flat.css" />
 </head>
diff --git a/doc/common/qpl-license.html b/doc/common/qpl-license.html
index 19a863bc5..dddb43623 100644
--- a/doc/common/qpl-license.html
+++ b/doc/common/qpl-license.html
@@ -9,7 +9,7 @@
     <META NAME="keywords" CONTENT="Q, q, Q Public License, Q public license, q public license, public license, Q Public Licence, Q public licence, q public licence, public licence, license, licence, software, softwarelicense, Troll, troll, Troll License, troll license, Troll Licence, troll licence">
     <META NAME="robots" CONTENT="none">
     <META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-    <LINK REL="stylesheet" HREF="kde-default.css" TYPE="text/css">
+    <LINK REL="stylesheet" HREF="tde-default.css" TYPE="text/css">
   </HEAD>
   <BODY CLASS="license">
     <H1>The Q Public License</H1>
diff --git a/doc/common/kde-common.css b/doc/common/tde-common.css
index 5898199ba..5898199ba 100644
--- a/doc/common/kde-common.css
+++ b/doc/common/tde-common.css
diff --git a/doc/common/kde-default.css b/doc/common/tde-default.css
index 61043e9ef..61043e9ef 100644
--- a/doc/common/kde-default.css
+++ b/doc/common/tde-default.css
diff --git a/doc/common/kde-localised.css.template b/doc/common/tde-localised.css.template
index abcd1ec91..52b91d179 100644
--- a/doc/common/kde-localised.css.template
+++ b/doc/common/tde-localised.css.template
@@ -20,7 +20,7 @@
 */
 
 /*
-   These settings will override kde-default.css.
+   These settings will override tde-default.css.
 
    Any updates should be validated, e.g. http://jigsaw.w3.org/css-validator/
 
diff --git a/doc/common/kde-web.css b/doc/common/tde-web.css
index 1e3efe64a..1e3efe64a 100644
--- a/doc/common/kde-web.css
+++ b/doc/common/tde-web.css
diff --git a/doc/common/kde.css b/doc/common/tde.css
index 183b62fa1..183b62fa1 100644
--- a/doc/common/kde.css
+++ b/doc/common/tde.css
diff --git a/doc/common/x11-license.html b/doc/common/x11-license.html
index 444a27bec..6ade70f69 100644
--- a/doc/common/x11-license.html
+++ b/doc/common/x11-license.html
@@ -9,7 +9,7 @@
     <META NAME="keywords" CONTENT="X, x, X Window, x window, X Windows, x windows, X Window System License, x window system license, X Window System Licence, x window system licence, X11R6.4, x11r6.4, x11r64, license, licence, software, softwarelicense">
     <META NAME="robots" CONTENT="none">
     <META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-    <LINK REL="stylesheet" HREF="kde-default.css" TYPE="text/css">
+    <LINK REL="stylesheet" HREF="tde-default.css" TYPE="text/css">
   </HEAD>
   <BODY CLASS="license">
     <H1>X Window System License - X11R6.4</H1>
author	Timothy Pearson <[email protected]>	2013-04-18 19:01:11 -0500
committer	Timothy Pearson <[email protected]>	2013-04-18 19:01:11 -0500
commit	2b31f11f979f3ffc3dd060072b85559a832bfab5 (patch)
tree	081358a0df37f88e89a3e2fa4e137810681ab480 /doc/common
parent	30b0af1f01cdbfcc51a56943e8c091bc8991f83a (diff)
parent	1c68d332fd7e08a190daedbaa6ace857b575b7c4 (diff)
download	tdelibs-2b31f11f979f3ffc3dd060072b85559a832bfab5.tar.gz tdelibs-2b31f11f979f3ffc3dd060072b85559a832bfab5.zip