[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [websites/edu-kde-org] /: Use Education instead of Edutainment consistently on edu.kde.org
From:       Burkhard_Lück <lueck () hube-lueck ! de>
Date:       2016-06-14 7:26:31
Message-ID: E1bCik3-0002EH-U8 () scm ! kde ! org
[Download RAW message or body]

Git commit b24cc4b729948e2f70d3615e799ba1bb58a0d7da by Burkhard Lück.
Committed on 14/06/2016 at 07:25.
Pushed by lueck into branch 'master'.

Use Education instead of Edutainment consistently on edu.kde.org
REVIEW:128177

M  +2    -2    applications/apps/kwordquiz_generated.json
M  +1    -1    cantor/news.rdf
M  +1    -1    contrib/kvtml2/index.php
M  +1    -1    contrib/kvtml2/kvtml2.php
M  +1    -1    khangman/news.rdf
M  +1    -1    ktouch/news.rdf
M  +1    -1    kturtle/news.rdf
M  +1    -1    kverbos/news.rdf
M  +1    -1    kwordquiz/news.rdf
M  +1    -1    marble/news.rdf
M  +1    -1    news.rdf
M  +1    -1    parley/news.rdf
M  +1    -1    rocs/news.rdf
M  +1    -1    step/news.rdf

http://commits.kde.org/websites/edu-kde-org/b24cc4b729948e2f70d3615e799ba1bb58a0d7da

diff --git a/applications/apps/kwordquiz_generated.json b/applications/apps/kwordquiz_generated.json
index 875f012..566d814 100644
--- a/applications/apps/kwordquiz_generated.json
+++ b/applications/apps/kwordquiz_generated.json
@@ -11,7 +11,7 @@
     "credits":[
         [
             "Anne-Marie Mahfouf",
-            "KDE Edutainment Maintainer",
+            "Former KDE Education Maintainer",
             "annma@kde.org",
             null
         ],
@@ -24,4 +24,4 @@
     ],
     "generic name":"Flash Card Trainer",
     "license":"GPL"
-}
\ No newline at end of file
+}
diff --git a/cantor/news.rdf b/cantor/news.rdf
index 05b3dc6..34231ab 100644
--- a/cantor/news.rdf
+++ b/cantor/news.rdf
@@ -2,7 +2,7 @@
 <!DOCTYPE rss SYSTEM "http://my.netscape.com/publish/formats/rss-0.91.dtd">
 <rss version="0.91">
   <channel>
-    <title>edu.kde.org: The KDE Edutainment Project</title>
+    <title>edu.kde.org: The KDE Education Project</title>
     <link>http://edu.kde.org/</link>
     <description>KDE Edu is promoting the development of educational software within KDE</description>
     <language>en-us</language>
diff --git a/contrib/kvtml2/index.php b/contrib/kvtml2/index.php
index ade1b78..f48eb92 100644
--- a/contrib/kvtml2/index.php
+++ b/contrib/kvtml2/index.php
@@ -5,7 +5,7 @@
 ?>
   <p>The learning files listed here are intended for use with <a href=
   "/applications/language/parley/">Parley</a> and <a href=
-  "/applications/language/kwordquiz/">KWordQuiz</a> which are both part of the KDE Edutainment
+  "/applications/language/kwordquiz/">KWordQuiz</a> which are both part of the KDE Education
   project. The files can also be used with <a href=
   "/applications/language/flashkard/">FlashKard</a>, a program that was included in earlier
   versions of KDE. To some extent these files also work with <a href=
diff --git a/contrib/kvtml2/kvtml2.php b/contrib/kvtml2/kvtml2.php
index e4c280c..d535068 100644
--- a/contrib/kvtml2/kvtml2.php
+++ b/contrib/kvtml2/kvtml2.php
@@ -6,7 +6,7 @@
   <p>The learning files listed here are intended for use with <a href=
   "/applications/language/parley/">Parley</a>, <a href=
   "/applications/language/kvoctrain/">KVocTrain</a> and <a href=
-  "/applications/language/kwordquiz/">KWordQuiz</a> which are both part of the KDE Edutainment
+  "/applications/language/kwordquiz/">KWordQuiz</a> which are both part of the KDE Education
   project. The files can also be used with <a href=
   "/applications/language/flashkard/">FlashKard</a>, a program that was included in earlier
   versions of KDE. To some extent these files also work with <a href=
diff --git a/khangman/news.rdf b/khangman/news.rdf
index 8feaf38..d98f7fe 100644
--- a/khangman/news.rdf
+++ b/khangman/news.rdf
@@ -2,7 +2,7 @@
 <!DOCTYPE rss SYSTEM "http://my.netscape.com/publish/formats/rss-0.91.dtd">
 <rss version="0.91">
   <channel>
-    <title>edu.kde.org: The KDE Edutainment Project</title>
+    <title>edu.kde.org: The KDE Education Project</title>
     <link>http://edu.kde.org/</link>
     <description>KDE Edu is promoting the development of educational software within KDE</description>
     <language>en-us</language>
diff --git a/ktouch/news.rdf b/ktouch/news.rdf
index d975f44..927c487 100644
--- a/ktouch/news.rdf
+++ b/ktouch/news.rdf
@@ -2,7 +2,7 @@
 <!DOCTYPE rss SYSTEM "http://my.netscape.com/publish/formats/rss-0.91.dtd">
 <rss version="0.91">
 <channel>
-	<title>edu.kde.org: The KDE Edutainment Project</title>
+	<title>edu.kde.org: The KDE Education Project</title>
 	<link>http://edu.kde.org/</link>
 	<description>KDE Edu is promoting the development of educational software within KDE</description>
 	<language>en-us</language>
diff --git a/kturtle/news.rdf b/kturtle/news.rdf
index 091fd0b..5f6f3d8 100644
--- a/kturtle/news.rdf
+++ b/kturtle/news.rdf
@@ -2,7 +2,7 @@
 <!DOCTYPE rss SYSTEM "http://my.netscape.com/publish/formats/rss-0.91.dtd">
 <rss version="0.91">
 <channel>
-<title>edu.kde.org: The KDE Edutainment Project</title>
+<title>edu.kde.org: The KDE Education Project</title>
 <link>http://edu.kde.org/</link>
 <description>KDE Edu is promoting the development of educational software within KDE</description>
 <language>en-us</language>
diff --git a/kverbos/news.rdf b/kverbos/news.rdf
index 4712ad1..0d8482d 100644
--- a/kverbos/news.rdf
+++ b/kverbos/news.rdf
@@ -2,7 +2,7 @@
 <!DOCTYPE rss SYSTEM "http://my.netscape.com/publish/formats/rss-0.91.dtd">
 <rss version="0.91">
   <channel>
-    <title>edu.kde.org: The KDE Edutainment Project</title>
+    <title>edu.kde.org: The KDE Education Project</title>
     <link>http://edu.kde.org/</link>
     <description>KDE Edu is promoting the development of educational software within KDE</description>
     <language>en-us</language>
diff --git a/kwordquiz/news.rdf b/kwordquiz/news.rdf
index e6f0904..fa9e40f 100644
--- a/kwordquiz/news.rdf
+++ b/kwordquiz/news.rdf
@@ -2,7 +2,7 @@
 <!DOCTYPE rss SYSTEM "http://my.netscape.com/publish/formats/rss-0.91.dtd">
 <rss version="0.91">
   <channel>
-    <title>edu.kde.org: The KDE Edutainment Project</title>
+    <title>edu.kde.org: The KDE Education Project</title>
     <link>http://edu.kde.org/</link>
     <description>KDE Edu is promoting the development of educational software within KDE</description>
     <language>en-us</language>
diff --git a/marble/news.rdf b/marble/news.rdf
index c996d7f..3b9bbc3 100644
--- a/marble/news.rdf
+++ b/marble/news.rdf
@@ -2,7 +2,7 @@
 <!DOCTYPE rss SYSTEM "http://my.netscape.com/publish/formats/rss-0.91.dtd">
 <rss version="0.92">
   <channel>
-    <title>edu.kde.org: The KDE Edutainment Project</title>
+    <title>edu.kde.org: The KDE Education Project</title>
     <link>http://edu.kde.org/</link>
     <description>KDE Edu is promoting the development of educational software within KDE</description>
     <language>en-us</language>
diff --git a/news.rdf b/news.rdf
index ba03f3c..ce15565 100644
--- a/news.rdf
+++ b/news.rdf
@@ -2,7 +2,7 @@
 <!DOCTYPE rss SYSTEM "http://my.netscape.com/publish/formats/rss-0.91.dtd">
 <rss version="0.91">
   <channel>
-    <title>edu.kde.org: the KDE Edutainment Project</title>
+    <title>edu.kde.org: the KDE Education Project</title>
     <link>http://edu.kde.org/</link>
     <description>KDE Edu is promoting the development of educational software within KDE</description>
     <language>en-us</language>
diff --git a/parley/news.rdf b/parley/news.rdf
index 30f7224..9a0cc6c 100644
--- a/parley/news.rdf
+++ b/parley/news.rdf
@@ -2,7 +2,7 @@
 <!DOCTYPE rss SYSTEM "http://my.netscape.com/publish/formats/rss-0.91.dtd">
 <rss version="0.91">
   <channel>
-    <title>edu.kde.org: The KDE Edutainment Project</title>
+    <title>edu.kde.org: The KDE Education Project</title>
     <link>http://edu.kde.org/</link>
     <description>KDE Edu is promoting the development of educational software within KDE</description>
     <language>en-us</language>
diff --git a/rocs/news.rdf b/rocs/news.rdf
index b4255d9..5757f15 100644
--- a/rocs/news.rdf
+++ b/rocs/news.rdf
@@ -2,7 +2,7 @@
 <!DOCTYPE rss SYSTEM "http://my.netscape.com/publish/formats/rss-0.91.dtd">
 <rss version="0.91">
   <channel>
-    <title>edu.kde.org: The KDE Edutainment Project</title>
+    <title>edu.kde.org: The KDE Education Project</title>
     <link>http://edu.kde.org/</link>
     <description>KDE Edu is promoting the development of educational software within KDE</description>
     <language>en-us</language>
diff --git a/step/news.rdf b/step/news.rdf
index 2dccb3d..ca182a7 100644
--- a/step/news.rdf
+++ b/step/news.rdf
@@ -2,7 +2,7 @@
 <!DOCTYPE rss SYSTEM "http://my.netscape.com/publish/formats/rss-0.91.dtd">
 <rss version="0.91">
   <channel>
-    <title>edu.kde.org: The KDE Edutainment Project</title>
+    <title>edu.kde.org: The KDE Education Project</title>
     <link>http://edu.kde.org/</link>
     <description>KDE Edu is promoting the development of educational software within KDE</description>
     <language>en-us</language>
[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic