[Blends-commit] [SCM] blends-dev branch, master, updated. e4973e08733b49b02472df5c9e33d271d3f7d709

[Holger Levsen]

The following commit has been merged in the master branch:
commit e4973e08733b49b02472df5c9e33d271d3f7d709
Author: Holger Levsen <holger at debian.org>
Date:   Tue May 24 14:19:42 2016 +0200

    Adjust description of Debian Edu: use correct project spelling and improve language.

diff --git a/debian-blends-tasks.desc b/debian-blends-tasks.desc
index 2a7fda7..14168a5 100644
--- a/debian-blends-tasks.desc
+++ b/debian-blends-tasks.desc
@@ -81,12 +81,11 @@ Task: debian-edu
 Parent: debian-blends
 Section: debian-blends
 Description: Debian Edu
- DebianEdu/Skolelinux is an operating system intended for educational
+ Debian Edu / Skolelinux is an operating system intended for educational
  use and a Debian Pure Blend . As skole [skuːlə] is the Norwegian word
- for school, Skolelinux's literal translation is "school linux". It
- has been created as an overall free software computer solution
- designed to fit on school's resources and needs and is currently
- being internationally developed by a large international and growing
+ for school, Skolelinux's literal translation is "school linux". It has
+ been created as an overall free software solution designed to fit the
+ resources and needs of schools and is being developed by a large global
  community.
 Test-new-install: show skip
 Key:
diff --git a/debian/changelog b/debian/changelog
index 697df4d..59507ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,15 @@
 blends (0.6.94) UNRELEASED; urgency=medium
 
+  [ Ole Streicher ]
   * Adjust description of Debian Science: install only common tasks
   * Make the default install opt-in instead of opt-out, and create the
     <blends>-all package only when there were tasks opted-in as default
     install. Closes: 825004
 
+  [ Holger Levsen ]
+  * Adjust description of Debian Edu: use correct project spelling and improve
+    language.
+
  -- Ole Streicher <olebole at debian.org>  Thu, 28 Apr 2016 11:57:38 +0200
 
 blends (0.6.93) unstable; urgency=medium

-- 
Git repository for blends code