[SCM] wiki-content branch, master, updated. 65be6270e3ee315b1776c01b037362516c4d60fc

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 65be6270e3ee315b1776c01b037362516c4d60fc
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun May 29 07:48:19 2011 +0200

    Adding Edix to project downstream page.

diff --git a/project/downstream.mdwn b/project/downstream.mdwn
index a3f803d..d7b5d97 100644
--- a/project/downstream.mdwn
+++ b/project/downstream.mdwn
@@ -68,6 +68,16 @@ More information:
 
   * [Homepage](http://www.doudoulinux.org/)
 
+## Edix
+
+The [Educational Linux System (Edix)](http://wwww.eddixon.net/moodle/) is a live system designed to boot from USB and provide instructors, trainers, and teachers with a ready to go solution providing classroom software support scaling from one learner to an entire school or district.
+
+While technically an Operating System the Edix system provides its real value as a system of operation using the software supplied as a means to organize, document, and provide professional training to learners at a distance or in the classroom.
+
+More information:
+
+  * [Homepage](http://www.eddixon.net/moodle/)
+
 ## FAI - Fully Automatic Installation
 
 [FAI](http://www.fai-project.org/) is a non-interactive system to install, customize and manage Linux systems and software configurations on computers as well as virtual machines and chroot environments, from small networks to large-scale infrastructures and clusters.

-- 
wiki-content