www/server/staging free-software-for-education....

[Dora Scilipoti]

CVSROOT:        /web/www
Module name:    www
Changes by:     Dora Scilipoti <dora>   16/01/25 18:29:13

Modified files:
        server/staging : free-software-for-education.html 

Log message:
        Some improvements.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/free-software-for-education.html?cvsroot=www&r1=1.1&r2=1.2

Patches:
Index: free-software-for-education.html
===================================================================
RCS file: /web/www/www/server/staging/free-software-for-education.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- free-software-for-education.html    25 Jan 2016 14:34:08 -0000      1.1
+++ free-software-for-education.html    25 Jan 2016 18:29:12 -0000      1.2
@@ -31,11 +31,6 @@
    border-bottom: 2px solid #6989b6;
    margin-top: 0;
 }
-#windows7sins {
-   width: 25em; max-width: 40%;
-   text-align: center;
-   margin: 0 1em 1em 1em;
-}
 -->
 </style>
 
@@ -64,7 +59,7 @@
 <td>Trisquel GNU/Linux</td>
 <td>Composed exclusively of software that respects your freedom.</td>
 <td>ChromeOS</td>
-<td>Windows</td>
+<td>Windows (any version)</td>
 </tr>
 
 <tr>
@@ -105,9 +100,9 @@
 
 <tr>
 <td>Media sharing</td>
-<td>MediaGoblin</td>
+<td>GNU MediaGoblin</td>
 <td>Entirely self-hosted. Can share all kinds of media in safety.</td>
-<td>Youtube, Google Photos</td>
+<td>Youtube, Google Photos, Picasa</td>
 <td>----</td>
 </tr>
 
@@ -125,10 +120,11 @@
 <tr>
 <td>Chat (audio,video, text)</td>
 <td>Jitsi, Jitsi Meet (browser-based)</td>
-<td>Entirely self-hosted (Prosody is recommended as a XMPP server) and 
-browser-based. Students can chat across many platforms without their faces 
-being scanned by facial recognition algorithms and their voice and text 
-being recorded.</td>
+<td>Entirely self-hosted 
+(<a href="http://directory.fsf.org/wiki/Prosody";>Prosody</a> 
+is recommended as a XMPP server) and browser-based. Students can chat 
+across many platforms without their faces being scanned by facial 
+recognition algorithms and their voice and text being recorded.</td>
 <td>Google Hangouts</td>
 <td>Skype</td>
 </tr>
@@ -176,22 +172,22 @@
 <tr>
 <td>Tux Paint</td>
 <td>Graphics editor aimed at young children 
-(<a href="/education/edu-software-gcompris.html">case study</a>.)</td>
+(<a href="/education/edu-software-tuxpaint.html">case study</a>.)</td>
 </tr>
 
 <tr>
 <td rowspan="1">Games and educational activities</td>
 <td>GCompris</td>
 <td>Educational software suite comprising of numerous activities for 
-children aged 2 to 10 (<a href="/education/edu-software-gcompris.html">
-case study</a>.)</td>
+children aged 2 to 10 
+(<a href="/education/edu-software-gcompris.html">case study</a>.)</td>
 </tr>
 
 <tr>
 <td rowspan="1">Maths</td>
 <td>GNU Octave</td>
 <td>High-level interpreted language similar to proprietary MATLAB, 
-primarily intended for numerical computations.
+primarily intended for numerical computations.</td>
 </tr>
 
 <tr>
@@ -243,7 +239,7 @@
 <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
 There are also <a href="/contact/">other ways to contact</a>
 the FSF.  Broken links and other corrections or suggestions can be sent
-to <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
+to <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
 
 <p><!-- TRANSLATORS: Ignore the original text in this paragraph,
         replace it with the translation of these two:
@@ -291,7 +287,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2016/01/25 14:34:08 $
+$Date: 2016/01/25 18:29:12 $
 <!-- timestamp end -->
 </p>
 </div>