[debian-edu-commits] debian-edu/ 01/01: Update manuals and images from the wiki.

Thu Apr 3 11:26:12 UTC 2014

This is an automated email from the git hooks/post-receive script.

schweer-guest pushed a commit to branch master
in repository debian-edu-doc.

commit b4df90147f3c200fae76a80352444bc1d4f2ef5b
Author: Wolfgang Schweer <w.schweer at gmx.de>
Date:   Thu Apr 3 13:24:39 2014 +0200

    Update manuals and images from the wiki.
---
 documentation/audacity/audacity-manual.pot         |   2 +-
 .../debian-edu-squeeze-manual.da.po                |  72 ++-
 .../debian-edu-squeeze-manual.de.po                |  72 ++-
 .../debian-edu-squeeze-manual.es.po                |  29 +-
 .../debian-edu-squeeze-manual.fr.po                |  72 ++-
 .../debian-edu-squeeze-manual.it.po                | 106 ++--
 .../debian-edu-squeeze-manual.nb.po                |  24 +-
 .../debian-edu-squeeze-manual.pot                  |  24 +-
 .../debian-edu-squeeze-manual.xml                  |  14 +-
 .../debian-edu-squeeze-manual.zh.po                |  24 +-
 .../debian-edu-squeeze/images/de/worldmap.png      | Bin 386831 -> 386901 bytes
 .../debian-edu-squeeze/images/es/worldmap.png      | Bin 386939 -> 387002 bytes
 .../debian-edu-squeeze/images/fr/worldmap.png      | Bin 386881 -> 386936 bytes
 .../debian-edu-squeeze/images/worldmap.png         | Bin 386882 -> 386926 bytes
 .../debian-edu-wheezy-manual.da.po                 | 247 ++++++++--
 .../debian-edu-wheezy-manual.de.po                 | 247 ++++++++--
 .../debian-edu-wheezy-manual.es.po                 | 185 ++++++-
 .../debian-edu-wheezy-manual.fr.po                 | 265 ++++++++--
 .../debian-edu-wheezy-manual.it.po                 | 281 +++++++++--
 .../debian-edu-wheezy-manual.nb.po                 | 535 ++++++++++++---------
 .../debian-edu-wheezy/debian-edu-wheezy-manual.pot | 159 +++++-
 .../debian-edu-wheezy/debian-edu-wheezy-manual.xml |  76 ++-
 .../debian-edu-wheezy/images/de/worldmap.png       | Bin 386846 -> 386901 bytes
 .../debian-edu-wheezy/images/es/worldmap.png       | Bin 386954 -> 387002 bytes
 .../debian-edu-wheezy/images/fr/worldmap.png       | Bin 386896 -> 386936 bytes
 .../debian-edu-wheezy/images/worldmap.png          | Bin 386897 -> 386926 bytes
 documentation/rosegarden/rosegarden-manual.pot     |   2 +-
 27 files changed, 1880 insertions(+), 556 deletions(-)

diff --git a/documentation/audacity/audacity-manual.pot b/documentation/audacity/audacity-manual.pot
index f944b2e..4ac3b96 100644
--- a/documentation/audacity/audacity-manual.pot
+++ b/documentation/audacity/audacity-manual.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-09-17 22:54+0300\n"
+"POT-Creation-Date: 2014-04-03 13:19+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.da.po b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.da.po
index 6bbd3d3..9506602 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.da.po
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.da.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-squeeze-manual\n"
-"POT-Creation-Date: 2013-08-07 16:01+0300\n"
+"POT-Creation-Date: 2014-04-03 13:18+0300\n"
 "PO-Revision-Date: 2013-02-28 11:20+0100\n"
 "Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -2125,10 +2125,15 @@ msgstr ""
 "og helst før partitioneringen begynder."
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "More information is available in <ulink url=\"http://bugs.skolelinux.org/"
+#| "show_bug.cgi?id=1395\">Debian-Edu bug #1395</ulink> and Debian bug <ulink "
+#| "url=\"http://bugs.debian.org/516280#\">516280</ulink>."
 msgid ""
 "More information is available in <ulink url=\"http://bugs.skolelinux.org/"
 "show_bug.cgi?id=1395\">Debian-Edu bug #1395</ulink> and Debian bug <ulink "
-"url=\"http://bugs.debian.org/516280#\">516280</ulink>."
+"url=\"https://bugs.debian.org/516280#\">516280</ulink>."
 msgstr ""
 "Yderligere information er tilgængelig i <ulink url=\"http://bugs.skolelinux."
 "org/show_bug.cgi?id=1395\">Debian-Edu-fejlen #1395</ulink> og Debianfejlen "
@@ -2139,10 +2144,17 @@ msgid "A note on thin-client-server installations"
 msgstr "En bemærkning om installationer af servere for tynde klienter"
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "First of all, this profile name is confusing for historic reasons. "
+#| "Currently this profile actually installs an LTSP server environment for "
+#| "thin-clients and for workstations. Debian bug <ulink url=\"http://bugs."
+#| "debian.org/588510#\">588510</ulink> has been filed to change the name of "
+#| "the profile into a better suited one."
 msgid ""
 "First of all, this profile name is confusing for historic reasons. Currently "
 "this profile actually installs an LTSP server environment for thin-clients "
-"and for workstations. Debian bug <ulink url=\"http://bugs.debian.org/588510#"
+"and for workstations. Debian bug <ulink url=\"https://bugs.debian.org/588510#"
 "\">588510</ulink> has been filed to change the name of the profile into a "
 "better suited one."
 msgstr ""
@@ -4384,11 +4396,18 @@ msgid "General notes on upgrading"
 msgstr "Generelle bemærkninger om opgradering"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Upgrading Debian from one distribution to the next is generally rather "
+#| "easy. For Debian Edu this is unfortunately not yet true as we heavily "
+#| "modify configuration files in ways we shouldn't. (See Debian bug <ulink "
+#| "url=\"http://bugs.debian.org/311188#\">311188</ulink> for more "
+#| "information.) Upgrading is still possible but may require some work."
 msgid ""
 "Upgrading Debian from one distribution to the next is generally rather easy. "
 "For Debian Edu this is unfortunately not yet true as we heavily modify "
 "configuration files in ways we shouldn't. (See Debian bug <ulink url="
-"\"http://bugs.debian.org/311188#\">311188</ulink> for more information.) "
+"\"https://bugs.debian.org/311188#\">311188</ulink> for more information.) "
 "Upgrading is still possible but may require some work."
 msgstr ""
 "Opgradering af Debian fra en distribution til den næste er normalt ret nemt. "
@@ -7968,9 +7987,18 @@ msgid "Moodle"
 msgstr "Moodle"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"http://packages.debian.org/stable/moodle#\">Moodle</ulink> "
+#| "is a free, Open Source course management system - software designed using "
+#| "sound pedagogical principles to help educators create effective online "
+#| "learning communities. You can download and use it on any computer "
+#| "(including webhosts), yet it can scale from a single-teacher site to a "
+#| "University with 200,000 students. Some schools in France use Moodle to "
+#| "keep track of students' facilities and credit points."
 msgid ""
-"<ulink url=\"http://packages.debian.org/stable/moodle#\">Moodle</ulink> is a "
-"free, Open Source course management system - software designed using sound "
+"<ulink url=\"https://packages.debian.org/stable/moodle#\">Moodle</ulink> is "
+"a free, Open Source course management system - software designed using sound "
 "pedagogical principles to help educators create effective online learning "
 "communities. You can download and use it on any computer (including "
 "webhosts), yet it can scale from a single-teacher site to a University with "
@@ -8009,8 +8037,13 @@ msgid "Teaching Prolog"
 msgstr "Undervisning i Prolog"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"http://packages.debian.org/stable/swi-prolog#\">SWI-Prolog</"
+#| "ulink> is an open source implementation of the programming language "
+#| "Prolog, commonly used for teaching and semantic web applications."
 msgid ""
-"<ulink url=\"http://packages.debian.org/stable/swi-prolog#\">SWI-Prolog</"
+"<ulink url=\"https://packages.debian.org/stable/swi-prolog#\">SWI-Prolog</"
 "ulink> is an open source implementation of the programming language Prolog, "
 "commonly used for teaching and semantic web applications."
 msgstr ""
@@ -8023,13 +8056,22 @@ msgid "Monitoring pupils"
 msgstr "Overvågning af elever"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Some schools use control tools like <ulink url=\"http://packages.debian."
+#| "org/stable/controlaula#\">Controlaula</ulink> or <ulink url=\"http://"
+#| "packages.debian.org/stable/italc-master#\">iTALC</ulink> to supervise "
+#| "their students.  See also the <ulink url=\"http://sourceforge.net/apps/"
+#| "mediawiki/italc/index.php?title=Main_Page\">iTALC Wiki</ulink> (and the "
+#| "documentation in bug <ulink url=\"http://bugs.debian.org/511387#"
+#| "\">511387</ulink>)."
 msgid ""
-"Some schools use control tools like <ulink url=\"http://packages.debian.org/"
-"stable/controlaula#\">Controlaula</ulink> or <ulink url=\"http://packages."
+"Some schools use control tools like <ulink url=\"https://packages.debian.org/"
+"stable/controlaula#\">Controlaula</ulink> or <ulink url=\"https://packages."
 "debian.org/stable/italc-master#\">iTALC</ulink> to supervise their "
 "students.  See also the <ulink url=\"http://sourceforge.net/apps/mediawiki/"
 "italc/index.php?title=Main_Page\">iTALC Wiki</ulink> (and the documentation "
-"in bug <ulink url=\"http://bugs.debian.org/511387#\">511387</ulink>)."
+"in bug <ulink url=\"https://bugs.debian.org/511387#\">511387</ulink>)."
 msgstr ""
 "Nogle skoler bruger kontrolværktøjer som <ulink url=\"http://packages.debian."
 "org/stable/controlaula#\">Controlaula</ulink> eller <ulink url=\"http://"
@@ -8053,9 +8095,15 @@ msgid "Restricting pupils' network access"
 msgstr "Begrænsning af elevers netværksadgang"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Some schools use <ulink url=\"http://packages.debian.org/stable/"
+#| "squidguard#\">Squidguard</ulink> or <ulink url=\"http://packages.debian."
+#| "org/stable/dansguardian#\">Dansguardian</ulink> to restrict Internet "
+#| "access."
 msgid ""
-"Some schools use <ulink url=\"http://packages.debian.org/stable/squidguard#"
-"\">Squidguard</ulink> or <ulink url=\"http://packages.debian.org/stable/"
+"Some schools use <ulink url=\"https://packages.debian.org/stable/squidguard#"
+"\">Squidguard</ulink> or <ulink url=\"https://packages.debian.org/stable/"
 "dansguardian#\">Dansguardian</ulink> to restrict Internet access."
 msgstr ""
 "Nogle skoler bruger <ulink url=\"http://packages.debian.org/stable/"
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.de.po b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.de.po
index db7716f..c2faae4 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.de.po
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.de.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-squeeze-manual.de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-07 16:01+0300\n"
+"POT-Creation-Date: 2014-04-03 13:18+0300\n"
 "PO-Revision-Date: 2013-06-17 01:21+0100\n"
 "Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -2180,10 +2180,15 @@ msgstr ""
 "vorzugsweise noch vor der Partitionierung."
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "More information is available in <ulink url=\"http://bugs.skolelinux.org/"
+#| "show_bug.cgi?id=1395\">Debian-Edu bug #1395</ulink> and Debian bug <ulink "
+#| "url=\"http://bugs.debian.org/516280#\">516280</ulink>."
 msgid ""
 "More information is available in <ulink url=\"http://bugs.skolelinux.org/"
 "show_bug.cgi?id=1395\">Debian-Edu bug #1395</ulink> and Debian bug <ulink "
-"url=\"http://bugs.debian.org/516280#\">516280</ulink>."
+"url=\"https://bugs.debian.org/516280#\">516280</ulink>."
 msgstr ""
 "Mehr Information findet sich unter <ulink url=\"http://bugs.skolelinux.org/"
 "show_bug.cgi?id=1395\">Debian-Edu-Fehler #1395</ulink> und Debian Bug <ulink "
@@ -2194,10 +2199,17 @@ msgid "A note on thin-client-server installations"
 msgstr "Bemerkung zur Installation des Profils Terminal-Server"
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "First of all, this profile name is confusing for historic reasons. "
+#| "Currently this profile actually installs an LTSP server environment for "
+#| "thin-clients and for workstations. Debian bug <ulink url=\"http://bugs."
+#| "debian.org/588510#\">588510</ulink> has been filed to change the name of "
+#| "the profile into a better suited one."
 msgid ""
 "First of all, this profile name is confusing for historic reasons. Currently "
 "this profile actually installs an LTSP server environment for thin-clients "
-"and for workstations. Debian bug <ulink url=\"http://bugs.debian.org/588510#"
+"and for workstations. Debian bug <ulink url=\"https://bugs.debian.org/588510#"
 "\">588510</ulink> has been filed to change the name of the profile into a "
 "better suited one."
 msgstr ""
@@ -4481,11 +4493,18 @@ msgid "General notes on upgrading"
 msgstr "Allgemeine Hinweise zum Upgrade"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Upgrading Debian from one distribution to the next is generally rather "
+#| "easy. For Debian Edu this is unfortunately not yet true as we heavily "
+#| "modify configuration files in ways we shouldn't. (See Debian bug <ulink "
+#| "url=\"http://bugs.debian.org/311188#\">311188</ulink> for more "
+#| "information.) Upgrading is still possible but may require some work."
 msgid ""
 "Upgrading Debian from one distribution to the next is generally rather easy. "
 "For Debian Edu this is unfortunately not yet true as we heavily modify "
 "configuration files in ways we shouldn't. (See Debian bug <ulink url="
-"\"http://bugs.debian.org/311188#\">311188</ulink> for more information.) "
+"\"https://bugs.debian.org/311188#\">311188</ulink> for more information.) "
 "Upgrading is still possible but may require some work."
 msgstr ""
 "Die Aktualisierung von Debian ist im Allgemeinen leicht vorzunehmen. Für "
@@ -8151,9 +8170,18 @@ msgid "Moodle"
 msgstr "Moodle"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"http://packages.debian.org/stable/moodle#\">Moodle</ulink> "
+#| "is a free, Open Source course management system - software designed using "
+#| "sound pedagogical principles to help educators create effective online "
+#| "learning communities. You can download and use it on any computer "
+#| "(including webhosts), yet it can scale from a single-teacher site to a "
+#| "University with 200,000 students. Some schools in France use Moodle to "
+#| "keep track of students' facilities and credit points."
 msgid ""
-"<ulink url=\"http://packages.debian.org/stable/moodle#\">Moodle</ulink> is a "
-"free, Open Source course management system - software designed using sound "
+"<ulink url=\"https://packages.debian.org/stable/moodle#\">Moodle</ulink> is "
+"a free, Open Source course management system - software designed using sound "
 "pedagogical principles to help educators create effective online learning "
 "communities. You can download and use it on any computer (including "
 "webhosts), yet it can scale from a single-teacher site to a University with "
@@ -8192,8 +8220,13 @@ msgid "Teaching Prolog"
 msgstr "Prolog unterrichten"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"http://packages.debian.org/stable/swi-prolog#\">SWI-Prolog</"
+#| "ulink> is an open source implementation of the programming language "
+#| "Prolog, commonly used for teaching and semantic web applications."
 msgid ""
-"<ulink url=\"http://packages.debian.org/stable/swi-prolog#\">SWI-Prolog</"
+"<ulink url=\"https://packages.debian.org/stable/swi-prolog#\">SWI-Prolog</"
 "ulink> is an open source implementation of the programming language Prolog, "
 "commonly used for teaching and semantic web applications."
 msgstr ""
@@ -8206,13 +8239,22 @@ msgid "Monitoring pupils"
 msgstr "Schüler/-innen beobachten"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Some schools use control tools like <ulink url=\"http://packages.debian."
+#| "org/stable/controlaula#\">Controlaula</ulink> or <ulink url=\"http://"
+#| "packages.debian.org/stable/italc-master#\">iTALC</ulink> to supervise "
+#| "their students.  See also the <ulink url=\"http://sourceforge.net/apps/"
+#| "mediawiki/italc/index.php?title=Main_Page\">iTALC Wiki</ulink> (and the "
+#| "documentation in bug <ulink url=\"http://bugs.debian.org/511387#"
+#| "\">511387</ulink>)."
 msgid ""
-"Some schools use control tools like <ulink url=\"http://packages.debian.org/"
-"stable/controlaula#\">Controlaula</ulink> or <ulink url=\"http://packages."
+"Some schools use control tools like <ulink url=\"https://packages.debian.org/"
+"stable/controlaula#\">Controlaula</ulink> or <ulink url=\"https://packages."
 "debian.org/stable/italc-master#\">iTALC</ulink> to supervise their "
 "students.  See also the <ulink url=\"http://sourceforge.net/apps/mediawiki/"
 "italc/index.php?title=Main_Page\">iTALC Wiki</ulink> (and the documentation "
-"in bug <ulink url=\"http://bugs.debian.org/511387#\">511387</ulink>)."
+"in bug <ulink url=\"https://bugs.debian.org/511387#\">511387</ulink>)."
 msgstr ""
 "Einige Schule benutzen Überwachungs-Werkzeuge wie <ulink url=\"http://"
 "packages.debian.org/stable/controlaula#\">Controlaula</ulink> oder <ulink "
@@ -8237,9 +8279,15 @@ msgid "Restricting pupils' network access"
 msgstr "Den Netzwerkzugang von Schülern beschränken"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Some schools use <ulink url=\"http://packages.debian.org/stable/"
+#| "squidguard#\">Squidguard</ulink> or <ulink url=\"http://packages.debian."
+#| "org/stable/dansguardian#\">Dansguardian</ulink> to restrict Internet "
+#| "access."
 msgid ""
-"Some schools use <ulink url=\"http://packages.debian.org/stable/squidguard#"
-"\">Squidguard</ulink> or <ulink url=\"http://packages.debian.org/stable/"
+"Some schools use <ulink url=\"https://packages.debian.org/stable/squidguard#"
+"\">Squidguard</ulink> or <ulink url=\"https://packages.debian.org/stable/"
 "dansguardian#\">Dansguardian</ulink> to restrict Internet access."
 msgstr ""
 "Einige Schulen verwenden <ulink url=\"http://packages.debian.org/stable/"
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.es.po b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.es.po
index 3cc963a..d8d2bfa 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.es.po
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.es.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: release-manual\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-07 15:51+0300\n"
+"POT-Creation-Date: 2014-04-03 13:18+0300\n"
 "PO-Revision-Date: 2012-06-16 18:34-0600\n"
 "Last-Translator: Norman Garcia Aguilar <norman at riseup.net>\n"
 "Language-Team: Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -2678,10 +2678,15 @@ msgstr ""
 "instale el firmware, y preferiblemente antes que inicie el particionado."
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "More information is available in <ulink url=\"http://bugs.skolelinux.org/"
+#| "show_bug.cgi?id=1395\">Debian-Edu bug #1395</ulink> and Debian bug <ulink "
+#| "url=\"http://bugs.debian.org/516280#\">516280</ulink>."
 msgid ""
 "More information is available in <ulink url=\"http://bugs.skolelinux.org/"
 "show_bug.cgi?id=1395\">Debian-Edu bug #1395</ulink> and Debian bug <ulink "
-"url=\"http://bugs.debian.org/516280#\">516280</ulink>."
+"url=\"https://bugs.debian.org/516280#\">516280</ulink>."
 msgstr ""
 "Más información esta disponible en <ulink url=\"http://bugs.skolelinux.org/"
 "show_bug.cgi?id=1395\">Debian-Edu bug #1395</ulink> and Debian bug <ulink "
@@ -2702,7 +2707,7 @@ msgstr "Una nota sobre la instalación de servidores de clientes ligeros"
 msgid ""
 "First of all, this profile name is confusing for historic reasons. Currently "
 "this profile actually installs an LTSP server environment for thin-clients "
-"and for workstations. Debian bug <ulink url=\"http://bugs.debian.org/588510#"
+"and for workstations. Debian bug <ulink url=\"https://bugs.debian.org/588510#"
 "\">588510</ulink> has been filed to change the name of the profile into a "
 "better suited one."
 msgstr ""
@@ -4938,7 +4943,7 @@ msgid ""
 "Upgrading Debian from one distribution to the next is generally rather easy. "
 "For Debian Edu this is unfortunately not yet true as we heavily modify "
 "configuration files in ways we shouldn't. (See Debian bug <ulink url="
-"\"http://bugs.debian.org/311188#\">311188</ulink> for more information.) "
+"\"https://bugs.debian.org/311188#\">311188</ulink> for more information.) "
 "Upgrading is still possible but may require some work."
 msgstr ""
 
@@ -7919,8 +7924,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"<ulink url=\"http://packages.debian.org/stable/moodle#\">Moodle</ulink> is a "
-"free, Open Source course management system - software designed using sound "
+"<ulink url=\"https://packages.debian.org/stable/moodle#\">Moodle</ulink> is "
+"a free, Open Source course management system - software designed using sound "
 "pedagogical principles to help educators create effective online learning "
 "communities. You can download and use it on any computer (including "
 "webhosts), yet it can scale from a single-teacher site to a University with "
@@ -7945,7 +7950,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"<ulink url=\"http://packages.debian.org/stable/swi-prolog#\">SWI-Prolog</"
+"<ulink url=\"https://packages.debian.org/stable/swi-prolog#\">SWI-Prolog</"
 "ulink> is an open source implementation of the programming language Prolog, "
 "commonly used for teaching and semantic web applications."
 msgstr ""
@@ -7956,12 +7961,12 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Some schools use control tools like <ulink url=\"http://packages.debian.org/"
-"stable/controlaula#\">Controlaula</ulink> or <ulink url=\"http://packages."
+"Some schools use control tools like <ulink url=\"https://packages.debian.org/"
+"stable/controlaula#\">Controlaula</ulink> or <ulink url=\"https://packages."
 "debian.org/stable/italc-master#\">iTALC</ulink> to supervise their "
 "students.  See also the <ulink url=\"http://sourceforge.net/apps/mediawiki/"
 "italc/index.php?title=Main_Page\">iTALC Wiki</ulink> (and the documentation "
-"in bug <ulink url=\"http://bugs.debian.org/511387#\">511387</ulink>)."
+"in bug <ulink url=\"https://bugs.debian.org/511387#\">511387</ulink>)."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -7977,8 +7982,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Some schools use <ulink url=\"http://packages.debian.org/stable/squidguard#"
-"\">Squidguard</ulink> or <ulink url=\"http://packages.debian.org/stable/"
+"Some schools use <ulink url=\"https://packages.debian.org/stable/squidguard#"
+"\">Squidguard</ulink> or <ulink url=\"https://packages.debian.org/stable/"
 "dansguardian#\">Dansguardian</ulink> to restrict Internet access."
 msgstr ""
 
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.fr.po b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.fr.po
index 6f62de6..2ecaade 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.fr.po
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.fr.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.9.20071124\n"
-"POT-Creation-Date: 2013-08-07 16:01+0300\n"
+"POT-Creation-Date: 2014-04-03 13:18+0300\n"
 "PO-Revision-Date: 2013-02-25 16:36+0100\n"
 "Last-Translator: Cédric Boutillier <cedric.boutillier at gmail.com>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -2188,10 +2188,15 @@ msgstr ""
 "avant que le partitionnement ne débute."
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "More information is available in <ulink url=\"http://bugs.skolelinux.org/"
+#| "show_bug.cgi?id=1395\">Debian-Edu bug #1395</ulink> and Debian bug <ulink "
+#| "url=\"http://bugs.debian.org/516280#\">516280</ulink>."
 msgid ""
 "More information is available in <ulink url=\"http://bugs.skolelinux.org/"
 "show_bug.cgi?id=1395\">Debian-Edu bug #1395</ulink> and Debian bug <ulink "
-"url=\"http://bugs.debian.org/516280#\">516280</ulink>."
+"url=\"https://bugs.debian.org/516280#\">516280</ulink>."
 msgstr ""
 "Plus d'informations sont disponibles dans le <ulink url=\"http://bugs."
 "skolelinux.org/show_bug.cgi?id=1395\">bogue Debian Edu nº 1395</ulink> et le "
@@ -2202,10 +2207,17 @@ msgid "A note on thin-client-server installations"
 msgstr "Note à propos des installations de serveur de clients légers"
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "First of all, this profile name is confusing for historic reasons. "
+#| "Currently this profile actually installs an LTSP server environment for "
+#| "thin-clients and for workstations. Debian bug <ulink url=\"http://bugs."
+#| "debian.org/588510#\">588510</ulink> has been filed to change the name of "
+#| "the profile into a better suited one."
 msgid ""
 "First of all, this profile name is confusing for historic reasons. Currently "
 "this profile actually installs an LTSP server environment for thin-clients "
-"and for workstations. Debian bug <ulink url=\"http://bugs.debian.org/588510#"
+"and for workstations. Debian bug <ulink url=\"https://bugs.debian.org/588510#"
 "\">588510</ulink> has been filed to change the name of the profile into a "
 "better suited one."
 msgstr ""
@@ -4502,11 +4514,18 @@ msgid "General notes on upgrading"
 msgstr "Notes à propos de la mise à jour"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Upgrading Debian from one distribution to the next is generally rather "
+#| "easy. For Debian Edu this is unfortunately not yet true as we heavily "
+#| "modify configuration files in ways we shouldn't. (See Debian bug <ulink "
+#| "url=\"http://bugs.debian.org/311188#\">311188</ulink> for more "
+#| "information.) Upgrading is still possible but may require some work."
 msgid ""
 "Upgrading Debian from one distribution to the next is generally rather easy. "
 "For Debian Edu this is unfortunately not yet true as we heavily modify "
 "configuration files in ways we shouldn't. (See Debian bug <ulink url="
-"\"http://bugs.debian.org/311188#\">311188</ulink> for more information.) "
+"\"https://bugs.debian.org/311188#\">311188</ulink> for more information.) "
 "Upgrading is still possible but may require some work."
 msgstr ""
 "Mettre à jour Debian d'une distribution à la suivante est généralement assez "
@@ -8193,9 +8212,18 @@ msgid "Moodle"
 msgstr "Moodle"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"http://packages.debian.org/stable/moodle#\">Moodle</ulink> "
+#| "is a free, Open Source course management system - software designed using "
+#| "sound pedagogical principles to help educators create effective online "
+#| "learning communities. You can download and use it on any computer "
+#| "(including webhosts), yet it can scale from a single-teacher site to a "
+#| "University with 200,000 students. Some schools in France use Moodle to "
+#| "keep track of students' facilities and credit points."
 msgid ""
-"<ulink url=\"http://packages.debian.org/stable/moodle#\">Moodle</ulink> is a "
-"free, Open Source course management system - software designed using sound "
+"<ulink url=\"https://packages.debian.org/stable/moodle#\">Moodle</ulink> is "
+"a free, Open Source course management system - software designed using sound "
 "pedagogical principles to help educators create effective online learning "
 "communities. You can download and use it on any computer (including "
 "webhosts), yet it can scale from a single-teacher site to a University with "
@@ -8236,8 +8264,13 @@ msgid "Teaching Prolog"
 msgstr "Enseigner Prolog"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"http://packages.debian.org/stable/swi-prolog#\">SWI-Prolog</"
+#| "ulink> is an open source implementation of the programming language "
+#| "Prolog, commonly used for teaching and semantic web applications."
 msgid ""
-"<ulink url=\"http://packages.debian.org/stable/swi-prolog#\">SWI-Prolog</"
+"<ulink url=\"https://packages.debian.org/stable/swi-prolog#\">SWI-Prolog</"
 "ulink> is an open source implementation of the programming language Prolog, "
 "commonly used for teaching and semantic web applications."
 msgstr ""
@@ -8251,13 +8284,22 @@ msgid "Monitoring pupils"
 msgstr "Surveillance des élèves"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Some schools use control tools like <ulink url=\"http://packages.debian."
+#| "org/stable/controlaula#\">Controlaula</ulink> or <ulink url=\"http://"
+#| "packages.debian.org/stable/italc-master#\">iTALC</ulink> to supervise "
+#| "their students.  See also the <ulink url=\"http://sourceforge.net/apps/"
+#| "mediawiki/italc/index.php?title=Main_Page\">iTALC Wiki</ulink> (and the "
+#| "documentation in bug <ulink url=\"http://bugs.debian.org/511387#"
+#| "\">511387</ulink>)."
 msgid ""
-"Some schools use control tools like <ulink url=\"http://packages.debian.org/"
-"stable/controlaula#\">Controlaula</ulink> or <ulink url=\"http://packages."
+"Some schools use control tools like <ulink url=\"https://packages.debian.org/"
+"stable/controlaula#\">Controlaula</ulink> or <ulink url=\"https://packages."
 "debian.org/stable/italc-master#\">iTALC</ulink> to supervise their "
 "students.  See also the <ulink url=\"http://sourceforge.net/apps/mediawiki/"
 "italc/index.php?title=Main_Page\">iTALC Wiki</ulink> (and the documentation "
-"in bug <ulink url=\"http://bugs.debian.org/511387#\">511387</ulink>)."
+"in bug <ulink url=\"https://bugs.debian.org/511387#\">511387</ulink>)."
 msgstr ""
 "Certains établissements utilisent des outils de contrôle tels que <ulink url="
 "\"http://packages.debian.org/stable/controlaula#\">Controlaula</ulink> ou "
@@ -8282,9 +8324,15 @@ msgid "Restricting pupils' network access"
 msgstr "Restriction de l'accès des élèves au réseau"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Some schools use <ulink url=\"http://packages.debian.org/stable/"
+#| "squidguard#\">Squidguard</ulink> or <ulink url=\"http://packages.debian."
+#| "org/stable/dansguardian#\">Dansguardian</ulink> to restrict Internet "
+#| "access."
 msgid ""
-"Some schools use <ulink url=\"http://packages.debian.org/stable/squidguard#"
-"\">Squidguard</ulink> or <ulink url=\"http://packages.debian.org/stable/"
+"Some schools use <ulink url=\"https://packages.debian.org/stable/squidguard#"
+"\">Squidguard</ulink> or <ulink url=\"https://packages.debian.org/stable/"
 "dansguardian#\">Dansguardian</ulink> to restrict Internet access."
 msgstr ""
 "Certaines écoles utilisent <ulink url=\"http://packages.debian.org/stable/"
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.it.po b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.it.po
index 62dd2ed..aff0ca5 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.it.po
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.it.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-lenny-manual\n"
-"POT-Creation-Date: 2013-09-14 15:56+0300\n"
+"POT-Creation-Date: 2014-04-03 13:18+0300\n"
 "PO-Revision-Date: 2013-02-28 18:47+0100\n"
 "Last-Translator: Claudio Carboncini <claudio.carboncini at gmail.com>\n"
 "Language-Team: Italian <>\n"
@@ -2136,10 +2136,15 @@ msgstr ""
 "firmware e preferibilmente prima di  iniziare il partizionamento."
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "More information is available in <ulink url=\"http://bugs.skolelinux.org/"
+#| "show_bug.cgi?id=1395\">Debian-Edu bug #1395</ulink> and Debian bug <ulink "
+#| "url=\"http://bugs.debian.org/516280#\">516280</ulink>."
 msgid ""
 "More information is available in <ulink url=\"http://bugs.skolelinux.org/"
 "show_bug.cgi?id=1395\">Debian-Edu bug #1395</ulink> and Debian bug <ulink "
-"url=\"http://bugs.debian.org/516280#\">516280</ulink>."
+"url=\"https://bugs.debian.org/516280#\">516280</ulink>."
 msgstr ""
 "Maggiori informazioni sono disponibili in <ulink url=\"http://bugs."
 "skolelinux.org/show_bug.cgi?id=1395\">Debian-Edu bug #1395</ulink> e Debian "
@@ -2150,10 +2155,17 @@ msgid "A note on thin-client-server installations"
 msgstr "Nota sull'installazione dei thin-client-server"
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "First of all, this profile name is confusing for historic reasons. "
+#| "Currently this profile actually installs an LTSP server environment for "
+#| "thin-clients and for workstations. Debian bug <ulink url=\"http://bugs."
+#| "debian.org/588510#\">588510</ulink> has been filed to change the name of "
+#| "the profile into a better suited one."
 msgid ""
 "First of all, this profile name is confusing for historic reasons. Currently "
 "this profile actually installs an LTSP server environment for thin-clients "
-"and for workstations. Debian bug <ulink url=\"http://bugs.debian.org/588510#"
+"and for workstations. Debian bug <ulink url=\"https://bugs.debian.org/588510#"
 "\">588510</ulink> has been filed to change the name of the profile into a "
 "better suited one."
 msgstr ""
@@ -4403,11 +4415,18 @@ msgid "General notes on upgrading"
 msgstr "Indicazioni generali sull'aggiornamento"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Upgrading Debian from one distribution to the next is generally rather "
+#| "easy. For Debian Edu this is unfortunately not yet true as we heavily "
+#| "modify configuration files in ways we shouldn't. (See Debian bug <ulink "
+#| "url=\"http://bugs.debian.org/311188#\">311188</ulink> for more "
+#| "information.) Upgrading is still possible but may require some work."
 msgid ""
 "Upgrading Debian from one distribution to the next is generally rather easy. "
 "For Debian Edu this is unfortunately not yet true as we heavily modify "
 "configuration files in ways we shouldn't. (See Debian bug <ulink url="
-"\"http://bugs.debian.org/311188#\">311188</ulink> for more information.) "
+"\"https://bugs.debian.org/311188#\">311188</ulink> for more information.) "
 "Upgrading is still possible but may require some work."
 msgstr ""
 "L'aggiornamento di Debian da una distribuzione alla successiva è piuttosto "
@@ -6383,8 +6402,8 @@ msgid ""
 msgstr ""
 "Il valore di default è definito in <computeroutput>[default]</"
 "computeroutput>, per configurare un client, occorre indicarlo usando "
-"l'indirizzo MAC o l'IP del client come questo: "
-"<computeroutput>[192.168.0.10] </computeroutput>."
+"l'indirizzo MAC o l'IP del client come questo: <computeroutput>"
+"[192.168.0.10] </computeroutput>."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -8003,9 +8022,18 @@ msgid "Moodle"
 msgstr "Moodle"
 
 #. type: Content of: <article><section><section><para>
-msgid ""
-"<ulink url=\"http://packages.debian.org/stable/moodle#\">Moodle</ulink> is a "
-"free, Open Source course management system - software designed using sound "
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"http://packages.debian.org/stable/moodle#\">Moodle</ulink> "
+#| "is a free, Open Source course management system - software designed using "
+#| "sound pedagogical principles to help educators create effective online "
+#| "learning communities. You can download and use it on any computer "
+#| "(including webhosts), yet it can scale from a single-teacher site to a "
+#| "University with 200,000 students. Some schools in France use Moodle to "
+#| "keep track of students' facilities and credit points."
+msgid ""
+"<ulink url=\"https://packages.debian.org/stable/moodle#\">Moodle</ulink> is "
+"a free, Open Source course management system - software designed using sound "
 "pedagogical principles to help educators create effective online learning "
 "communities. You can download and use it on any computer (including "
 "webhosts), yet it can scale from a single-teacher site to a University with "
@@ -8043,8 +8071,13 @@ msgid "Teaching Prolog"
 msgstr "Insegnare Prolog"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"http://packages.debian.org/stable/swi-prolog#\">SWI-Prolog</"
+#| "ulink> is an open source implementation of the programming language "
+#| "Prolog, commonly used for teaching and semantic web applications."
 msgid ""
-"<ulink url=\"http://packages.debian.org/stable/swi-prolog#\">SWI-Prolog</"
+"<ulink url=\"https://packages.debian.org/stable/swi-prolog#\">SWI-Prolog</"
 "ulink> is an open source implementation of the programming language Prolog, "
 "commonly used for teaching and semantic web applications."
 msgstr ""
@@ -8057,13 +8090,22 @@ msgid "Monitoring pupils"
 msgstr "Monitorare gli allievi"
 
 #. type: Content of: <article><section><section><para>
-msgid ""
-"Some schools use control tools like <ulink url=\"http://packages.debian.org/"
-"stable/controlaula#\">Controlaula</ulink> or <ulink url=\"http://packages."
+#, fuzzy
+#| msgid ""
+#| "Some schools use control tools like <ulink url=\"http://packages.debian."
+#| "org/stable/controlaula#\">Controlaula</ulink> or <ulink url=\"http://"
+#| "packages.debian.org/stable/italc-master#\">iTALC</ulink> to supervise "
+#| "their students.  See also the <ulink url=\"http://sourceforge.net/apps/"
+#| "mediawiki/italc/index.php?title=Main_Page\">iTALC Wiki</ulink> (and the "
+#| "documentation in bug <ulink url=\"http://bugs.debian.org/511387#"
+#| "\">511387</ulink>)."
+msgid ""
+"Some schools use control tools like <ulink url=\"https://packages.debian.org/"
+"stable/controlaula#\">Controlaula</ulink> or <ulink url=\"https://packages."
 "debian.org/stable/italc-master#\">iTALC</ulink> to supervise their "
 "students.  See also the <ulink url=\"http://sourceforge.net/apps/mediawiki/"
 "italc/index.php?title=Main_Page\">iTALC Wiki</ulink> (and the documentation "
-"in bug <ulink url=\"http://bugs.debian.org/511387#\">511387</ulink>)."
+"in bug <ulink url=\"https://bugs.debian.org/511387#\">511387</ulink>)."
 msgstr ""
 "Alcune scuole usano strumenti di conrollo come <ulink url=\"http://packages."
 "debian.org/stable/controlaula#\">Controlaula</ulink> o <ulink url=\"http://"
@@ -8088,9 +8130,15 @@ msgid "Restricting pupils' network access"
 msgstr "Limitare agli allievi l'accesso alla rete"
 
 #. type: Content of: <article><section><section><para>
-msgid ""
-"Some schools use <ulink url=\"http://packages.debian.org/stable/squidguard#"
-"\">Squidguard</ulink> or <ulink url=\"http://packages.debian.org/stable/"
+#, fuzzy
+#| msgid ""
+#| "Some schools use <ulink url=\"http://packages.debian.org/stable/"
+#| "squidguard#\">Squidguard</ulink> or <ulink url=\"http://packages.debian."
+#| "org/stable/dansguardian#\">Dansguardian</ulink> to restrict Internet "
+#| "access."
+msgid ""
+"Some schools use <ulink url=\"https://packages.debian.org/stable/squidguard#"
+"\">Squidguard</ulink> or <ulink url=\"https://packages.debian.org/stable/"
 "dansguardian#\">Dansguardian</ulink> to restrict Internet access."
 msgstr ""
 "Alcune scuole usano  <ulink url=\"http://packages.debian.org/stable/"
@@ -14963,13 +15011,13 @@ msgstr ""
 
 #~ msgid ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
 #~ "(sambaPwdLastSet=0)))' uid  | less"
 #~ msgstr ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
 #~ "(sambaPwdLastSet=0)))' uid  | less"
 
 #~ msgid ""
@@ -14981,8 +15029,8 @@ msgstr ""
 
 #~ msgid ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
 #~ "\\changetype: modify\\nadd:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' > /"
 #~ "etc/ldap/fixamba.ldif\n"
 #~ "\n"
@@ -14990,8 +15038,8 @@ msgstr ""
 #~ "            -f /etc/ldap/fixamba.ldif"
 #~ msgstr ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
 #~ "\\changetype: modify\\nadd:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' > /"
 #~ "etc/ldap/fixamba.ldif\n"
 #~ "\n"
@@ -15008,8 +15056,8 @@ msgstr ""
 
 #~ msgid ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
 #~ "\\changetype: modify\\nreplace:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' "
 #~ "> /etc/ldap/fixamba.ldif\n"
 #~ "\n"
@@ -15017,8 +15065,8 @@ msgstr ""
 #~ "           -f /etc/ldap/fixamba.ldif"
 #~ msgstr ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
 #~ "\\changetype: modify\\nreplace:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' "
 #~ "> /etc/ldap/fixamba.ldif\n"
 #~ "\n"
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.nb.po b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.nb.po
index dab72b9..86486fa 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.nb.po
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.nb.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: release-manual.nb\n"
-"POT-Creation-Date: 2013-08-07 15:51+0300\n"
+"POT-Creation-Date: 2014-04-03 13:18+0300\n"
 "PO-Revision-Date: 2012-03-10 18:32+0100\n"
 "Last-Translator: Petter Reinholdtsen <pere at hungry.com>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
@@ -2550,7 +2550,7 @@ msgstr ""
 msgid ""
 "More information is available in <ulink url=\"http://bugs.skolelinux.org/"
 "show_bug.cgi?id=1395\">Debian-Edu bug #1395</ulink> and Debian bug <ulink "
-"url=\"http://bugs.debian.org/516280#\">516280</ulink>."
+"url=\"https://bugs.debian.org/516280#\">516280</ulink>."
 msgstr ""
 "Mer informasjon om dettefinnes i <ulink url=\"http://bugs.skolelinux.org/"
 "show_bug.cgi?id=1395\">Debian-Edu bug #1395</ulink> og i Debian bug <ulink "
@@ -2565,7 +2565,7 @@ msgstr "En kommentar om installasjon av tynnklienttjenere"
 msgid ""
 "First of all, this profile name is confusing for historic reasons. Currently "
 "this profile actually installs an LTSP server environment for thin-clients "
-"and for workstations. Debian bug <ulink url=\"http://bugs.debian.org/588510#"
+"and for workstations. Debian bug <ulink url=\"https://bugs.debian.org/588510#"
 "\">588510</ulink> has been filed to change the name of the profile into a "
 "better suited one."
 msgstr ""
@@ -4967,7 +4967,7 @@ msgid ""
 "Upgrading Debian from one distribution to the next is generally rather easy. "
 "For Debian Edu this is unfortunately not yet true as we heavily modify "
 "configuration files in ways we shouldn't. (See Debian bug <ulink url="
-"\"http://bugs.debian.org/311188#\">311188</ulink> for more information.) "
+"\"https://bugs.debian.org/311188#\">311188</ulink> for more information.) "
 "Upgrading is still possible but may require some work."
 msgstr ""
 "Oppgradering av debian fra en distro til en annen er genrell enkelt. For "
@@ -8793,8 +8793,8 @@ msgstr "moodle"
 #| "schools in France use moodle to keep track of students' facilities and "
 #| "credit points."
 msgid ""
-"<ulink url=\"http://packages.debian.org/stable/moodle#\">Moodle</ulink> is a "
-"free, Open Source course management system - software designed using sound "
+"<ulink url=\"https://packages.debian.org/stable/moodle#\">Moodle</ulink> is "
+"a free, Open Source course management system - software designed using sound "
 "pedagogical principles to help educators create effective online learning "
 "communities. You can download and use it on any computer (including "
 "webhosts), yet it can scale from a single-teacher site to a University with "
@@ -8835,7 +8835,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"<ulink url=\"http://packages.debian.org/stable/swi-prolog#\">SWI-Prolog</"
+"<ulink url=\"https://packages.debian.org/stable/swi-prolog#\">SWI-Prolog</"
 "ulink> is an open source implementation of the programming language Prolog, "
 "commonly used for teaching and semantic web applications."
 msgstr ""
@@ -8846,12 +8846,12 @@ msgstr "Overvåkning av elever"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Some schools use control tools like <ulink url=\"http://packages.debian.org/"
-"stable/controlaula#\">Controlaula</ulink> or <ulink url=\"http://packages."
+"Some schools use control tools like <ulink url=\"https://packages.debian.org/"
+"stable/controlaula#\">Controlaula</ulink> or <ulink url=\"https://packages."
 "debian.org/stable/italc-master#\">iTALC</ulink> to supervise their "
 "students.  See also the <ulink url=\"http://sourceforge.net/apps/mediawiki/"
 "italc/index.php?title=Main_Page\">iTALC Wiki</ulink> (and the documentation "
-"in bug <ulink url=\"http://bugs.debian.org/511387#\">511387</ulink>)."
+"in bug <ulink url=\"https://bugs.debian.org/511387#\">511387</ulink>)."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -8876,8 +8876,8 @@ msgstr "Begrense nettadgang for elever"
 #| "Some schools use squidguard or dansguardian to restrict internet access.  "
 #| "FIXME: explain how to install and use squidguard and/or dansguardian"
 msgid ""
-"Some schools use <ulink url=\"http://packages.debian.org/stable/squidguard#"
-"\">Squidguard</ulink> or <ulink url=\"http://packages.debian.org/stable/"
+"Some schools use <ulink url=\"https://packages.debian.org/stable/squidguard#"
+"\">Squidguard</ulink> or <ulink url=\"https://packages.debian.org/stable/"
 "dansguardian#\">Dansguardian</ulink> to restrict Internet access."
 msgstr ""
 "Noen skoler bruker squidguard eller dansguardian for å begrense "
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.pot b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.pot
index b186679..ab3de1c 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.pot
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-09-17 22:53+0300\n"
+"POT-Creation-Date: 2014-04-03 13:18+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -1610,7 +1610,7 @@ msgstr ""
 msgid ""
 "More information is available in <ulink url=\"http://bugs.skolelinux.org/"
 "show_bug.cgi?id=1395\">Debian-Edu bug #1395</ulink> and Debian bug <ulink "
-"url=\"http://bugs.debian.org/516280#\">516280</ulink>."
+"url=\"https://bugs.debian.org/516280#\">516280</ulink>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
@@ -1621,7 +1621,7 @@ msgstr ""
 msgid ""
 "First of all, this profile name is confusing for historic reasons. Currently "
 "this profile actually installs an LTSP server environment for thin-clients "
-"and for workstations. Debian bug <ulink url=\"http://bugs.debian.org/588510#"
+"and for workstations. Debian bug <ulink url=\"https://bugs.debian.org/588510#"
 "\">588510</ulink> has been filed to change the name of the profile into a "
 "better suited one."
 msgstr ""
@@ -3315,7 +3315,7 @@ msgid ""
 "Upgrading Debian from one distribution to the next is generally rather easy. "
 "For Debian Edu this is unfortunately not yet true as we heavily modify "
 "configuration files in ways we shouldn't. (See Debian bug <ulink url="
-"\"http://bugs.debian.org/311188#\">311188</ulink> for more information.) "
+"\"https://bugs.debian.org/311188#\">311188</ulink> for more information.) "
 "Upgrading is still possible but may require some work."
 msgstr ""
 
@@ -5942,8 +5942,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"<ulink url=\"http://packages.debian.org/stable/moodle#\">Moodle</ulink> is a "
-"free, Open Source course management system - software designed using sound "
+"<ulink url=\"https://packages.debian.org/stable/moodle#\">Moodle</ulink> is "
+"a free, Open Source course management system - software designed using sound "
 "pedagogical principles to help educators create effective online learning "
 "communities. You can download and use it on any computer (including "
 "webhosts), yet it can scale from a single-teacher site to a University with "
@@ -5968,7 +5968,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"<ulink url=\"http://packages.debian.org/stable/swi-prolog#\">SWI-Prolog</"
+"<ulink url=\"https://packages.debian.org/stable/swi-prolog#\">SWI-Prolog</"
 "ulink> is an open source implementation of the programming language Prolog, "
 "commonly used for teaching and semantic web applications."
 msgstr ""
@@ -5979,12 +5979,12 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Some schools use control tools like <ulink url=\"http://packages.debian.org/"
-"stable/controlaula#\">Controlaula</ulink> or <ulink url=\"http://packages."
+"Some schools use control tools like <ulink url=\"https://packages.debian.org/"
+"stable/controlaula#\">Controlaula</ulink> or <ulink url=\"https://packages."
 "debian.org/stable/italc-master#\">iTALC</ulink> to supervise their "
 "students.  See also the <ulink url=\"http://sourceforge.net/apps/mediawiki/"
 "italc/index.php?title=Main_Page\">iTALC Wiki</ulink> (and the documentation "
-"in bug <ulink url=\"http://bugs.debian.org/511387#\">511387</ulink>)."
+"in bug <ulink url=\"https://bugs.debian.org/511387#\">511387</ulink>)."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -6000,8 +6000,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Some schools use <ulink url=\"http://packages.debian.org/stable/squidguard#"
-"\">Squidguard</ulink> or <ulink url=\"http://packages.debian.org/stable/"
+"Some schools use <ulink url=\"https://packages.debian.org/stable/squidguard#"
+"\">Squidguard</ulink> or <ulink url=\"https://packages.debian.org/stable/"
 "dansguardian#\">Dansguardian</ulink> to restrict Internet access."
 msgstr ""
 
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.xml b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.xml
index 4c1b088..9332e53 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.xml
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.xml
@@ -695,14 +695,14 @@ FIXME Check these numbers for Squeeze.  They are 2012-01-22 for Lenny.
 </title>
 <para>When using a USB drive to add missing firmware during install, with some RAID-controllers GRUB is installed to the USB drive. So a reboot after installation results in a GRUB error. A workaround for this problem is to remove the USB drive after the firmware is loaded, and preferably before partitioning starts.     
 </para>
-<para>More information is available in <ulink url="http://bugs.skolelinux.org/show_bug.cgi?id=1395">Debian-Edu bug #1395</ulink> and Debian bug <ulink url="http://bugs.debian.org/516280#">516280</ulink>. 
+<para>More information is available in <ulink url="http://bugs.skolelinux.org/show_bug.cgi?id=1395">Debian-Edu bug #1395</ulink> and Debian bug <ulink url="https://bugs.debian.org/516280#">516280</ulink>. 
 </para>
 </section>
 
 <section id="Installation--A_note_on_thin-client-server_installations">
 <title>A note on thin-client-server installations
 </title>
-<para>First of all, this profile name is confusing for historic reasons. Currently this profile actually installs an LTSP server environment for thin-clients and for workstations. Debian bug <ulink url="http://bugs.debian.org/588510#">588510</ulink> has been filed to change the name of the profile into a better suited one. 
+<para>First of all, this profile name is confusing for historic reasons. Currently this profile actually installs an LTSP server environment for thin-clients and for workstations. Debian bug <ulink url="https://bugs.debian.org/588510#">588510</ulink> has been filed to change the name of the profile into a better suited one. 
 </para>
 <para>Providing the kernel boot parameter <computeroutput>edu-skip-ltsp-make-client</computeroutput> makes it possible to skip the step which converts the LTSP chroot from a thin-client chroot into a combined thin-client/diskless workstation chroot.  
 </para>
@@ -1392,7 +1392,7 @@ enter password: █]]></screen>
 <section id="Upgrades--General_notes_on_upgrading">
 <title>General notes on upgrading
 </title>
-<para>Upgrading Debian from one distribution to the next is generally rather easy. For Debian Edu this is unfortunately not yet true as we heavily modify configuration files in ways we shouldn't. (See Debian bug <ulink url="http://bugs.debian.org/311188#">311188</ulink> for more information.) Upgrading is still possible but may require some work.  
+<para>Upgrading Debian from one distribution to the next is generally rather easy. For Debian Edu this is unfortunately not yet true as we heavily modify configuration files in ways we shouldn't. (See Debian bug <ulink url="https://bugs.debian.org/311188#">311188</ulink> for more information.) Upgrading is still possible but may require some work.  
 </para>
 <para>In general, upgrading the servers is more difficult than the workstations and the main-server is the most difficult to upgrade. The diskless machines are easy, as their chroot environment can be deleted and recreated, if you haven't modified it. If you have, the chroot is basically a workstation chroot anyway, so rather easy to upgrade. 
 </para>
@@ -2642,7 +2642,7 @@ logon home = ""]]></screen>
 <section id="TeachAndLearn--Moodle">
 <title>Moodle
 </title>
-<para><ulink url="http://packages.debian.org/stable/moodle#">Moodle</ulink> is a free, Open Source course management system - software designed using sound pedagogical principles to help educators create effective online learning communities. You can download and use it on any computer (including webhosts), yet it can scale from a single-teacher site to a University with 200,000 students. Some schools in France use Moodle to keep track of students' facilities and credit points.  
+<para><ulink url="https://packages.debian.org/stable/moodle#">Moodle</ulink> is a free, Open Source course management system - software designed using sound pedagogical principles to help educators create effective online learning communities. You can download and use it on any computer (including webhosts), yet it can scale from a single-teacher site to a University with 200,000 students. Some schools in France use Moodle to keep track of students' facilities and credit points.  
 </para>
 <para>There are <ulink url="http://moodle.org/sites/">moodle sites</ulink> all over the world, mostly concentrated in Europe and North America. Check the site of an <ulink url="http://moodle.org/sites/">institution</ulink> near you to get an idea about it. More information is available at the <ulink url="http://moodle.org">moodle project page,</ulink> including <ulink url="http://docs.moodle.org/en/Main_Page">documentation</ulink> and <ulink url="http://moodle.org/support/">support</ulink>.  
 </para>
@@ -2651,14 +2651,14 @@ logon home = ""]]></screen>
 <section id="TeachAndLearn--Teaching_Prolog">
 <title>Teaching Prolog
 </title>
-<para><ulink url="http://packages.debian.org/stable/swi-prolog#">SWI-Prolog</ulink> is an open source implementation of the programming language Prolog, commonly used for teaching and semantic web applications. 
+<para><ulink url="https://packages.debian.org/stable/swi-prolog#">SWI-Prolog</ulink> is an open source implementation of the programming language Prolog, commonly used for teaching and semantic web applications. 
 </para>
 </section>
 
 <section id="TeachAndLearn--Monitoring_pupils">
 <title>Monitoring pupils
 </title>
-<para>Some schools use control tools like <ulink url="http://packages.debian.org/stable/controlaula#">Controlaula</ulink> or <ulink url="http://packages.debian.org/stable/italc-master#">iTALC</ulink> to supervise their students.  See also the <ulink url="http://sourceforge.net/apps/mediawiki/italc/index.php?title=Main_Page">iTALC Wiki</ulink> (and the documentation in bug <ulink url="http://bugs.debian.org/511387#">511387</ulink>). 
+<para>Some schools use control tools like <ulink url="https://packages.debian.org/stable/controlaula#">Controlaula</ulink> or <ulink url="https://packages.debian.org/stable/italc-master#">iTALC</ulink> to supervise their students.  See also the <ulink url="http://sourceforge.net/apps/mediawiki/italc/index.php?title=Main_Page">iTALC Wiki</ulink> (and the documentation in bug <ulink url="https://bugs.debian.org/511387#">511387</ulink>). 
 </para>
 <para><inlinemediaobject><imageobject><imagedata fileref="./images/alert.png"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> <emphasis role="strong">Warning</emphasis>: make sure you know the status of the laws about monitoring and restricting computer users' activities in your jurisdiction. 
 </para>
@@ -2667,7 +2667,7 @@ logon home = ""]]></screen>
 <section id="TeachAndLearn--Restricting_pupils.27_network_access">
 <title>Restricting pupils' network access
 </title>
-<para>Some schools use <ulink url="http://packages.debian.org/stable/squidguard#">Squidguard</ulink> or <ulink url="http://packages.debian.org/stable/dansguardian#">Dansguardian</ulink> to restrict Internet access. 
+<para>Some schools use <ulink url="https://packages.debian.org/stable/squidguard#">Squidguard</ulink> or <ulink url="https://packages.debian.org/stable/dansguardian#">Dansguardian</ulink> to restrict Internet access. 
 </para>
 </section>
 
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.zh.po b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.zh.po
index 2af3fc8..905d55a 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.zh.po
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.zh.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: release-manual.zh\n"
-"POT-Creation-Date: 2013-08-07 15:51+0300\n"
+"POT-Creation-Date: 2014-04-03 13:18+0300\n"
 "PO-Revision-Date: 2011-03-28 20:21+0800\n"
 "Last-Translator: Andrew Lee <ajqlee at debian.org>\n"
 "Language-Team: zh-l10n <zh-l10n at lists.linux.org.tw>\n"
@@ -1936,7 +1936,7 @@ msgstr ""
 msgid ""
 "More information is available in <ulink url=\"http://bugs.skolelinux.org/"
 "show_bug.cgi?id=1395\">Debian-Edu bug #1395</ulink> and Debian bug <ulink "
-"url=\"http://bugs.debian.org/516280#\">516280</ulink>."
+"url=\"https://bugs.debian.org/516280#\">516280</ulink>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
@@ -1947,7 +1947,7 @@ msgstr ""
 msgid ""
 "First of all, this profile name is confusing for historic reasons. Currently "
 "this profile actually installs an LTSP server environment for thin-clients "
-"and for workstations. Debian bug <ulink url=\"http://bugs.debian.org/588510#"
+"and for workstations. Debian bug <ulink url=\"https://bugs.debian.org/588510#"
 "\">588510</ulink> has been filed to change the name of the profile into a "
 "better suited one."
 msgstr ""
@@ -3796,7 +3796,7 @@ msgid ""
 "Upgrading Debian from one distribution to the next is generally rather easy. "
 "For Debian Edu this is unfortunately not yet true as we heavily modify "
 "configuration files in ways we shouldn't. (See Debian bug <ulink url="
-"\"http://bugs.debian.org/311188#\">311188</ulink> for more information.) "
+"\"https://bugs.debian.org/311188#\">311188</ulink> for more information.) "
 "Upgrading is still possible but may require some work."
 msgstr ""
 
@@ -6507,8 +6507,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"<ulink url=\"http://packages.debian.org/stable/moodle#\">Moodle</ulink> is a "
-"free, Open Source course management system - software designed using sound "
+"<ulink url=\"https://packages.debian.org/stable/moodle#\">Moodle</ulink> is "
+"a free, Open Source course management system - software designed using sound "
 "pedagogical principles to help educators create effective online learning "
 "communities. You can download and use it on any computer (including "
 "webhosts), yet it can scale from a single-teacher site to a University with "
@@ -6533,7 +6533,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"<ulink url=\"http://packages.debian.org/stable/swi-prolog#\">SWI-Prolog</"
+"<ulink url=\"https://packages.debian.org/stable/swi-prolog#\">SWI-Prolog</"
 "ulink> is an open source implementation of the programming language Prolog, "
 "commonly used for teaching and semantic web applications."
 msgstr ""
@@ -6544,12 +6544,12 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Some schools use control tools like <ulink url=\"http://packages.debian.org/"
-"stable/controlaula#\">Controlaula</ulink> or <ulink url=\"http://packages."
+"Some schools use control tools like <ulink url=\"https://packages.debian.org/"
+"stable/controlaula#\">Controlaula</ulink> or <ulink url=\"https://packages."
 "debian.org/stable/italc-master#\">iTALC</ulink> to supervise their "
 "students.  See also the <ulink url=\"http://sourceforge.net/apps/mediawiki/"
 "italc/index.php?title=Main_Page\">iTALC Wiki</ulink> (and the documentation "
-"in bug <ulink url=\"http://bugs.debian.org/511387#\">511387</ulink>)."
+"in bug <ulink url=\"https://bugs.debian.org/511387#\">511387</ulink>)."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -6565,8 +6565,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Some schools use <ulink url=\"http://packages.debian.org/stable/squidguard#"
-"\">Squidguard</ulink> or <ulink url=\"http://packages.debian.org/stable/"
+"Some schools use <ulink url=\"https://packages.debian.org/stable/squidguard#"
+"\">Squidguard</ulink> or <ulink url=\"https://packages.debian.org/stable/"
 "dansguardian#\">Dansguardian</ulink> to restrict Internet access."
 msgstr ""
 
diff --git a/documentation/debian-edu-squeeze/images/de/worldmap.png b/documentation/debian-edu-squeeze/images/de/worldmap.png
index 05bd6d3..6cd04eb 100644
Binary files a/documentation/debian-edu-squeeze/images/de/worldmap.png and b/documentation/debian-edu-squeeze/images/de/worldmap.png differ
diff --git a/documentation/debian-edu-squeeze/images/es/worldmap.png b/documentation/debian-edu-squeeze/images/es/worldmap.png
index e24af17..1f97493 100644
Binary files a/documentation/debian-edu-squeeze/images/es/worldmap.png and b/documentation/debian-edu-squeeze/images/es/worldmap.png differ
diff --git a/documentation/debian-edu-squeeze/images/fr/worldmap.png b/documentation/debian-edu-squeeze/images/fr/worldmap.png
index 5c881a3..4f1a076 100644
Binary files a/documentation/debian-edu-squeeze/images/fr/worldmap.png and b/documentation/debian-edu-squeeze/images/fr/worldmap.png differ
diff --git a/documentation/debian-edu-squeeze/images/worldmap.png b/documentation/debian-edu-squeeze/images/worldmap.png
index 34f892d..50fa827 100644
Binary files a/documentation/debian-edu-squeeze/images/worldmap.png and b/documentation/debian-edu-squeeze/images/worldmap.png differ
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po
index d03bcfc..449af4a 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-wheezy-manual\n"
-"POT-Creation-Date: 2013-10-27 13:51-0400\n"
+"POT-Creation-Date: 2014-04-03 13:19+0300\n"
 "PO-Revision-Date: 2013-09-19 19:20+0100\n"
 "Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -2150,10 +2150,17 @@ msgid "A note on thin-client-server installations"
 msgstr "En bemærkning om installationer af servere for tynde klienter"
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "First of all, this profile name is confusing for historic reasons. "
+#| "Currently this profile actually installs an LTSP server environment for "
+#| "thin-clients and for workstations. Debian bug <ulink url=\"http://bugs."
+#| "debian.org/588510#\">588510</ulink> has been filed to change the name of "
+#| "the profile into a better suited one."
 msgid ""
 "First of all, this profile name is confusing for historic reasons. Currently "
 "this profile actually installs an LTSP server environment for thin-clients "
-"and for workstations. Debian bug <ulink url=\"http://bugs.debian.org/588510#"
+"and for workstations. Debian bug <ulink url=\"https://bugs.debian.org/588510#"
 "\">588510</ulink> has been filed to change the name of the profile into a "
 "better suited one."
 msgstr ""
@@ -3901,10 +3908,16 @@ msgstr ""
 "upgrade</computeroutput>."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Automatic installation of updates can be done easily if desired, it just "
+#| "needs the <computeroutput>unattended-upgrades</computeroutput> package to "
+#| "be installed."
 msgid ""
 "Automatic installation of updates can be done easily if desired, it just "
 "needs the <computeroutput>unattended-upgrades</computeroutput> package to be "
-"installed."
+"installed and configured as described on <ulink url=\"https://wiki.debian."
+"org/UnattendedUpgrades\">wiki.debian.org/UnattendedUpgrades</ulink>."
 msgstr ""
 "Automatisk installation af opdateringer kan nemt udføres, det kræver bare at "
 "pakken <computeroutput>unattended-upgrades</computeroutput> installeres."
@@ -3926,10 +3939,21 @@ msgid "Keep yourself informed about security updates"
 msgstr "Hold dig informeret om sikkerhedsopdateringer"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Running <computeroutput>cron-apt</computeroutput> as described above is a "
+#| "good way to learn when security updates are available for installed "
+#| "packages.  Another way to stay informed about security updates is to "
+#| "subscribe to the <ulink url=\"http://lists.debian.org/debian-security-"
+#| "announce/\">Debian security-announce mailinglist</ulink>, which has the "
+#| "benefit of also telling you what the security update is about. The "
+#| "downside (compared to <computeroutput>cron-apt</computeroutput>) is that "
+#| "it also includes information about updates for packages which aren't "
+#| "installed."
 msgid ""
 "Running <computeroutput>cron-apt</computeroutput> as described above is a "
 "good way to learn when security updates are available for installed "
-"packages.  Another way to stay informed about security updates is to "
+"packages. Another way to stay informed about security updates is to "
 "subscribe to the <ulink url=\"http://lists.debian.org/debian-security-"
 "announce/\">Debian security-announce mailinglist</ulink>, which has the "
 "benefit of also telling you what the security update is about. The downside "
@@ -4397,11 +4421,18 @@ msgid "General notes on upgrading"
 msgstr "Generelle bemærkninger om opgradering"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Upgrading Debian from one distribution to the next is generally rather "
+#| "easy. For Debian Edu this is unfortunately not yet true as we heavily "
+#| "modify configuration files in ways we shouldn't. (See Debian bug <ulink "
+#| "url=\"http://bugs.debian.org/311188#\">311188</ulink> for more "
+#| "information.) Upgrading is still possible but may require some work."
 msgid ""
 "Upgrading Debian from one distribution to the next is generally rather easy. "
 "For Debian Edu this is unfortunately not yet true as we heavily modify "
 "configuration files in ways we shouldn't. (See Debian bug <ulink url="
-"\"http://bugs.debian.org/311188#\">311188</ulink> for more information.) "
+"\"https://bugs.debian.org/311188#\">311188</ulink> for more information.) "
 "Upgrading is still possible but may require some work."
 msgstr ""
 "Opgradering af Debian fra en distribution til den næste er normalt ret nemt. "
@@ -5789,6 +5820,112 @@ msgstr ""
 "Dette spores som <ulink url=\"http://bugs.skolelinux.org/1376\">Debian Edu "
 "bug #1376</ulink>."
 
+#. type: Content of: <article><section><section><title>
+msgid "Use a dedicated storage server"
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Take these steps to set up a dedicated storage server for user home "
+"directories and possibly other data."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add a new system of type server using GOsa² as outlined in the <link linkend="
+"\"GettingStarted--Machine_Management_with_GOsa.2BALI-\">Getting started</"
+"link> chapter of this manual."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"This example uses 'nas-server.intern' as the server name. Once 'nas-server."
+"intern' ist configured, check if the NFS export points on the new storage "
+"server are exported to the relevant subnets or machines:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"root at tjener:~# showmount -e nas-server\n"
+"    Export list for nas-server:\n"
+"    /storage         10.0.0.0/8\n"
+"    root at tjener:~#"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Here everything on the backbone network is granted access to the /storage "
+"export. (This could be restricted to netgroup membership or single IP "
+"addresses to limit NFS access like it is done in the tjener:/etc/exports "
+"file.)"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add automount information about 'nas-server.intern' in LDAP to allow all "
+"clients to automatically mount the new export on request."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"This can't be done using GOsa², because a module for automount is missing. "
+"Instead, use ldapvi and add the required LDAP objects using an editor."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"<computeroutput>ldapvi --ldap-conf -ZD '(cn=admin)' -b ou=automount,dc=skole,"
+"dc=skolelinux,dc=no</computeroutput>"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"When the editor shows up, add the following LDAP objects at the bottom of "
+"the document. (The \"/&\" part in the last LDAP object is a wild card "
+"matching everything 'nas-server.intern' exports, removing the need to list "
+"individual mount points in LDAP.)"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"add cn=nas-server,ou=auto.skole,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
+"    objectClass: automount\n"
+"    cn: nas-server\n"
+"    automountInformation: -fstype=autofs --timeout=60 ldap:ou=auto.nas-server,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
+"\n"
+"    add ou=auto.nas-server,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
+"    objectClass: top\n"
+"    objectClass: automountMap\n"
+"    ou: auto.nas-server\n"
+"\n"
+"    add cn=/,ou=auto.nas-server,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
+"    objectClass: automount\n"
+"    cn: /\n"
+"    automountInformation: -fstype=nfs,tcp,rsize=32768,wsize=32768,rw,intr,hard,nodev,nosuid,noatime nas-server.intern:/&"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add the relevant entries in tjener.intern:/etc/fstab, because tjener.intern "
+"does not use automount to avoid mounting loops:"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Create the mount directories using <computeroutput>mkdir</computeroutput>, "
+"edit '/etc/fstab' as adequate and run <computeroutput>mount -a</"
+"computeroutput> to mount the new resources."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Now users should be able to access the files on 'nas-server.intern' directly "
+"by just visiting the '/tjener/nas-server/storage/' directory using any "
+"application on any workstation, LTSP client or LTSP server."
+msgstr ""
+
 #. type: Content of: <article><section><title>
 msgid "HowTos for the desktop"
 msgstr "Hjælp for skrivebordet"
@@ -6019,12 +6156,21 @@ msgstr ""
 "udstyr med den same lave vedligeholdelsesomkostning som tynde klienter."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "LTSP defines 320MB as the default minimum amount of RAM for diskless "
+#| "workstations. If the amount of RAM is less, the machine will boot as thin "
+#| "client. Unlike workstations, diskless workstations run without any need "
+#| "to add them with GOsa², cause LDM is used to login and connect to the "
+#| "LTSP server."
 msgid ""
 "LTSP defines 320MB as the default minimum amount of RAM for diskless "
 "workstations. If the amount of RAM is less, the machine will boot as thin "
 "client. Unlike workstations, diskless workstations run without any need to "
 "add them with GOsa², cause LDM is used to login and connect to the LTSP "
-"server."
+"server.  The home directory is by default mounted using sshfs, and not "
+"automount and NFS.  This causes shared directories available via NFS to not "
+"be available on diskless workstations."
 msgstr ""
 "LTSP definerer 320 MB som minimum for RAM for diskløse arbejdsstationer. "
 "Hvis mængden af RAM er mindre, vil maskinen starte op som tynd klient. Til "
@@ -6033,9 +6179,13 @@ msgstr ""
 "LTSP-serveren."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The following steps can be used to get back the behaviour from Debian Edu "
+#| "Squeeze:"
 msgid ""
 "The following steps can be used to get back the behaviour from Debian Edu "
-"Squeeze:"
+"Squeeze, using automount, NFS and a display manager other than ldm:"
 msgstr ""
 "De følgende trin kan bruges til at få opførslen fra Debian Edu Squeeze "
 "tilbage:"
@@ -8158,9 +8308,18 @@ msgid "Moodle"
 msgstr "Moodle"
 
 #. type: Content of: <article><section><section><para>
-msgid ""
-"<ulink url=\"http://packages.debian.org/stable/moodle#\">Moodle</ulink> is a "
-"free, Open Source course management system - software designed using sound "
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"http://packages.debian.org/stable/moodle#\">Moodle</ulink> "
+#| "is a free, Open Source course management system - software designed using "
+#| "sound pedagogical principles to help educators create effective online "
+#| "learning communities. You can download and use it on any computer "
+#| "(including webhosts), yet it can scale from a single-teacher site to a "
+#| "University with 200,000 students. Some schools in France use Moodle to "
+#| "keep track of students' facilities and credit points."
+msgid ""
+"<ulink url=\"https://packages.debian.org/stable/moodle#\">Moodle</ulink> is "
+"a free, Open Source course management system - software designed using sound "
 "pedagogical principles to help educators create effective online learning "
 "communities. You can download and use it on any computer (including "
 "webhosts), yet it can scale from a single-teacher site to a University with "
@@ -8199,8 +8358,13 @@ msgid "Teaching Prolog"
 msgstr "Undervisning i Prolog"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"http://packages.debian.org/stable/swi-prolog#\">SWI-Prolog</"
+#| "ulink> is an open source implementation of the programming language "
+#| "Prolog, commonly used for teaching and semantic web applications."
 msgid ""
-"<ulink url=\"http://packages.debian.org/stable/swi-prolog#\">SWI-Prolog</"
+"<ulink url=\"https://packages.debian.org/stable/swi-prolog#\">SWI-Prolog</"
 "ulink> is an open source implementation of the programming language Prolog, "
 "commonly used for teaching and semantic web applications."
 msgstr ""
@@ -8213,13 +8377,22 @@ msgid "Monitoring pupils"
 msgstr "Overvågning af elever"
 
 #. type: Content of: <article><section><section><para>
-msgid ""
-"Some schools use control tools like <ulink url=\"http://packages.debian.org/"
-"stable/controlaula#\">Controlaula</ulink> or <ulink url=\"http://packages."
+#, fuzzy
+#| msgid ""
+#| "Some schools use control tools like <ulink url=\"http://packages.debian."
+#| "org/stable/controlaula#\">Controlaula</ulink> or <ulink url=\"http://"
+#| "packages.debian.org/stable/italc-master#\">iTALC</ulink> to supervise "
+#| "their students.  See also the <ulink url=\"http://sourceforge.net/apps/"
+#| "mediawiki/italc/index.php?title=Main_Page\">iTALC Wiki</ulink> (and the "
+#| "documentation in bug <ulink url=\"http://bugs.debian.org/511387#"
+#| "\">511387</ulink>)."
+msgid ""
+"Some schools use control tools like <ulink url=\"https://packages.debian.org/"
+"stable/controlaula#\">Controlaula</ulink> or <ulink url=\"https://packages."
 "debian.org/stable/italc-master#\">iTALC</ulink> to supervise their "
 "students.  See also the <ulink url=\"http://sourceforge.net/apps/mediawiki/"
 "italc/index.php?title=Main_Page\">iTALC Wiki</ulink> (and the documentation "
-"in bug <ulink url=\"http://bugs.debian.org/511387#\">511387</ulink>)."
+"in bug <ulink url=\"https://bugs.debian.org/511387#\">511387</ulink>)."
 msgstr ""
 "Nogle skoler bruger kontrolværktøjer som <ulink url=\"http://packages.debian."
 "org/stable/controlaula#\">Controlaula</ulink> eller <ulink url=\"http://"
@@ -8243,9 +8416,15 @@ msgid "Restricting pupils' network access"
 msgstr "Begrænsning af elevers netværksadgang"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Some schools use <ulink url=\"http://packages.debian.org/stable/"
+#| "squidguard#\">Squidguard</ulink> or <ulink url=\"http://packages.debian."
+#| "org/stable/dansguardian#\">Dansguardian</ulink> to restrict Internet "
+#| "access."
 msgid ""
-"Some schools use <ulink url=\"http://packages.debian.org/stable/squidguard#"
-"\">Squidguard</ulink> or <ulink url=\"http://packages.debian.org/stable/"
+"Some schools use <ulink url=\"https://packages.debian.org/stable/squidguard#"
+"\">Squidguard</ulink> or <ulink url=\"https://packages.debian.org/stable/"
 "dansguardian#\">Dansguardian</ulink> to restrict Internet access."
 msgstr ""
 "Nogle skoler bruger <ulink url=\"http://packages.debian.org/stable/"
@@ -9079,18 +9258,32 @@ msgid "Copyright and authors"
 msgstr "Ophavsret og forfattere"
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "This document is written and copyrighted by Holger Levsen (2007, 2008, "
+#| "2009, 2010, 2011, 2012, 2013), Petter Reinholdtsen (2001, 2002, 2003, "
+#| "2004, 2007, 2008, 2009, 2010, 2012), Daniel Heß (2007), Patrick Winnertz "
+#| "(2007), Knut Yrvin (2007), Ralf Gesellensetter (2007), Ronny Aasen "
+#| "(2007), Morten Werner Forsbring (2007), Bjarne Nielsen (2007, 2008), "
+#| "Nigel Barker (2007), José L. Redrejo Rodríguez (2007), John Bildoy "
+#| "(2007), Joakim Seeberg (2008), Jürgen Leibner (2009, 2010, 2011, 2012), "
+#| "Oded Naveh (2009), Philipp Hübner (2009, 2010), Andreas Mundt (2010), "
+#| "Olivier Vitrat (2010, 2012), Vagrant Cascadian (2010), Mike Gabriel "
+#| "(2011), Justin B Rye (2012), David Prévot (2012), Wolfgang Schweer (2012, "
+#| "2013) and Bernhard Hammes (2012) and is released under the GPL2 or any "
+#| "later version. Enjoy!"
 msgid ""
 "This document is written and copyrighted by Holger Levsen (2007, 2008, 2009, "
-"2010, 2011, 2012, 2013), Petter Reinholdtsen (2001, 2002, 2003, 2004, 2007, "
-"2008, 2009, 2010, 2012), Daniel Heß (2007), Patrick Winnertz (2007), Knut "
-"Yrvin (2007), Ralf Gesellensetter (2007), Ronny Aasen (2007), Morten Werner "
-"Forsbring (2007), Bjarne Nielsen (2007, 2008), Nigel Barker (2007), José L. "
-"Redrejo Rodríguez (2007), John Bildoy (2007), Joakim Seeberg (2008), Jürgen "
-"Leibner (2009, 2010, 2011, 2012), Oded Naveh (2009), Philipp Hübner (2009, "
-"2010), Andreas Mundt (2010), Olivier Vitrat (2010, 2012), Vagrant Cascadian "
-"(2010), Mike Gabriel (2011), Justin B Rye (2012), David Prévot (2012), "
-"Wolfgang Schweer (2012, 2013) and Bernhard Hammes (2012) and is released "
-"under the GPL2 or any later version. Enjoy!"
+"2010, 2011, 2012, 2013, 2014), Petter Reinholdtsen (2001, 2002, 2003, 2004, "
+"2007, 2008, 2009, 2010, 2012), Daniel Heß (2007), Patrick Winnertz (2007), "
+"Knut Yrvin (2007), Ralf Gesellensetter (2007), Ronny Aasen (2007), Morten "
+"Werner Forsbring (2007), Bjarne Nielsen (2007, 2008), Nigel Barker (2007), "
+"José L. Redrejo Rodríguez (2007), John Bildoy (2007), Joakim Seeberg (2008), "
+"Jürgen Leibner (2009, 2010, 2011, 2012), Oded Naveh (2009), Philipp Hübner "
+"(2009, 2010), Andreas Mundt (2010), Olivier Vitrat (2010, 2012), Vagrant "
+"Cascadian (2010), Mike Gabriel (2011), Justin B Rye (2012), David Prévot "
+"(2012), Wolfgang Schweer (2012, 2013) and Bernhard Hammes (2012) and is "
+"released under the GPL2 or any later version. Enjoy!"
 msgstr ""
 "Dette dokument er underlagt ophavsretten og skrevet af Holger Levsen (2007, "
 "2008, 2009, 2010, 2011, 2012, 2013), Petter Reinholdtsen (2001, 2002, 2003, "
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po
index 16aaa80..4c410e5 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-wheezy-manual.de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-27 13:51-0400\n"
+"POT-Creation-Date: 2014-04-03 13:19+0300\n"
 "PO-Revision-Date: 2013-10-29 11:39+0100\n"
 "Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -780,8 +780,8 @@ msgid ""
 "using network-PROM (or PXE) without using the local client hard drive. The "
 "thin client setup used is that of the Linux Terminal Server Project (LTSP)."
 msgstr ""
-"Durch Einrichtung als Thin Client kann ein gewöhnlicher Rechner als "
-"(X-)Terminal eingesetzt werden. Das heißt, dass diese Maschine von einer "
+"Durch Einrichtung als Thin Client kann ein gewöhnlicher Rechner als (X-)"
+"Terminal eingesetzt werden. Das heißt, dass diese Maschine von einer "
 "Diskette, unter Benutzung des Netzwerkkarten-PROMs oder via PXE direkt vom "
 "Server startet, ohne die lokale Festplatte zu benutzen. Die Einrichtung der "
 "Thin Clients erfolgt gemäß dem Linux-Terminal-Server-Projekt (LTSP)."
@@ -2201,10 +2201,17 @@ msgid "A note on thin-client-server installations"
 msgstr "Bemerkung zur Installation des Profils Terminal-Server"
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "First of all, this profile name is confusing for historic reasons. "
+#| "Currently this profile actually installs an LTSP server environment for "
+#| "thin-clients and for workstations. Debian bug <ulink url=\"http://bugs."
+#| "debian.org/588510#\">588510</ulink> has been filed to change the name of "
+#| "the profile into a better suited one."
 msgid ""
 "First of all, this profile name is confusing for historic reasons. Currently "
 "this profile actually installs an LTSP server environment for thin-clients "
-"and for workstations. Debian bug <ulink url=\"http://bugs.debian.org/588510#"
+"and for workstations. Debian bug <ulink url=\"https://bugs.debian.org/588510#"
 "\">588510</ulink> has been filed to change the name of the profile into a "
 "better suited one."
 msgstr ""
@@ -3982,10 +3989,16 @@ msgstr ""
 "<computeroutput>aptitude upgrade</computeroutput> ausführen."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Automatic installation of updates can be done easily if desired, it just "
+#| "needs the <computeroutput>unattended-upgrades</computeroutput> package to "
+#| "be installed."
 msgid ""
 "Automatic installation of updates can be done easily if desired, it just "
 "needs the <computeroutput>unattended-upgrades</computeroutput> package to be "
-"installed."
+"installed and configured as described on <ulink url=\"https://wiki.debian."
+"org/UnattendedUpgrades\">wiki.debian.org/UnattendedUpgrades</ulink>."
 msgstr ""
 "Falls gewünscht, können Aktualisierungen automatisch installiert werden. "
 "Dazu muss lediglich das Paket <computeroutput>unattended-upgrades</"
@@ -4008,10 +4021,21 @@ msgid "Keep yourself informed about security updates"
 msgstr "Über Sicherheitsaktualisierungen auf dem Laufenden bleiben"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Running <computeroutput>cron-apt</computeroutput> as described above is a "
+#| "good way to learn when security updates are available for installed "
+#| "packages.  Another way to stay informed about security updates is to "
+#| "subscribe to the <ulink url=\"http://lists.debian.org/debian-security-"
+#| "announce/\">Debian security-announce mailinglist</ulink>, which has the "
+#| "benefit of also telling you what the security update is about. The "
+#| "downside (compared to <computeroutput>cron-apt</computeroutput>) is that "
+#| "it also includes information about updates for packages which aren't "
+#| "installed."
 msgid ""
 "Running <computeroutput>cron-apt</computeroutput> as described above is a "
 "good way to learn when security updates are available for installed "
-"packages.  Another way to stay informed about security updates is to "
+"packages. Another way to stay informed about security updates is to "
 "subscribe to the <ulink url=\"http://lists.debian.org/debian-security-"
 "announce/\">Debian security-announce mailinglist</ulink>, which has the "
 "benefit of also telling you what the security update is about. The downside "
@@ -4493,11 +4517,18 @@ msgid "General notes on upgrading"
 msgstr "Allgemeine Hinweise zum Upgrade"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Upgrading Debian from one distribution to the next is generally rather "
+#| "easy. For Debian Edu this is unfortunately not yet true as we heavily "
+#| "modify configuration files in ways we shouldn't. (See Debian bug <ulink "
+#| "url=\"http://bugs.debian.org/311188#\">311188</ulink> for more "
+#| "information.) Upgrading is still possible but may require some work."
 msgid ""
 "Upgrading Debian from one distribution to the next is generally rather easy. "
 "For Debian Edu this is unfortunately not yet true as we heavily modify "
 "configuration files in ways we shouldn't. (See Debian bug <ulink url="
-"\"http://bugs.debian.org/311188#\">311188</ulink> for more information.) "
+"\"https://bugs.debian.org/311188#\">311188</ulink> for more information.) "
 "Upgrading is still possible but may require some work."
 msgstr ""
 "Die Aktualisierung von Debian ist im Allgemeinen leicht vorzunehmen. Für "
@@ -5929,6 +5960,112 @@ msgstr ""
 "Dieser Fehler wird unter <ulink url=\"http://bugs.skolelinux."
 "org/1376\">Debian-Edu-Fehler #1376</ulink> verfolgt."
 
+#. type: Content of: <article><section><section><title>
+msgid "Use a dedicated storage server"
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Take these steps to set up a dedicated storage server for user home "
+"directories and possibly other data."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add a new system of type server using GOsa² as outlined in the <link linkend="
+"\"GettingStarted--Machine_Management_with_GOsa.2BALI-\">Getting started</"
+"link> chapter of this manual."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"This example uses 'nas-server.intern' as the server name. Once 'nas-server."
+"intern' ist configured, check if the NFS export points on the new storage "
+"server are exported to the relevant subnets or machines:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"root at tjener:~# showmount -e nas-server\n"
+"    Export list for nas-server:\n"
+"    /storage         10.0.0.0/8\n"
+"    root at tjener:~#"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Here everything on the backbone network is granted access to the /storage "
+"export. (This could be restricted to netgroup membership or single IP "
+"addresses to limit NFS access like it is done in the tjener:/etc/exports "
+"file.)"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add automount information about 'nas-server.intern' in LDAP to allow all "
+"clients to automatically mount the new export on request."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"This can't be done using GOsa², because a module for automount is missing. "
+"Instead, use ldapvi and add the required LDAP objects using an editor."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"<computeroutput>ldapvi --ldap-conf -ZD '(cn=admin)' -b ou=automount,dc=skole,"
+"dc=skolelinux,dc=no</computeroutput>"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"When the editor shows up, add the following LDAP objects at the bottom of "
+"the document. (The \"/&\" part in the last LDAP object is a wild card "
+"matching everything 'nas-server.intern' exports, removing the need to list "
+"individual mount points in LDAP.)"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"add cn=nas-server,ou=auto.skole,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
+"    objectClass: automount\n"
+"    cn: nas-server\n"
+"    automountInformation: -fstype=autofs --timeout=60 ldap:ou=auto.nas-server,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
+"\n"
+"    add ou=auto.nas-server,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
+"    objectClass: top\n"
+"    objectClass: automountMap\n"
+"    ou: auto.nas-server\n"
+"\n"
+"    add cn=/,ou=auto.nas-server,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
+"    objectClass: automount\n"
+"    cn: /\n"
+"    automountInformation: -fstype=nfs,tcp,rsize=32768,wsize=32768,rw,intr,hard,nodev,nosuid,noatime nas-server.intern:/&"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add the relevant entries in tjener.intern:/etc/fstab, because tjener.intern "
+"does not use automount to avoid mounting loops:"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Create the mount directories using <computeroutput>mkdir</computeroutput>, "
+"edit '/etc/fstab' as adequate and run <computeroutput>mount -a</"
+"computeroutput> to mount the new resources."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Now users should be able to access the files on 'nas-server.intern' directly "
+"by just visiting the '/tjener/nas-server/storage/' directory using any "
+"application on any workstation, LTSP client or LTSP server."
+msgstr ""
+
 #. type: Content of: <article><section><title>
 msgid "HowTos for the desktop"
 msgstr "HowTos für die graphische Arbeitsumgebung"
@@ -6164,12 +6301,21 @@ msgstr ""
 "Clients verwenden zu können."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "LTSP defines 320MB as the default minimum amount of RAM for diskless "
+#| "workstations. If the amount of RAM is less, the machine will boot as thin "
+#| "client. Unlike workstations, diskless workstations run without any need "
+#| "to add them with GOsa², cause LDM is used to login and connect to the "
+#| "LTSP server."
 msgid ""
 "LTSP defines 320MB as the default minimum amount of RAM for diskless "
 "workstations. If the amount of RAM is less, the machine will boot as thin "
 "client. Unlike workstations, diskless workstations run without any need to "
 "add them with GOsa², cause LDM is used to login and connect to the LTSP "
-"server."
+"server.  The home directory is by default mounted using sshfs, and not "
+"automount and NFS.  This causes shared directories available via NFS to not "
+"be available on diskless workstations."
 msgstr ""
 "LTSP definiert 320MB als das (voreingestellte) Minimum an RAM für Diskless "
 "Workstations. Wenn weniger RAM vorhanden ist, wird die Maschine als Thin "
@@ -6178,9 +6324,13 @@ msgstr ""
 "Anmelden und Verbinden mit dem LTSP-Server verwendet wird."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The following steps can be used to get back the behaviour from Debian Edu "
+#| "Squeeze:"
 msgid ""
 "The following steps can be used to get back the behaviour from Debian Edu "
-"Squeeze:"
+"Squeeze, using automount, NFS and a display manager other than ldm:"
 msgstr ""
 "Um zum Verhalten wie bei Debian-Edu Squeeze zurück zu gelangen, können die "
 "folgenden Schritte durchgeführt weren: "
@@ -8344,9 +8494,18 @@ msgid "Moodle"
 msgstr "Moodle"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"http://packages.debian.org/stable/moodle#\">Moodle</ulink> "
+#| "is a free, Open Source course management system - software designed using "
+#| "sound pedagogical principles to help educators create effective online "
+#| "learning communities. You can download and use it on any computer "
+#| "(including webhosts), yet it can scale from a single-teacher site to a "
+#| "University with 200,000 students. Some schools in France use Moodle to "
+#| "keep track of students' facilities and credit points."
 msgid ""
-"<ulink url=\"http://packages.debian.org/stable/moodle#\">Moodle</ulink> is a "
-"free, Open Source course management system - software designed using sound "
+"<ulink url=\"https://packages.debian.org/stable/moodle#\">Moodle</ulink> is "
+"a free, Open Source course management system - software designed using sound "
 "pedagogical principles to help educators create effective online learning "
 "communities. You can download and use it on any computer (including "
 "webhosts), yet it can scale from a single-teacher site to a University with "
@@ -8385,8 +8544,13 @@ msgid "Teaching Prolog"
 msgstr "Prolog unterrichten"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"http://packages.debian.org/stable/swi-prolog#\">SWI-Prolog</"
+#| "ulink> is an open source implementation of the programming language "
+#| "Prolog, commonly used for teaching and semantic web applications."
 msgid ""
-"<ulink url=\"http://packages.debian.org/stable/swi-prolog#\">SWI-Prolog</"
+"<ulink url=\"https://packages.debian.org/stable/swi-prolog#\">SWI-Prolog</"
 "ulink> is an open source implementation of the programming language Prolog, "
 "commonly used for teaching and semantic web applications."
 msgstr ""
@@ -8400,13 +8564,22 @@ msgid "Monitoring pupils"
 msgstr "Schüler/-innen beobachten"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Some schools use control tools like <ulink url=\"http://packages.debian."
+#| "org/stable/controlaula#\">Controlaula</ulink> or <ulink url=\"http://"
+#| "packages.debian.org/stable/italc-master#\">iTALC</ulink> to supervise "
+#| "their students.  See also the <ulink url=\"http://sourceforge.net/apps/"
+#| "mediawiki/italc/index.php?title=Main_Page\">iTALC Wiki</ulink> (and the "
+#| "documentation in bug <ulink url=\"http://bugs.debian.org/511387#"
+#| "\">511387</ulink>)."
 msgid ""
-"Some schools use control tools like <ulink url=\"http://packages.debian.org/"
-"stable/controlaula#\">Controlaula</ulink> or <ulink url=\"http://packages."
+"Some schools use control tools like <ulink url=\"https://packages.debian.org/"
+"stable/controlaula#\">Controlaula</ulink> or <ulink url=\"https://packages."
 "debian.org/stable/italc-master#\">iTALC</ulink> to supervise their "
 "students.  See also the <ulink url=\"http://sourceforge.net/apps/mediawiki/"
 "italc/index.php?title=Main_Page\">iTALC Wiki</ulink> (and the documentation "
-"in bug <ulink url=\"http://bugs.debian.org/511387#\">511387</ulink>)."
+"in bug <ulink url=\"https://bugs.debian.org/511387#\">511387</ulink>)."
 msgstr ""
 "Einige Schule benutzen Überwachungs-Werkzeuge wie <ulink url=\"http://"
 "packages.debian.org/stable/controlaula#\">Controlaula</ulink> oder <ulink "
@@ -8431,9 +8604,15 @@ msgid "Restricting pupils' network access"
 msgstr "Den Netzwerkzugang von Schülern beschränken"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Some schools use <ulink url=\"http://packages.debian.org/stable/"
+#| "squidguard#\">Squidguard</ulink> or <ulink url=\"http://packages.debian."
+#| "org/stable/dansguardian#\">Dansguardian</ulink> to restrict Internet "
+#| "access."
 msgid ""
-"Some schools use <ulink url=\"http://packages.debian.org/stable/squidguard#"
-"\">Squidguard</ulink> or <ulink url=\"http://packages.debian.org/stable/"
+"Some schools use <ulink url=\"https://packages.debian.org/stable/squidguard#"
+"\">Squidguard</ulink> or <ulink url=\"https://packages.debian.org/stable/"
 "dansguardian#\">Dansguardian</ulink> to restrict Internet access."
 msgstr ""
 "Einige Schulen verwenden <ulink url=\"http://packages.debian.org/stable/"
@@ -9299,18 +9478,32 @@ msgid "Copyright and authors"
 msgstr "Copyright und Autoren"
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "This document is written and copyrighted by Holger Levsen (2007, 2008, "
+#| "2009, 2010, 2011, 2012, 2013), Petter Reinholdtsen (2001, 2002, 2003, "
+#| "2004, 2007, 2008, 2009, 2010, 2012), Daniel Heß (2007), Patrick Winnertz "
+#| "(2007), Knut Yrvin (2007), Ralf Gesellensetter (2007), Ronny Aasen "
+#| "(2007), Morten Werner Forsbring (2007), Bjarne Nielsen (2007, 2008), "
+#| "Nigel Barker (2007), José L. Redrejo Rodríguez (2007), John Bildoy "
+#| "(2007), Joakim Seeberg (2008), Jürgen Leibner (2009, 2010, 2011, 2012), "
+#| "Oded Naveh (2009), Philipp Hübner (2009, 2010), Andreas Mundt (2010), "
+#| "Olivier Vitrat (2010, 2012), Vagrant Cascadian (2010), Mike Gabriel "
+#| "(2011), Justin B Rye (2012), David Prévot (2012), Wolfgang Schweer (2012, "
+#| "2013) and Bernhard Hammes (2012) and is released under the GPL2 or any "
+#| "later version. Enjoy!"
 msgid ""
 "This document is written and copyrighted by Holger Levsen (2007, 2008, 2009, "
-"2010, 2011, 2012, 2013), Petter Reinholdtsen (2001, 2002, 2003, 2004, 2007, "
-"2008, 2009, 2010, 2012), Daniel Heß (2007), Patrick Winnertz (2007), Knut "
-"Yrvin (2007), Ralf Gesellensetter (2007), Ronny Aasen (2007), Morten Werner "
-"Forsbring (2007), Bjarne Nielsen (2007, 2008), Nigel Barker (2007), José L. "
-"Redrejo Rodríguez (2007), John Bildoy (2007), Joakim Seeberg (2008), Jürgen "
-"Leibner (2009, 2010, 2011, 2012), Oded Naveh (2009), Philipp Hübner (2009, "
-"2010), Andreas Mundt (2010), Olivier Vitrat (2010, 2012), Vagrant Cascadian "
-"(2010), Mike Gabriel (2011), Justin B Rye (2012), David Prévot (2012), "
-"Wolfgang Schweer (2012, 2013) and Bernhard Hammes (2012) and is released "
-"under the GPL2 or any later version. Enjoy!"
+"2010, 2011, 2012, 2013, 2014), Petter Reinholdtsen (2001, 2002, 2003, 2004, "
+"2007, 2008, 2009, 2010, 2012), Daniel Heß (2007), Patrick Winnertz (2007), "
+"Knut Yrvin (2007), Ralf Gesellensetter (2007), Ronny Aasen (2007), Morten "
+"Werner Forsbring (2007), Bjarne Nielsen (2007, 2008), Nigel Barker (2007), "
+"José L. Redrejo Rodríguez (2007), John Bildoy (2007), Joakim Seeberg (2008), "
+"Jürgen Leibner (2009, 2010, 2011, 2012), Oded Naveh (2009), Philipp Hübner "
+"(2009, 2010), Andreas Mundt (2010), Olivier Vitrat (2010, 2012), Vagrant "
+"Cascadian (2010), Mike Gabriel (2011), Justin B Rye (2012), David Prévot "
+"(2012), Wolfgang Schweer (2012, 2013) and Bernhard Hammes (2012) and is "
+"released under the GPL2 or any later version. Enjoy!"
 msgstr ""
 "Dieses Dokument wurde u. a. von folgenden Personen verfasst: Holger Levsen "
 "(2007, 2008, 2009, 2010, 2011, 2012, 2013), Petter Reinholdtsen (2001, 2002, "
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po
index 9dc13aa..677f129 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: release-manual\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-27 13:51-0400\n"
+"POT-Creation-Date: 2014-04-03 13:19+0300\n"
 "PO-Revision-Date: 2013-12-02 00:31-0600\n"
 "Last-Translator: Norman Garcia Aguilar <norman at riseup.net>\n"
 "Language-Team: Debian Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -2198,10 +2198,17 @@ msgid "A note on thin-client-server installations"
 msgstr "Nota sobre la instalación de servidores de clientes ligeros"
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "First of all, this profile name is confusing for historic reasons. "
+#| "Currently this profile actually installs an LTSP server environment for "
+#| "thin-clients and for workstations. Debian bug <ulink url=\"http://bugs."
+#| "debian.org/588510#\">588510</ulink> has been filed to change the name of "
+#| "the profile into a better suited one."
 msgid ""
 "First of all, this profile name is confusing for historic reasons. Currently "
 "this profile actually installs an LTSP server environment for thin-clients "
-"and for workstations. Debian bug <ulink url=\"http://bugs.debian.org/588510#"
+"and for workstations. Debian bug <ulink url=\"https://bugs.debian.org/588510#"
 "\">588510</ulink> has been filed to change the name of the profile into a "
 "better suited one."
 msgstr ""
@@ -3911,10 +3918,16 @@ msgstr ""
 "<computeroutput>aptitude upgrade</computeroutput>."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Automatic installation of updates can be done easily if desired, it just "
+#| "needs the <computeroutput>unattended-upgrades</computeroutput> package to "
+#| "be installed."
 msgid ""
 "Automatic installation of updates can be done easily if desired, it just "
 "needs the <computeroutput>unattended-upgrades</computeroutput> package to be "
-"installed."
+"installed and configured as described on <ulink url=\"https://wiki.debian."
+"org/UnattendedUpgrades\">wiki.debian.org/UnattendedUpgrades</ulink>."
 msgstr ""
 "Instalación automática de actualizaciones se puede hacer fácilmente si se "
 "desea, solo necesita instalar el paquete <computeroutput>unattended-"
@@ -3936,7 +3949,7 @@ msgstr "Mantente informado sobre actualizaciones de seguridad"
 msgid ""
 "Running <computeroutput>cron-apt</computeroutput> as described above is a "
 "good way to learn when security updates are available for installed "
-"packages.  Another way to stay informed about security updates is to "
+"packages. Another way to stay informed about security updates is to "
 "subscribe to the <ulink url=\"http://lists.debian.org/debian-security-"
 "announce/\">Debian security-announce mailinglist</ulink>, which has the "
 "benefit of also telling you what the security update is about. The downside "
@@ -4386,11 +4399,18 @@ msgid "General notes on upgrading"
 msgstr "Notas generales sobre la actualización"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Upgrading Debian from one distribution to the next is generally rather "
+#| "easy. For Debian Edu this is unfortunately not yet true as we heavily "
+#| "modify configuration files in ways we shouldn't. (See Debian bug <ulink "
+#| "url=\"http://bugs.debian.org/311188#\">311188</ulink> for more "
+#| "information.) Upgrading is still possible but may require some work."
 msgid ""
 "Upgrading Debian from one distribution to the next is generally rather easy. "
 "For Debian Edu this is unfortunately not yet true as we heavily modify "
 "configuration files in ways we shouldn't. (See Debian bug <ulink url="
-"\"http://bugs.debian.org/311188#\">311188</ulink> for more information.) "
+"\"https://bugs.debian.org/311188#\">311188</ulink> for more information.) "
 "Upgrading is still possible but may require some work."
 msgstr ""
 "Actualizar Debian de una versión a la siguiente generalmente es bastante "
@@ -5631,6 +5651,112 @@ msgid ""
 "org/1376\">Debian Edu bug #1376</ulink>."
 msgstr ""
 
+#. type: Content of: <article><section><section><title>
+msgid "Use a dedicated storage server"
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Take these steps to set up a dedicated storage server for user home "
+"directories and possibly other data."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add a new system of type server using GOsa² as outlined in the <link linkend="
+"\"GettingStarted--Machine_Management_with_GOsa.2BALI-\">Getting started</"
+"link> chapter of this manual."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"This example uses 'nas-server.intern' as the server name. Once 'nas-server."
+"intern' ist configured, check if the NFS export points on the new storage "
+"server are exported to the relevant subnets or machines:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"root at tjener:~# showmount -e nas-server\n"
+"    Export list for nas-server:\n"
+"    /storage         10.0.0.0/8\n"
+"    root at tjener:~#"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Here everything on the backbone network is granted access to the /storage "
+"export. (This could be restricted to netgroup membership or single IP "
+"addresses to limit NFS access like it is done in the tjener:/etc/exports "
+"file.)"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add automount information about 'nas-server.intern' in LDAP to allow all "
+"clients to automatically mount the new export on request."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"This can't be done using GOsa², because a module for automount is missing. "
+"Instead, use ldapvi and add the required LDAP objects using an editor."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"<computeroutput>ldapvi --ldap-conf -ZD '(cn=admin)' -b ou=automount,dc=skole,"
+"dc=skolelinux,dc=no</computeroutput>"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"When the editor shows up, add the following LDAP objects at the bottom of "
+"the document. (The \"/&\" part in the last LDAP object is a wild card "
+"matching everything 'nas-server.intern' exports, removing the need to list "
+"individual mount points in LDAP.)"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"add cn=nas-server,ou=auto.skole,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
+"    objectClass: automount\n"
+"    cn: nas-server\n"
+"    automountInformation: -fstype=autofs --timeout=60 ldap:ou=auto.nas-server,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
+"\n"
+"    add ou=auto.nas-server,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
+"    objectClass: top\n"
+"    objectClass: automountMap\n"
+"    ou: auto.nas-server\n"
+"\n"
+"    add cn=/,ou=auto.nas-server,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
+"    objectClass: automount\n"
+"    cn: /\n"
+"    automountInformation: -fstype=nfs,tcp,rsize=32768,wsize=32768,rw,intr,hard,nodev,nosuid,noatime nas-server.intern:/&"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add the relevant entries in tjener.intern:/etc/fstab, because tjener.intern "
+"does not use automount to avoid mounting loops:"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Create the mount directories using <computeroutput>mkdir</computeroutput>, "
+"edit '/etc/fstab' as adequate and run <computeroutput>mount -a</"
+"computeroutput> to mount the new resources."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Now users should be able to access the files on 'nas-server.intern' directly "
+"by just visiting the '/tjener/nas-server/storage/' directory using any "
+"application on any workstation, LTSP client or LTSP server."
+msgstr ""
+
 #. type: Content of: <article><section><title>
 #, fuzzy
 msgid "HowTos for the desktop"
@@ -5855,12 +5981,21 @@ msgstr ""
 "configuraciones de sistema son guardadas en el servidor."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "LTSP defines 320MB as the default minimum amount of RAM for diskless "
+#| "workstations. If the amount of RAM is less, the machine will boot as thin "
+#| "client. Unlike workstations, diskless workstations run without any need "
+#| "to add them with GOsa², cause LDM is used to login and connect to the "
+#| "LTSP server."
 msgid ""
 "LTSP defines 320MB as the default minimum amount of RAM for diskless "
 "workstations. If the amount of RAM is less, the machine will boot as thin "
 "client. Unlike workstations, diskless workstations run without any need to "
 "add them with GOsa², cause LDM is used to login and connect to the LTSP "
-"server."
+"server.  The home directory is by default mounted using sshfs, and not "
+"automount and NFS.  This causes shared directories available via NFS to not "
+"be available on diskless workstations."
 msgstr ""
 "LTSP requiere un minímo de 320MB de memoria RAM para estaciones de trabajo "
 "sin disco. Si el tamaño de RAM es menor, la computadora cargará como cliente "
@@ -5872,7 +6007,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "The following steps can be used to get back the behaviour from Debian Edu "
-"Squeeze:"
+"Squeeze, using automount, NFS and a display manager other than ldm:"
 msgstr "Puede seguir los siguientes pasos para "
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -7648,8 +7783,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"<ulink url=\"http://packages.debian.org/stable/moodle#\">Moodle</ulink> is a "
-"free, Open Source course management system - software designed using sound "
+"<ulink url=\"https://packages.debian.org/stable/moodle#\">Moodle</ulink> is "
+"a free, Open Source course management system - software designed using sound "
 "pedagogical principles to help educators create effective online learning "
 "communities. You can download and use it on any computer (including "
 "webhosts), yet it can scale from a single-teacher site to a University with "
@@ -7674,7 +7809,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"<ulink url=\"http://packages.debian.org/stable/swi-prolog#\">SWI-Prolog</"
+"<ulink url=\"https://packages.debian.org/stable/swi-prolog#\">SWI-Prolog</"
 "ulink> is an open source implementation of the programming language Prolog, "
 "commonly used for teaching and semantic web applications."
 msgstr ""
@@ -7685,12 +7820,12 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Some schools use control tools like <ulink url=\"http://packages.debian.org/"
-"stable/controlaula#\">Controlaula</ulink> or <ulink url=\"http://packages."
+"Some schools use control tools like <ulink url=\"https://packages.debian.org/"
+"stable/controlaula#\">Controlaula</ulink> or <ulink url=\"https://packages."
 "debian.org/stable/italc-master#\">iTALC</ulink> to supervise their "
 "students.  See also the <ulink url=\"http://sourceforge.net/apps/mediawiki/"
 "italc/index.php?title=Main_Page\">iTALC Wiki</ulink> (and the documentation "
-"in bug <ulink url=\"http://bugs.debian.org/511387#\">511387</ulink>)."
+"in bug <ulink url=\"https://bugs.debian.org/511387#\">511387</ulink>)."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -7706,8 +7841,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Some schools use <ulink url=\"http://packages.debian.org/stable/squidguard#"
-"\">Squidguard</ulink> or <ulink url=\"http://packages.debian.org/stable/"
+"Some schools use <ulink url=\"https://packages.debian.org/stable/squidguard#"
+"\">Squidguard</ulink> or <ulink url=\"https://packages.debian.org/stable/"
 "dansguardian#\">Dansguardian</ulink> to restrict Internet access."
 msgstr ""
 
@@ -8517,16 +8652,16 @@ msgstr "Copyright y authores"
 #, fuzzy
 msgid ""
 "This document is written and copyrighted by Holger Levsen (2007, 2008, 2009, "
-"2010, 2011, 2012, 2013), Petter Reinholdtsen (2001, 2002, 2003, 2004, 2007, "
-"2008, 2009, 2010, 2012), Daniel Heß (2007), Patrick Winnertz (2007), Knut "
-"Yrvin (2007), Ralf Gesellensetter (2007), Ronny Aasen (2007), Morten Werner "
-"Forsbring (2007), Bjarne Nielsen (2007, 2008), Nigel Barker (2007), José L. "
-"Redrejo Rodríguez (2007), John Bildoy (2007), Joakim Seeberg (2008), Jürgen "
-"Leibner (2009, 2010, 2011, 2012), Oded Naveh (2009), Philipp Hübner (2009, "
-"2010), Andreas Mundt (2010), Olivier Vitrat (2010, 2012), Vagrant Cascadian "
-"(2010), Mike Gabriel (2011), Justin B Rye (2012), David Prévot (2012), "
-"Wolfgang Schweer (2012, 2013) and Bernhard Hammes (2012) and is released "
-"under the GPL2 or any later version. Enjoy!"
+"2010, 2011, 2012, 2013, 2014), Petter Reinholdtsen (2001, 2002, 2003, 2004, "
+"2007, 2008, 2009, 2010, 2012), Daniel Heß (2007), Patrick Winnertz (2007), "
+"Knut Yrvin (2007), Ralf Gesellensetter (2007), Ronny Aasen (2007), Morten "
+"Werner Forsbring (2007), Bjarne Nielsen (2007, 2008), Nigel Barker (2007), "
+"José L. Redrejo Rodríguez (2007), John Bildoy (2007), Joakim Seeberg (2008), "
+"Jürgen Leibner (2009, 2010, 2011, 2012), Oded Naveh (2009), Philipp Hübner "
+"(2009, 2010), Andreas Mundt (2010), Olivier Vitrat (2010, 2012), Vagrant "
+"Cascadian (2010), Mike Gabriel (2011), Justin B Rye (2012), David Prévot "
+"(2012), Wolfgang Schweer (2012, 2013) and Bernhard Hammes (2012) and is "
+"released under the GPL2 or any later version. Enjoy!"
 msgstr ""
 "Esto documento ha sido escrito con copyright de Holger Levsen, Petter "
 "Reinholdtsen, Daniel Heß and Patrick Winnertz  2007 y distribuido bajo la "
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po
index 5689e61..d381d47 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2013-10-27 13:51-0400\n"
+"POT-Creation-Date: 2014-04-03 13:19+0300\n"
 "PO-Revision-Date: 2013-09-18 15:22+0200\n"
 "Last-Translator: Cédric Boutillier <boutil at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -2241,10 +2241,17 @@ msgid "A note on thin-client-server installations"
 msgstr "Note à propos des installations de serveur de clients légers"
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "First of all, this profile name is confusing for historic reasons. "
+#| "Currently this profile actually installs an LTSP server environment for "
+#| "thin-clients and for workstations. Debian bug <ulink url=\"http://bugs."
+#| "debian.org/588510#\">588510</ulink> has been filed to change the name of "
+#| "the profile into a better suited one."
 msgid ""
 "First of all, this profile name is confusing for historic reasons. Currently "
 "this profile actually installs an LTSP server environment for thin-clients "
-"and for workstations. Debian bug <ulink url=\"http://bugs.debian.org/588510#"
+"and for workstations. Debian bug <ulink url=\"https://bugs.debian.org/588510#"
 "\">588510</ulink> has been filed to change the name of the profile into a "
 "better suited one."
 msgstr ""
@@ -4035,10 +4042,16 @@ msgstr ""
 "computeroutput>."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Automatic installation of updates can be done easily if desired, it just "
+#| "needs the <computeroutput>unattended-upgrades</computeroutput> package to "
+#| "be installed."
 msgid ""
 "Automatic installation of updates can be done easily if desired, it just "
 "needs the <computeroutput>unattended-upgrades</computeroutput> package to be "
-"installed."
+"installed and configured as described on <ulink url=\"https://wiki.debian."
+"org/UnattendedUpgrades\">wiki.debian.org/UnattendedUpgrades</ulink>."
 msgstr ""
 "Si vous le souhaitez, l'installation des mises à jour peut être rendue "
 "automatique, en installant simplement le paquet <computeroutput>unattended-"
@@ -4062,10 +4075,21 @@ msgid "Keep yourself informed about security updates"
 msgstr "Restez informé des mises à jour de sécurité"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Running <computeroutput>cron-apt</computeroutput> as described above is a "
+#| "good way to learn when security updates are available for installed "
+#| "packages.  Another way to stay informed about security updates is to "
+#| "subscribe to the <ulink url=\"http://lists.debian.org/debian-security-"
+#| "announce/\">Debian security-announce mailinglist</ulink>, which has the "
+#| "benefit of also telling you what the security update is about. The "
+#| "downside (compared to <computeroutput>cron-apt</computeroutput>) is that "
+#| "it also includes information about updates for packages which aren't "
+#| "installed."
 msgid ""
 "Running <computeroutput>cron-apt</computeroutput> as described above is a "
 "good way to learn when security updates are available for installed "
-"packages.  Another way to stay informed about security updates is to "
+"packages. Another way to stay informed about security updates is to "
 "subscribe to the <ulink url=\"http://lists.debian.org/debian-security-"
 "announce/\">Debian security-announce mailinglist</ulink>, which has the "
 "benefit of also telling you what the security update is about. The downside "
@@ -4550,11 +4574,18 @@ msgid "General notes on upgrading"
 msgstr "Notes à propos de la mise à jour"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Upgrading Debian from one distribution to the next is generally rather "
+#| "easy. For Debian Edu this is unfortunately not yet true as we heavily "
+#| "modify configuration files in ways we shouldn't. (See Debian bug <ulink "
+#| "url=\"http://bugs.debian.org/311188#\">311188</ulink> for more "
+#| "information.) Upgrading is still possible but may require some work."
 msgid ""
 "Upgrading Debian from one distribution to the next is generally rather easy. "
 "For Debian Edu this is unfortunately not yet true as we heavily modify "
 "configuration files in ways we shouldn't. (See Debian bug <ulink url="
-"\"http://bugs.debian.org/311188#\">311188</ulink> for more information.) "
+"\"https://bugs.debian.org/311188#\">311188</ulink> for more information.) "
 "Upgrading is still possible but may require some work."
 msgstr ""
 "Mettre à jour Debian d'une distribution à la suivante est généralement assez "
@@ -5985,6 +6016,112 @@ msgstr ""
 "Ce problème est suivi dans le <ulink url=\"http://bugs.skolelinux."
 "org/1376\">bogue Debian Edu nº 1376</ulink>."
 
+#. type: Content of: <article><section><section><title>
+msgid "Use a dedicated storage server"
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Take these steps to set up a dedicated storage server for user home "
+"directories and possibly other data."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add a new system of type server using GOsa² as outlined in the <link linkend="
+"\"GettingStarted--Machine_Management_with_GOsa.2BALI-\">Getting started</"
+"link> chapter of this manual."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"This example uses 'nas-server.intern' as the server name. Once 'nas-server."
+"intern' ist configured, check if the NFS export points on the new storage "
+"server are exported to the relevant subnets or machines:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"root at tjener:~# showmount -e nas-server\n"
+"    Export list for nas-server:\n"
+"    /storage         10.0.0.0/8\n"
+"    root at tjener:~#"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Here everything on the backbone network is granted access to the /storage "
+"export. (This could be restricted to netgroup membership or single IP "
+"addresses to limit NFS access like it is done in the tjener:/etc/exports "
+"file.)"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add automount information about 'nas-server.intern' in LDAP to allow all "
+"clients to automatically mount the new export on request."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"This can't be done using GOsa², because a module for automount is missing. "
+"Instead, use ldapvi and add the required LDAP objects using an editor."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"<computeroutput>ldapvi --ldap-conf -ZD '(cn=admin)' -b ou=automount,dc=skole,"
+"dc=skolelinux,dc=no</computeroutput>"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"When the editor shows up, add the following LDAP objects at the bottom of "
+"the document. (The \"/&\" part in the last LDAP object is a wild card "
+"matching everything 'nas-server.intern' exports, removing the need to list "
+"individual mount points in LDAP.)"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"add cn=nas-server,ou=auto.skole,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
+"    objectClass: automount\n"
+"    cn: nas-server\n"
+"    automountInformation: -fstype=autofs --timeout=60 ldap:ou=auto.nas-server,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
+"\n"
+"    add ou=auto.nas-server,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
+"    objectClass: top\n"
+"    objectClass: automountMap\n"
+"    ou: auto.nas-server\n"
+"\n"
+"    add cn=/,ou=auto.nas-server,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
+"    objectClass: automount\n"
+"    cn: /\n"
+"    automountInformation: -fstype=nfs,tcp,rsize=32768,wsize=32768,rw,intr,hard,nodev,nosuid,noatime nas-server.intern:/&"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add the relevant entries in tjener.intern:/etc/fstab, because tjener.intern "
+"does not use automount to avoid mounting loops:"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Create the mount directories using <computeroutput>mkdir</computeroutput>, "
+"edit '/etc/fstab' as adequate and run <computeroutput>mount -a</"
+"computeroutput> to mount the new resources."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Now users should be able to access the files on 'nas-server.intern' directly "
+"by just visiting the '/tjener/nas-server/storage/' directory using any "
+"application on any workstation, LTSP client or LTSP server."
+msgstr ""
+
 #. type: Content of: <article><section><title>
 msgid "HowTos for the desktop"
 msgstr "Manuels pour le bureau"
@@ -6039,8 +6176,8 @@ msgid ""
 "instructions</link>."
 msgstr ""
 "Si vous voulez utiliser GNOME ou LXDE au lieu de KDE « Plasma », veuillez "
-"consulter les <link linkend=\"Installation--The_installation_process\">instructions "
-"d'installation</link>."
+"consulter les <link linkend=\"Installation--The_installation_process"
+"\">instructions d'installation</link>."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -6219,12 +6356,21 @@ msgstr ""
 "maintenance que les clients légers."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "LTSP defines 320MB as the default minimum amount of RAM for diskless "
+#| "workstations. If the amount of RAM is less, the machine will boot as thin "
+#| "client. Unlike workstations, diskless workstations run without any need "
+#| "to add them with GOsa², cause LDM is used to login and connect to the "
+#| "LTSP server."
 msgid ""
 "LTSP defines 320MB as the default minimum amount of RAM for diskless "
 "workstations. If the amount of RAM is less, the machine will boot as thin "
 "client. Unlike workstations, diskless workstations run without any need to "
 "add them with GOsa², cause LDM is used to login and connect to the LTSP "
-"server."
+"server.  The home directory is by default mounted using sshfs, and not "
+"automount and NFS.  This causes shared directories available via NFS to not "
+"be available on diskless workstations."
 msgstr ""
 "LTSP définit à 320 Mo la quantité minimale de mémoire vive nécessaire pour "
 "une station de travail sans disque. Si la quantité de mémoire vive est "
@@ -6234,9 +6380,13 @@ msgstr ""
 "et se connecter au serveur LTSP."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The following steps can be used to get back the behaviour from Debian Edu "
+#| "Squeeze:"
 msgid ""
 "The following steps can be used to get back the behaviour from Debian Edu "
-"Squeeze:"
+"Squeeze, using automount, NFS and a display manager other than ldm:"
 msgstr ""
 "Les étapes suivantes peuvent être suivies pour rétablir le comportement de "
 "Debian Edu Squeeze :"
@@ -6766,10 +6916,10 @@ msgid ""
 "address or IP address like this: <computeroutput>[192.168.0.10]</"
 "computeroutput>."
 msgstr ""
-"Les valeurs par défaut sont définies dans la section "
-"<computeroutput>[default]</computeroutput>. Pour configurer un client, "
-"indiquez son adresse MAC ou son adresse IP de cette manière : "
-"<computeroutput>[192.168.0.10]</computeroutput>."
+"Les valeurs par défaut sont définies dans la section <computeroutput>"
+"[default]</computeroutput>. Pour configurer un client, indiquez son adresse "
+"MAC ou son adresse IP de cette manière : <computeroutput>[192.168.0.10]</"
+"computeroutput>."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -8422,9 +8572,18 @@ msgid "Moodle"
 msgstr "Moodle"
 
 #. type: Content of: <article><section><section><para>
-msgid ""
-"<ulink url=\"http://packages.debian.org/stable/moodle#\">Moodle</ulink> is a "
-"free, Open Source course management system - software designed using sound "
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"http://packages.debian.org/stable/moodle#\">Moodle</ulink> "
+#| "is a free, Open Source course management system - software designed using "
+#| "sound pedagogical principles to help educators create effective online "
+#| "learning communities. You can download and use it on any computer "
+#| "(including webhosts), yet it can scale from a single-teacher site to a "
+#| "University with 200,000 students. Some schools in France use Moodle to "
+#| "keep track of students' facilities and credit points."
+msgid ""
+"<ulink url=\"https://packages.debian.org/stable/moodle#\">Moodle</ulink> is "
+"a free, Open Source course management system - software designed using sound "
 "pedagogical principles to help educators create effective online learning "
 "communities. You can download and use it on any computer (including "
 "webhosts), yet it can scale from a single-teacher site to a University with "
@@ -8465,8 +8624,13 @@ msgid "Teaching Prolog"
 msgstr "Enseigner Prolog"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"http://packages.debian.org/stable/swi-prolog#\">SWI-Prolog</"
+#| "ulink> is an open source implementation of the programming language "
+#| "Prolog, commonly used for teaching and semantic web applications."
 msgid ""
-"<ulink url=\"http://packages.debian.org/stable/swi-prolog#\">SWI-Prolog</"
+"<ulink url=\"https://packages.debian.org/stable/swi-prolog#\">SWI-Prolog</"
 "ulink> is an open source implementation of the programming language Prolog, "
 "commonly used for teaching and semantic web applications."
 msgstr ""
@@ -8480,13 +8644,22 @@ msgid "Monitoring pupils"
 msgstr "Surveillance des élèves"
 
 #. type: Content of: <article><section><section><para>
-msgid ""
-"Some schools use control tools like <ulink url=\"http://packages.debian.org/"
-"stable/controlaula#\">Controlaula</ulink> or <ulink url=\"http://packages."
+#, fuzzy
+#| msgid ""
+#| "Some schools use control tools like <ulink url=\"http://packages.debian."
+#| "org/stable/controlaula#\">Controlaula</ulink> or <ulink url=\"http://"
+#| "packages.debian.org/stable/italc-master#\">iTALC</ulink> to supervise "
+#| "their students.  See also the <ulink url=\"http://sourceforge.net/apps/"
+#| "mediawiki/italc/index.php?title=Main_Page\">iTALC Wiki</ulink> (and the "
+#| "documentation in bug <ulink url=\"http://bugs.debian.org/511387#"
+#| "\">511387</ulink>)."
+msgid ""
+"Some schools use control tools like <ulink url=\"https://packages.debian.org/"
+"stable/controlaula#\">Controlaula</ulink> or <ulink url=\"https://packages."
 "debian.org/stable/italc-master#\">iTALC</ulink> to supervise their "
 "students.  See also the <ulink url=\"http://sourceforge.net/apps/mediawiki/"
 "italc/index.php?title=Main_Page\">iTALC Wiki</ulink> (and the documentation "
-"in bug <ulink url=\"http://bugs.debian.org/511387#\">511387</ulink>)."
+"in bug <ulink url=\"https://bugs.debian.org/511387#\">511387</ulink>)."
 msgstr ""
 "Certains établissements utilisent des outils de contrôle tels que <ulink url="
 "\"http://packages.debian.org/stable/controlaula#\">Controlaula</ulink> ou "
@@ -8511,9 +8684,15 @@ msgid "Restricting pupils' network access"
 msgstr "Restriction de l'accès des élèves au réseau"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Some schools use <ulink url=\"http://packages.debian.org/stable/"
+#| "squidguard#\">Squidguard</ulink> or <ulink url=\"http://packages.debian."
+#| "org/stable/dansguardian#\">Dansguardian</ulink> to restrict Internet "
+#| "access."
 msgid ""
-"Some schools use <ulink url=\"http://packages.debian.org/stable/squidguard#"
-"\">Squidguard</ulink> or <ulink url=\"http://packages.debian.org/stable/"
+"Some schools use <ulink url=\"https://packages.debian.org/stable/squidguard#"
+"\">Squidguard</ulink> or <ulink url=\"https://packages.debian.org/stable/"
 "dansguardian#\">Dansguardian</ulink> to restrict Internet access."
 msgstr ""
 "Certaines écoles utilisent <ulink url=\"http://packages.debian.org/stable/"
@@ -9381,18 +9560,32 @@ msgid "Copyright and authors"
 msgstr "Droits d'auteur et auteurs"
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "This document is written and copyrighted by Holger Levsen (2007, 2008, "
+#| "2009, 2010, 2011, 2012, 2013), Petter Reinholdtsen (2001, 2002, 2003, "
+#| "2004, 2007, 2008, 2009, 2010, 2012), Daniel Heß (2007), Patrick Winnertz "
+#| "(2007), Knut Yrvin (2007), Ralf Gesellensetter (2007), Ronny Aasen "
+#| "(2007), Morten Werner Forsbring (2007), Bjarne Nielsen (2007, 2008), "
+#| "Nigel Barker (2007), José L. Redrejo Rodríguez (2007), John Bildoy "
+#| "(2007), Joakim Seeberg (2008), Jürgen Leibner (2009, 2010, 2011, 2012), "
+#| "Oded Naveh (2009), Philipp Hübner (2009, 2010), Andreas Mundt (2010), "
+#| "Olivier Vitrat (2010, 2012), Vagrant Cascadian (2010), Mike Gabriel "
+#| "(2011), Justin B Rye (2012), David Prévot (2012), Wolfgang Schweer (2012, "
+#| "2013) and Bernhard Hammes (2012) and is released under the GPL2 or any "
+#| "later version. Enjoy!"
 msgid ""
 "This document is written and copyrighted by Holger Levsen (2007, 2008, 2009, "
-"2010, 2011, 2012, 2013), Petter Reinholdtsen (2001, 2002, 2003, 2004, 2007, "
-"2008, 2009, 2010, 2012), Daniel Heß (2007), Patrick Winnertz (2007), Knut "
-"Yrvin (2007), Ralf Gesellensetter (2007), Ronny Aasen (2007), Morten Werner "
-"Forsbring (2007), Bjarne Nielsen (2007, 2008), Nigel Barker (2007), José L. "
-"Redrejo Rodríguez (2007), John Bildoy (2007), Joakim Seeberg (2008), Jürgen "
-"Leibner (2009, 2010, 2011, 2012), Oded Naveh (2009), Philipp Hübner (2009, "
-"2010), Andreas Mundt (2010), Olivier Vitrat (2010, 2012), Vagrant Cascadian "
-"(2010), Mike Gabriel (2011), Justin B Rye (2012), David Prévot (2012), "
-"Wolfgang Schweer (2012, 2013) and Bernhard Hammes (2012) and is released "
-"under the GPL2 or any later version. Enjoy!"
+"2010, 2011, 2012, 2013, 2014), Petter Reinholdtsen (2001, 2002, 2003, 2004, "
+"2007, 2008, 2009, 2010, 2012), Daniel Heß (2007), Patrick Winnertz (2007), "
+"Knut Yrvin (2007), Ralf Gesellensetter (2007), Ronny Aasen (2007), Morten "
+"Werner Forsbring (2007), Bjarne Nielsen (2007, 2008), Nigel Barker (2007), "
+"José L. Redrejo Rodríguez (2007), John Bildoy (2007), Joakim Seeberg (2008), "
+"Jürgen Leibner (2009, 2010, 2011, 2012), Oded Naveh (2009), Philipp Hübner "
+"(2009, 2010), Andreas Mundt (2010), Olivier Vitrat (2010, 2012), Vagrant "
+"Cascadian (2010), Mike Gabriel (2011), Justin B Rye (2012), David Prévot "
+"(2012), Wolfgang Schweer (2012, 2013) and Bernhard Hammes (2012) and is "
+"released under the GPL2 or any later version. Enjoy!"
 msgstr ""
 "Ce document a été écrit (droits d'auteur) par Holger Levsen (2007, 2008, "
 "2009, 2010, 2011, 2012, 2013), Petter Reinholdtsen (2001, 2002, 2003, 2004, "
@@ -10643,9 +10836,9 @@ msgid ""
 "GNOME option, the LXDE desktop option is only supported by the CD "
 "installation method."
 msgstr ""
-"Nouvelle option de choix de bureau LXDE, en plus de KDE (par défaut) et GNOME. "
-"Tout comme l'option GNOME, l'option de bureau LXDE n'est prise en charge que "
-"par la méthode d'installation par CD."
+"Nouvelle option de choix de bureau LXDE, en plus de KDE (par défaut) et "
+"GNOME. Tout comme l'option GNOME, l'option de bureau LXDE n'est prise en "
+"charge que par la méthode d'installation par CD."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Speed up LTSP client boot."
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
index c03491d..6b7873f 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-squeeze-manual\n"
-"POT-Creation-Date: 2013-10-27 13:51-0400\n"
+"POT-Creation-Date: 2014-04-03 13:19+0300\n"
 "PO-Revision-Date: 2013-09-29 09:58+0200\n"
 "Last-Translator: Claudio Carboncini <claudio.carboncini at gmail.com>\n"
 "Language-Team: Italian <debian-l10n-italian at lists.debian.org>\n"
@@ -2185,10 +2185,17 @@ msgid "A note on thin-client-server installations"
 msgstr "Nota sull'installazione dei thin-client-server"
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "First of all, this profile name is confusing for historic reasons. "
+#| "Currently this profile actually installs an LTSP server environment for "
+#| "thin-clients and for workstations. Debian bug <ulink url=\"http://bugs."
+#| "debian.org/588510#\">588510</ulink> has been filed to change the name of "
+#| "the profile into a better suited one."
 msgid ""
 "First of all, this profile name is confusing for historic reasons. Currently "
 "this profile actually installs an LTSP server environment for thin-clients "
-"and for workstations. Debian bug <ulink url=\"http://bugs.debian.org/588510#"
+"and for workstations. Debian bug <ulink url=\"https://bugs.debian.org/588510#"
 "\">588510</ulink> has been filed to change the name of the profile into a "
 "better suited one."
 msgstr ""
@@ -3948,10 +3955,16 @@ msgstr ""
 "<computeroutput>aptitude upgrade</computeroutput>."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Automatic installation of updates can be done easily if desired, it just "
+#| "needs the <computeroutput>unattended-upgrades</computeroutput> package to "
+#| "be installed."
 msgid ""
 "Automatic installation of updates can be done easily if desired, it just "
 "needs the <computeroutput>unattended-upgrades</computeroutput> package to be "
-"installed."
+"installed and configured as described on <ulink url=\"https://wiki.debian."
+"org/UnattendedUpgrades\">wiki.debian.org/UnattendedUpgrades</ulink>."
 msgstr ""
 "L'installazione automatica degli aggiornamenti può essere fatta facilmente "
 "se lo si desidera, occorre installare il pacchetto "
@@ -3974,10 +3987,21 @@ msgid "Keep yourself informed about security updates"
 msgstr "Tenersi informati sugli aggiornamenti di sicurezza "
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Running <computeroutput>cron-apt</computeroutput> as described above is a "
+#| "good way to learn when security updates are available for installed "
+#| "packages.  Another way to stay informed about security updates is to "
+#| "subscribe to the <ulink url=\"http://lists.debian.org/debian-security-"
+#| "announce/\">Debian security-announce mailinglist</ulink>, which has the "
+#| "benefit of also telling you what the security update is about. The "
+#| "downside (compared to <computeroutput>cron-apt</computeroutput>) is that "
+#| "it also includes information about updates for packages which aren't "
+#| "installed."
 msgid ""
 "Running <computeroutput>cron-apt</computeroutput> as described above is a "
 "good way to learn when security updates are available for installed "
-"packages.  Another way to stay informed about security updates is to "
+"packages. Another way to stay informed about security updates is to "
 "subscribe to the <ulink url=\"http://lists.debian.org/debian-security-"
 "announce/\">Debian security-announce mailinglist</ulink>, which has the "
 "benefit of also telling you what the security update is about. The downside "
@@ -4450,11 +4474,18 @@ msgid "General notes on upgrading"
 msgstr "Indicazioni generali sull'aggiornamento"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Upgrading Debian from one distribution to the next is generally rather "
+#| "easy. For Debian Edu this is unfortunately not yet true as we heavily "
+#| "modify configuration files in ways we shouldn't. (See Debian bug <ulink "
+#| "url=\"http://bugs.debian.org/311188#\">311188</ulink> for more "
+#| "information.) Upgrading is still possible but may require some work."
 msgid ""
 "Upgrading Debian from one distribution to the next is generally rather easy. "
 "For Debian Edu this is unfortunately not yet true as we heavily modify "
 "configuration files in ways we shouldn't. (See Debian bug <ulink url="
-"\"http://bugs.debian.org/311188#\">311188</ulink> for more information.) "
+"\"https://bugs.debian.org/311188#\">311188</ulink> for more information.) "
 "Upgrading is still possible but may require some work."
 msgstr ""
 "L'aggiornamento di Debian da una distribuzione alla successiva è piuttosto "
@@ -5851,6 +5882,112 @@ msgstr ""
 "Questo è indicato come <ulink url=\"http://bugs.skolelinux.org/1376\">Debian "
 "Edu bug #1376</ulink>."
 
+#. type: Content of: <article><section><section><title>
+msgid "Use a dedicated storage server"
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Take these steps to set up a dedicated storage server for user home "
+"directories and possibly other data."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add a new system of type server using GOsa² as outlined in the <link linkend="
+"\"GettingStarted--Machine_Management_with_GOsa.2BALI-\">Getting started</"
+"link> chapter of this manual."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"This example uses 'nas-server.intern' as the server name. Once 'nas-server."
+"intern' ist configured, check if the NFS export points on the new storage "
+"server are exported to the relevant subnets or machines:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"root at tjener:~# showmount -e nas-server\n"
+"    Export list for nas-server:\n"
+"    /storage         10.0.0.0/8\n"
+"    root at tjener:~#"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Here everything on the backbone network is granted access to the /storage "
+"export. (This could be restricted to netgroup membership or single IP "
+"addresses to limit NFS access like it is done in the tjener:/etc/exports "
+"file.)"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add automount information about 'nas-server.intern' in LDAP to allow all "
+"clients to automatically mount the new export on request."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"This can't be done using GOsa², because a module for automount is missing. "
+"Instead, use ldapvi and add the required LDAP objects using an editor."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"<computeroutput>ldapvi --ldap-conf -ZD '(cn=admin)' -b ou=automount,dc=skole,"
+"dc=skolelinux,dc=no</computeroutput>"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"When the editor shows up, add the following LDAP objects at the bottom of "
+"the document. (The \"/&\" part in the last LDAP object is a wild card "
+"matching everything 'nas-server.intern' exports, removing the need to list "
+"individual mount points in LDAP.)"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"add cn=nas-server,ou=auto.skole,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
+"    objectClass: automount\n"
+"    cn: nas-server\n"
+"    automountInformation: -fstype=autofs --timeout=60 ldap:ou=auto.nas-server,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
+"\n"
+"    add ou=auto.nas-server,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
+"    objectClass: top\n"
+"    objectClass: automountMap\n"
+"    ou: auto.nas-server\n"
+"\n"
+"    add cn=/,ou=auto.nas-server,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
+"    objectClass: automount\n"
+"    cn: /\n"
+"    automountInformation: -fstype=nfs,tcp,rsize=32768,wsize=32768,rw,intr,hard,nodev,nosuid,noatime nas-server.intern:/&"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add the relevant entries in tjener.intern:/etc/fstab, because tjener.intern "
+"does not use automount to avoid mounting loops:"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Create the mount directories using <computeroutput>mkdir</computeroutput>, "
+"edit '/etc/fstab' as adequate and run <computeroutput>mount -a</"
+"computeroutput> to mount the new resources."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Now users should be able to access the files on 'nas-server.intern' directly "
+"by just visiting the '/tjener/nas-server/storage/' directory using any "
+"application on any workstation, LTSP client or LTSP server."
+msgstr ""
+
 #. type: Content of: <article><section><title>
 msgid "HowTos for the desktop"
 msgstr "HowTo per il desktop"
@@ -5904,9 +6041,9 @@ msgid ""
 "linkend=\"Installation--The_installation_process\">installation "
 "instructions</link>."
 msgstr ""
-"Se si vuole usare GNOME o LXDE al posto di KDE \"Plasma\", seguire <link linkend="
-"\"Installation--The_installation_process\">le istruzioni di installazione</"
-"link> ."
+"Se si vuole usare GNOME o LXDE al posto di KDE \"Plasma\", seguire <link "
+"linkend=\"Installation--The_installation_process\">le istruzioni di "
+"installazione</link> ."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -6082,12 +6219,21 @@ msgstr ""
 "manutenzione dei thin-client."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "LTSP defines 320MB as the default minimum amount of RAM for diskless "
+#| "workstations. If the amount of RAM is less, the machine will boot as thin "
+#| "client. Unlike workstations, diskless workstations run without any need "
+#| "to add them with GOsa², cause LDM is used to login and connect to the "
+#| "LTSP server."
 msgid ""
 "LTSP defines 320MB as the default minimum amount of RAM for diskless "
 "workstations. If the amount of RAM is less, the machine will boot as thin "
 "client. Unlike workstations, diskless workstations run without any need to "
 "add them with GOsa², cause LDM is used to login and connect to the LTSP "
-"server."
+"server.  The home directory is by default mounted using sshfs, and not "
+"automount and NFS.  This causes shared directories available via NFS to not "
+"be available on diskless workstations."
 msgstr ""
 "LTSP definisce 320MB di RAM il minimo per le workstation senza dischi. Se la "
 "quantità di RAM è minore, la macchina si avvierà come thin-client. A "
@@ -6095,9 +6241,13 @@ msgstr ""
 "che sia necessario aggiungerle con GOsa²."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The following steps can be used to get back the behaviour from Debian Edu "
+#| "Squeeze:"
 msgid ""
 "The following steps can be used to get back the behaviour from Debian Edu "
-"Squeeze:"
+"Squeeze, using automount, NFS and a display manager other than ldm:"
 msgstr ""
 "Le seguenti operazioni possono essere usate per ritornare al comportamento "
 "di Debian Edu Squeeze:"
@@ -6620,8 +6770,8 @@ msgid ""
 msgstr ""
 "I valori predefiniti sono definiti in <computeroutput>[default]</"
 "computeroutput>; per configurare un client, occorre indicarlo usando "
-"l'indirizzo MAC o l'IP del client come questo: "
-"<computeroutput>[192.168.0.10]</computeroutput>."
+"l'indirizzo MAC o l'IP del client come questo: <computeroutput>[192.168.0.10]"
+"</computeroutput>."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -8243,9 +8393,18 @@ msgid "Moodle"
 msgstr "Moodle"
 
 #. type: Content of: <article><section><section><para>
-msgid ""
-"<ulink url=\"http://packages.debian.org/stable/moodle#\">Moodle</ulink> is a "
-"free, Open Source course management system - software designed using sound "
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"http://packages.debian.org/stable/moodle#\">Moodle</ulink> "
+#| "is a free, Open Source course management system - software designed using "
+#| "sound pedagogical principles to help educators create effective online "
+#| "learning communities. You can download and use it on any computer "
+#| "(including webhosts), yet it can scale from a single-teacher site to a "
+#| "University with 200,000 students. Some schools in France use Moodle to "
+#| "keep track of students' facilities and credit points."
+msgid ""
+"<ulink url=\"https://packages.debian.org/stable/moodle#\">Moodle</ulink> is "
+"a free, Open Source course management system - software designed using sound "
 "pedagogical principles to help educators create effective online learning "
 "communities. You can download and use it on any computer (including "
 "webhosts), yet it can scale from a single-teacher site to a University with "
@@ -8283,8 +8442,13 @@ msgid "Teaching Prolog"
 msgstr "Insegnare Prolog"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"http://packages.debian.org/stable/swi-prolog#\">SWI-Prolog</"
+#| "ulink> is an open source implementation of the programming language "
+#| "Prolog, commonly used for teaching and semantic web applications."
 msgid ""
-"<ulink url=\"http://packages.debian.org/stable/swi-prolog#\">SWI-Prolog</"
+"<ulink url=\"https://packages.debian.org/stable/swi-prolog#\">SWI-Prolog</"
 "ulink> is an open source implementation of the programming language Prolog, "
 "commonly used for teaching and semantic web applications."
 msgstr ""
@@ -8297,13 +8461,22 @@ msgid "Monitoring pupils"
 msgstr "Monitorare gli allievi"
 
 #. type: Content of: <article><section><section><para>
-msgid ""
-"Some schools use control tools like <ulink url=\"http://packages.debian.org/"
-"stable/controlaula#\">Controlaula</ulink> or <ulink url=\"http://packages."
+#, fuzzy
+#| msgid ""
+#| "Some schools use control tools like <ulink url=\"http://packages.debian."
+#| "org/stable/controlaula#\">Controlaula</ulink> or <ulink url=\"http://"
+#| "packages.debian.org/stable/italc-master#\">iTALC</ulink> to supervise "
+#| "their students.  See also the <ulink url=\"http://sourceforge.net/apps/"
+#| "mediawiki/italc/index.php?title=Main_Page\">iTALC Wiki</ulink> (and the "
+#| "documentation in bug <ulink url=\"http://bugs.debian.org/511387#"
+#| "\">511387</ulink>)."
+msgid ""
+"Some schools use control tools like <ulink url=\"https://packages.debian.org/"
+"stable/controlaula#\">Controlaula</ulink> or <ulink url=\"https://packages."
 "debian.org/stable/italc-master#\">iTALC</ulink> to supervise their "
 "students.  See also the <ulink url=\"http://sourceforge.net/apps/mediawiki/"
 "italc/index.php?title=Main_Page\">iTALC Wiki</ulink> (and the documentation "
-"in bug <ulink url=\"http://bugs.debian.org/511387#\">511387</ulink>)."
+"in bug <ulink url=\"https://bugs.debian.org/511387#\">511387</ulink>)."
 msgstr ""
 "Alcune scuole usano strumenti di controllo come <ulink url=\"http://packages."
 "debian.org/stable/controlaula#\">Controlaula</ulink> o <ulink url=\"http://"
@@ -8328,9 +8501,15 @@ msgid "Restricting pupils' network access"
 msgstr "Limitare agli allievi l'accesso alla rete"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Some schools use <ulink url=\"http://packages.debian.org/stable/"
+#| "squidguard#\">Squidguard</ulink> or <ulink url=\"http://packages.debian."
+#| "org/stable/dansguardian#\">Dansguardian</ulink> to restrict Internet "
+#| "access."
 msgid ""
-"Some schools use <ulink url=\"http://packages.debian.org/stable/squidguard#"
-"\">Squidguard</ulink> or <ulink url=\"http://packages.debian.org/stable/"
+"Some schools use <ulink url=\"https://packages.debian.org/stable/squidguard#"
+"\">Squidguard</ulink> or <ulink url=\"https://packages.debian.org/stable/"
 "dansguardian#\">Dansguardian</ulink> to restrict Internet access."
 msgstr ""
 "Alcune scuole usano <ulink url=\"http://packages.debian.org/stable/"
@@ -9180,18 +9359,32 @@ msgid "Copyright and authors"
 msgstr "Copyright e autori"
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "This document is written and copyrighted by Holger Levsen (2007, 2008, "
+#| "2009, 2010, 2011, 2012, 2013), Petter Reinholdtsen (2001, 2002, 2003, "
+#| "2004, 2007, 2008, 2009, 2010, 2012), Daniel Heß (2007), Patrick Winnertz "
+#| "(2007), Knut Yrvin (2007), Ralf Gesellensetter (2007), Ronny Aasen "
+#| "(2007), Morten Werner Forsbring (2007), Bjarne Nielsen (2007, 2008), "
+#| "Nigel Barker (2007), José L. Redrejo Rodríguez (2007), John Bildoy "
+#| "(2007), Joakim Seeberg (2008), Jürgen Leibner (2009, 2010, 2011, 2012), "
+#| "Oded Naveh (2009), Philipp Hübner (2009, 2010), Andreas Mundt (2010), "
+#| "Olivier Vitrat (2010, 2012), Vagrant Cascadian (2010), Mike Gabriel "
+#| "(2011), Justin B Rye (2012), David Prévot (2012), Wolfgang Schweer (2012, "
+#| "2013) and Bernhard Hammes (2012) and is released under the GPL2 or any "
+#| "later version. Enjoy!"
 msgid ""
 "This document is written and copyrighted by Holger Levsen (2007, 2008, 2009, "
-"2010, 2011, 2012, 2013), Petter Reinholdtsen (2001, 2002, 2003, 2004, 2007, "
-"2008, 2009, 2010, 2012), Daniel Heß (2007), Patrick Winnertz (2007), Knut "
-"Yrvin (2007), Ralf Gesellensetter (2007), Ronny Aasen (2007), Morten Werner "
-"Forsbring (2007), Bjarne Nielsen (2007, 2008), Nigel Barker (2007), José L. "
-"Redrejo Rodríguez (2007), John Bildoy (2007), Joakim Seeberg (2008), Jürgen "
-"Leibner (2009, 2010, 2011, 2012), Oded Naveh (2009), Philipp Hübner (2009, "
-"2010), Andreas Mundt (2010), Olivier Vitrat (2010, 2012), Vagrant Cascadian "
-"(2010), Mike Gabriel (2011), Justin B Rye (2012), David Prévot (2012), "
-"Wolfgang Schweer (2012, 2013) and Bernhard Hammes (2012) and is released "
-"under the GPL2 or any later version. Enjoy!"
+"2010, 2011, 2012, 2013, 2014), Petter Reinholdtsen (2001, 2002, 2003, 2004, "
+"2007, 2008, 2009, 2010, 2012), Daniel Heß (2007), Patrick Winnertz (2007), "
+"Knut Yrvin (2007), Ralf Gesellensetter (2007), Ronny Aasen (2007), Morten "
+"Werner Forsbring (2007), Bjarne Nielsen (2007, 2008), Nigel Barker (2007), "
+"José L. Redrejo Rodríguez (2007), John Bildoy (2007), Joakim Seeberg (2008), "
+"Jürgen Leibner (2009, 2010, 2011, 2012), Oded Naveh (2009), Philipp Hübner "
+"(2009, 2010), Andreas Mundt (2010), Olivier Vitrat (2010, 2012), Vagrant "
+"Cascadian (2010), Mike Gabriel (2011), Justin B Rye (2012), David Prévot "
+"(2012), Wolfgang Schweer (2012, 2013) and Bernhard Hammes (2012) and is "
+"released under the GPL2 or any later version. Enjoy!"
 msgstr ""
 "Questo documento è scritto e sotto copyright da Holger Levsen (2007, 2008, "
 "2009, 2010, 2011, 2012, 2013), Petter Reinholdtsen (2001, 2002, 2003, 2004, "
@@ -15850,13 +16043,13 @@ msgstr ""
 
 #~ msgid ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
 #~ "(sambaPwdLastSet=0)))' uid  | less"
 #~ msgstr ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
 #~ "(sambaPwdLastSet=0)))' uid  | less"
 
 #~ msgid ""
@@ -15868,8 +16061,8 @@ msgstr ""
 
 #~ msgid ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
 #~ "\\changetype: modify\\nadd:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' > /"
 #~ "etc/ldap/fixamba.ldif\n"
 #~ "\n"
@@ -15877,8 +16070,8 @@ msgstr ""
 #~ "            -f /etc/ldap/fixamba.ldif"
 #~ msgstr ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
 #~ "\\changetype: modify\\nadd:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' > /"
 #~ "etc/ldap/fixamba.ldif\n"
 #~ "\n"
@@ -15895,8 +16088,8 @@ msgstr ""
 
 #~ msgid ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
 #~ "\\changetype: modify\\nreplace:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' "
 #~ "> /etc/ldap/fixamba.ldif\n"
 #~ "\n"
@@ -15904,8 +16097,8 @@ msgstr ""
 #~ "           -f /etc/ldap/fixamba.ldif"
 #~ msgstr ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
 #~ "\\changetype: modify\\nreplace:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' "
 #~ "> /etc/ldap/fixamba.ldif\n"
 #~ "\n"
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
index a92acfd..e61ccea 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: release-manual.nb\n"
-"POT-Creation-Date: 2013-10-27 12:10-0400\n"
+"POT-Creation-Date: 2014-04-03 13:19+0300\n"
 "PO-Revision-Date: 2014-03-30 18:59+0200\n"
 "Last-Translator: Ole-Erik Yrvin <oeyrvin at hagan.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
@@ -31,7 +31,6 @@ msgid "Debian Edu / Skolelinux Wheezy 7.1+edu0 Manual"
 msgstr "Debian Edu / Skolelinux Wheezy 7.1+edu0 utgivelsesmanual"
 
 #. type: Content of: <article><section><title>
-#| msgid "Manual for Debian Edu 7.1+edu0 Codename \"Wheezy\""
 msgid "Manual for Debian Edu 7.1+edu0 Codename Wheezy"
 msgstr "Utgivelsesmanual for Debian Edu 7.1+edu0 kodenavn Wheezy"
 
@@ -95,22 +94,17 @@ msgid ""
 "diskless machines like traditional thin-clients."
 msgstr ""
 "Rett etter installasjonen vill skoletjeneren være satt opp til å kjøre alle "
-"tjenester som trengs "
-"i skolenettverket (se neste kapittel <link linkend="
+"tjenester som trengs i skolenettverket (se neste kapittel <link linkend="
 "\"Architecture\"> for detaljer omkring arkitektur og oppsett</link>). "
 "Tjenereren vil vente på at brukere og maskiner blir lagt til via GOsa² og få "
-"et komfortabelt "
-"Web-brukergrensesnitt eller foreta andre LDAP redigeringer. Et "
-"nettoppstartmiljø er utarbeidet "
-"ved hjelp av PXE slik at etter første installasjon av hovedtjener fra en CD, "
-"Blue-ray-plate eller "
-"USB-minne, vil alle andre maskiner bli installert via nettverket.  Dette "
-"gjelder også  vandrende "
-"arbeidsstasjoner som periodvis forlater det lokale skolenettverket. Dette kan "
-"være bærbare "
-"datamaskiner eller nettbrett, men også tradisjonelle tynne klienter som "
-"lagringsløse maskiner  "
-"med PXE oppstart."
+"et komfortabelt Web-brukergrensesnitt eller foreta andre LDAP redigeringer. "
+"Et nettoppstartmiljø er utarbeidet ved hjelp av PXE slik at etter første "
+"installasjon av hovedtjener fra en CD, Blue-ray-plate eller USB-minne, vil "
+"alle andre maskiner bli installert via nettverket.  Dette gjelder også  "
+"vandrende arbeidsstasjoner som periodvis forlater det lokale "
+"skolenettverket. Dette kan være bærbare datamaskiner eller nettbrett, men "
+"også tradisjonelle tynne klienter som lagringsløse maskiner  med PXE "
+"oppstart."
 
 #. type: Content of: <article><section><para>
 msgid ""
@@ -787,10 +781,10 @@ msgid ""
 "using network-PROM (or PXE) without using the local client hard drive. The "
 "thin client setup used is that of the Linux Terminal Server Project (LTSP)."
 msgstr ""
-"Et tynnklientoppsett gjør det mulig for vanlige PCer å fungere som en "
-"(X-)terminal. Dette betyr at maskinen starter opp fra en diskett eller "
-"direkte fra tjeneren ved hjelp av nettverks-PROM (eller PXE) uten bruk av "
-"lokal harddisk i klienten. Tynnklientoppsettet som er brukt er det til Linux "
+"Et tynnklientoppsett gjør det mulig for vanlige PCer å fungere som en (X-)"
+"terminal. Dette betyr at maskinen starter opp fra en diskett eller direkte "
+"fra tjeneren ved hjelp av nettverks-PROM (eller PXE) uten bruk av lokal "
+"harddisk i klienten. Tynnklientoppsettet som er brukt er det til Linux "
 "Terminal Server Project (LTSP)."
 
 #. type: Content of: <article><section><section><section><para>
@@ -1792,8 +1786,8 @@ msgstr "<emphasis role='strong'>Tynnklient</emphasis>"
 #, fuzzy
 msgid "./images/Installer_help.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-10-basesystem.png\"/></imageobject>"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
@@ -2206,7 +2200,7 @@ msgstr "En kommentar om installasjon av tynnklienttjenere"
 msgid ""
 "First of all, this profile name is confusing for historic reasons. Currently "
 "this profile actually installs an LTSP server environment for thin-clients "
-"and for workstations. Debian bug <ulink url=\"http://bugs.debian.org/588510#"
+"and for workstations. Debian bug <ulink url=\"https://bugs.debian.org/588510#"
 "\">588510</ulink> has been filed to change the name of the profile into a "
 "better suited one."
 msgstr ""
@@ -2605,57 +2599,57 @@ msgstr ""
 #, fuzzy
 msgid "./images/08-Choose_Debian_Edu_profile.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-06-profile.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-06-profile.png\"/></imageobject>"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
 msgid "08-Choose_Debian_Edu_profile.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-06-profile.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-06-profile.png\"/></imageobject>"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 msgid "./images/09-Really_use_the_automatic_partitioning_tool.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-07-partitioning.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-07-partitioning.png\"/></imageobject>"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
 msgid "09-Really_use_the_automatic_partitioning_tool.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-07-partitioning.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-07-partitioning.png\"/></imageobject>"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 msgid "./images/10-Really_use_the_automatic_partitioning_tool-Yes.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-07-partitioning.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-07-partitioning.png\"/></imageobject>"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
 msgid "10-Really_use_the_automatic_partitioning_tool-Yes.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-07-partitioning.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-07-partitioning.png\"/></imageobject>"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 msgid "./images/11-Participate_in_the_package_usage_survey.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
-"lwat-]edituser_squeeze.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:lwat-]"
+"edituser_squeeze.png\"/></imageobject>"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
 msgid "11-Participate_in_the_package_usage_survey.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
-"lwat-]edituser_squeeze.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:lwat-]"
+"edituser_squeeze.png\"/></imageobject>"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
@@ -2720,43 +2714,43 @@ msgstr ""
 #, fuzzy
 msgid "./images/13-Install+the+base+system.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-10-basesystem.png\"/></imageobject>"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
 msgid "13-Install the base system.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-10-basesystem.png\"/></imageobject>"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 msgid "./images/14-Select_and_install_software.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
-"getting-]started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
+"started.png\"/></imageobject>"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
 msgid "14-Select_and_install_software.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
-"getting-]started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
+"started.png\"/></imageobject>"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 msgid "./images/17-Select_and_install_software.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
-"getting-]started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
+"started.png\"/></imageobject>"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
 msgid "17-Select_and_install_software.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
-"getting-]started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
+"started.png\"/></imageobject>"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
@@ -2787,29 +2781,29 @@ msgstr ""
 #, fuzzy
 msgid "./images/20-Finish_the_Installation.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
-"getting-]started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
+"started.png\"/></imageobject>"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
 msgid "20-Finish_the_Installation.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
-"getting-]started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
+"started.png\"/></imageobject>"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 msgid "./images/21-Finish_the_Installation-Installation_complete.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
-"getting-]started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
+"started.png\"/></imageobject>"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
 msgid "21-Finish_the_Installation-Installation_complete.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
-"getting-]started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
+"started.png\"/></imageobject>"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/22-Tjener_GRUB_boot_menu.png"
@@ -3583,10 +3577,8 @@ msgstr ""
 #. type: CDATA
 #, no-wrap
 msgid ""
-"root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t "
-"workstations\n"
-"info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] "
-"id ether-00:04:76:d3:28:b7.\n"
+"root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t workstations\n"
+"info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] id ether-00:04:76:d3:28:b7.\n"
 "\n"
 "Enter password if you want to activate these changes, and ^c to abort.\n"
 "\n"
@@ -3598,8 +3590,8 @@ msgstr ""
 #, fuzzy
 msgid "./images/gosa_systems_list.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-10-basesystem.png\"/></imageobject>"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "GOsa² systems listing"
@@ -3609,8 +3601,8 @@ msgstr ""
 #, fuzzy
 msgid "./images/gosa_systems_host_details.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-10-basesystem.png\"/></imageobject>"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "Host details"
@@ -3631,8 +3623,8 @@ msgstr ""
 #, fuzzy
 msgid "./images/gosa_systems_add_netgroup.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-10-basesystem.png\"/></imageobject>"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "Add netgroup"
@@ -3839,9 +3831,9 @@ msgid ""
 "machines on the local network.  Combined with web proxy restrictions this "
 "might be used during exams."
 msgstr ""
-"Debian Edu maskiner i denne gruppen vil bare få lov til å koble til"
-"maskiner på det lokale nettverket. Kombinert med web proxy begrensninger "
-"kan dette brukes under eksamen."
+"Debian Edu maskiner i denne gruppen vil bare få lov til å koble tilmaskiner "
+"på det lokale nettverket. Kombinert med web proxy begrensninger kan dette "
+"brukes under eksamen."
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
@@ -4015,12 +4007,12 @@ msgstr ""
 msgid ""
 "Automatic installation of updates can be done easily if desired, it just "
 "needs the <computeroutput>unattended-upgrades</computeroutput> package to be "
-"installed."
+"installed and configured as described on <ulink url=\"https://wiki.debian."
+"org/UnattendedUpgrades\">wiki.debian.org/UnattendedUpgrades</ulink>."
 msgstr ""
 "Automatisk installasjon av oppdateringer kan gjøres enkelt hvis det er "
-"ønskelig, det "
-"trengs bare at <computeroutput> ubetjente-oppgraderinger </ computeroutput>"
-"-pakken er installert."
+"ønskelig, det trengs bare at <computeroutput> ubetjente-oppgraderinger </ "
+"computeroutput>-pakken er installert."
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
@@ -4043,7 +4035,7 @@ msgstr "Hold deg oppdatert vedrørende sikkerhetsoppdateringer."
 msgid ""
 "Running <computeroutput>cron-apt</computeroutput> as described above is a "
 "good way to learn when security updates are available for installed "
-"packages.  Another way to stay informed about security updates is to "
+"packages. Another way to stay informed about security updates is to "
 "subscribe to the <ulink url=\"http://lists.debian.org/debian-security-"
 "announce/\">Debian security-announce mailinglist</ulink>, which has the "
 "benefit of also telling you what the security update is about. The downside "
@@ -4159,8 +4151,8 @@ msgstr ""
 #, fuzzy
 msgid "./images/slbackup-php_maintenance.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-10-basesystem.png\"/></imageobject>"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
@@ -4347,16 +4339,14 @@ msgid ""
 "host in question can be added to the <computeroutput>fsautoresize-hosts</"
 "computeroutput> netgroup."
 msgstr ""
-"Partisjonen (/usr/ i eksempelet) er for full. Det finnes generelt to"
-"måter å håndtere dette: (1) Fjerne noen filer eller (2) øke størrelsen på"
-"partisjon. Hvis partisjonen er /var/, sletting APT cache med"
-"<computeroutput> apt-get clean </computeroutput> fjerner kanskje noen filer. "
-"Hvis"
-"det er mer plass tilgjengelig i  LVM volum gruppen, kan programmet"
-"<computeroutput> debian-edu-fsautoresize </computeroutput> forlenge"
-"partisjoner. For å kjøre dette programmet automatisk hver time,"
-"kan verten det gjelder legges til nettgruppen <computeroutput> "
-"fsautoresize-hosts </computeroutput>."
+"Partisjonen (/usr/ i eksempelet) er for full. Det finnes generelt tomåter å "
+"håndtere dette: (1) Fjerne noen filer eller (2) øke størrelsen påpartisjon. "
+"Hvis partisjonen er /var/, sletting APT cache med<computeroutput> apt-get "
+"clean </computeroutput> fjerner kanskje noen filer. Hvisdet er mer plass "
+"tilgjengelig i  LVM volum gruppen, kan programmet<computeroutput> debian-edu-"
+"fsautoresize </computeroutput> forlengepartisjoner. For å kjøre dette "
+"programmet automatisk hver time,kan verten det gjelder legges til "
+"nettgruppen <computeroutput> fsautoresize-hosts </computeroutput>."
 
 #. type: Content of: <article><section><section><section><section><section><title>
 #, fuzzy
@@ -4375,13 +4365,12 @@ msgid ""
 "<computeroutput>ltsp-chroot apt-get update && ltsp-chroot apt-get "
 "upgrade</computeroutput>."
 msgstr ""
-"Ny pakke er tilgjengelig for oppgraderinger. De kritiske de er normalt"
-"sikkerhetsfikser. For å oppgradere, kjør 'apt-get upgrade && apt-get "
-"dist-upgrade' som root i en terminal eller logge inn via ssh for å gjøre det "
-"samme. På tynne"
-"klienttjenere, husk også oppdatere LTSP chroot med"
-"<computeroutput> ltsp-chroot apt-get update && ltsp-chroot apt-get"
-"upgrade </computeroutput>."
+"Ny pakke er tilgjengelig for oppgraderinger. De kritiske de er "
+"normaltsikkerhetsfikser. For å oppgradere, kjør 'apt-get upgrade && "
+"apt-get dist-upgrade' som root i en terminal eller logge inn via ssh for å "
+"gjøre det samme. På tynneklienttjenere, husk også oppdatere LTSP chroot "
+"med<computeroutput> ltsp-chroot apt-get update && ltsp-chroot apt-"
+"getupgrade </computeroutput>."
 
 #. type: Content of: <article><section><section><section><section><section><para>
 #, fuzzy
@@ -4391,11 +4380,10 @@ msgid ""
 "upgrades</computeroutput> package and configure it to automatically upgrade "
 "all new packages every night.  This will not upgrade the LTSP chroots."
 msgstr ""
-"Hvis du ikke ønsker å manuelt oppgradere pakker og stoler på at Debian gjør en"
-"god jobb med nye versjoner, kan du installere <computeroutput>"
-"unattended-upgrades</ computeroutput> -pakke og konfigurere den til å "
-"automatisk oppgradere "
-"alle nye pakker hver natt. Dette vil ikke oppgradere LTSP chroot."
+"Hvis du ikke ønsker å manuelt oppgradere pakker og stoler på at Debian gjør "
+"engod jobb med nye versjoner, kan du installere <computeroutput>unattended-"
+"upgrades</ computeroutput> -pakke og konfigurere den til å automatisk "
+"oppgradere alle nye pakker hver natt. Dette vil ikke oppgradere LTSP chroot."
 
 #. type: Content of: <article><section><section><section><section><section><para>
 #, fuzzy
@@ -4406,11 +4394,10 @@ msgid ""
 "argument to ltsp-chroot.  It is a good idea to update the chroot when "
 "updating the host system."
 msgstr ""
-"For å oppgradere LTSP chroot, kan man bruke <computeroutput>ltsp-chroot "
-"apt-get "
-"update && ltsp-chroot apt-get upgrade</computeroutput>. På 64-bit"
-"servere, vil man måtte legge <computeroutput>-en i386 </ computeroutput>  til "
-"ltsp-chroot. Det er en god idé å oppdatere chroot når man oppdaterer "
+"For å oppgradere LTSP chroot, kan man bruke <computeroutput>ltsp-chroot apt-"
+"get update && ltsp-chroot apt-get upgrade</computeroutput>. På 64-"
+"bitservere, vil man måtte legge <computeroutput>-en i386 </ computeroutput>  "
+"til ltsp-chroot. Det er en god idé å oppdatere chroot når man oppdaterer "
 "vertssystemet."
 
 #. type: Content of: <article><section><section><section><section><section><title>
@@ -4430,8 +4417,8 @@ msgid ""
 "fairly urgent, as new kernels normally show up in Debian Edu to fix security "
 "issues."
 msgstr ""
-"Kjernen som brukes er eldre enn den nyeste installerte kjernen, og omstart"
-"må til for å aktivere den nyest installerte kjernen. Dette vil normalt haste "
+"Kjernen som brukes er eldre enn den nyeste installerte kjernen, og omstartmå "
+"til for å aktivere den nyest installerte kjernen. Dette vil normalt haste "
 "endel, fordi nye kjerner i Debian Edu bidrar til å løse sikkerhetsproblemer."
 
 #. type: Content of: <article><section><section><section><section><section><title>
@@ -4453,11 +4440,11 @@ msgid ""
 msgstr ""
 "Skriverkøene i CUPS har mange jobber som venter. Dette er mest sannsynlig på "
 "grunn av at skriver ikke er tilgjengelig. Deaktiverte utskriftskøer blir "
-"aktivert hver time på vertene som er med i nettgruppen <computeroutput>"
-"cups-queue-autoreenable-hosts</computeroutput>. For slike verter bør ikke "
-"manuell handling være nødvendig. Utskriftskøene blir tømt hver kveld for "
-"vertene som er med i nettgruppen <computeroutput>cups-queue-autoflush-hosts<"
-"/computeroutput>. Hvis en vert har mange jobber i sin kø, vurder å legge "
+"aktivert hver time på vertene som er med i nettgruppen <computeroutput>cups-"
+"queue-autoreenable-hosts</computeroutput>. For slike verter bør ikke manuell "
+"handling være nødvendig. Utskriftskøene blir tømt hver kveld for vertene som "
+"er med i nettgruppen <computeroutput>cups-queue-autoflush-hosts</"
+"computeroutput>. Hvis en vert har mange jobber i sin kø, vurder å legge "
 "slike verter inn i en eller begge nettgrupper. "
 
 #. type: Content of: <article><section><section><section><title>
@@ -4507,9 +4494,9 @@ msgid ""
 "\">Administration Howto chapter</link> and in the <link linkend="
 "\"AdvancedAdministration\">Advanced administration Howto chapter</link>"
 msgstr ""
-"Mer informasjonom nyttige tilpasninger i Debian Edu for systemadministratorer "
-"finnes i <link linkend=\"Administration\">Administration Howto chapter</link> "
-"og i <link linkend="
+"Mer informasjonom nyttige tilpasninger i Debian Edu for "
+"systemadministratorer finnes i <link linkend=\"Administration"
+"\">Administration Howto chapter</link> og i <link linkend="
 "\"AdvancedAdministration\">Advanced administration Howto chapter</link> "
 
 #. type: Content of: <article><section><title>
@@ -4547,7 +4534,7 @@ msgid ""
 "Upgrading Debian from one distribution to the next is generally rather easy. "
 "For Debian Edu this is unfortunately not yet true as we heavily modify "
 "configuration files in ways we shouldn't. (See Debian bug <ulink url="
-"\"http://bugs.debian.org/311188#\">311188</ulink> for more information.) "
+"\"https://bugs.debian.org/311188#\">311188</ulink> for more information.) "
 "Upgrading is still possible but may require some work."
 msgstr ""
 "Oppgradering av debian fra en distro til en annen er genrell enkelt. For "
@@ -4667,8 +4654,8 @@ msgid ""
 "before doing anything."
 msgstr ""
 "LDAP-oppsettet har endret seg noe fra Squeeze til Wheezy. Likevel, LDAP må "
-"gjenoppbygges fra bunnen av. Det er et script som kan få til dette i <"
-"computeroutput>ldap-debian-edu-install</computeroutput> (i /usr/bin). Les "
+"gjenoppbygges fra bunnen av. Det er et script som kan få til dette i "
+"<computeroutput>ldap-debian-edu-install</computeroutput> (i /usr/bin). Les "
 "kommentaren i begynnelsen av dette skriptet nøye før du gjør noe."
 
 #. type: Content of: <article><section><section><section><title>
@@ -5056,17 +5043,14 @@ msgid ""
 "shell as the user you created during the main server's installation (first "
 "user):"
 msgstr ""
-"Hvis du (sannsynligvis ved et uhell) har installert en ren hoved-serverprofil "
-"og"
-"ikke har en klient med en nettleser for hånden, er det enkelt å installere et "
-"minimalt"
-"skrivebord på hovedserveren ved hjelp av denne kommandosekvensen i et "
-"(ikke-grafisk)"
-"skall som brukeren du opprettet under installasjonen av hovedserveren (første"
-"bruker):"
+"Hvis du (sannsynligvis ved et uhell) har installert en ren hoved-"
+"serverprofil ogikke har en klient med en nettleser for hånden, er det enkelt "
+"å installere et minimaltskrivebord på hovedserveren ved hjelp av denne "
+"kommandosekvensen i et (ikke-grafisk)skall som brukeren du opprettet under "
+"installasjonen av hovedserveren (førstebruker):"
 
 #. type: CDATA
-#, fuzzy, no-wrap
+#, no-wrap
 msgid ""
 "$ sudo apt-get update\n"
 "  $ sudo apt-get install gnome-session gnome-terminal iceweasel xorg\n"
@@ -5095,7 +5079,7 @@ msgid "The following needs to be executed:"
 msgstr "Følgende må utføres:"
 
 #. type: CDATA
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "ldapvi --ldap-conf -ZD '(cn=admin)'"
 msgstr ""
 
@@ -5221,8 +5205,7 @@ msgstr "Bruk av backports.org"
 #. type: CDATA
 #, fuzzy, no-wrap
 msgid ""
-"echo \"deb http://ftp.debian.org/debian/ wheezy-backports main\" >> /etc/apt "
-"sources.list\n"
+"echo \"deb http://ftp.debian.org/debian/ wheezy-backports main\" >> /etc/apt sources.list\n"
 "apt-get update"
 msgstr "deb http://ftp.debian.org/debian/ squeeze main contrib non-free"
 
@@ -5349,10 +5332,9 @@ msgstr ""
 "<computeroutput>unattended-upgrades</computeroutput> er en Debian-pakke som "
 "automatisk vil  installere sikkerhets- (og andre) oppdateringer. Hvis du "
 "planlegger å bruke den, må du ha noen muligheter til å overvåke dine "
-"systemer, som å ha installert pakken "
-"<computeroutput>apt-listchanges</computeroutput> og konfigurer den til å "
-"sende e-poster om oppdateringer. Og det er alltid  "
-"<computeroutput>/var/log/dpkg.log</computeroutput>."
+"systemer, som å ha installert pakken <computeroutput>apt-listchanges</"
+"computeroutput> og konfigurer den til å sende e-poster om oppdateringer. Og "
+"det er alltid  <computeroutput>/var/log/dpkg.log</computeroutput>."
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
@@ -5760,8 +5742,7 @@ msgid ""
 "        chown $user:$group $home_path/$home/$shared_folder\n"
 "        ((created_dir+=1))\n"
 "    else\n"
-"        echo -e \"the folder $home_path/$home/$shared_folder already "
-"exists.\\n\"\n"
+"        echo -e \"the folder $home_path/$home/$shared_folder already exists.\\n\"\n"
 "    fi\n"
 " done\n"
 " echo \"$created_dir folders have been created\""
@@ -5781,8 +5762,7 @@ msgstr ""
 "        chown $user:$group $home_path/$home/$shared_folder\n"
 "        ((created_dir+=1))\n"
 " else\n"
-"  . echo -e \"the folder $home_path/$home/$shared_folder already "
-"exists.\\n\"\n"
+"  . echo -e \"the folder $home_path/$home/$shared_folder already exists.\\n\"\n"
 " . fi\n"
 "done\n"
 "echo \"$created_dir folders has been created\""
@@ -5850,20 +5830,17 @@ msgid ""
 "        ln -s /media/$home $home_path/$home/$shared_folder\n"
 "        ((created_dir+=1))\n"
 "    else\n"
-"        echo -e \"the folder $home_path/$home/$shared_folder already "
-"exists.\\n\"\n"
+"        echo -e \"the folder $home_path/$home/$shared_folder already exists.\\n\"\n"
 "    fi\n"
 " done\n"
 " echo \"$created_dir folders has been created\""
 msgstr ""
-"home_path=\"/skole/tjener/home0\"; shared_folder=\"Media\"; "
-"permissions=\"775\"; created_dir=0;\n"
+"home_path=\"/skole/tjener/home0\"; shared_folder=\"Media\"; permissions=\"775\"; created_dir=0;\n"
 "for home in $(ls $home_path); do\n"
 "  if [ ! -d \"$home_path/$home/$shared_folder\" ]; then\n"
 "    ln -s /media/$home $home_path/$home/$shared_folder ((created_dir+=1))\n"
 "  else\n"
-"    echo -e \"the folder $home_path/$home/$shared_folder already "
-"exists.\\n\"\n"
+"    echo -e \"the folder $home_path/$home/$shared_folder already exists.\\n\"\n"
 "  fi\n"
 "done\n"
 "echo \"$created_dir folders has been created\""
@@ -5899,6 +5876,112 @@ msgstr ""
 "Dette er registret som <ulink url=\"http://bugs.skolelinux.org/1376\">Debian "
 "Edu bug #1376</ulink>."
 
+#. type: Content of: <article><section><section><title>
+msgid "Use a dedicated storage server"
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Take these steps to set up a dedicated storage server for user home "
+"directories and possibly other data."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add a new system of type server using GOsa² as outlined in the <link linkend="
+"\"GettingStarted--Machine_Management_with_GOsa.2BALI-\">Getting started</"
+"link> chapter of this manual."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"This example uses 'nas-server.intern' as the server name. Once 'nas-server."
+"intern' ist configured, check if the NFS export points on the new storage "
+"server are exported to the relevant subnets or machines:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"root at tjener:~# showmount -e nas-server\n"
+"    Export list for nas-server:\n"
+"    /storage         10.0.0.0/8\n"
+"    root at tjener:~#"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Here everything on the backbone network is granted access to the /storage "
+"export. (This could be restricted to netgroup membership or single IP "
+"addresses to limit NFS access like it is done in the tjener:/etc/exports "
+"file.)"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add automount information about 'nas-server.intern' in LDAP to allow all "
+"clients to automatically mount the new export on request."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"This can't be done using GOsa², because a module for automount is missing. "
+"Instead, use ldapvi and add the required LDAP objects using an editor."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"<computeroutput>ldapvi --ldap-conf -ZD '(cn=admin)' -b ou=automount,dc=skole,"
+"dc=skolelinux,dc=no</computeroutput>"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"When the editor shows up, add the following LDAP objects at the bottom of "
+"the document. (The \"/&\" part in the last LDAP object is a wild card "
+"matching everything 'nas-server.intern' exports, removing the need to list "
+"individual mount points in LDAP.)"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"add cn=nas-server,ou=auto.skole,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
+"    objectClass: automount\n"
+"    cn: nas-server\n"
+"    automountInformation: -fstype=autofs --timeout=60 ldap:ou=auto.nas-server,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
+"\n"
+"    add ou=auto.nas-server,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
+"    objectClass: top\n"
+"    objectClass: automountMap\n"
+"    ou: auto.nas-server\n"
+"\n"
+"    add cn=/,ou=auto.nas-server,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
+"    objectClass: automount\n"
+"    cn: /\n"
+"    automountInformation: -fstype=nfs,tcp,rsize=32768,wsize=32768,rw,intr,hard,nodev,nosuid,noatime nas-server.intern:/&"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add the relevant entries in tjener.intern:/etc/fstab, because tjener.intern "
+"does not use automount to avoid mounting loops:"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Create the mount directories using <computeroutput>mkdir</computeroutput>, "
+"edit '/etc/fstab' as adequate and run <computeroutput>mount -a</"
+"computeroutput> to mount the new resources."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Now users should be able to access the files on 'nas-server.intern' directly "
+"by just visiting the '/tjener/nas-server/storage/' directory using any "
+"application on any workstation, LTSP client or LTSP server."
+msgstr ""
+
 #. type: Content of: <article><section><title>
 msgid "HowTos for the desktop"
 msgstr "Veiledninger for skrivebordet"
@@ -6046,10 +6129,8 @@ msgid ""
 "apt-get install debian-keyring\n"
 "# fetch the deb-multimedia key insecurely:\n"
 "gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 1F41B907\n"
-"# check securely if the key is correct and add it to the keyring used by APT "
-"if it is:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && "
-"gpg --export 1F41B907 | apt-key add -\n"
+"# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
+"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\n"
 "# add repository to sources.list - please check the homepages for mirrors!\n"
 "echo \"deb http://deb-multimedia.org wheezy main\" >> /etc/apt/sources.list\n"
 "# update the list of available packages:\n"
@@ -6059,12 +6140,9 @@ msgstr ""
 "aptitude install debian-keyring\n"
 "# hent deb-multimedianøkkelen usikret:\n"
 "gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 1F41B907\n"
-"# sjekk sikkert om nøkkelen er korrekt og legg den til nøkkelingen apt "
-"benytter hvis den er det:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && "
-"gpg --export 1F41B907 | apt-key add -\n"
-"# legg programvarearkivet til sources.list - vennligst sjekk hjemmesidene for "
-"speil!\n"
+"# sjekk sikkert om nøkkelen er korrekt og legg den til nøkkelingen apt benytter hvis den er det:\n"
+"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\n"
+"# legg programvarearkivet til sources.list - vennligst sjekk hjemmesidene for speil!\n"
 "echo \"deb http://deb-multimedia.org squeeze main\" >> /etc/apt/sources.list\n"
 "# oppdater listen over tilgjengelige pakker:\n"
 "aptitude update"
@@ -6113,10 +6191,10 @@ msgid ""
 "boots from a diskette or directly from the server using network-PROM (or "
 "PXE) without using a local client hard drive."
 msgstr ""
-"Et tynnklientoppsett gjør det mulig for vanlige PCer å fungere som en "
-"(X-)terminal. Dette betyr at maskinen starter opp fra en diskett eller "
-"direkte fra tjeneren ved hjelp av nettverks-PROM (eller PXE) uten bruk av "
-"lokal harddisk i klienten. "
+"Et tynnklientoppsett gjør det mulig for vanlige PCer å fungere som en (X-)"
+"terminal. Dette betyr at maskinen starter opp fra en diskett eller direkte "
+"fra tjeneren ved hjelp av nettverks-PROM (eller PXE) uten bruk av lokal "
+"harddisk i klienten. "
 
 #. type: Content of: <article><section><section><para>
 msgid "<emphasis role=\"strong\">Diskless workstation</emphasis>"
@@ -6142,13 +6220,15 @@ msgid ""
 "workstations. If the amount of RAM is less, the machine will boot as thin "
 "client. Unlike workstations, diskless workstations run without any need to "
 "add them with GOsa², cause LDM is used to login and connect to the LTSP "
-"server."
+"server.  The home directory is by default mounted using sshfs, and not "
+"automount and NFS.  This causes shared directories available via NFS to not "
+"be available on diskless workstations."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
 "The following steps can be used to get back the behaviour from Debian Edu "
-"Squeeze:"
+"Squeeze, using automount, NFS and a display manager other than ldm:"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -6359,8 +6439,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "#add the skole projects local repository\n"
-"d-i     apt-setup/local1/repository string      http://example.org/debian "
-"stable main contrib non-free\n"
+"d-i     apt-setup/local1/repository string      http://example.org/debian stable main contrib non-free\n"
 "d-i     apt-setup/local1/comment string         Example Software Repository\n"
 "d-i     apt-setup/local1/source boolean         true\n"
 "d-i     apt-setup/local1/key    string          http://example.org/key.asc"
@@ -6407,12 +6486,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid ""
-"ln -s /var/lib/tftpboot/debian-edu/default-diskless.cfg "
-"/var/lib/tftpboot/pxelinux.cfg/default"
-msgstr ""
-"ln -s /var/lib/tftpboot/debian-edu/default-diskless.cfg "
-"/var/lib/tftpboot/pxelinux.cfg/default"
+msgid "ln -s /var/lib/tftpboot/debian-edu/default-diskless.cfg /var/lib/tftpboot/pxelinux.cfg/default"
+msgstr "ln -s /var/lib/tftpboot/debian-edu/default-diskless.cfg /var/lib/tftpboot/pxelinux.cfg/default"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
@@ -6425,12 +6500,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid ""
-"ln -s /var/lib/tftpboot/debian-edu/default-thin.cfg "
-"/var/lib/tftpboot/pxelinux.cfg/default"
-msgstr ""
-"ln -s /var/lib/tftpboot/debian-edu/default-thin.cfg "
-"/var/lib/tftpboot/pxelinux.cfg/default"
+msgid "ln -s /var/lib/tftpboot/debian-edu/default-thin.cfg /var/lib/tftpboot/pxelinux.cfg/default"
+msgstr "ln -s /var/lib/tftpboot/debian-edu/default-thin.cfg /var/lib/tftpboot/pxelinux.cfg/default"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
@@ -6488,10 +6559,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid ""
-"DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img "
-"nfsroot=10.0.2.10:/opt/ltsp/i386 init=/sbin/init-ltsp boot=nfs ro quiet "
-"ipappend 2"
+msgid "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 init=/sbin/init-ltsp boot=nfs ro quiet ipappend 2"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -6941,8 +7009,7 @@ msgstr ""
 #. type: CDATA
 #, fuzzy, no-wrap
 msgid ""
-"ltsp-chroot -a i386  # this does \"chroot /opt/ltsp/i386\" and more, ie it "
-"also prevents daemons from being started\n"
+"ltsp-chroot -a i386  # this does \"chroot /opt/ltsp/i386\" and more, ie it also prevents daemons from being started\n"
 "aptitude update\n"
 "aptitude upgrade\n"
 "aptitude dist-upgrade\n"
@@ -7863,8 +7930,8 @@ msgid ""
 msgstr ""
 "Samba (v3) i Debian Edu Wheezy er utarbeidet til bruk som en NT4-stil domene "
 "kontroll med Windows XP, Windows Vista og Windovs 7 som klient. Etter at en "
-"maskin har  sluttet seg til domenet, kan denne maskinen  bli fullstendig styr "
-"t med GOsa²."
+"maskin har  sluttet seg til domenet, kan denne maskinen  bli fullstendig "
+"styr t med GOsa²."
 
 #. type: Content of: <article><section><section><title>
 msgid "Getting Started"
@@ -7880,13 +7947,13 @@ msgid ""
 "also presume that you have a Windows XP/Vista/7 workstation at hand, so you "
 "can test access to the Debian Edu main server from a Windows machine."
 msgstr ""
-"Denne dokumentasjonen forutsetter at du har installert Debian Edu "
-"hoved-server, og kanskje også en Debian Edu arbeidsstasjon for å bekrefte at "
-"det å arbeide under Debian Edu/Skolelinux  fungerer for deg. Vi antar at du "
+"Denne dokumentasjonen forutsetter at du har installert Debian Edu hoved-"
+"server, og kanskje også en Debian Edu arbeidsstasjon for å bekrefte at det å "
+"arbeide under Debian Edu/Skolelinux  fungerer for deg. Vi antar at du "
 "allerede har  opprettet noen brukere som kan bruke Debian Edu arbeidsstasjon "
-"feilfritt. Vi forutsetter også at du har en Windows/XP/Vista/7 arbeidsstasjon "
-"for hånden, slik at du kan teste tilgang to Debian Edu hoved-server fra en "
-"Windows maskin."
+"feilfritt. Vi forutsetter også at du har en Windows/XP/Vista/7 "
+"arbeidsstasjon for hånden, slik at du kan teste tilgang to Debian Edu hoved-"
+"server fra en Windows maskin."
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
@@ -8169,8 +8236,8 @@ msgstr "moodle"
 #. type: Content of: <article><section><section><para>
 #, fuzzy
 msgid ""
-"<ulink url=\"http://packages.debian.org/stable/moodle#\">Moodle</ulink> is a "
-"free, Open Source course management system - software designed using sound "
+"<ulink url=\"https://packages.debian.org/stable/moodle#\">Moodle</ulink> is "
+"a free, Open Source course management system - software designed using sound "
 "pedagogical principles to help educators create effective online learning "
 "communities. You can download and use it on any computer (including "
 "webhosts), yet it can scale from a single-teacher site to a University with "
@@ -8211,7 +8278,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"<ulink url=\"http://packages.debian.org/stable/swi-prolog#\">SWI-Prolog</"
+"<ulink url=\"https://packages.debian.org/stable/swi-prolog#\">SWI-Prolog</"
 "ulink> is an open source implementation of the programming language Prolog, "
 "commonly used for teaching and semantic web applications."
 msgstr ""
@@ -8222,12 +8289,12 @@ msgstr "Overvåkning av elever"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Some schools use control tools like <ulink url=\"http://packages.debian.org/"
-"stable/controlaula#\">Controlaula</ulink> or <ulink url=\"http://packages."
+"Some schools use control tools like <ulink url=\"https://packages.debian.org/"
+"stable/controlaula#\">Controlaula</ulink> or <ulink url=\"https://packages."
 "debian.org/stable/italc-master#\">iTALC</ulink> to supervise their "
 "students.  See also the <ulink url=\"http://sourceforge.net/apps/mediawiki/"
 "italc/index.php?title=Main_Page\">iTALC Wiki</ulink> (and the documentation "
-"in bug <ulink url=\"http://bugs.debian.org/511387#\">511387</ulink>)."
+"in bug <ulink url=\"https://bugs.debian.org/511387#\">511387</ulink>)."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -8248,8 +8315,8 @@ msgstr "Begrense nettadgang for elever"
 #. type: Content of: <article><section><section><para>
 #, fuzzy
 msgid ""
-"Some schools use <ulink url=\"http://packages.debian.org/stable/squidguard#"
-"\">Squidguard</ulink> or <ulink url=\"http://packages.debian.org/stable/"
+"Some schools use <ulink url=\"https://packages.debian.org/stable/squidguard#"
+"\">Squidguard</ulink> or <ulink url=\"https://packages.debian.org/stable/"
 "dansguardian#\">Dansguardian</ulink> to restrict Internet access."
 msgstr ""
 "Noen skoler bruker squidguard eller dansguardian for å begrense "
@@ -8286,8 +8353,7 @@ msgstr ""
 #. type: CDATA
 #, no-wrap
 msgid ""
-"# move the tar.gz file to a repository directory on the school network's "
-"webroot (by default located on tjener):\n"
+"# move the tar.gz file to a repository directory on the school network's webroot (by default located on tjener):\n"
 "root at tjener:~# \n"
 "mkdir /etc/debian-edu/www/debian\n"
 "mv smartnotebook10_2sp1debianrepository.tar.gz /etc/debian-edu/www/debian\n"
@@ -8316,8 +8382,7 @@ msgid ""
 "d-i apt-setup/local1/repository string http://www/debian/ stable non-free\n"
 "d-i apt-setup/local1/comment string SMART Repo\n"
 "d-i apt-setup/local1/key string http://www/debian/swbuild.asc\n"
-"d-i pkgsel/include string smart-activation,smart-common,smart-gallerysetup,sma"
-"rt-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers"
+"d-i pkgsel/include string smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -8382,9 +8447,7 @@ msgid ""
 "ltsp-chroot -a i386 rm swbuild.asc\n"
 "# update the dpkg database and install the wanted packages\n"
 "ltsp-chroot -a i386 aptitude update\n"
-"ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-galle"
-"rysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-prod"
-"uct-drivers"
+"ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -9051,16 +9114,16 @@ msgstr "Opphavsrett og forfattere"
 #, fuzzy
 msgid ""
 "This document is written and copyrighted by Holger Levsen (2007, 2008, 2009, "
-"2010, 2011, 2012, 2013), Petter Reinholdtsen (2001, 2002, 2003, 2004, 2007, "
-"2008, 2009, 2010, 2012), Daniel Heß (2007), Patrick Winnertz (2007), Knut "
-"Yrvin (2007), Ralf Gesellensetter (2007), Ronny Aasen (2007), Morten Werner "
-"Forsbring (2007), Bjarne Nielsen (2007, 2008), Nigel Barker (2007), José L. "
-"Redrejo Rodríguez (2007), John Bildoy (2007), Joakim Seeberg (2008), Jürgen "
-"Leibner (2009, 2010, 2011, 2012), Oded Naveh (2009), Philipp Hübner (2009, "
-"2010), Andreas Mundt (2010), Olivier Vitrat (2010, 2012), Vagrant Cascadian "
-"(2010), Mike Gabriel (2011), Justin B Rye (2012), David Prévot (2012), "
-"Wolfgang Schweer (2012, 2013) and Bernhard Hammes (2012) and is released "
-"under the GPL2 or any later version. Enjoy!"
+"2010, 2011, 2012, 2013, 2014), Petter Reinholdtsen (2001, 2002, 2003, 2004, "
+"2007, 2008, 2009, 2010, 2012), Daniel Heß (2007), Patrick Winnertz (2007), "
+"Knut Yrvin (2007), Ralf Gesellensetter (2007), Ronny Aasen (2007), Morten "
+"Werner Forsbring (2007), Bjarne Nielsen (2007, 2008), Nigel Barker (2007), "
+"José L. Redrejo Rodríguez (2007), John Bildoy (2007), Joakim Seeberg (2008), "
+"Jürgen Leibner (2009, 2010, 2011, 2012), Oded Naveh (2009), Philipp Hübner "
+"(2009, 2010), Andreas Mundt (2010), Olivier Vitrat (2010, 2012), Vagrant "
+"Cascadian (2010), Mike Gabriel (2011), Justin B Rye (2012), David Prévot "
+"(2012), Wolfgang Schweer (2012, 2013) and Bernhard Hammes (2012) and is "
+"released under the GPL2 or any later version. Enjoy!"
 msgstr ""
 "Dette dokumentet er skrevet av Holger Levsen, Petter Reinholdtsen, Daniel "
 "Heß, Patrick Winnertz, Knut Yrvin, Ralf Gesellensetter, Ronny Aasen, Morten "
@@ -9291,7 +9354,7 @@ msgstr ""
 "språk, hvis det ikke finnes allerede, og hvordan oppdatere oversettelser."
 
 #.  <remark>
-#. status ignore</remark>
+#. status ignore</remark> 
 #. type: Content of: <article><section><section><para>
 msgid ""
 "Please keep in mind that this manual is still under development, so don't "
@@ -9332,10 +9395,8 @@ msgstr "Vedlegg A - GNU Generell Offentlig Lisens"
 
 #. type: CDATA
 #, no-wrap
-msgid ""
-"Note to translators: there is no need to translate the GPL license text."
-msgstr ""
-"Note to translators: there is no need to translate the GPL license text."
+msgid "Note to translators: there is no need to translate the GPL license text."
+msgstr "Note to translators: there is no need to translate the GPL license text."
 
 #. type: Content of: <article><section><section><title>
 msgid "Manual for Debian Edu 7.1+edu0 Codename \"Wheezy\""
@@ -11418,8 +11479,8 @@ msgstr ""
 #, fuzzy
 #~ msgid "[attachment:21-Finish_the_Installation-Installation_complete.png]"
 #~ msgstr ""
-#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
-#~ "getting-]started.png\"/></imageobject>"
+#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
+#~ "started.png\"/></imageobject>"
 
 #, fuzzy
 #~ msgid "FIXME: add wheezy kde desktop screenshot here"
@@ -11442,8 +11503,8 @@ msgstr ""
 #, fuzzy
 #~ msgid "[attachment:11-Participate_in_the_package_usage_survey.png]"
 #~ msgstr ""
-#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
-#~ "lwat-]edituser_squeeze.png\"/></imageobject>"
+#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:lwat-]"
+#~ "edituser_squeeze.png\"/></imageobject>"
 
 #, fuzzy
 #~| msgid "Set passwords"
@@ -12706,8 +12767,8 @@ msgstr ""
 #~ "workstation server(s):"
 #~ msgstr ""
 #~ "Forutsatt at de diskløse arbeidsstasjonene kjører <computeroutput>i386</"
-#~ "computeroutput>, må følgende kommandoer utføres på "
-#~ "arbeidsstasjonstjener(ne):"
+#~ "computeroutput>, må følgende kommandoer utføres på arbeidsstasjonstjener"
+#~ "(ne):"
 
 #~ msgid ""
 #~ "export LTSPCHROOT=/opt/ltsp/i386/\n"
@@ -15034,13 +15095,13 @@ msgstr ""
 
 #~ msgid ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
 #~ "(sambaPwdLastSet=0)))' uid  | less"
 #~ msgstr ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
 #~ "(sambaPwdLastSet=0)))' uid  | less"
 
 #~ msgid ""
@@ -15052,8 +15113,8 @@ msgstr ""
 
 #~ msgid ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
 #~ "\\changetype: modify\\nadd:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' > /"
 #~ "etc/ldap/fixamba.ldif\n"
 #~ "\n"
@@ -15061,8 +15122,8 @@ msgstr ""
 #~ "            -f /etc/ldap/fixamba.ldif"
 #~ msgstr ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
 #~ "\\changetype: modify\\nadd:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' > /"
 #~ "etc/ldap/fixamba.ldif\n"
 #~ "\n"
@@ -15078,8 +15139,8 @@ msgstr ""
 
 #~ msgid ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
 #~ "\\changetype: modify\\nreplace:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' "
 #~ "> /etc/ldap/fixamba.ldif\n"
 #~ "\n"
@@ -15087,8 +15148,8 @@ msgstr ""
 #~ "           -f /etc/ldap/fixamba.ldif"
 #~ msgstr ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
 #~ "\\changetype: modify\\nreplace:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' "
 #~ "> /etc/ldap/fixamba.ldif\n"
 #~ "\n"
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
index 6843d25..26ffc3b 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-12-28 19:29-0400\n"
+"POT-Creation-Date: 2014-04-03 13:19+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -1610,7 +1610,7 @@ msgstr ""
 msgid ""
 "First of all, this profile name is confusing for historic reasons. Currently "
 "this profile actually installs an LTSP server environment for thin-clients "
-"and for workstations. Debian bug <ulink url=\"http://bugs.debian.org/588510#"
+"and for workstations. Debian bug <ulink url=\"https://bugs.debian.org/588510#"
 "\">588510</ulink> has been filed to change the name of the profile into a "
 "better suited one."
 msgstr ""
@@ -2954,7 +2954,8 @@ msgstr ""
 msgid ""
 "Automatic installation of updates can be done easily if desired, it just "
 "needs the <computeroutput>unattended-upgrades</computeroutput> package to be "
-"installed."
+"installed and configured as described on <ulink url=\"https://wiki.debian."
+"org/UnattendedUpgrades\">wiki.debian.org/UnattendedUpgrades</ulink>."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -2973,7 +2974,7 @@ msgstr ""
 msgid ""
 "Running <computeroutput>cron-apt</computeroutput> as described above is a "
 "good way to learn when security updates are available for installed "
-"packages.  Another way to stay informed about security updates is to "
+"packages. Another way to stay informed about security updates is to "
 "subscribe to the <ulink url=\"http://lists.debian.org/debian-security-"
 "announce/\">Debian security-announce mailinglist</ulink>, which has the "
 "benefit of also telling you what the security update is about. The downside "
@@ -3305,7 +3306,7 @@ msgid ""
 "Upgrading Debian from one distribution to the next is generally rather easy. "
 "For Debian Edu this is unfortunately not yet true as we heavily modify "
 "configuration files in ways we shouldn't. (See Debian bug <ulink url="
-"\"http://bugs.debian.org/311188#\">311188</ulink> for more information.) "
+"\"https://bugs.debian.org/311188#\">311188</ulink> for more information.) "
 "Upgrading is still possible but may require some work."
 msgstr ""
 
@@ -4323,6 +4324,112 @@ msgid ""
 "org/1376\">Debian Edu bug #1376</ulink>."
 msgstr ""
 
+#. type: Content of: <article><section><section><title>
+msgid "Use a dedicated storage server"
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Take these steps to set up a dedicated storage server for user home "
+"directories and possibly other data."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add a new system of type server using GOsa² as outlined in the <link linkend="
+"\"GettingStarted--Machine_Management_with_GOsa.2BALI-\">Getting started</"
+"link> chapter of this manual."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"This example uses 'nas-server.intern' as the server name. Once 'nas-server."
+"intern' ist configured, check if the NFS export points on the new storage "
+"server are exported to the relevant subnets or machines:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"root at tjener:~# showmount -e nas-server\n"
+"    Export list for nas-server:\n"
+"    /storage         10.0.0.0/8\n"
+"    root at tjener:~#"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Here everything on the backbone network is granted access to the /storage "
+"export. (This could be restricted to netgroup membership or single IP "
+"addresses to limit NFS access like it is done in the tjener:/etc/exports "
+"file.)"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add automount information about 'nas-server.intern' in LDAP to allow all "
+"clients to automatically mount the new export on request."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"This can't be done using GOsa², because a module for automount is missing. "
+"Instead, use ldapvi and add the required LDAP objects using an editor."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"<computeroutput>ldapvi --ldap-conf -ZD '(cn=admin)' -b ou=automount,dc=skole,"
+"dc=skolelinux,dc=no</computeroutput>"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"When the editor shows up, add the following LDAP objects at the bottom of "
+"the document. (The \"/&\" part in the last LDAP object is a wild card "
+"matching everything 'nas-server.intern' exports, removing the need to list "
+"individual mount points in LDAP.)"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"add cn=nas-server,ou=auto.skole,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
+"    objectClass: automount\n"
+"    cn: nas-server\n"
+"    automountInformation: -fstype=autofs --timeout=60 ldap:ou=auto.nas-server,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
+"\n"
+"    add ou=auto.nas-server,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
+"    objectClass: top\n"
+"    objectClass: automountMap\n"
+"    ou: auto.nas-server\n"
+"\n"
+"    add cn=/,ou=auto.nas-server,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
+"    objectClass: automount\n"
+"    cn: /\n"
+"    automountInformation: -fstype=nfs,tcp,rsize=32768,wsize=32768,rw,intr,hard,nodev,nosuid,noatime nas-server.intern:/&"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add the relevant entries in tjener.intern:/etc/fstab, because tjener.intern "
+"does not use automount to avoid mounting loops:"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Create the mount directories using <computeroutput>mkdir</computeroutput>, "
+"edit '/etc/fstab' as adequate and run <computeroutput>mount -a</"
+"computeroutput> to mount the new resources."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Now users should be able to access the files on 'nas-server.intern' directly "
+"by just visiting the '/tjener/nas-server/storage/' directory using any "
+"application on any workstation, LTSP client or LTSP server."
+msgstr ""
+
 #. type: Content of: <article><section><title>
 msgid "HowTos for the desktop"
 msgstr ""
@@ -4500,13 +4607,15 @@ msgid ""
 "workstations. If the amount of RAM is less, the machine will boot as thin "
 "client. Unlike workstations, diskless workstations run without any need to "
 "add them with GOsa², cause LDM is used to login and connect to the LTSP "
-"server."
+"server.  The home directory is by default mounted using sshfs, and not "
+"automount and NFS.  This causes shared directories available via NFS to not "
+"be available on diskless workstations."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
 "The following steps can be used to get back the behaviour from Debian Edu "
-"Squeeze:"
+"Squeeze, using automount, NFS and a display manager other than ldm:"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -6060,8 +6169,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"<ulink url=\"http://packages.debian.org/stable/moodle#\">Moodle</ulink> is a "
-"free, Open Source course management system - software designed using sound "
+"<ulink url=\"https://packages.debian.org/stable/moodle#\">Moodle</ulink> is "
+"a free, Open Source course management system - software designed using sound "
 "pedagogical principles to help educators create effective online learning "
 "communities. You can download and use it on any computer (including "
 "webhosts), yet it can scale from a single-teacher site to a University with "
@@ -6086,7 +6195,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"<ulink url=\"http://packages.debian.org/stable/swi-prolog#\">SWI-Prolog</"
+"<ulink url=\"https://packages.debian.org/stable/swi-prolog#\">SWI-Prolog</"
 "ulink> is an open source implementation of the programming language Prolog, "
 "commonly used for teaching and semantic web applications."
 msgstr ""
@@ -6097,12 +6206,12 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Some schools use control tools like <ulink url=\"http://packages.debian.org/"
-"stable/controlaula#\">Controlaula</ulink> or <ulink url=\"http://packages."
+"Some schools use control tools like <ulink url=\"https://packages.debian.org/"
+"stable/controlaula#\">Controlaula</ulink> or <ulink url=\"https://packages."
 "debian.org/stable/italc-master#\">iTALC</ulink> to supervise their "
 "students.  See also the <ulink url=\"http://sourceforge.net/apps/mediawiki/"
 "italc/index.php?title=Main_Page\">iTALC Wiki</ulink> (and the documentation "
-"in bug <ulink url=\"http://bugs.debian.org/511387#\">511387</ulink>)."
+"in bug <ulink url=\"https://bugs.debian.org/511387#\">511387</ulink>)."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -6118,8 +6227,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Some schools use <ulink url=\"http://packages.debian.org/stable/squidguard#"
-"\">Squidguard</ulink> or <ulink url=\"http://packages.debian.org/stable/"
+"Some schools use <ulink url=\"https://packages.debian.org/stable/squidguard#"
+"\">Squidguard</ulink> or <ulink url=\"https://packages.debian.org/stable/"
 "dansguardian#\">Dansguardian</ulink> to restrict Internet access."
 msgstr ""
 
@@ -6770,16 +6879,16 @@ msgstr ""
 #. type: Content of: <article><section><para>
 msgid ""
 "This document is written and copyrighted by Holger Levsen (2007, 2008, 2009, "
-"2010, 2011, 2012, 2013), Petter Reinholdtsen (2001, 2002, 2003, 2004, 2007, "
-"2008, 2009, 2010, 2012), Daniel Heß (2007), Patrick Winnertz (2007), Knut "
-"Yrvin (2007), Ralf Gesellensetter (2007), Ronny Aasen (2007), Morten Werner "
-"Forsbring (2007), Bjarne Nielsen (2007, 2008), Nigel Barker (2007), José L. "
-"Redrejo Rodríguez (2007), John Bildoy (2007), Joakim Seeberg (2008), Jürgen "
-"Leibner (2009, 2010, 2011, 2012), Oded Naveh (2009), Philipp Hübner (2009, "
-"2010), Andreas Mundt (2010), Olivier Vitrat (2010, 2012), Vagrant Cascadian "
-"(2010), Mike Gabriel (2011), Justin B Rye (2012), David Prévot (2012), "
-"Wolfgang Schweer (2012, 2013) and Bernhard Hammes (2012) and is released "
-"under the GPL2 or any later version. Enjoy!"
+"2010, 2011, 2012, 2013, 2014), Petter Reinholdtsen (2001, 2002, 2003, 2004, "
+"2007, 2008, 2009, 2010, 2012), Daniel Heß (2007), Patrick Winnertz (2007), "
+"Knut Yrvin (2007), Ralf Gesellensetter (2007), Ronny Aasen (2007), Morten "
+"Werner Forsbring (2007), Bjarne Nielsen (2007, 2008), Nigel Barker (2007), "
+"José L. Redrejo Rodríguez (2007), John Bildoy (2007), Joakim Seeberg (2008), "
+"Jürgen Leibner (2009, 2010, 2011, 2012), Oded Naveh (2009), Philipp Hübner "
+"(2009, 2010), Andreas Mundt (2010), Olivier Vitrat (2010, 2012), Vagrant "
+"Cascadian (2010), Mike Gabriel (2011), Justin B Rye (2012), David Prévot "
+"(2012), Wolfgang Schweer (2012, 2013) and Bernhard Hammes (2012) and is "
+"released under the GPL2 or any later version. Enjoy!"
 msgstr ""
 
 #. type: Content of: <article><section><para>
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
index 41dd970..6aa4196 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
@@ -679,7 +679,7 @@ deb http://ftp.skolelinux.org/skolelinux wheezy local]]></screen>
 <section id="Installation--A_note_on_thin-client-server_installations">
 <title>A note on thin-client-server installations
 </title>
-<para>First of all, this profile name is confusing for historic reasons. Currently this profile actually installs an LTSP server environment for thin-clients and for workstations. Debian bug <ulink url="http://bugs.debian.org/588510#">588510</ulink> has been filed to change the name of the profile into a better suited one. 
+<para>First of all, this profile name is confusing for historic reasons. Currently this profile actually installs an LTSP server environment for thin-clients and for workstations. Debian bug <ulink url="https://bugs.debian.org/588510#">588510</ulink> has been filed to change the name of the profile into a better suited one. 
 </para>
 <para>Providing the kernel boot parameter <computeroutput>edu-skip-ltsp-make-client</computeroutput> makes it possible to skip the step which converts the LTSP chroot from a thin-client chroot into a combined thin-client/diskless workstation chroot.  
 </para>
@@ -1216,11 +1216,11 @@ enter password: ]]></screen>
 </para>
 <para>Using <computeroutput>aptitude</computeroutput> is really simply. To update a system you need to execute two commands on the command line as root: <computeroutput>aptitude update</computeroutput> (which updates the lists of available packages) and <computeroutput>aptitude upgrade</computeroutput> (which upgrades the packages for which an upgrade is available). 
 </para>
-<para>It is also a good idea to install <computeroutput>cron-apt</computeroutput> and <computeroutput>apt-listchanges</computeroutput> and configure them to send mail to an address you are reading.  
+<para>It is also a good idea to install <computeroutput>cron-apt</computeroutput> and <computeroutput>apt-listchanges</computeroutput> and configure them to send mail to an address you are reading. 
 </para>
 <para><computeroutput>cron-apt</computeroutput> will notify you once a day via email about any packages that can be upgraded. It does not install these upgrades, but does download them (usually in the night), so you don't have to wait for the download when you do <computeroutput>aptitude upgrade</computeroutput>. 
 </para>
-<para>Automatic installation of updates can be done easily if desired, it just needs the <computeroutput>unattended-upgrades</computeroutput> package to be installed. 
+<para>Automatic installation of updates can be done easily if desired, it just needs the <computeroutput>unattended-upgrades</computeroutput> package to be installed and configured as described on <ulink url="https://wiki.debian.org/UnattendedUpgrades">wiki.debian.org/UnattendedUpgrades</ulink>. 
 </para>
 <para><computeroutput>apt-listchanges</computeroutput> can send new changelog entries to you via email, or alternativly display them in the terminal when running <computeroutput>aptitude</computeroutput> or <computeroutput>apt-get</computeroutput>. 
 </para>
@@ -1228,7 +1228,7 @@ enter password: ]]></screen>
 <section id="Maintenance--Keep_yourself_informed_about_security_updates">
 <title>Keep yourself informed about security updates
 </title>
-<para>Running <computeroutput>cron-apt</computeroutput> as described above is a good way to learn when security updates are available for installed packages.  Another way to stay informed about security updates is to subscribe to the <ulink url="http://lists.debian.org/debian-security-announce/">Debian security-announce mailinglist</ulink>, which has the benefit of also telling you what the security update is about. The downside (compared to <computeroutput>cron-apt</computeroutput>) is  [...]
+<para>Running <computeroutput>cron-apt</computeroutput> as described above is a good way to learn when security updates are available for installed packages. Another way to stay informed about security updates is to subscribe to the <ulink url="http://lists.debian.org/debian-security-announce/">Debian security-announce mailinglist</ulink>, which has the benefit of also telling you what the security update is about. The downside (compared to <computeroutput>cron-apt</computeroutput>) is t [...]
 </para>
 </section>
 </section>
@@ -1238,7 +1238,7 @@ enter password: ]]></screen>
 </title>
 <para>For backup management point your browser to <ulink url="https://www/slbackup-php"/>. Please note that you need to access this site via SSL, since you have to enter the root password there. If you try to access this site without using SSL it will fail. 
 </para>
-<para>By default tjener will back up <computeroutput>/skole/tjener/home0</computeroutput>, <computeroutput>/etc/</computeroutput>, <computeroutput>/root/.svk</computeroutput> and LDAP to /skole/backup which is under the LVM. If you only want to have spare copies of things (in case you delete them) this setup should be fine for you.  
+<para>By default tjener will back up <computeroutput>/skole/tjener/home0</computeroutput>, <computeroutput>/etc/</computeroutput>, <computeroutput>/root/.svk</computeroutput> and LDAP to /skole/backup which is under the LVM. If you only want to have spare copies of things (in case you delete them) this setup should be fine for you. 
 </para>
 <para><inlinemediaobject><imageobject><imagedata fileref="./images/alert.png"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> Be aware that this backup scheme doesn't protect you from failing hard drives. 
 </para>
@@ -1362,7 +1362,7 @@ enter password: ]]></screen>
 <section id="Upgrades--General_notes_on_upgrading">
 <title>General notes on upgrading
 </title>
-<para>Upgrading Debian from one distribution to the next is generally rather easy. For Debian Edu this is unfortunately not yet true as we heavily modify configuration files in ways we shouldn't. (See Debian bug <ulink url="http://bugs.debian.org/311188#">311188</ulink> for more information.) Upgrading is still possible but may require some work.  
+<para>Upgrading Debian from one distribution to the next is generally rather easy. For Debian Edu this is unfortunately not yet true as we heavily modify configuration files in ways we shouldn't. (See Debian bug <ulink url="https://bugs.debian.org/311188#">311188</ulink> for more information.) Upgrading is still possible but may require some work.  
 </para>
 <para>In general, upgrading the servers is more difficult than the workstations and the main-server is the most difficult to upgrade. The diskless machines are easy, as their chroot environment can be deleted and recreated, if you haven't modified it. If you have, the chroot is basically a workstation chroot anyway, so rather easy to upgrade. 
 </para>
@@ -1844,6 +1844,56 @@ apt-get upgrade]]></screen>
 </section>
 </section>
 </section>
+
+<section id="AdvancedAdministration--Use_a_dedicated_storage_server">
+<title>Use a dedicated storage server
+</title>
+<para>Take these steps to set up a dedicated storage server for user home directories and possibly other data. 
+</para>
+<itemizedlist>
+<listitem>
+<para>Add a new system of type server using GOsa² as outlined in the <link linkend="GettingStarted--Machine_Management_with_GOsa.2BALI-">Getting started</link> chapter of this manual. 
+</para>
+<itemizedlist><listitem override="none">
+<para>This example uses 'nas-server.intern' as the server name. Once 'nas-server.intern' ist configured, check if the NFS export points on the new storage server are exported to the relevant subnets or machines: 
+</para><screen><![CDATA[    root at tjener:~# showmount -e nas-server
+    Export list for nas-server:
+    /storage         10.0.0.0/8
+    root at tjener:~#]]></screen>
+<para>Here everything on the backbone network is granted access to the /storage export. (This could be restricted to netgroup membership or single IP addresses to limit NFS access like it is done in the tjener:/etc/exports file.) 
+</para></listitem></itemizedlist></listitem>
+<listitem>
+<para>Add automount information about 'nas-server.intern' in LDAP to allow all clients to automatically mount the new export on request. 
+</para>
+<itemizedlist><listitem override="none">
+<para>This can't be done using GOsa², because a module for automount is missing. Instead, use ldapvi and add the required LDAP objects using an editor. 
+</para>
+<para><computeroutput>ldapvi --ldap-conf -ZD '(cn=admin)' -b ou=automount,dc=skole,dc=skolelinux,dc=no</computeroutput> 
+</para>
+<para>When the editor shows up, add the following LDAP objects at the bottom of the document. (The "/&" part in the last LDAP object is a wild card matching everything 'nas-server.intern' exports, removing the need to list individual mount points in LDAP.) 
+</para><screen><![CDATA[    add cn=nas-server,ou=auto.skole,ou=automount,dc=skole,dc=skolelinux,dc=no
+    objectClass: automount
+    cn: nas-server
+    automountInformation: -fstype=autofs --timeout=60 ldap:ou=auto.nas-server,ou=automount,dc=skole,dc=skolelinux,dc=no
+
+    add ou=auto.nas-server,ou=automount,dc=skole,dc=skolelinux,dc=no
+    objectClass: top
+    objectClass: automountMap
+    ou: auto.nas-server
+
+    add cn=/,ou=auto.nas-server,ou=automount,dc=skole,dc=skolelinux,dc=no
+    objectClass: automount
+    cn: /
+    automountInformation: -fstype=nfs,tcp,rsize=32768,wsize=32768,rw,intr,hard,nodev,nosuid,noatime nas-server.intern:/&]]></screen></listitem></itemizedlist></listitem>
+<listitem>
+<para>Add the relevant entries in tjener.intern:/etc/fstab, because tjener.intern does not use automount to avoid mounting loops: 
+</para>
+<itemizedlist><listitem override="none">
+<para>Create the mount directories using <computeroutput>mkdir</computeroutput>, edit '/etc/fstab' as adequate and run <computeroutput>mount -a</computeroutput> to mount the new resources. 
+</para></listitem></itemizedlist></listitem></itemizedlist>
+<para>Now users should be able to access the files on 'nas-server.intern' directly by just visiting the '/tjener/nas-server/storage/' directory using any application on any workstation, LTSP client or LTSP server. 
+</para>
+</section>
 </section>
 
 <section id="Desktop">
@@ -1928,9 +1978,9 @@ apt-get update]]></screen>
 </para>
 <para>A diskless workstation runs all software locally. The client machines boot directly from the LTSP server without a local hard drive. Software is administered and maintained on the LTSP server, but it runs on the diskless workstation. Home directories and system settings are stored on the server too. Diskless workstations are an excellent way of reusing newer hardware with the same low maintenance cost as with thin clients.  
 </para>
-<para>LTSP defines 320MB as the default minimum amount of RAM for diskless workstations. If the amount of RAM is less, the machine will boot as thin client. Unlike workstations, diskless workstations run without any need to add them with GOsa², cause LDM is used to login and connect to the LTSP server. 
+<para>LTSP defines 320MB as the default minimum amount of RAM for diskless workstations. If the amount of RAM is less, the machine will boot as thin client. Unlike workstations, diskless workstations run without any need to add them with GOsa², cause LDM is used to login and connect to the LTSP server.  The home directory is by default mounted using sshfs, and not automount and NFS.  This causes shared directories available via NFS to not be available on diskless workstations.  
 </para>
-<para>The following steps can be used to get back the behaviour from Debian Edu Squeeze: 
+<para>The following steps can be used to get back the behaviour from Debian Edu Squeeze, using automount, NFS and a display manager other than ldm: 
 </para>
 <itemizedlist>
 <listitem>
@@ -2669,7 +2719,7 @@ logon home = ""]]></screen>
 <section id="TeachAndLearn--Moodle">
 <title>Moodle
 </title>
-<para><ulink url="http://packages.debian.org/stable/moodle#">Moodle</ulink> is a free, Open Source course management system - software designed using sound pedagogical principles to help educators create effective online learning communities. You can download and use it on any computer (including webhosts), yet it can scale from a single-teacher site to a University with 200,000 students. Some schools in France use Moodle to keep track of students' facilities and credit points.  
+<para><ulink url="https://packages.debian.org/stable/moodle#">Moodle</ulink> is a free, Open Source course management system - software designed using sound pedagogical principles to help educators create effective online learning communities. You can download and use it on any computer (including webhosts), yet it can scale from a single-teacher site to a University with 200,000 students. Some schools in France use Moodle to keep track of students' facilities and credit points.  
 </para>
 <para>There are <ulink url="http://moodle.org/sites/">moodle sites</ulink> all over the world, mostly concentrated in Europe and North America. Check the site of an <ulink url="http://moodle.org/sites/">institution</ulink> near you to get an idea about it. More information is available at the <ulink url="http://moodle.org">moodle project page,</ulink> including <ulink url="http://docs.moodle.org/en/Main_Page">documentation</ulink> and <ulink url="http://moodle.org/support/">support</ulink>.  
 </para>
@@ -2678,14 +2728,14 @@ logon home = ""]]></screen>
 <section id="TeachAndLearn--Teaching_Prolog">
 <title>Teaching Prolog
 </title>
-<para><ulink url="http://packages.debian.org/stable/swi-prolog#">SWI-Prolog</ulink> is an open source implementation of the programming language Prolog, commonly used for teaching and semantic web applications. 
+<para><ulink url="https://packages.debian.org/stable/swi-prolog#">SWI-Prolog</ulink> is an open source implementation of the programming language Prolog, commonly used for teaching and semantic web applications. 
 </para>
 </section>
 
 <section id="TeachAndLearn--Monitoring_pupils">
 <title>Monitoring pupils
 </title>
-<para>Some schools use control tools like <ulink url="http://packages.debian.org/stable/controlaula#">Controlaula</ulink> or <ulink url="http://packages.debian.org/stable/italc-master#">iTALC</ulink> to supervise their students.  See also the <ulink url="http://sourceforge.net/apps/mediawiki/italc/index.php?title=Main_Page">iTALC Wiki</ulink> (and the documentation in bug <ulink url="http://bugs.debian.org/511387#">511387</ulink>). 
+<para>Some schools use control tools like <ulink url="https://packages.debian.org/stable/controlaula#">Controlaula</ulink> or <ulink url="https://packages.debian.org/stable/italc-master#">iTALC</ulink> to supervise their students.  See also the <ulink url="http://sourceforge.net/apps/mediawiki/italc/index.php?title=Main_Page">iTALC Wiki</ulink> (and the documentation in bug <ulink url="https://bugs.debian.org/511387#">511387</ulink>). 
 </para>
 <para><inlinemediaobject><imageobject><imagedata fileref="./images/alert.png"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> <emphasis role="strong">Warning</emphasis>: make sure you know the status of the laws about monitoring and restricting computer users' activities in your jurisdiction. 
 </para>
@@ -2694,7 +2744,7 @@ logon home = ""]]></screen>
 <section id="TeachAndLearn--Restricting_pupils.27_network_access">
 <title>Restricting pupils' network access
 </title>
-<para>Some schools use <ulink url="http://packages.debian.org/stable/squidguard#">Squidguard</ulink> or <ulink url="http://packages.debian.org/stable/dansguardian#">Dansguardian</ulink> to restrict Internet access. 
+<para>Some schools use <ulink url="https://packages.debian.org/stable/squidguard#">Squidguard</ulink> or <ulink url="https://packages.debian.org/stable/dansguardian#">Dansguardian</ulink> to restrict Internet access. 
 </para>
 </section>
 
@@ -3097,7 +3147,7 @@ FIXMEs within the text. If you happen to know (a bit of) what needs to be explai
 <section id="CopyRight">
 <title>Copyright and authors
 </title>
-<para>This document is written and copyrighted by Holger Levsen (2007, 2008, 2009, 2010, 2011, 2012, 2013), Petter Reinholdtsen (2001, 2002, 2003, 2004, 2007, 2008, 2009, 2010, 2012), Daniel Heß (2007), Patrick Winnertz (2007), Knut Yrvin (2007), Ralf Gesellensetter (2007), Ronny Aasen (2007), Morten Werner Forsbring (2007), Bjarne Nielsen (2007, 2008), Nigel Barker (2007), José L. Redrejo Rodríguez (2007), John Bildoy (2007), Joakim Seeberg (2008), Jürgen Leibner (2009, 2010, 2011, 2012 [...]
+<para>This document is written and copyrighted by Holger Levsen (2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014), Petter Reinholdtsen (2001, 2002, 2003, 2004, 2007, 2008, 2009, 2010, 2012), Daniel Heß (2007), Patrick Winnertz (2007), Knut Yrvin (2007), Ralf Gesellensetter (2007), Ronny Aasen (2007), Morten Werner Forsbring (2007), Bjarne Nielsen (2007, 2008), Nigel Barker (2007), José L. Redrejo Rodríguez (2007), John Bildoy (2007), Joakim Seeberg (2008), Jürgen Leibner (2009, 2010, 2011 [...]
 </para>
 <para>If you add content to it, <emphasis role="strong">please only do so if you are the author. You need to release it under the same conditions</emphasis>! Then add your name here and release it under the GPL2 or later version. 
 </para>
diff --git a/documentation/debian-edu-wheezy/images/de/worldmap.png b/documentation/debian-edu-wheezy/images/de/worldmap.png
index ea10c6c..6cd04eb 100644
Binary files a/documentation/debian-edu-wheezy/images/de/worldmap.png and b/documentation/debian-edu-wheezy/images/de/worldmap.png differ
diff --git a/documentation/debian-edu-wheezy/images/es/worldmap.png b/documentation/debian-edu-wheezy/images/es/worldmap.png
index 523cd7f..1f97493 100644
Binary files a/documentation/debian-edu-wheezy/images/es/worldmap.png and b/documentation/debian-edu-wheezy/images/es/worldmap.png differ
diff --git a/documentation/debian-edu-wheezy/images/fr/worldmap.png b/documentation/debian-edu-wheezy/images/fr/worldmap.png
index e147e44..4f1a076 100644
Binary files a/documentation/debian-edu-wheezy/images/fr/worldmap.png and b/documentation/debian-edu-wheezy/images/fr/worldmap.png differ
diff --git a/documentation/debian-edu-wheezy/images/worldmap.png b/documentation/debian-edu-wheezy/images/worldmap.png
index 096242d..50fa827 100644
Binary files a/documentation/debian-edu-wheezy/images/worldmap.png and b/documentation/debian-edu-wheezy/images/worldmap.png differ
diff --git a/documentation/rosegarden/rosegarden-manual.pot b/documentation/rosegarden/rosegarden-manual.pot
index 386d47a..3d468ef 100644
--- a/documentation/rosegarden/rosegarden-manual.pot
+++ b/documentation/rosegarden/rosegarden-manual.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-09-17 22:54+0300\n"
+"POT-Creation-Date: 2014-04-03 13:19+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-doc.git

