[debian-edu-commits] debian-edu/ 01/01: updated from the wiki

Tue Mar 10 13:36:04 UTC 2015

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

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

commit 77fd83e10a2af58b494b5f949d99843b46ae6ee4
Author: Holger Levsen <holger at layer-acht.org>
Date:   Tue Mar 10 14:34:01 2015 +0100

    updated from the wiki
---
 debian/changelog                                   |   2 +-
 .../debian-edu-jessie-manual.da.po                 | 360 ++++++++++++++---
 .../debian-edu-jessie-manual.de.po                 | 366 ++++++++++++++---
 .../debian-edu-jessie-manual.es.po                 | 364 ++++++++++++++---
 .../debian-edu-jessie-manual.fr.po                 | 355 +++++++++++++---
 .../debian-edu-jessie-manual.it.po                 | 354 +++++++++++++---
 .../debian-edu-jessie-manual.nb.po                 | 351 +++++++++++++---
 .../debian-edu-jessie-manual.nl.po                 | 447 ++++++++++++++-------
 .../debian-edu-jessie/debian-edu-jessie-manual.pot | 267 ++++++++++--
 .../debian-edu-jessie/debian-edu-jessie-manual.xml | 129 +++++-
 documentation/debian-edu-jessie/fixme-status.txt   |   5 +-
 .../debian-edu-jessie/images/de/worldmap.png       | Bin 386995 -> 387005 bytes
 .../debian-edu-jessie/images/es/worldmap.png       | Bin 387100 -> 387110 bytes
 .../debian-edu-jessie/images/fr/worldmap.png       | Bin 387034 -> 387044 bytes
 .../debian-edu-jessie/images/worldmap.png          | Bin 387028 -> 387037 bytes
 15 files changed, 2511 insertions(+), 489 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6bc1066..ad8b754 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-debian-edu-doc (1.6~20150223~8+edu0~alpha2) UNRELEASED; urgency=medium
+debian-edu-doc (1.6~20150318~8+edu0~alpha2) UNRELEASED; urgency=medium
 
   [ Holger Levsen ]
   * Update Debian Edu Jessie manual from the wiki.
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po
index 7f7ad8f..75a031a 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-jessie-manual\n"
-"POT-Creation-Date: 2015-02-14 14:47+0000\n"
+"POT-Creation-Date: 2015-03-10 13:02+0000\n"
 "PO-Revision-Date: 2014-10-21 19:20+0100\n"
 "Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -4597,74 +4597,285 @@ msgstr "Opgraderinger fra Debian Edu Wheezy"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"FIXME: confirm this is really all what needs to be done for upgrades. It's "
-"great if that's true! It could be..."
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-msgid ""
 "Be prepared: make sure you have tested the upgrade from Wheezy in a test "
 "environment or have backups ready to be able to go back."
 msgstr ""
 "Vær forberedt: Vær sikker på at du har testet opgraderingen fra Wheezy i et "
 "testmiljø eller har sikkerhedskopier klar til en gendannelse."
 
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Please note that the following recipe applies to a default Debian Edu main "
+"server installation (desktop=kde, profiles Main-Server, Workstation, Thin-"
+"Client-Server). (For a general overview concernig wheezy to jessie upgrade, "
+"see: <ulink url=\"https://www.debian.org/releases/jessie/releasenotes\"/>)"
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Don't use X, use a virtual console, log in as root. Read all debconf "
+"information carefully, choose 'keep the local version currently installed'; "
+"in most cases hitting return will be fine. Press 'q' to quit the apt-"
+"listchanges pager once you've read the information."
+msgstr ""
+
 #. type: Content of: <article><section><section><section><title>
-msgid "The basic upgrade operation"
-msgstr "Den grundlæggende opgraderingshandling"
+#, fuzzy
+#| msgid "Update the preseed file:"
+msgid "Upgrade the server side"
+msgstr "Opdater den forudfyldte fil (preseed):"
 
-#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Make sure the current system is up-to-date."
+msgstr ""
+
+#. type: CDATA
+#, fuzzy, no-wrap
+#| msgid ""
+#| "apt-get update\n"
+#| "apt-get upgrade"
 msgid ""
-"Edit <computeroutput>/etc/apt/sources.list</computeroutput> and replace all "
-"occurrences of \"wheezy\" with \"jessie\"."
+"apt-get update\n"
+"apt-get -y upgrade"
 msgstr ""
-"Rediger <computeroutput>/etc/apt/sources.list</computeroutput> og erstat "
-"alle forekomster af »wheezy« med »jessie«."
+"apt-get update\n"
+"apt-get upgrade"
 
-#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
-msgid "run <computeroutput>apt-get update</computeroutput>"
-msgstr "kør <computeroutput>apt-get update</computeroutput>"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Remove diversion; debian-edu-config's postinst seems to do it too late "
+"(Debian bug <ulink url=\"https://bugs.debian.org/779641#\">779641</ulink>)."
+msgstr ""
 
-#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
-msgid "run <computeroutput>apt-get upgrade</computeroutput>"
-msgstr "kør <computeroutput>apt-get upgrade</computeroutput>"
+#. type: CDATA
+#, no-wrap
+msgid ""
+"dpkg-divert --remove /usr/share/pam-configs/krb5\n"
+"rm /usr/share/pam-configs/edu-krb5"
+msgstr ""
 
-#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
-msgid "run <computeroutput>apt-get dist-upgrade</computeroutput>"
-msgstr "kør <computeroutput>apt-get dist-upgrade</computeroutput>"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Keep backup of Kerberos configuration file (Debian bug <ulink url=\"https://"
+"bugs.debian.org/779642#\">779642</ulink>)."
+msgstr ""
 
-#. type: Content of: <article><section><section><section><title>
-msgid "LDAP service needs to be reconfigured"
-msgstr "LDAP-tjeneste skal konfigureres igen"
+#. type: CDATA
+#, no-wrap
+msgid "cp /etc/krb5.conf /etc/krb5.conf.backup"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Do the actual upgrade."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"sed -i 's/wheezy/jessie/g' /etc/apt/sources.list\n"
+"apt-get update\n"
+"apt-get -y dist-upgrade\n"
+"apt-get -f install\n"
+"apt-get -y dist-upgrade"
+msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "The LDAP setup has changed slightly from Wheezy to Jessie. Nevertheless, "
-#| "LDAP has to be rebuild from scratch. There's a script "
-#| "<computeroutput>ldap-debian-edu-install</computeroutput> (in /usr/bin) "
-#| "that could be used to achieve this. Read the comment at the beginning of "
-#| "that script carefully before doing anything."
-msgid ""
-"The LDAP setup has only scarcely changed from Wheezy to Jessie so chances "
-"are that LDAP hasn't to be rebuild from scratch. There's a script "
-"<computeroutput>ldap-debian-edu-install</computeroutput> (in /usr/bin) that "
-"could be used to achieve rebuilding LDAP if needed. Read the comment at the "
-"beginning of that script carefully before doing anything."
-msgstr ""
-"LDAP-opsætningen har ændret sig meget fra Wheezy til Jessie. Så LDAP skal "
-"genbygges fra bunden af. Der er et skript <computeroutput>ldap-debian-edu-"
-"install</computeroutput> (i /usr/bin), som kan opnå dette. Læs kommentaren i "
-"begyndelsen af det skript omhyggeligt før du gør noget."
+msgid ""
+"If apt-get still finishes with an error, try to fix it and/or run the apt-"
+"get commands again, esp. apt-get -f install."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Install additional package to make PXE work (Debian bug <ulink url=\"https://"
+"bugs.debian.org/779644#\">779644</ulink>)."
+msgstr ""
+
+#. type: CDATA
+#, fuzzy, no-wrap
+#| msgid "apt-get install killer"
+msgid "apt-get -y install pxelinux"
+msgstr "apt-get install killer"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Install squid3 as squid is deprecated and missing in jessie (Debian bug "
+"<ulink url=\"https://bugs.debian.org/779649#\">779649</ulink>)."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"apt-get -y install squid3\n"
+"service squid3 stop"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Apply debian-edu configuration (takes some time)."
+msgstr ""
+
+#. type: CDATA
+#, fuzzy, no-wrap
+#| msgid "/usr/sbin/debian-edu-pxeinstall"
+msgid "cfengine-debian-edu -D installation"
+msgstr "/usr/sbin/debian-edu-pxeinstall"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Replace squid with squid3, keep the cache; a new swap file will be generated "
+"and the cache index be rebuilt upon first squid3 start."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"service squid stop\n"
+"umount /var/spool/squid\n"
+"sed -i 's#/var/spool/squid#/var/spool/squid3#' /etc/fstab\n"
+"mount /var/spool/squid3\n"
+"service squid3 start\n"
+"apt-get -y purge squid squid-common"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Replace Kerberos file (messed up by cfengine) with the right one."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "cp /etc/krb5.conf.backup /etc/krb5.conf"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Regenerate gosa.secrets to make GOsa² work with new php version."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"rm /etc/gosa/gosa.secrets\n"
+"cp /etc/gosa/gosa.conf.orig /etc/gosa/gosa.conf\n"
+"gosa-encrypt-passwords"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Install newly split out cups package needed for networked printing (Debian "
+"bug <ulink url=\"https://bugs.debian.org/779645#\">779645</ulink>)."
+msgstr ""
+
+#. type: CDATA
+#, fuzzy, no-wrap
+#| msgid "apt-get install killer"
+msgid "apt-get -y install cups-browsed"
+msgstr "apt-get install killer"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Install missing packages; the package names were obtained using "
+"<computeroutput>/usr/lib/debian-edu-config/testsuite/taskpkgs | grep error:</"
+"computeroutput> after the step above (Debian bug <ulink url=\"https://bugs."
+"debian.org/779648#\">779648</ulink>)."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"apt-get -y install browser-plugin-libreoffice gosa-plugin-netgroups \\\n"
+"killer libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Check if the upgraded system works."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Reboot and test if it works like before: Log in as first user and test if "
+"the GOsa² gui is working, if you're able to connect LTSP clients and "
+"workstations, if you can add/remove a netgroup membership of a system, if "
+"you can send and receive internal email, if you can manage printers, and "
+"maybe other site specific things. Use the testsuite scripts if you spot an "
+"error."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Consider an optional step (Debian bug <ulink url=\"https://bugs.debian."
+"org/779646#\">779646</ulink>)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Clean up after cfengine has autoremoved packages without purging. This will "
+"remove configuration files of removed packages and should only be used with "
+"care; use <computeroutput>dpkg -l|grep ^rc</computeroutput> first to check "
+"what would be removed, then run <computeroutput>for i in $(dpkg -l|grep ^rc|"
+"cut -d' ' -f3);do dpkg -P $i;done</computeroutput>."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
+msgid "Upgrade LTSP chroot (default arch i386)"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"sed -i '/jessie/ s/deb/#deb/g' /opt/ltsp/i386/etc/apt/sources.list\n"
+"ltsp-chroot -m -a i386 apt-get update\n"
+"ltsp-chroot -m -a i386 apt-get -y upgrade\n"
+"sed -i 's/wheezy/jessie/g' /opt/ltsp/i386/etc/apt/sources.list\n"
+"ltsp-chroot -m -a i386 apt-get update\n"
+"ltsp-chroot -m -a i386 apt-get -y dist-upgrade\n"
+"ltsp-chroot -m -a i386 apt-get -f install\n"
+"ltsp-chroot -m -a i386 apt-get -y dist-upgrade"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Install missing packages in the LTSP chroot (Debian bug <ulink url=\"https://"
+"bugs.debian.org/779647#\">779647</ulink>)."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"ltsp-chroot -m -a i386 apt-get -y install browser-plugin-libreoffice killer \\\n"
+"libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Cleaning up."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "ltsp-chroot -m -a i386 apt-get --purge autoremove"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Update LTSP support on the server side."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"ltsp-update-kernels\n"
+"ltsp-update-sshkeys"
+msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Recreating an LTSP chroot"
 msgstr "Genskabelse af en LTSP-chroot"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "On the LTSP server(s) the LTSP chroot should be recreated. The new chroot "
+#| "will still support both thin-clients and diskless workstations."
 msgid ""
-"On the LTSP server(s) the LTSP chroot should be recreated. The new chroot "
-"will still support both thin-clients and diskless workstations."
+"On the LTSP server(s) the LTSP chroot could also be recreated. The new "
+"chroot will still support both thin-clients and diskless workstations."
 msgstr ""
 "På LTSP-serverne skal LTSP-chroot gendannes. Den nye chroot vil stadig "
 "understøtte både tynde klienter og diskløse arbejdsstationer."
@@ -4680,17 +4891,18 @@ msgstr ""
 "opsætning). Hvis du har nok diskplads, så overvej at lave en sikkerhedskopi."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Recreate the chroot by running <computeroutput>debian-edu-ltsp</"
+#| "computeroutput> as root."
 msgid ""
-"Recreate the chroot by running <computeroutput>debian-edu-ltsp</"
-"computeroutput> as root."
+"Recreate the chroot by running <computeroutput>debian-edu-ltsp --arch i386</"
+"computeroutput> (or <computeroutput>debian-edu-ltsp --arch amd64</"
+"computeroutput>) as root."
 msgstr ""
 "Genskab chroot'en ved at køre <computeroutput>debian-edu-ltsp</"
 "computeroutput> som root."
 
-#. type: Content of: <article><section><section><section><para>
-msgid "Of course you can also upgrade the chroot as usual."
-msgstr "Selvfølgelig kan du også opgradere chroot'en som normalt."
-
 #. type: Content of: <article><section><section><title>
 msgid ""
 "Upgrades from older Debian Edu / Skolelinux installations (before Wheezy)"
@@ -12494,6 +12706,50 @@ msgstr ""
 "Yderligere information om endnu ældre versioner kan findes på <ulink url="
 "\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
+#~ msgid "The basic upgrade operation"
+#~ msgstr "Den grundlæggende opgraderingshandling"
+
+#~ msgid ""
+#~ "Edit <computeroutput>/etc/apt/sources.list</computeroutput> and replace "
+#~ "all occurrences of \"wheezy\" with \"jessie\"."
+#~ msgstr ""
+#~ "Rediger <computeroutput>/etc/apt/sources.list</computeroutput> og erstat "
+#~ "alle forekomster af »wheezy« med »jessie«."
+
+#~ msgid "run <computeroutput>apt-get update</computeroutput>"
+#~ msgstr "kør <computeroutput>apt-get update</computeroutput>"
+
+#~ msgid "run <computeroutput>apt-get upgrade</computeroutput>"
+#~ msgstr "kør <computeroutput>apt-get upgrade</computeroutput>"
+
+#~ msgid "run <computeroutput>apt-get dist-upgrade</computeroutput>"
+#~ msgstr "kør <computeroutput>apt-get dist-upgrade</computeroutput>"
+
+#~ msgid "LDAP service needs to be reconfigured"
+#~ msgstr "LDAP-tjeneste skal konfigureres igen"
+
+#, fuzzy
+#~| msgid ""
+#~| "The LDAP setup has changed slightly from Wheezy to Jessie. Nevertheless, "
+#~| "LDAP has to be rebuild from scratch. There's a script "
+#~| "<computeroutput>ldap-debian-edu-install</computeroutput> (in /usr/bin) "
+#~| "that could be used to achieve this. Read the comment at the beginning of "
+#~| "that script carefully before doing anything."
+#~ msgid ""
+#~ "The LDAP setup has only scarcely changed from Wheezy to Jessie so chances "
+#~ "are that LDAP hasn't to be rebuild from scratch. There's a script "
+#~ "<computeroutput>ldap-debian-edu-install</computeroutput> (in /usr/bin) "
+#~ "that could be used to achieve rebuilding LDAP if needed. Read the comment "
+#~ "at the beginning of that script carefully before doing anything."
+#~ msgstr ""
+#~ "LDAP-opsætningen har ændret sig meget fra Wheezy til Jessie. Så LDAP skal "
+#~ "genbygges fra bunden af. Der er et skript <computeroutput>ldap-debian-edu-"
+#~ "install</computeroutput> (i /usr/bin), som kan opnå dette. Læs "
+#~ "kommentaren i begyndelsen af det skript omhyggeligt før du gør noget."
+
+#~ msgid "Of course you can also upgrade the chroot as usual."
+#~ msgstr "Selvfølgelig kan du også opgradere chroot'en som normalt."
+
 #~ msgid "Every user who wants to use KMail needs to configure it as follows."
 #~ msgstr ""
 #~ "Hver bruger som ønsker at bruge KMail skal konfigurere den som i det "
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po
index a0018f0..ee20fa5 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-jessie-manual.de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-14 14:47+0000\n"
+"POT-Creation-Date: 2015-03-10 13:02+0000\n"
 "PO-Revision-Date: 2015-02-14 16:09+0100\n"
 "Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -4670,14 +4670,6 @@ msgstr "Upgrade von Debian Edu Wheezy"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"FIXME: confirm this is really all what needs to be done for upgrades. It's "
-"great if that's true! It could be..."
-msgstr ""
-"FIXME: confirm this is really all what needs to be done for upgrades. It's "
-"great if that's true! It could be..."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
 "Be prepared: make sure you have tested the upgrade from Wheezy in a test "
 "environment or have backups ready to be able to go back."
 msgstr ""
@@ -4685,57 +4677,281 @@ msgstr ""
 "Testumgebung getestet haben oder über Sicherungskopien verfügen, die ihnen "
 "ermöglichen, notfalls wieder zurück zu gehen."
 
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Please note that the following recipe applies to a default Debian Edu main "
+"server installation (desktop=kde, profiles Main-Server, Workstation, Thin-"
+"Client-Server). (For a general overview concernig wheezy to jessie upgrade, "
+"see: <ulink url=\"https://www.debian.org/releases/jessie/releasenotes\"/>)"
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Don't use X, use a virtual console, log in as root. Read all debconf "
+"information carefully, choose 'keep the local version currently installed'; "
+"in most cases hitting return will be fine. Press 'q' to quit the apt-"
+"listchanges pager once you've read the information."
+msgstr ""
+
 #. type: Content of: <article><section><section><section><title>
-msgid "The basic upgrade operation"
-msgstr "Die grundlegende Upgrade-Operation"
+#, fuzzy
+#| msgid "Update the preseed file:"
+msgid "Upgrade the server side"
+msgstr "Die Preseed-Datei aktualisieren:"
 
-#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Make sure the current system is up-to-date."
+msgstr ""
+
+#. type: CDATA
+#, fuzzy, no-wrap
+#| msgid ""
+#| "apt-get update\n"
+#| "apt-get upgrade"
+msgid ""
+"apt-get update\n"
+"apt-get -y upgrade"
+msgstr ""
+"apt-get update\n"
+"apt-get upgrade"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Edit <computeroutput>/etc/apt/sources.list</computeroutput> and replace all "
-"occurrences of \"wheezy\" with \"jessie\"."
+"Remove diversion; debian-edu-config's postinst seems to do it too late "
+"(Debian bug <ulink url=\"https://bugs.debian.org/779641#\">779641</ulink>)."
 msgstr ""
-"Ersetzen Sie in der Datei <computeroutput>/etc/apt/sources.list</"
-"computeroutput> alle Vorkommen von »wheezy« durch »jessie«."
 
-#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
-msgid "run <computeroutput>apt-get update</computeroutput>"
-msgstr "führen Sie <computeroutput>apt-get update</computeroutput> aus"
+#. type: CDATA
+#, no-wrap
+msgid ""
+"dpkg-divert --remove /usr/share/pam-configs/krb5\n"
+"rm /usr/share/pam-configs/edu-krb5"
+msgstr ""
 
-#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
-msgid "run <computeroutput>apt-get upgrade</computeroutput>"
-msgstr "führen Sie <computeroutput>apt-get upgrade</computeroutput> aus"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Keep backup of Kerberos configuration file (Debian bug <ulink url=\"https://"
+"bugs.debian.org/779642#\">779642</ulink>)."
+msgstr ""
 
-#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
-msgid "run <computeroutput>apt-get dist-upgrade</computeroutput>"
-msgstr "führen Sie <computeroutput>apt-get dist-upgrade</computeroutput> aus"
+#. type: CDATA
+#, no-wrap
+msgid "cp /etc/krb5.conf /etc/krb5.conf.backup"
+msgstr ""
 
-#. type: Content of: <article><section><section><section><title>
-msgid "LDAP service needs to be reconfigured"
-msgstr "Der LDAP-Service muss muss neu eingerichtet werden"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Do the actual upgrade."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"sed -i 's/wheezy/jessie/g' /etc/apt/sources.list\n"
+"apt-get update\n"
+"apt-get -y dist-upgrade\n"
+"apt-get -f install\n"
+"apt-get -y dist-upgrade"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"If apt-get still finishes with an error, try to fix it and/or run the apt-"
+"get commands again, esp. apt-get -f install."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Install additional package to make PXE work (Debian bug <ulink url=\"https://"
+"bugs.debian.org/779644#\">779644</ulink>)."
+msgstr ""
+
+#. type: CDATA
+#, fuzzy, no-wrap
+#| msgid "apt-get install killer"
+msgid "apt-get -y install pxelinux"
+msgstr "apt-get install killer"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Install squid3 as squid is deprecated and missing in jessie (Debian bug "
+"<ulink url=\"https://bugs.debian.org/779649#\">779649</ulink>)."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"apt-get -y install squid3\n"
+"service squid3 stop"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Apply debian-edu configuration (takes some time)."
+msgstr ""
+
+#. type: CDATA
+#, fuzzy, no-wrap
+#| msgid "/usr/sbin/debian-edu-pxeinstall"
+msgid "cfengine-debian-edu -D installation"
+msgstr "/usr/sbin/debian-edu-pxeinstall"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Replace squid with squid3, keep the cache; a new swap file will be generated "
+"and the cache index be rebuilt upon first squid3 start."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"service squid stop\n"
+"umount /var/spool/squid\n"
+"sed -i 's#/var/spool/squid#/var/spool/squid3#' /etc/fstab\n"
+"mount /var/spool/squid3\n"
+"service squid3 start\n"
+"apt-get -y purge squid squid-common"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Replace Kerberos file (messed up by cfengine) with the right one."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "cp /etc/krb5.conf.backup /etc/krb5.conf"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Regenerate gosa.secrets to make GOsa² work with new php version."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"rm /etc/gosa/gosa.secrets\n"
+"cp /etc/gosa/gosa.conf.orig /etc/gosa/gosa.conf\n"
+"gosa-encrypt-passwords"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Install newly split out cups package needed for networked printing (Debian "
+"bug <ulink url=\"https://bugs.debian.org/779645#\">779645</ulink>)."
+msgstr ""
+
+#. type: CDATA
+#, fuzzy, no-wrap
+#| msgid "apt-get install killer"
+msgid "apt-get -y install cups-browsed"
+msgstr "apt-get install killer"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Install missing packages; the package names were obtained using "
+"<computeroutput>/usr/lib/debian-edu-config/testsuite/taskpkgs | grep error:</"
+"computeroutput> after the step above (Debian bug <ulink url=\"https://bugs."
+"debian.org/779648#\">779648</ulink>)."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"apt-get -y install browser-plugin-libreoffice gosa-plugin-netgroups \\\n"
+"killer libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "check if the username is present"
+msgid "Check if the upgraded system works."
+msgstr "kontrollieren, ob der Benutzername vorhanden ist"
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Reboot and test if it works like before: Log in as first user and test if "
+"the GOsa² gui is working, if you're able to connect LTSP clients and "
+"workstations, if you can add/remove a netgroup membership of a system, if "
+"you can send and receive internal email, if you can manage printers, and "
+"maybe other site specific things. Use the testsuite scripts if you spot an "
+"error."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Consider an optional step (Debian bug <ulink url=\"https://bugs.debian."
+"org/779646#\">779646</ulink>)."
+msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"The LDAP setup has only scarcely changed from Wheezy to Jessie so chances "
-"are that LDAP hasn't to be rebuild from scratch. There's a script "
-"<computeroutput>ldap-debian-edu-install</computeroutput> (in /usr/bin) that "
-"could be used to achieve rebuilding LDAP if needed. Read the comment at the "
-"beginning of that script carefully before doing anything."
+"Clean up after cfengine has autoremoved packages without purging. This will "
+"remove configuration files of removed packages and should only be used with "
+"care; use <computeroutput>dpkg -l|grep ^rc</computeroutput> first to check "
+"what would be removed, then run <computeroutput>for i in $(dpkg -l|grep ^rc|"
+"cut -d' ' -f3);do dpkg -P $i;done</computeroutput>."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
+msgid "Upgrade LTSP chroot (default arch i386)"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"sed -i '/jessie/ s/deb/#deb/g' /opt/ltsp/i386/etc/apt/sources.list\n"
+"ltsp-chroot -m -a i386 apt-get update\n"
+"ltsp-chroot -m -a i386 apt-get -y upgrade\n"
+"sed -i 's/wheezy/jessie/g' /opt/ltsp/i386/etc/apt/sources.list\n"
+"ltsp-chroot -m -a i386 apt-get update\n"
+"ltsp-chroot -m -a i386 apt-get -y dist-upgrade\n"
+"ltsp-chroot -m -a i386 apt-get -f install\n"
+"ltsp-chroot -m -a i386 apt-get -y dist-upgrade"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Install missing packages in the LTSP chroot (Debian bug <ulink url=\"https://"
+"bugs.debian.org/779647#\">779647</ulink>)."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"ltsp-chroot -m -a i386 apt-get -y install browser-plugin-libreoffice killer \\\n"
+"libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Cleaning up."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "ltsp-chroot -m -a i386 apt-get --purge autoremove"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Update LTSP support on the server side."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"ltsp-update-kernels\n"
+"ltsp-update-sshkeys"
 msgstr ""
-"Mit dem Wechsel von Wheezy nach Jessie hat sich die LDAP-Einrichtung kaum "
-"geändert; möglicherweise muss LDAP nicht vollständig neu eingerichtet "
-"werden. Falls doch notwendig, kann das Skript <computeroutput>ldap-debian-"
-"edu-install</computeroutput> (was in /usr/bin liegt) zur Neueinrichtung "
-"verwendet werden. Lesen Sie die Anmerkungen zu Beginn des Skripts sorgfältig "
-"durch, bevor Sie irgendetwas tun. "
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Recreating an LTSP chroot"
 msgstr "Eine LTSP-Chroot-Umgebung neu erzeugen"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "On the LTSP server(s) the LTSP chroot should be recreated. The new chroot "
+#| "will still support both thin-clients and diskless workstations."
 msgid ""
-"On the LTSP server(s) the LTSP chroot should be recreated. The new chroot "
-"will still support both thin-clients and diskless workstations."
+"On the LTSP server(s) the LTSP chroot could also be recreated. The new "
+"chroot will still support both thin-clients and diskless workstations."
 msgstr ""
 "Auf LTSP-Servern sollte die LTSP-Chroot-Umgebung neu erzeugt werden. Diese "
 "wird weiterhin automatisch sowohl Thin Clients wie auch Diskless "
@@ -4752,19 +4968,18 @@ msgstr ""
 "Sie genug Speicherplatz haben, sollten Sie über ein Backup nachdenken."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Recreate the chroot by running <computeroutput>debian-edu-ltsp</"
+#| "computeroutput> as root."
 msgid ""
-"Recreate the chroot by running <computeroutput>debian-edu-ltsp</"
-"computeroutput> as root."
+"Recreate the chroot by running <computeroutput>debian-edu-ltsp --arch i386</"
+"computeroutput> (or <computeroutput>debian-edu-ltsp --arch amd64</"
+"computeroutput>) as root."
 msgstr ""
 "Erzeugen Sie die Chroot-Umgebung neu, indem Sie <computeroutput>debian-edu-"
 "ltsp</computeroutput> als Root ausführen."
 
-#. type: Content of: <article><section><section><section><para>
-msgid "Of course you can also upgrade the chroot as usual."
-msgstr ""
-"Natürlich können Sie ein Upgrade auch im Chroot auf übliche Weise "
-"durchführen."
-
 #. type: Content of: <article><section><section><title>
 msgid ""
 "Upgrades from older Debian Edu / Skolelinux installations (before Wheezy)"
@@ -10284,8 +10499,8 @@ msgstr ""
 "translations, wenn Sie eine neue PO-Datei für Ihre Sprache anlegen oder "
 "Übersetzungen aktualisieren wollen."
 
-#. <remark>
-#. status ignore</remark>
+#.  <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 "
@@ -12636,3 +12851,52 @@ msgstr ""
 "Mehr Informationen zu noch älteren Veröffentlichungen können unter <ulink "
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/> gefunden "
 "werden."
+
+#~ msgid ""
+#~ "FIXME: confirm this is really all what needs to be done for upgrades. "
+#~ "It's great if that's true! It could be..."
+#~ msgstr ""
+#~ "FIXME: confirm this is really all what needs to be done for upgrades. "
+#~ "It's great if that's true! It could be..."
+
+#~ msgid "The basic upgrade operation"
+#~ msgstr "Die grundlegende Upgrade-Operation"
+
+#~ msgid ""
+#~ "Edit <computeroutput>/etc/apt/sources.list</computeroutput> and replace "
+#~ "all occurrences of \"wheezy\" with \"jessie\"."
+#~ msgstr ""
+#~ "Ersetzen Sie in der Datei <computeroutput>/etc/apt/sources.list</"
+#~ "computeroutput> alle Vorkommen von »wheezy« durch »jessie«."
+
+#~ msgid "run <computeroutput>apt-get update</computeroutput>"
+#~ msgstr "führen Sie <computeroutput>apt-get update</computeroutput> aus"
+
+#~ msgid "run <computeroutput>apt-get upgrade</computeroutput>"
+#~ msgstr "führen Sie <computeroutput>apt-get upgrade</computeroutput> aus"
+
+#~ msgid "run <computeroutput>apt-get dist-upgrade</computeroutput>"
+#~ msgstr ""
+#~ "führen Sie <computeroutput>apt-get dist-upgrade</computeroutput> aus"
+
+#~ msgid "LDAP service needs to be reconfigured"
+#~ msgstr "Der LDAP-Service muss muss neu eingerichtet werden"
+
+#~ msgid ""
+#~ "The LDAP setup has only scarcely changed from Wheezy to Jessie so chances "
+#~ "are that LDAP hasn't to be rebuild from scratch. There's a script "
+#~ "<computeroutput>ldap-debian-edu-install</computeroutput> (in /usr/bin) "
+#~ "that could be used to achieve rebuilding LDAP if needed. Read the comment "
+#~ "at the beginning of that script carefully before doing anything."
+#~ msgstr ""
+#~ "Mit dem Wechsel von Wheezy nach Jessie hat sich die LDAP-Einrichtung kaum "
+#~ "geändert; möglicherweise muss LDAP nicht vollständig neu eingerichtet "
+#~ "werden. Falls doch notwendig, kann das Skript <computeroutput>ldap-debian-"
+#~ "edu-install</computeroutput> (was in /usr/bin liegt) zur Neueinrichtung "
+#~ "verwendet werden. Lesen Sie die Anmerkungen zu Beginn des Skripts "
+#~ "sorgfältig durch, bevor Sie irgendetwas tun. "
+
+#~ msgid "Of course you can also upgrade the chroot as usual."
+#~ msgstr ""
+#~ "Natürlich können Sie ein Upgrade auch im Chroot auf übliche Weise "
+#~ "durchführen."
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po
index 0069a8d..b59032f 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: release-manual\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-14 14:47+0000\n"
+"POT-Creation-Date: 2015-03-10 13:02+0000\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"
@@ -4569,75 +4569,284 @@ msgstr "Actualizar desde Debian-Edu Wheezy"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"FIXME: confirm this is really all what needs to be done for upgrades. It's "
-"great if that's true! It could be..."
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-msgid ""
 "Be prepared: make sure you have tested the upgrade from Wheezy in a test "
 "environment or have backups ready to be able to go back."
 msgstr ""
 "Prepárese: asegúrese de haber probado la actualización desde Wheezy en un "
 "entorno de prueba o tener un respaldo listo para poder volver. "
 
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Please note that the following recipe applies to a default Debian Edu main "
+"server installation (desktop=kde, profiles Main-Server, Workstation, Thin-"
+"Client-Server). (For a general overview concernig wheezy to jessie upgrade, "
+"see: <ulink url=\"https://www.debian.org/releases/jessie/releasenotes\"/>)"
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Don't use X, use a virtual console, log in as root. Read all debconf "
+"information carefully, choose 'keep the local version currently installed'; "
+"in most cases hitting return will be fine. Press 'q' to quit the apt-"
+"listchanges pager once you've read the information."
+msgstr ""
+
 #. type: Content of: <article><section><section><section><title>
-msgid "The basic upgrade operation"
-msgstr "La operación básica para actualizar"
+#, fuzzy
+#| msgid "configure the service"
+msgid "Upgrade the server side"
+msgstr "Configure el servicio."
 
-#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Make sure the current system is up-to-date."
+msgstr ""
+
+#. type: CDATA
+#, fuzzy, no-wrap
+#| msgid ""
+#| "apt-get update\n"
+#| "apt-get upgrade"
+msgid ""
+"apt-get update\n"
+"apt-get -y upgrade"
+msgstr ""
+"apt-get update \n"
+"apt-get upgrade"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Edit <computeroutput>/etc/apt/sources.list</computeroutput> and replace all "
-"occurrences of \"wheezy\" with \"jessie\"."
+"Remove diversion; debian-edu-config's postinst seems to do it too late "
+"(Debian bug <ulink url=\"https://bugs.debian.org/779641#\">779641</ulink>)."
 msgstr ""
-"Edite <computeroutput>/etc/apt/sources.list</computeroutput> y reemplace "
-"\"wheezy\" con \"jessie\" en las líneas que lo encuentre."
 
-#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
-msgid "run <computeroutput>apt-get update</computeroutput>"
-msgstr "Ejecute <computeroutput>apt-get update</computeroutput>"
+#. type: CDATA
+#, no-wrap
+msgid ""
+"dpkg-divert --remove /usr/share/pam-configs/krb5\n"
+"rm /usr/share/pam-configs/edu-krb5"
+msgstr ""
 
-#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
-msgid "run <computeroutput>apt-get upgrade</computeroutput>"
-msgstr "Ejecute <computeroutput>apt-get upgrade</computeroutput>"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Keep backup of Kerberos configuration file (Debian bug <ulink url=\"https://"
+"bugs.debian.org/779642#\">779642</ulink>)."
+msgstr ""
 
-#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
-msgid "run <computeroutput>apt-get dist-upgrade</computeroutput>"
-msgstr "Ejecute <computeroutput>apt-get dist-upgrade</computeroutput>"
+#. type: CDATA
+#, no-wrap
+msgid "cp /etc/krb5.conf /etc/krb5.conf.backup"
+msgstr ""
 
-#. type: Content of: <article><section><section><section><title>
-msgid "LDAP service needs to be reconfigured"
-msgstr "El servicio LDAP necesita ser reconfigurado"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Do the actual upgrade."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"sed -i 's/wheezy/jessie/g' /etc/apt/sources.list\n"
+"apt-get update\n"
+"apt-get -y dist-upgrade\n"
+"apt-get -f install\n"
+"apt-get -y dist-upgrade"
+msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "The LDAP setup has changed slightly from Wheezy to Jessie. Nevertheless, "
-#| "LDAP has to be rebuild from scratch. There's a script "
-#| "<computeroutput>ldap-debian-edu-install</computeroutput> (in /usr/bin) "
-#| "that could be used to achieve this. Read the comment at the beginning of "
-#| "that script carefully before doing anything."
-msgid ""
-"The LDAP setup has only scarcely changed from Wheezy to Jessie so chances "
-"are that LDAP hasn't to be rebuild from scratch. There's a script "
-"<computeroutput>ldap-debian-edu-install</computeroutput> (in /usr/bin) that "
-"could be used to achieve rebuilding LDAP if needed. Read the comment at the "
-"beginning of that script carefully before doing anything."
-msgstr ""
-"La configuración de LDAP ha cambiado ligeramente de Wheezy a Jessie. No "
-"obstante, LDAP se debe reconstruir desde cero. Existe un script "
-"<computeroutput>ldap-debian-edu-install</computeroutput> (en /usr/bin) que "
-"podría ser usado para lograr esto. Lea cuidadosamente el comentario al "
-"inicio de ese script antes de hacer algo. "
+msgid ""
+"If apt-get still finishes with an error, try to fix it and/or run the apt-"
+"get commands again, esp. apt-get -f install."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Install additional package to make PXE work (Debian bug <ulink url=\"https://"
+"bugs.debian.org/779644#\">779644</ulink>)."
+msgstr ""
+
+#. type: CDATA
+#, fuzzy, no-wrap
+#| msgid "apt-get -f install"
+msgid "apt-get -y install pxelinux"
+msgstr "apt-get -f install"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Install squid3 as squid is deprecated and missing in jessie (Debian bug "
+"<ulink url=\"https://bugs.debian.org/779649#\">779649</ulink>)."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"apt-get -y install squid3\n"
+"service squid3 stop"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Apply debian-edu configuration (takes some time)."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "cfengine-debian-edu -D installation"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Replace squid with squid3, keep the cache; a new swap file will be generated "
+"and the cache index be rebuilt upon first squid3 start."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"service squid stop\n"
+"umount /var/spool/squid\n"
+"sed -i 's#/var/spool/squid#/var/spool/squid3#' /etc/fstab\n"
+"mount /var/spool/squid3\n"
+"service squid3 start\n"
+"apt-get -y purge squid squid-common"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Replace Kerberos file (messed up by cfengine) with the right one."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "cp /etc/krb5.conf.backup /etc/krb5.conf"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Regenerate gosa.secrets to make GOsa² work with new php version."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"rm /etc/gosa/gosa.secrets\n"
+"cp /etc/gosa/gosa.conf.orig /etc/gosa/gosa.conf\n"
+"gosa-encrypt-passwords"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Install newly split out cups package needed for networked printing (Debian "
+"bug <ulink url=\"https://bugs.debian.org/779645#\">779645</ulink>)."
+msgstr ""
+
+#. type: CDATA
+#, fuzzy, no-wrap
+#| msgid "apt-get -f install"
+msgid "apt-get -y install cups-browsed"
+msgstr "apt-get -f install"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Install missing packages; the package names were obtained using "
+"<computeroutput>/usr/lib/debian-edu-config/testsuite/taskpkgs | grep error:</"
+"computeroutput> after the step above (Debian bug <ulink url=\"https://bugs."
+"debian.org/779648#\">779648</ulink>)."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"apt-get -y install browser-plugin-libreoffice gosa-plugin-netgroups \\\n"
+"killer libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Check if the upgraded system works."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Reboot and test if it works like before: Log in as first user and test if "
+"the GOsa² gui is working, if you're able to connect LTSP clients and "
+"workstations, if you can add/remove a netgroup membership of a system, if "
+"you can send and receive internal email, if you can manage printers, and "
+"maybe other site specific things. Use the testsuite scripts if you spot an "
+"error."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Consider an optional step (Debian bug <ulink url=\"https://bugs.debian."
+"org/779646#\">779646</ulink>)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Clean up after cfengine has autoremoved packages without purging. This will "
+"remove configuration files of removed packages and should only be used with "
+"care; use <computeroutput>dpkg -l|grep ^rc</computeroutput> first to check "
+"what would be removed, then run <computeroutput>for i in $(dpkg -l|grep ^rc|"
+"cut -d' ' -f3);do dpkg -P $i;done</computeroutput>."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
+msgid "Upgrade LTSP chroot (default arch i386)"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"sed -i '/jessie/ s/deb/#deb/g' /opt/ltsp/i386/etc/apt/sources.list\n"
+"ltsp-chroot -m -a i386 apt-get update\n"
+"ltsp-chroot -m -a i386 apt-get -y upgrade\n"
+"sed -i 's/wheezy/jessie/g' /opt/ltsp/i386/etc/apt/sources.list\n"
+"ltsp-chroot -m -a i386 apt-get update\n"
+"ltsp-chroot -m -a i386 apt-get -y dist-upgrade\n"
+"ltsp-chroot -m -a i386 apt-get -f install\n"
+"ltsp-chroot -m -a i386 apt-get -y dist-upgrade"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Install missing packages in the LTSP chroot (Debian bug <ulink url=\"https://"
+"bugs.debian.org/779647#\">779647</ulink>)."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"ltsp-chroot -m -a i386 apt-get -y install browser-plugin-libreoffice killer \\\n"
+"libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Cleaning up."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "ltsp-chroot -m -a i386 apt-get --purge autoremove"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Update LTSP support on the server side."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"ltsp-update-kernels\n"
+"ltsp-update-sshkeys"
+msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Recreating an LTSP chroot"
 msgstr "Recrear un chroot LTSP"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "On the LTSP server(s) the LTSP chroot should be recreated. The new chroot "
+#| "will still support both thin-clients and diskless workstations."
 msgid ""
-"On the LTSP server(s) the LTSP chroot should be recreated. The new chroot "
-"will still support both thin-clients and diskless workstations."
+"On the LTSP server(s) the LTSP chroot could also be recreated. The new "
+"chroot will still support both thin-clients and diskless workstations."
 msgstr ""
 "En los servidores LTSP, el chroot LTSP debería ser recreado. El nuevo chroot "
 "todavía soportará clientes ligeros y estaciones de trabajo sin disco."
@@ -4653,17 +4862,18 @@ msgstr ""
 "suficiente espacio en disco, considere respaldarlo."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Recreate the chroot by running <computeroutput>debian-edu-ltsp</"
+#| "computeroutput> as root."
 msgid ""
-"Recreate the chroot by running <computeroutput>debian-edu-ltsp</"
-"computeroutput> as root."
+"Recreate the chroot by running <computeroutput>debian-edu-ltsp --arch i386</"
+"computeroutput> (or <computeroutput>debian-edu-ltsp --arch amd64</"
+"computeroutput>) as root."
 msgstr ""
 "Recree el chroot ejecutando <computeroutput>debian-edu-ltsp</computeroutput> "
 "como usuario root."
 
-#. type: Content of: <article><section><section><section><para>
-msgid "Of course you can also upgrade the chroot as usual."
-msgstr "Por supuesto, puede actualizar el chroot a como es usual."
-
 #. type: Content of: <article><section><section><title>
 msgid ""
 "Upgrades from older Debian Edu / Skolelinux installations (before Wheezy)"
@@ -11322,6 +11532,51 @@ msgstr ""
 "Más información sobre versiones más anteriores puede encontrarse en <ulink "
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
+#~ msgid "The basic upgrade operation"
+#~ msgstr "La operación básica para actualizar"
+
+#~ msgid ""
+#~ "Edit <computeroutput>/etc/apt/sources.list</computeroutput> and replace "
+#~ "all occurrences of \"wheezy\" with \"jessie\"."
+#~ msgstr ""
+#~ "Edite <computeroutput>/etc/apt/sources.list</computeroutput> y reemplace "
+#~ "\"wheezy\" con \"jessie\" en las líneas que lo encuentre."
+
+#~ msgid "run <computeroutput>apt-get update</computeroutput>"
+#~ msgstr "Ejecute <computeroutput>apt-get update</computeroutput>"
+
+#~ msgid "run <computeroutput>apt-get upgrade</computeroutput>"
+#~ msgstr "Ejecute <computeroutput>apt-get upgrade</computeroutput>"
+
+#~ msgid "run <computeroutput>apt-get dist-upgrade</computeroutput>"
+#~ msgstr "Ejecute <computeroutput>apt-get dist-upgrade</computeroutput>"
+
+#~ msgid "LDAP service needs to be reconfigured"
+#~ msgstr "El servicio LDAP necesita ser reconfigurado"
+
+#, fuzzy
+#~| msgid ""
+#~| "The LDAP setup has changed slightly from Wheezy to Jessie. Nevertheless, "
+#~| "LDAP has to be rebuild from scratch. There's a script "
+#~| "<computeroutput>ldap-debian-edu-install</computeroutput> (in /usr/bin) "
+#~| "that could be used to achieve this. Read the comment at the beginning of "
+#~| "that script carefully before doing anything."
+#~ msgid ""
+#~ "The LDAP setup has only scarcely changed from Wheezy to Jessie so chances "
+#~ "are that LDAP hasn't to be rebuild from scratch. There's a script "
+#~ "<computeroutput>ldap-debian-edu-install</computeroutput> (in /usr/bin) "
+#~ "that could be used to achieve rebuilding LDAP if needed. Read the comment "
+#~ "at the beginning of that script carefully before doing anything."
+#~ msgstr ""
+#~ "La configuración de LDAP ha cambiado ligeramente de Wheezy a Jessie. No "
+#~ "obstante, LDAP se debe reconstruir desde cero. Existe un script "
+#~ "<computeroutput>ldap-debian-edu-install</computeroutput> (en /usr/bin) "
+#~ "que podría ser usado para lograr esto. Lea cuidadosamente el comentario "
+#~ "al inicio de ese script antes de hacer algo. "
+
+#~ msgid "Of course you can also upgrade the chroot as usual."
+#~ msgstr "Por supuesto, puede actualizar el chroot a como es usual."
+
 #~ msgid "Every user who wants to use KMail needs to configure it as follows."
 #~ msgstr ""
 #~ "Cada usuario que quiera usar KMail necesita configurarlo de la siguiente "
@@ -15104,9 +15359,6 @@ msgstr ""
 #~ "ambos la línea que contiene: <emphasis>update-mozilla-firefox-chrome</"
 #~ "emphasis>. Después reinicie el proceso de actualización con:"
 
-#~ msgid "apt-get -f install"
-#~ msgstr "apt-get -f install"
-
 #, fuzzy
 #~ msgid "Now the upgrade continues:"
 #~ msgstr "Ahora la actualización funciona de nuevo:"
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po
index 38c9d62..564c28c 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2015-02-14 14:47+0000\n"
+"POT-Creation-Date: 2015-03-10 13:02+0000\n"
 "PO-Revision-Date: 2014-12-23 23:13+0100\n"
 "Last-Translator: Cédric Boutillier <boutil at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -4707,14 +4707,6 @@ msgstr "Mises à jour depuis Debian Edu Wheezy"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"FIXME: confirm this is really all what needs to be done for upgrades. It's "
-"great if that's true! It could be..."
-msgstr ""
-"FIXME: confirm this is really all what needs to be done for upgrades. It's "
-"great if that's true! It could be..."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
 "Be prepared: make sure you have tested the upgrade from Wheezy in a test "
 "environment or have backups ready to be able to go back."
 msgstr ""
@@ -4722,57 +4714,279 @@ msgstr ""
 "dans un environnement de test, ou bien d'avoir des sauvegardes prêtes à être "
 "restaurées."
 
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Please note that the following recipe applies to a default Debian Edu main "
+"server installation (desktop=kde, profiles Main-Server, Workstation, Thin-"
+"Client-Server). (For a general overview concernig wheezy to jessie upgrade, "
+"see: <ulink url=\"https://www.debian.org/releases/jessie/releasenotes\"/>)"
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Don't use X, use a virtual console, log in as root. Read all debconf "
+"information carefully, choose 'keep the local version currently installed'; "
+"in most cases hitting return will be fine. Press 'q' to quit the apt-"
+"listchanges pager once you've read the information."
+msgstr ""
+
 #. type: Content of: <article><section><section><section><title>
-msgid "The basic upgrade operation"
-msgstr "La mise à jour de base"
+#, fuzzy
+#| msgid "Update the preseed file:"
+msgid "Upgrade the server side"
+msgstr "Mettez à jour le fichier de préconfiguration :"
 
-#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Make sure the current system is up-to-date."
+msgstr ""
+
+#. type: CDATA
+#, fuzzy, no-wrap
+#| msgid ""
+#| "apt-get update\n"
+#| "apt-get upgrade"
 msgid ""
-"Edit <computeroutput>/etc/apt/sources.list</computeroutput> and replace all "
-"occurrences of \"wheezy\" with \"jessie\"."
+"apt-get update\n"
+"apt-get -y upgrade"
 msgstr ""
-"Éditez <computeroutput>/etc/apt/sources.list</computeroutput> et remplacez "
-"toutes les occurrences de « wheezy » par « jessie »."
+"apt-get update\n"
+"apt-get upgrade"
 
-#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
-msgid "run <computeroutput>apt-get update</computeroutput>"
-msgstr "exécutez <computeroutput>apt-get update</computeroutput>"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Remove diversion; debian-edu-config's postinst seems to do it too late "
+"(Debian bug <ulink url=\"https://bugs.debian.org/779641#\">779641</ulink>)."
+msgstr ""
 
-#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
-msgid "run <computeroutput>apt-get upgrade</computeroutput>"
-msgstr "exécutez <computeroutput>apt-get upgrade</computeroutput>"
+#. type: CDATA
+#, no-wrap
+msgid ""
+"dpkg-divert --remove /usr/share/pam-configs/krb5\n"
+"rm /usr/share/pam-configs/edu-krb5"
+msgstr ""
 
-#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
-msgid "run <computeroutput>apt-get dist-upgrade</computeroutput>"
-msgstr "exécutez <computeroutput>apt-get dist-upgrade</computeroutput>"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Keep backup of Kerberos configuration file (Debian bug <ulink url=\"https://"
+"bugs.debian.org/779642#\">779642</ulink>)."
+msgstr ""
 
-#. type: Content of: <article><section><section><section><title>
-msgid "LDAP service needs to be reconfigured"
-msgstr "Le service LDAP doit être reconfiguré"
+#. type: CDATA
+#, no-wrap
+msgid "cp /etc/krb5.conf /etc/krb5.conf.backup"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Do the actual upgrade."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"sed -i 's/wheezy/jessie/g' /etc/apt/sources.list\n"
+"apt-get update\n"
+"apt-get -y dist-upgrade\n"
+"apt-get -f install\n"
+"apt-get -y dist-upgrade"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"If apt-get still finishes with an error, try to fix it and/or run the apt-"
+"get commands again, esp. apt-get -f install."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Install additional package to make PXE work (Debian bug <ulink url=\"https://"
+"bugs.debian.org/779644#\">779644</ulink>)."
+msgstr ""
+
+#. type: CDATA
+#, fuzzy, no-wrap
+#| msgid "apt-get install killer"
+msgid "apt-get -y install pxelinux"
+msgstr "apt-get install killer"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Install squid3 as squid is deprecated and missing in jessie (Debian bug "
+"<ulink url=\"https://bugs.debian.org/779649#\">779649</ulink>)."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"apt-get -y install squid3\n"
+"service squid3 stop"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Apply debian-edu configuration (takes some time)."
+msgstr ""
+
+#. type: CDATA
+#, fuzzy, no-wrap
+#| msgid "/usr/sbin/debian-edu-pxeinstall"
+msgid "cfengine-debian-edu -D installation"
+msgstr "/usr/sbin/debian-edu-pxeinstall"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Replace squid with squid3, keep the cache; a new swap file will be generated "
+"and the cache index be rebuilt upon first squid3 start."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"service squid stop\n"
+"umount /var/spool/squid\n"
+"sed -i 's#/var/spool/squid#/var/spool/squid3#' /etc/fstab\n"
+"mount /var/spool/squid3\n"
+"service squid3 start\n"
+"apt-get -y purge squid squid-common"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Replace Kerberos file (messed up by cfengine) with the right one."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "cp /etc/krb5.conf.backup /etc/krb5.conf"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Regenerate gosa.secrets to make GOsa² work with new php version."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"rm /etc/gosa/gosa.secrets\n"
+"cp /etc/gosa/gosa.conf.orig /etc/gosa/gosa.conf\n"
+"gosa-encrypt-passwords"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Install newly split out cups package needed for networked printing (Debian "
+"bug <ulink url=\"https://bugs.debian.org/779645#\">779645</ulink>)."
+msgstr ""
+
+#. type: CDATA
+#, fuzzy, no-wrap
+#| msgid "apt-get install killer"
+msgid "apt-get -y install cups-browsed"
+msgstr "apt-get install killer"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Install missing packages; the package names were obtained using "
+"<computeroutput>/usr/lib/debian-edu-config/testsuite/taskpkgs | grep error:</"
+"computeroutput> after the step above (Debian bug <ulink url=\"https://bugs."
+"debian.org/779648#\">779648</ulink>)."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"apt-get -y install browser-plugin-libreoffice gosa-plugin-netgroups \\\n"
+"killer libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Check if the upgraded system works."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Reboot and test if it works like before: Log in as first user and test if "
+"the GOsa² gui is working, if you're able to connect LTSP clients and "
+"workstations, if you can add/remove a netgroup membership of a system, if "
+"you can send and receive internal email, if you can manage printers, and "
+"maybe other site specific things. Use the testsuite scripts if you spot an "
+"error."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Consider an optional step (Debian bug <ulink url=\"https://bugs.debian."
+"org/779646#\">779646</ulink>)."
+msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"The LDAP setup has only scarcely changed from Wheezy to Jessie so chances "
-"are that LDAP hasn't to be rebuild from scratch. There's a script "
-"<computeroutput>ldap-debian-edu-install</computeroutput> (in /usr/bin) that "
-"could be used to achieve rebuilding LDAP if needed. Read the comment at the "
-"beginning of that script carefully before doing anything."
+"Clean up after cfengine has autoremoved packages without purging. This will "
+"remove configuration files of removed packages and should only be used with "
+"care; use <computeroutput>dpkg -l|grep ^rc</computeroutput> first to check "
+"what would be removed, then run <computeroutput>for i in $(dpkg -l|grep ^rc|"
+"cut -d' ' -f3);do dpkg -P $i;done</computeroutput>."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
+msgid "Upgrade LTSP chroot (default arch i386)"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"sed -i '/jessie/ s/deb/#deb/g' /opt/ltsp/i386/etc/apt/sources.list\n"
+"ltsp-chroot -m -a i386 apt-get update\n"
+"ltsp-chroot -m -a i386 apt-get -y upgrade\n"
+"sed -i 's/wheezy/jessie/g' /opt/ltsp/i386/etc/apt/sources.list\n"
+"ltsp-chroot -m -a i386 apt-get update\n"
+"ltsp-chroot -m -a i386 apt-get -y dist-upgrade\n"
+"ltsp-chroot -m -a i386 apt-get -f install\n"
+"ltsp-chroot -m -a i386 apt-get -y dist-upgrade"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Install missing packages in the LTSP chroot (Debian bug <ulink url=\"https://"
+"bugs.debian.org/779647#\">779647</ulink>)."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"ltsp-chroot -m -a i386 apt-get -y install browser-plugin-libreoffice killer \\\n"
+"libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Cleaning up."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "ltsp-chroot -m -a i386 apt-get --purge autoremove"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Update LTSP support on the server side."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"ltsp-update-kernels\n"
+"ltsp-update-sshkeys"
 msgstr ""
-"La configuration LDAP n'a que très légèrement changé entre Wheezy et Jessie, "
-"de sorte qu'il y a une chance que le service LDAP ne doive pas être "
-"reconstruit complètement. Il existe un script <computeroutput>ldap-debian-"
-"edu-install</computeroutput> (dans /usr/bin) qui permet de faire cette "
-"reconstruction. Lisez attentivement les commentaires au début du script "
-"avant de faire quoi que ce soit."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Recreating an LTSP chroot"
 msgstr "Recréer un chroot LTSP"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "On the LTSP server(s) the LTSP chroot should be recreated. The new chroot "
+#| "will still support both thin-clients and diskless workstations."
 msgid ""
-"On the LTSP server(s) the LTSP chroot should be recreated. The new chroot "
-"will still support both thin-clients and diskless workstations."
+"On the LTSP server(s) the LTSP chroot could also be recreated. The new "
+"chroot will still support both thin-clients and diskless workstations."
 msgstr ""
 "Sur le(s) serveur(s) LTSP, le chroot LTSP doit être recréé. Le nouveau "
 "chroot gérera encore les clients légers et les stations de travail sans "
@@ -4789,17 +5003,18 @@ msgstr ""
 "assez d'espace disque, vous devriez plutôt en faire une sauvegarde."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Recreate the chroot by running <computeroutput>debian-edu-ltsp</"
+#| "computeroutput> as root."
 msgid ""
-"Recreate the chroot by running <computeroutput>debian-edu-ltsp</"
-"computeroutput> as root."
+"Recreate the chroot by running <computeroutput>debian-edu-ltsp --arch i386</"
+"computeroutput> (or <computeroutput>debian-edu-ltsp --arch amd64</"
+"computeroutput>) as root."
 msgstr ""
 "Recréez le chroot en exécutant la commande <computeroutput>debian-edu-ltsp</"
 "computeroutput> en tant que superutilisateur."
 
-#. type: Content of: <article><section><section><section><para>
-msgid "Of course you can also upgrade the chroot as usual."
-msgstr "Bien sûr, vous pouvez mettre à jour le chroot comme d'habitude."
-
 #. type: Content of: <article><section><section><title>
 msgid ""
 "Upgrades from older Debian Edu / Skolelinux installations (before Wheezy)"
@@ -12780,6 +12995,52 @@ msgstr ""
 "ici <ulink url='http://developer.skolelinux.no/info/cdbygging/news."
 "html'>http://developer.skolelinux.no/info/cdbygging/news.html</ulink>"
 
+#~ msgid ""
+#~ "FIXME: confirm this is really all what needs to be done for upgrades. "
+#~ "It's great if that's true! It could be..."
+#~ msgstr ""
+#~ "FIXME: confirm this is really all what needs to be done for upgrades. "
+#~ "It's great if that's true! It could be..."
+
+#~ msgid "The basic upgrade operation"
+#~ msgstr "La mise à jour de base"
+
+#~ msgid ""
+#~ "Edit <computeroutput>/etc/apt/sources.list</computeroutput> and replace "
+#~ "all occurrences of \"wheezy\" with \"jessie\"."
+#~ msgstr ""
+#~ "Éditez <computeroutput>/etc/apt/sources.list</computeroutput> et "
+#~ "remplacez toutes les occurrences de « wheezy » par « jessie »."
+
+#~ msgid "run <computeroutput>apt-get update</computeroutput>"
+#~ msgstr "exécutez <computeroutput>apt-get update</computeroutput>"
+
+#~ msgid "run <computeroutput>apt-get upgrade</computeroutput>"
+#~ msgstr "exécutez <computeroutput>apt-get upgrade</computeroutput>"
+
+#~ msgid "run <computeroutput>apt-get dist-upgrade</computeroutput>"
+#~ msgstr "exécutez <computeroutput>apt-get dist-upgrade</computeroutput>"
+
+#~ msgid "LDAP service needs to be reconfigured"
+#~ msgstr "Le service LDAP doit être reconfiguré"
+
+#~ msgid ""
+#~ "The LDAP setup has only scarcely changed from Wheezy to Jessie so chances "
+#~ "are that LDAP hasn't to be rebuild from scratch. There's a script "
+#~ "<computeroutput>ldap-debian-edu-install</computeroutput> (in /usr/bin) "
+#~ "that could be used to achieve rebuilding LDAP if needed. Read the comment "
+#~ "at the beginning of that script carefully before doing anything."
+#~ msgstr ""
+#~ "La configuration LDAP n'a que très légèrement changé entre Wheezy et "
+#~ "Jessie, de sorte qu'il y a une chance que le service LDAP ne doive pas "
+#~ "être reconstruit complètement. Il existe un script <computeroutput>ldap-"
+#~ "debian-edu-install</computeroutput> (dans /usr/bin) qui permet de faire "
+#~ "cette reconstruction. Lisez attentivement les commentaires au début du "
+#~ "script avant de faire quoi que ce soit."
+
+#~ msgid "Of course you can also upgrade the chroot as usual."
+#~ msgstr "Bien sûr, vous pouvez mettre à jour le chroot comme d'habitude."
+
 #~ msgid "Every user who wants to use KMail needs to configure it as follows."
 #~ msgstr ""
 #~ "Tous les utilisateurs voulant utiliser KMail doivent le configurer de la "
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po
index e8297f2..811d90d 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-wheezy-manual\n"
-"POT-Creation-Date: 2015-02-14 14:47+0000\n"
+"POT-Creation-Date: 2015-03-10 13:02+0000\n"
 "PO-Revision-Date: 2014-12-19 20:45+0100\n"
 "Last-Translator: Claudio Carboncini <claudio.carboncini at gmail.com>\n"
 "Language-Team: Italian <debian-l10n-italian at list.debian.org>\n"
@@ -4626,70 +4626,285 @@ msgstr "Aggiornamento da Debian Edu wheezy"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"FIXME: confirm this is really all what needs to be done for upgrades. It's "
-"great if that's true! It could be..."
-msgstr ""
-"FIXME: confirm this is really all what needs to be done for upgrades. It's "
-"great if that's true! It could be..."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
 "Be prepared: make sure you have tested the upgrade from Wheezy in a test "
 "environment or have backups ready to be able to go back."
 msgstr ""
 "Essere preparati: essere sicuri di avere provato l'aggiornamento da Wheezy "
 "in un ambiente di test o avere il backup per poter tornare indietro."
 
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Please note that the following recipe applies to a default Debian Edu main "
+"server installation (desktop=kde, profiles Main-Server, Workstation, Thin-"
+"Client-Server). (For a general overview concernig wheezy to jessie upgrade, "
+"see: <ulink url=\"https://www.debian.org/releases/jessie/releasenotes\"/>)"
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Don't use X, use a virtual console, log in as root. Read all debconf "
+"information carefully, choose 'keep the local version currently installed'; "
+"in most cases hitting return will be fine. Press 'q' to quit the apt-"
+"listchanges pager once you've read the information."
+msgstr ""
+
 #. type: Content of: <article><section><section><section><title>
-msgid "The basic upgrade operation"
-msgstr "Le operazioni di aggiornamento di base"
+#, fuzzy
+#| msgid "Update the preseed file:"
+msgid "Upgrade the server side"
+msgstr "Aggiornare il file di preconfigurazione:"
 
-#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Make sure the current system is up-to-date."
+msgstr ""
+
+#. type: CDATA
+#, fuzzy, no-wrap
+#| msgid ""
+#| "apt-get update\n"
+#| "apt-get upgrade"
 msgid ""
-"Edit <computeroutput>/etc/apt/sources.list</computeroutput> and replace all "
-"occurrences of \"wheezy\" with \"jessie\"."
+"apt-get update\n"
+"apt-get -y upgrade"
 msgstr ""
-"Modificare il file <computeroutput>/etc/apt/sources.list</computeroutput> e "
-"sostituire tutte le occorrenze di \"wheezy\" con \"jessie\"."
+"apt-get update\n"
+"apt-get upgrade"
 
-#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
-msgid "run <computeroutput>apt-get update</computeroutput>"
-msgstr "eseguire <computeroutput>apt-get update</computeroutput>"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Remove diversion; debian-edu-config's postinst seems to do it too late "
+"(Debian bug <ulink url=\"https://bugs.debian.org/779641#\">779641</ulink>)."
+msgstr ""
 
-#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
-msgid "run <computeroutput>apt-get upgrade</computeroutput>"
-msgstr "eseguire <computeroutput>apt-get upgrade</computeroutput>"
+#. type: CDATA
+#, no-wrap
+msgid ""
+"dpkg-divert --remove /usr/share/pam-configs/krb5\n"
+"rm /usr/share/pam-configs/edu-krb5"
+msgstr ""
 
-#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
-msgid "run <computeroutput>apt-get dist-upgrade</computeroutput>"
-msgstr "eseguire <computeroutput>apt-get dist-upgrade</computeroutput>"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Keep backup of Kerberos configuration file (Debian bug <ulink url=\"https://"
+"bugs.debian.org/779642#\">779642</ulink>)."
+msgstr ""
 
-#. type: Content of: <article><section><section><section><title>
-msgid "LDAP service needs to be reconfigured"
-msgstr "Il servizio LDAP ha bisogno di essere riconfigurato"
+#. type: CDATA
+#, no-wrap
+msgid "cp /etc/krb5.conf /etc/krb5.conf.backup"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Do the actual upgrade."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"sed -i 's/wheezy/jessie/g' /etc/apt/sources.list\n"
+"apt-get update\n"
+"apt-get -y dist-upgrade\n"
+"apt-get -f install\n"
+"apt-get -y dist-upgrade"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"If apt-get still finishes with an error, try to fix it and/or run the apt-"
+"get commands again, esp. apt-get -f install."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Install additional package to make PXE work (Debian bug <ulink url=\"https://"
+"bugs.debian.org/779644#\">779644</ulink>)."
+msgstr ""
+
+#. type: CDATA
+#, fuzzy, no-wrap
+#| msgid "apt-get install killer"
+msgid "apt-get -y install pxelinux"
+msgstr "apt-get install killer"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Install squid3 as squid is deprecated and missing in jessie (Debian bug "
+"<ulink url=\"https://bugs.debian.org/779649#\">779649</ulink>)."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"apt-get -y install squid3\n"
+"service squid3 stop"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Apply debian-edu configuration (takes some time)."
+msgstr ""
+
+#. type: CDATA
+#, fuzzy, no-wrap
+#| msgid "/usr/sbin/debian-edu-pxeinstall"
+msgid "cfengine-debian-edu -D installation"
+msgstr "/usr/sbin/debian-edu-pxeinstall"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Replace squid with squid3, keep the cache; a new swap file will be generated "
+"and the cache index be rebuilt upon first squid3 start."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"service squid stop\n"
+"umount /var/spool/squid\n"
+"sed -i 's#/var/spool/squid#/var/spool/squid3#' /etc/fstab\n"
+"mount /var/spool/squid3\n"
+"service squid3 start\n"
+"apt-get -y purge squid squid-common"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Replace Kerberos file (messed up by cfengine) with the right one."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "cp /etc/krb5.conf.backup /etc/krb5.conf"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Regenerate gosa.secrets to make GOsa² work with new php version."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"rm /etc/gosa/gosa.secrets\n"
+"cp /etc/gosa/gosa.conf.orig /etc/gosa/gosa.conf\n"
+"gosa-encrypt-passwords"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Install newly split out cups package needed for networked printing (Debian "
+"bug <ulink url=\"https://bugs.debian.org/779645#\">779645</ulink>)."
+msgstr ""
+
+#. type: CDATA
+#, fuzzy, no-wrap
+#| msgid "apt-get install killer"
+msgid "apt-get -y install cups-browsed"
+msgstr "apt-get install killer"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Install missing packages; the package names were obtained using "
+"<computeroutput>/usr/lib/debian-edu-config/testsuite/taskpkgs | grep error:</"
+"computeroutput> after the step above (Debian bug <ulink url=\"https://bugs."
+"debian.org/779648#\">779648</ulink>)."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"apt-get -y install browser-plugin-libreoffice gosa-plugin-netgroups \\\n"
+"killer libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Check if the upgraded system works."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Reboot and test if it works like before: Log in as first user and test if "
+"the GOsa² gui is working, if you're able to connect LTSP clients and "
+"workstations, if you can add/remove a netgroup membership of a system, if "
+"you can send and receive internal email, if you can manage printers, and "
+"maybe other site specific things. Use the testsuite scripts if you spot an "
+"error."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Consider an optional step (Debian bug <ulink url=\"https://bugs.debian."
+"org/779646#\">779646</ulink>)."
+msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"The LDAP setup has only scarcely changed from Wheezy to Jessie so chances "
-"are that LDAP hasn't to be rebuild from scratch. There's a script "
-"<computeroutput>ldap-debian-edu-install</computeroutput> (in /usr/bin) that "
-"could be used to achieve rebuilding LDAP if needed. Read the comment at the "
-"beginning of that script carefully before doing anything."
+"Clean up after cfengine has autoremoved packages without purging. This will "
+"remove configuration files of removed packages and should only be used with "
+"care; use <computeroutput>dpkg -l|grep ^rc</computeroutput> first to check "
+"what would be removed, then run <computeroutput>for i in $(dpkg -l|grep ^rc|"
+"cut -d' ' -f3);do dpkg -P $i;done</computeroutput>."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
+msgid "Upgrade LTSP chroot (default arch i386)"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"sed -i '/jessie/ s/deb/#deb/g' /opt/ltsp/i386/etc/apt/sources.list\n"
+"ltsp-chroot -m -a i386 apt-get update\n"
+"ltsp-chroot -m -a i386 apt-get -y upgrade\n"
+"sed -i 's/wheezy/jessie/g' /opt/ltsp/i386/etc/apt/sources.list\n"
+"ltsp-chroot -m -a i386 apt-get update\n"
+"ltsp-chroot -m -a i386 apt-get -y dist-upgrade\n"
+"ltsp-chroot -m -a i386 apt-get -f install\n"
+"ltsp-chroot -m -a i386 apt-get -y dist-upgrade"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Install missing packages in the LTSP chroot (Debian bug <ulink url=\"https://"
+"bugs.debian.org/779647#\">779647</ulink>)."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"ltsp-chroot -m -a i386 apt-get -y install browser-plugin-libreoffice killer \\\n"
+"libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Cleaning up."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "ltsp-chroot -m -a i386 apt-get --purge autoremove"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Update LTSP support on the server side."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"ltsp-update-kernels\n"
+"ltsp-update-sshkeys"
 msgstr ""
-"La configurazione di LDAP è cambiata di poco da Wheezy a Jessie quindi è "
-"probabile che LDAP non debba essere ricostruito da zero. C'è lo script "
-"<computeroutput>ldap-debian-edu-install</computeroutput> (in /usr/bin) che "
-"può essere usato per per ricostruire LDAP, se necessario. Leggere il "
-"commento all'inizio dello script con attenzione prima di fare qualsiasi cosa."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Recreating an LTSP chroot"
 msgstr "Ricreare un chroot LTSP"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "On the LTSP server(s) the LTSP chroot should be recreated. The new chroot "
+#| "will still support both thin-clients and diskless workstations."
 msgid ""
-"On the LTSP server(s) the LTSP chroot should be recreated. The new chroot "
-"will still support both thin-clients and diskless workstations."
+"On the LTSP server(s) the LTSP chroot could also be recreated. The new "
+"chroot will still support both thin-clients and diskless workstations."
 msgstr ""
 "Sui server LTSP il chroot di LTSP dovrebbe essere ricreato. Il nuovo chroot "
 "supporterà di nuovo automaticamente sia i thin-client che le workstation "
@@ -4707,17 +4922,18 @@ msgstr ""
 "considerazione di fare il backup."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Recreate the chroot by running <computeroutput>debian-edu-ltsp</"
+#| "computeroutput> as root."
 msgid ""
-"Recreate the chroot by running <computeroutput>debian-edu-ltsp</"
-"computeroutput> as root."
+"Recreate the chroot by running <computeroutput>debian-edu-ltsp --arch i386</"
+"computeroutput> (or <computeroutput>debian-edu-ltsp --arch amd64</"
+"computeroutput>) as root."
 msgstr ""
 "Per ricreare chroot eseguire <computeroutput>debian-edu-ltsp</"
 "computeroutput> come root."
 
-#. type: Content of: <article><section><section><section><para>
-msgid "Of course you can also upgrade the chroot as usual."
-msgstr "Naturalmente si può anche aggiornare chroot come al solito."
-
 #. type: Content of: <article><section><section><title>
 msgid ""
 "Upgrades from older Debian Edu / Skolelinux installations (before Wheezy)"
@@ -12553,6 +12769,52 @@ msgstr ""
 "Maggiori informazioni sulle vecchie versioni possono essere trovate a <ulink "
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
+#~ msgid ""
+#~ "FIXME: confirm this is really all what needs to be done for upgrades. "
+#~ "It's great if that's true! It could be..."
+#~ msgstr ""
+#~ "FIXME: confirm this is really all what needs to be done for upgrades. "
+#~ "It's great if that's true! It could be..."
+
+#~ msgid "The basic upgrade operation"
+#~ msgstr "Le operazioni di aggiornamento di base"
+
+#~ msgid ""
+#~ "Edit <computeroutput>/etc/apt/sources.list</computeroutput> and replace "
+#~ "all occurrences of \"wheezy\" with \"jessie\"."
+#~ msgstr ""
+#~ "Modificare il file <computeroutput>/etc/apt/sources.list</computeroutput> "
+#~ "e sostituire tutte le occorrenze di \"wheezy\" con \"jessie\"."
+
+#~ msgid "run <computeroutput>apt-get update</computeroutput>"
+#~ msgstr "eseguire <computeroutput>apt-get update</computeroutput>"
+
+#~ msgid "run <computeroutput>apt-get upgrade</computeroutput>"
+#~ msgstr "eseguire <computeroutput>apt-get upgrade</computeroutput>"
+
+#~ msgid "run <computeroutput>apt-get dist-upgrade</computeroutput>"
+#~ msgstr "eseguire <computeroutput>apt-get dist-upgrade</computeroutput>"
+
+#~ msgid "LDAP service needs to be reconfigured"
+#~ msgstr "Il servizio LDAP ha bisogno di essere riconfigurato"
+
+#~ msgid ""
+#~ "The LDAP setup has only scarcely changed from Wheezy to Jessie so chances "
+#~ "are that LDAP hasn't to be rebuild from scratch. There's a script "
+#~ "<computeroutput>ldap-debian-edu-install</computeroutput> (in /usr/bin) "
+#~ "that could be used to achieve rebuilding LDAP if needed. Read the comment "
+#~ "at the beginning of that script carefully before doing anything."
+#~ msgstr ""
+#~ "La configurazione di LDAP è cambiata di poco da Wheezy a Jessie quindi è "
+#~ "probabile che LDAP non debba essere ricostruito da zero. C'è lo script "
+#~ "<computeroutput>ldap-debian-edu-install</computeroutput> (in /usr/bin) "
+#~ "che può essere usato per per ricostruire LDAP, se necessario. Leggere il "
+#~ "commento all'inizio dello script con attenzione prima di fare qualsiasi "
+#~ "cosa."
+
+#~ msgid "Of course you can also upgrade the chroot as usual."
+#~ msgstr "Naturalmente si può anche aggiornare chroot come al solito."
+
 #~ msgid "Every user who wants to use KMail needs to configure it as follows."
 #~ msgstr ""
 #~ "Ogni utente che vuole usare KMail bisogna che lo configuri nel modo "
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
index c3f8aae..f3350c0 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
@@ -18,7 +18,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2015-02-14 14:47+0000\n"
+"POT-Creation-Date: 2015-03-10 13:02+0000\n"
 "PO-Revision-Date: 2015-01-31 17:45+0000\n"
 "Last-Translator: Ingrid Yrvin <iyrvin at hagan.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
@@ -4567,14 +4567,6 @@ msgstr "Oppgraderinger fra Debian Edu Wheezy"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"FIXME: confirm this is really all what needs to be done for upgrades. It's "
-"great if that's true! It could be..."
-msgstr ""
-"FIXME: bekreft at dette er alt som er nødvendig for å oppgradere. Det er "
-"flott om det virker, og det kan være det ..."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
 "Be prepared: make sure you have tested the upgrade from Wheezy in a test "
 "environment or have backups ready to be able to go back."
 msgstr ""
@@ -4582,55 +4574,279 @@ msgstr ""
 "testmiljø, eller at du har backup tilgjengelig, for å kunne gå tilbake ved "
 "eventuelle problemer."
 
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Please note that the following recipe applies to a default Debian Edu main "
+"server installation (desktop=kde, profiles Main-Server, Workstation, Thin-"
+"Client-Server). (For a general overview concernig wheezy to jessie upgrade, "
+"see: <ulink url=\"https://www.debian.org/releases/jessie/releasenotes\"/>)"
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Don't use X, use a virtual console, log in as root. Read all debconf "
+"information carefully, choose 'keep the local version currently installed'; "
+"in most cases hitting return will be fine. Press 'q' to quit the apt-"
+"listchanges pager once you've read the information."
+msgstr ""
+
 #. type: Content of: <article><section><section><section><title>
-msgid "The basic upgrade operation"
-msgstr "Standard upgraderings metode"
+#, fuzzy
+#| msgid "Update the preseed file:"
+msgid "Upgrade the server side"
+msgstr "Oppdatere preseed filen:"
 
-#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Make sure the current system is up-to-date."
+msgstr ""
+
+#. type: CDATA
+#, fuzzy, no-wrap
+#| msgid ""
+#| "apt-get update\n"
+#| "apt-get upgrade"
+msgid ""
+"apt-get update\n"
+"apt-get -y upgrade"
+msgstr ""
+"aptitude update \n"
+"aptitude dist-upgrade"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Edit <computeroutput>/etc/apt/sources.list</computeroutput> and replace all "
-"occurrences of \"wheezy\" with \"jessie\"."
+"Remove diversion; debian-edu-config's postinst seems to do it too late "
+"(Debian bug <ulink url=\"https://bugs.debian.org/779641#\">779641</ulink>)."
 msgstr ""
-"Nå kan du endre <computeroutput>/etc/apt/sources.list</computeroutput> slik "
-"at de inneholder disse linjene"
 
-#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
-msgid "run <computeroutput>apt-get update</computeroutput>"
-msgstr "<computeroutput>git pull</computeroutput>"
+#. type: CDATA
+#, no-wrap
+msgid ""
+"dpkg-divert --remove /usr/share/pam-configs/krb5\n"
+"rm /usr/share/pam-configs/edu-krb5"
+msgstr ""
 
-#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
-msgid "run <computeroutput>apt-get upgrade</computeroutput>"
-msgstr "<computeroutput>git pull</computeroutput>"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Keep backup of Kerberos configuration file (Debian bug <ulink url=\"https://"
+"bugs.debian.org/779642#\">779642</ulink>)."
+msgstr ""
 
-#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
-msgid "run <computeroutput>apt-get dist-upgrade</computeroutput>"
-msgstr "<computeroutput>git pull</computeroutput>"
+#. type: CDATA
+#, no-wrap
+msgid "cp /etc/krb5.conf /etc/krb5.conf.backup"
+msgstr ""
 
-#. type: Content of: <article><section><section><section><title>
-msgid "LDAP service needs to be reconfigured"
-msgstr "LDAP-tjenesten trenger å bli reparert"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Do the actual upgrade."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"sed -i 's/wheezy/jessie/g' /etc/apt/sources.list\n"
+"apt-get update\n"
+"apt-get -y dist-upgrade\n"
+"apt-get -f install\n"
+"apt-get -y dist-upgrade"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"If apt-get still finishes with an error, try to fix it and/or run the apt-"
+"get commands again, esp. apt-get -f install."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Install additional package to make PXE work (Debian bug <ulink url=\"https://"
+"bugs.debian.org/779644#\">779644</ulink>)."
+msgstr ""
+
+#. type: CDATA
+#, fuzzy, no-wrap
+#| msgid "apt-get install killer"
+msgid "apt-get -y install pxelinux"
+msgstr "apt-get install killer"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Install squid3 as squid is deprecated and missing in jessie (Debian bug "
+"<ulink url=\"https://bugs.debian.org/779649#\">779649</ulink>)."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"apt-get -y install squid3\n"
+"service squid3 stop"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Apply debian-edu configuration (takes some time)."
+msgstr ""
+
+#. type: CDATA
+#, fuzzy, no-wrap
+#| msgid "/usr/sbin/debian-edu-pxeinstall"
+msgid "cfengine-debian-edu -D installation"
+msgstr "/usr/sbin/debian-edu-pxeinstall"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Replace squid with squid3, keep the cache; a new swap file will be generated "
+"and the cache index be rebuilt upon first squid3 start."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"service squid stop\n"
+"umount /var/spool/squid\n"
+"sed -i 's#/var/spool/squid#/var/spool/squid3#' /etc/fstab\n"
+"mount /var/spool/squid3\n"
+"service squid3 start\n"
+"apt-get -y purge squid squid-common"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Replace Kerberos file (messed up by cfengine) with the right one."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "cp /etc/krb5.conf.backup /etc/krb5.conf"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Regenerate gosa.secrets to make GOsa² work with new php version."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"rm /etc/gosa/gosa.secrets\n"
+"cp /etc/gosa/gosa.conf.orig /etc/gosa/gosa.conf\n"
+"gosa-encrypt-passwords"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Install newly split out cups package needed for networked printing (Debian "
+"bug <ulink url=\"https://bugs.debian.org/779645#\">779645</ulink>)."
+msgstr ""
+
+#. type: CDATA
+#, fuzzy, no-wrap
+#| msgid "apt-get install killer"
+msgid "apt-get -y install cups-browsed"
+msgstr "apt-get install killer"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Install missing packages; the package names were obtained using "
+"<computeroutput>/usr/lib/debian-edu-config/testsuite/taskpkgs | grep error:</"
+"computeroutput> after the step above (Debian bug <ulink url=\"https://bugs."
+"debian.org/779648#\">779648</ulink>)."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"apt-get -y install browser-plugin-libreoffice gosa-plugin-netgroups \\\n"
+"killer libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Check if the upgraded system works."
+msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"The LDAP setup has only scarcely changed from Wheezy to Jessie so chances "
-"are that LDAP hasn't to be rebuild from scratch. There's a script "
-"<computeroutput>ldap-debian-edu-install</computeroutput> (in /usr/bin) that "
-"could be used to achieve rebuilding LDAP if needed. Read the comment at the "
-"beginning of that script carefully before doing anything."
+"Reboot and test if it works like before: Log in as first user and test if "
+"the GOsa² gui is working, if you're able to connect LTSP clients and "
+"workstations, if you can add/remove a netgroup membership of a system, if "
+"you can send and receive internal email, if you can manage printers, and "
+"maybe other site specific things. Use the testsuite scripts if you spot an "
+"error."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Consider an optional step (Debian bug <ulink url=\"https://bugs.debian."
+"org/779646#\">779646</ulink>)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Clean up after cfengine has autoremoved packages without purging. This will "
+"remove configuration files of removed packages and should only be used with "
+"care; use <computeroutput>dpkg -l|grep ^rc</computeroutput> first to check "
+"what would be removed, then run <computeroutput>for i in $(dpkg -l|grep ^rc|"
+"cut -d' ' -f3);do dpkg -P $i;done</computeroutput>."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
+msgid "Upgrade LTSP chroot (default arch i386)"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"sed -i '/jessie/ s/deb/#deb/g' /opt/ltsp/i386/etc/apt/sources.list\n"
+"ltsp-chroot -m -a i386 apt-get update\n"
+"ltsp-chroot -m -a i386 apt-get -y upgrade\n"
+"sed -i 's/wheezy/jessie/g' /opt/ltsp/i386/etc/apt/sources.list\n"
+"ltsp-chroot -m -a i386 apt-get update\n"
+"ltsp-chroot -m -a i386 apt-get -y dist-upgrade\n"
+"ltsp-chroot -m -a i386 apt-get -f install\n"
+"ltsp-chroot -m -a i386 apt-get -y dist-upgrade"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Install missing packages in the LTSP chroot (Debian bug <ulink url=\"https://"
+"bugs.debian.org/779647#\">779647</ulink>)."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"ltsp-chroot -m -a i386 apt-get -y install browser-plugin-libreoffice killer \\\n"
+"libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Cleaning up."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "ltsp-chroot -m -a i386 apt-get --purge autoremove"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Update LTSP support on the server side."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"ltsp-update-kernels\n"
+"ltsp-update-sshkeys"
 msgstr ""
-"LDAP-oppsettet har endret seg noe fra Wheezy til Jessie. 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 "
-"kommentaren i begynnelsen av dette skriptet nøye før du gjør noe."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Recreating an LTSP chroot"
 msgstr "Gjenoppretter LTSP chroot"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "On the LTSP server(s) the LTSP chroot should be recreated. The new chroot "
+#| "will still support both thin-clients and diskless workstations."
 msgid ""
-"On the LTSP server(s) the LTSP chroot should be recreated. The new chroot "
-"will still support both thin-clients and diskless workstations."
+"On the LTSP server(s) the LTSP chroot could also be recreated. The new "
+"chroot will still support both thin-clients and diskless workstations."
 msgstr ""
 "LTSP chroot vil bli gjenopprettet på LTSP-server(ene). Den nye chroot vil "
 "automatisk støtte både tynn-klienter og diskløse klienter/arbeidsstasjoner. "
@@ -4646,17 +4862,18 @@ msgstr ""
 "computeroutput> som det passer."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Recreate the chroot by running <computeroutput>debian-edu-ltsp</"
+#| "computeroutput> as root."
 msgid ""
-"Recreate the chroot by running <computeroutput>debian-edu-ltsp</"
-"computeroutput> as root."
+"Recreate the chroot by running <computeroutput>debian-edu-ltsp --arch i386</"
+"computeroutput> (or <computeroutput>debian-edu-ltsp --arch amd64</"
+"computeroutput>) as root."
 msgstr ""
 "Gjenopprett chroot ved å kjøre <computeroutput>debian-edu-ltsp</"
 "computeroutput> som root."
 
-#. type: Content of: <article><section><section><section><para>
-msgid "Of course you can also upgrade the chroot as usual."
-msgstr "Du kan selvfølgelig også oppgradere chroot som vanlig."
-
 #. type: Content of: <article><section><section><title>
 msgid ""
 "Upgrades from older Debian Edu / Skolelinux installations (before Wheezy)"
@@ -12360,6 +12577,50 @@ msgstr ""
 "developer.skolelinux.no/info/cdbygging/news.html'>http://developer."
 "skolelinux.no/info/cdbygging/news.html</ulink>."
 
+#~ msgid ""
+#~ "FIXME: confirm this is really all what needs to be done for upgrades. "
+#~ "It's great if that's true! It could be..."
+#~ msgstr ""
+#~ "FIXME: bekreft at dette er alt som er nødvendig for å oppgradere. Det er "
+#~ "flott om det virker, og det kan være det ..."
+
+#~ msgid "The basic upgrade operation"
+#~ msgstr "Standard upgraderings metode"
+
+#~ msgid ""
+#~ "Edit <computeroutput>/etc/apt/sources.list</computeroutput> and replace "
+#~ "all occurrences of \"wheezy\" with \"jessie\"."
+#~ msgstr ""
+#~ "Nå kan du endre <computeroutput>/etc/apt/sources.list</computeroutput> "
+#~ "slik at de inneholder disse linjene"
+
+#~ msgid "run <computeroutput>apt-get update</computeroutput>"
+#~ msgstr "<computeroutput>git pull</computeroutput>"
+
+#~ msgid "run <computeroutput>apt-get upgrade</computeroutput>"
+#~ msgstr "<computeroutput>git pull</computeroutput>"
+
+#~ msgid "run <computeroutput>apt-get dist-upgrade</computeroutput>"
+#~ msgstr "<computeroutput>git pull</computeroutput>"
+
+#~ msgid "LDAP service needs to be reconfigured"
+#~ msgstr "LDAP-tjenesten trenger å bli reparert"
+
+#~ msgid ""
+#~ "The LDAP setup has only scarcely changed from Wheezy to Jessie so chances "
+#~ "are that LDAP hasn't to be rebuild from scratch. There's a script "
+#~ "<computeroutput>ldap-debian-edu-install</computeroutput> (in /usr/bin) "
+#~ "that could be used to achieve rebuilding LDAP if needed. Read the comment "
+#~ "at the beginning of that script carefully before doing anything."
+#~ msgstr ""
+#~ "LDAP-oppsettet har endret seg noe fra Wheezy til Jessie. 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 kommentaren i begynnelsen av dette skriptet nøye før du gjør noe."
+
+#~ msgid "Of course you can also upgrade the chroot as usual."
+#~ msgstr "Du kan selvfølgelig også oppgradere chroot som vanlig."
+
 #~ msgid "Every user who wants to use KMail needs to configure it as follows."
 #~ msgstr "Hver bruker som ønsker å bruke KMail må sette den opp som følger."
 
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
index 2f70f05..668e720 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2015-02-14 14:47+0000\n"
+"POT-Creation-Date: 2015-03-10 13:02+0000\n"
 "PO-Revision-Date: 2015-02-15 22:33+0100\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert at yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch at lists.debian.org>\n"
@@ -1096,9 +1096,6 @@ msgstr ""
 "hoofdstuk <link linkend=\"Architecture\">Architectuur van het netwerk</link>."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "The computers running Debian Edu / Skolelinux must have either i386 "
-#| "(oldest supported processors: Intel Pentium/AMD K5) or amd64 processors."
 msgid ""
 "The computers running Debian Edu / Skolelinux must have either 32 bit "
 "(Debian architecture 'i386', oldest supported processors are Intel Pentium "
@@ -1118,9 +1115,6 @@ msgstr ""
 "aanbevolen voor de profielen hoofdserver en thin-clientserver."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "Thin clients can run on as low as 64 MiB RAM and 133 MHz processor, "
-#| "though 128 MiB RAM and somewhat faster processors are recommended."
 msgid ""
 "Thin clients with only 64 MiB RAM and 133 MHz on 32 bit processors are "
 "possible, though 256 MiB RAM or more and faster processors are recommended."
@@ -1130,11 +1124,6 @@ msgstr ""
 "snellere processors aanbevolen worden."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid ""
-#| "Swapping over the network is automatically enabled; the swap size is 512 "
-#| "MiB, and if you need more you can tune this by editing /etc/ltsp/nbdswapd."
-#| "conf on tjener to set the SIZE variable. Please <emphasis>tune up the "
-#| "swap size</emphasis> either locally on the PC or on the server."
 msgid ""
 "Swapping over the network is automatically enabled for LTSP clients; the "
 "swap size is 512 MiB, and if you need more you can tune this by editing "
@@ -1158,10 +1147,6 @@ msgstr ""
 "netwerk."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "For workstations, diskless workstations and standalone PCs, 800 MHz, 320 "
-#| "MiB RAM are minimum requirements, though 512 or 1024 MiB RAM will perform "
-#| "considerably better. Just a faster CPU will speed things up."
 msgid ""
 "For workstations, diskless workstations and standalone systems, 800 MHz and "
 "512 MiB RAM are the absolute minimum requirements. For running modern "
@@ -1199,7 +1184,6 @@ msgstr ""
 "een hoofdserver, geldt \"hoe meer, hoe beter\"."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid "Thin Client Server/s"
 msgid "thin client server: 40 GiB."
 msgstr "Thin-clientserver: 40GB."
 
@@ -1231,9 +1215,6 @@ msgstr ""
 "link>."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "Laptops have the same requirements as for workstations since they are "
-#| "just movable workstations."
 msgid ""
 "Laptops are movable workstations, so they have the same requirements as "
 "workstations."
@@ -4782,14 +4763,6 @@ msgstr "Opwaarderen van Debian Edu Wheezy"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"FIXME: confirm this is really all what needs to be done for upgrades. It's "
-"great if that's true! It could be..."
-msgstr ""
-"FIXME: confirm this is really all what needs to be done for upgrades. It's "
-"great if that's true! It could be..."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
 "Be prepared: make sure you have tested the upgrade from Wheezy in a test "
 "environment or have backups ready to be able to go back."
 msgstr ""
@@ -4797,58 +4770,281 @@ msgstr ""
 "Wheezy uit in een testomgeving of hou reservekopieën klaar, zodat u zo nodig "
 "naar de oorspronkelijke situatie kunt terugkeren."
 
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Please note that the following recipe applies to a default Debian Edu main "
+"server installation (desktop=kde, profiles Main-Server, Workstation, Thin-"
+"Client-Server). (For a general overview concernig wheezy to jessie upgrade, "
+"see: <ulink url=\"https://www.debian.org/releases/jessie/releasenotes\"/>)"
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Don't use X, use a virtual console, log in as root. Read all debconf "
+"information carefully, choose 'keep the local version currently installed'; "
+"in most cases hitting return will be fine. Press 'q' to quit the apt-"
+"listchanges pager once you've read the information."
+msgstr ""
+
 #. type: Content of: <article><section><section><section><title>
-msgid "The basic upgrade operation"
-msgstr "Basishandelingen van een opwaardering"
+#, fuzzy
+#| msgid "Update the preseed file:"
+msgid "Upgrade the server side"
+msgstr "Werk het bestand met voorgeprogrammeerde configuraties bij:"
 
-#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Make sure the current system is up-to-date."
+msgstr ""
+
+#. type: CDATA
+#, fuzzy, no-wrap
+#| msgid ""
+#| "apt-get update\n"
+#| "apt-get upgrade"
 msgid ""
-"Edit <computeroutput>/etc/apt/sources.list</computeroutput> and replace all "
-"occurrences of \"wheezy\" with \"jessie\"."
+"apt-get update\n"
+"apt-get -y upgrade"
 msgstr ""
-"Bewerk het bestand <computeroutput>/etc/apt/sources.list</computeroutput> en "
-"vervang overal het woord \"wheezy\" door het woord \"jessie\"."
+"apt-get update\n"
+"apt-get upgrade"
 
-#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
-msgid "run <computeroutput>apt-get update</computeroutput>"
-msgstr "geef de opdracht <computeroutput>apt-get update</computeroutput>"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Remove diversion; debian-edu-config's postinst seems to do it too late "
+"(Debian bug <ulink url=\"https://bugs.debian.org/779641#\">779641</ulink>)."
+msgstr ""
 
-#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
-msgid "run <computeroutput>apt-get upgrade</computeroutput>"
-msgstr "geef de opdracht <computeroutput>apt-get upgrade</computeroutput>"
+#. type: CDATA
+#, no-wrap
+msgid ""
+"dpkg-divert --remove /usr/share/pam-configs/krb5\n"
+"rm /usr/share/pam-configs/edu-krb5"
+msgstr ""
 
-#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
-msgid "run <computeroutput>apt-get dist-upgrade</computeroutput>"
-msgstr "geef de opdracht <computeroutput>apt-get dist-upgrade</computeroutput>"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Keep backup of Kerberos configuration file (Debian bug <ulink url=\"https://"
+"bugs.debian.org/779642#\">779642</ulink>)."
+msgstr ""
 
-#. type: Content of: <article><section><section><section><title>
-msgid "LDAP service needs to be reconfigured"
-msgstr "De dienst LDAP moet opnieuw geconfigureerd worden"
+#. type: CDATA
+#, no-wrap
+msgid "cp /etc/krb5.conf /etc/krb5.conf.backup"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Do the actual upgrade."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"sed -i 's/wheezy/jessie/g' /etc/apt/sources.list\n"
+"apt-get update\n"
+"apt-get -y dist-upgrade\n"
+"apt-get -f install\n"
+"apt-get -y dist-upgrade"
+msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"The LDAP setup has only scarcely changed from Wheezy to Jessie so chances "
-"are that LDAP hasn't to be rebuild from scratch. There's a script "
-"<computeroutput>ldap-debian-edu-install</computeroutput> (in /usr/bin) that "
-"could be used to achieve rebuilding LDAP if needed. Read the comment at the "
-"beginning of that script carefully before doing anything."
+"If apt-get still finishes with an error, try to fix it and/or run the apt-"
+"get commands again, esp. apt-get -f install."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Install additional package to make PXE work (Debian bug <ulink url=\"https://"
+"bugs.debian.org/779644#\">779644</ulink>)."
+msgstr ""
+
+#. type: CDATA
+#, fuzzy, no-wrap
+#| msgid "apt-get install killer"
+msgid "apt-get -y install pxelinux"
+msgstr "apt-get install killer"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Install squid3 as squid is deprecated and missing in jessie (Debian bug "
+"<ulink url=\"https://bugs.debian.org/779649#\">779649</ulink>)."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"apt-get -y install squid3\n"
+"service squid3 stop"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Apply debian-edu configuration (takes some time)."
+msgstr ""
+
+#. type: CDATA
+#, fuzzy, no-wrap
+#| msgid "/usr/sbin/debian-edu-pxeinstall"
+msgid "cfengine-debian-edu -D installation"
+msgstr "/usr/sbin/debian-edu-pxeinstall"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Replace squid with squid3, keep the cache; a new swap file will be generated "
+"and the cache index be rebuilt upon first squid3 start."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"service squid stop\n"
+"umount /var/spool/squid\n"
+"sed -i 's#/var/spool/squid#/var/spool/squid3#' /etc/fstab\n"
+"mount /var/spool/squid3\n"
+"service squid3 start\n"
+"apt-get -y purge squid squid-common"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Replace Kerberos file (messed up by cfengine) with the right one."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "cp /etc/krb5.conf.backup /etc/krb5.conf"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Regenerate gosa.secrets to make GOsa² work with new php version."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"rm /etc/gosa/gosa.secrets\n"
+"cp /etc/gosa/gosa.conf.orig /etc/gosa/gosa.conf\n"
+"gosa-encrypt-passwords"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Install newly split out cups package needed for networked printing (Debian "
+"bug <ulink url=\"https://bugs.debian.org/779645#\">779645</ulink>)."
+msgstr ""
+
+#. type: CDATA
+#, fuzzy, no-wrap
+#| msgid "apt-get install killer"
+msgid "apt-get -y install cups-browsed"
+msgstr "apt-get install killer"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Install missing packages; the package names were obtained using "
+"<computeroutput>/usr/lib/debian-edu-config/testsuite/taskpkgs | grep error:</"
+"computeroutput> after the step above (Debian bug <ulink url=\"https://bugs."
+"debian.org/779648#\">779648</ulink>)."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"apt-get -y install browser-plugin-libreoffice gosa-plugin-netgroups \\\n"
+"killer libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "check if the username is present"
+msgid "Check if the upgraded system works."
+msgstr "controleer of de gebruikersnaam ingevuld staat"
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Reboot and test if it works like before: Log in as first user and test if "
+"the GOsa² gui is working, if you're able to connect LTSP clients and "
+"workstations, if you can add/remove a netgroup membership of a system, if "
+"you can send and receive internal email, if you can manage printers, and "
+"maybe other site specific things. Use the testsuite scripts if you spot an "
+"error."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Consider an optional step (Debian bug <ulink url=\"https://bugs.debian."
+"org/779646#\">779646</ulink>)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Clean up after cfengine has autoremoved packages without purging. This will "
+"remove configuration files of removed packages and should only be used with "
+"care; use <computeroutput>dpkg -l|grep ^rc</computeroutput> first to check "
+"what would be removed, then run <computeroutput>for i in $(dpkg -l|grep ^rc|"
+"cut -d' ' -f3);do dpkg -P $i;done</computeroutput>."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
+msgid "Upgrade LTSP chroot (default arch i386)"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"sed -i '/jessie/ s/deb/#deb/g' /opt/ltsp/i386/etc/apt/sources.list\n"
+"ltsp-chroot -m -a i386 apt-get update\n"
+"ltsp-chroot -m -a i386 apt-get -y upgrade\n"
+"sed -i 's/wheezy/jessie/g' /opt/ltsp/i386/etc/apt/sources.list\n"
+"ltsp-chroot -m -a i386 apt-get update\n"
+"ltsp-chroot -m -a i386 apt-get -y dist-upgrade\n"
+"ltsp-chroot -m -a i386 apt-get -f install\n"
+"ltsp-chroot -m -a i386 apt-get -y dist-upgrade"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Install missing packages in the LTSP chroot (Debian bug <ulink url=\"https://"
+"bugs.debian.org/779647#\">779647</ulink>)."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"ltsp-chroot -m -a i386 apt-get -y install browser-plugin-libreoffice killer \\\n"
+"libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Cleaning up."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "ltsp-chroot -m -a i386 apt-get --purge autoremove"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Update LTSP support on the server side."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"ltsp-update-kernels\n"
+"ltsp-update-sshkeys"
 msgstr ""
-"Tussen de instellingen van LDAP in Wheezy en die in Jessie zijn er slechts "
-"kleine verschillen. Er bestaat dus een kans dat LDAP niet helemaal opnieuw "
-"moet opgebouwd worden. Men kan het script <computeroutput>ldap-debian-edu-"
-"install</computeroutput> (in /usr/bin) gebruiken om het heropbouwen van LDAP "
-"uit te voeren, mocht het toch nodig blijken. Lees wel aandachtig de "
-"commentaarregels aan het begin van het script alvorens concreet actie te "
-"ondernemen."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Recreating an LTSP chroot"
 msgstr "Een LTSP-chroot opnieuw aanmaken"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "On the LTSP server(s) the LTSP chroot should be recreated. The new chroot "
+#| "will still support both thin-clients and diskless workstations."
 msgid ""
-"On the LTSP server(s) the LTSP chroot should be recreated. The new chroot "
-"will still support both thin-clients and diskless workstations."
+"On the LTSP server(s) the LTSP chroot could also be recreated. The new "
+"chroot will still support both thin-clients and diskless workstations."
 msgstr ""
 "Op de  LTSP-server(s) moet de LTSP-chroot opnieuw aangemaakt worden. De "
 "nieuwe chroot ondersteunt zowel thin clients als schijfloze werkstations."
@@ -4865,17 +5061,18 @@ msgstr ""
 "als u over voldoende opslagruimte beschikt."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Recreate the chroot by running <computeroutput>debian-edu-ltsp</"
+#| "computeroutput> as root."
 msgid ""
-"Recreate the chroot by running <computeroutput>debian-edu-ltsp</"
-"computeroutput> as root."
+"Recreate the chroot by running <computeroutput>debian-edu-ltsp --arch i386</"
+"computeroutput> (or <computeroutput>debian-edu-ltsp --arch amd64</"
+"computeroutput>) as root."
 msgstr ""
 "Maak de chroot opnieuw aan door als systeembeheerder de opdracht "
 "<computeroutput>debian-edu-ltsp</computeroutput> uit te voeren."
 
-#. type: Content of: <article><section><section><section><para>
-msgid "Of course you can also upgrade the chroot as usual."
-msgstr "Natuurlijk kunt u ook zoals gewoonlijk de chroot opwaarderen."
-
 #. type: Content of: <article><section><section><title>
 msgid ""
 "Upgrades from older Debian Edu / Skolelinux installations (before Wheezy)"
@@ -6573,11 +6770,6 @@ msgid "Flash"
 msgstr "Flash"
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "While the free software flash-player <computeroutput>gnash</"
-#| "computeroutput> is <emphasis>not</emphasis> installed by default anymore, "
-#| "as it has been removed from Jessie, installing a non-free flash player is "
-#| "still an option."
 msgid ""
 "While the free software flash-player <computeroutput>gnash</computeroutput> "
 "is <emphasis>not</emphasis> installed by default anymore, as it has been "
@@ -6591,12 +6783,6 @@ msgstr ""
 "noteren dat in dit geval opwaarderen op een bijzondere manier verloopt."
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "To install the (non-free) Adobe Flash Player web browser plugin, install "
-#| "the <computeroutput>flashplugin-nonfree</computeroutput> Debian package "
-#| "from <computeroutput>contrib</computeroutput>. This requires "
-#| "<computeroutput>contrib</computeroutput> enabled in <computeroutput>/etc/"
-#| "apt/sources.list</computeroutput>."
 msgid ""
 "To install the (non-free) Adobe Flash Player web browser plugin, install the "
 "<computeroutput>flashplugin-nonfree</computeroutput> Debian package from "
@@ -6618,11 +6804,6 @@ msgstr ""
 "om die te installeren."
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "The solution for Chromium is similar, it needs the package "
-#| "<computeroutput>pepperflashplugin-nonfree</computeroutput> (also from "
-#| "<computeroutput>contrib</computeroutput>) to be installed, which will "
-#| "install the (non-free) Adobe Flash Player web browser plugin."
 msgid ""
 "The solution for Chromium is similar, it needs the package "
 "<computeroutput>pepperflashplugin-nonfree</computeroutput> (also from "
@@ -7242,15 +7423,6 @@ msgid "Use a different LTSP client network"
 msgstr "Gebruik een verschillend LTSP clientnetwerk"
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "192.168.0.0/24 is the default LTSP client network if a machine is "
-#| "installed using the Thin-Client-Server profile. If loads of LTSP clients "
-#| "are used or if different LTSP servers should serve both i386 and amd64 "
-#| "chroot environments the second preconfigured network 192.168.1.0/24 could "
-#| "be used as well. Edit the file <computeroutput>/etc/network/interfaces</"
-#| "computeroutput> and adjust the eth1 settings accordingly. Use "
-#| "<computeroutput>ldapvi</computeroutput> or any other LDAP editor to "
-#| "inspect DNS and DHCP configuration."
 msgid ""
 "192.168.0.0/24 is the default LTSP client network if a machine is installed "
 "using the Thin-Client-Server profile. If lots of LTSP clients are used or if "
@@ -9433,7 +9605,6 @@ msgid "Java"
 msgstr "Java"
 
 #. type: Content of: <article><section><section><section><title>
-#| msgid "running standalone Java applications"
 msgid "Running standalone Java applications"
 msgstr "Autonome Java-toepassingen uitvoeren"
 
@@ -9606,7 +9777,6 @@ msgid "click on the just configured server entry, click 'Modify'"
 msgstr "klik op het pas ingestelde servertype en klip op \"Bewerken\" "
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid "File system access configuration"
 msgid "click advanced configuration"
 msgstr "klik op geavanceerde isntellingen"
 
@@ -10066,7 +10236,6 @@ msgstr ""
 "een van de andere te kiezen."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid "the browsers Iceweasel 31 ESR and Chromium 39"
 msgid "the browsers Iceweasel 31 ESR and Chromium 40"
 msgstr "de webbrowsers Iceweasel 31 ESR en Chromium 40"
 
@@ -10240,19 +10409,6 @@ msgid "Copyright and authors"
 msgstr "Auteursrechten en auteurs"
 
 #. type: Content of: <article><section><para>
-#| msgid ""
-#| "This document is written and copyrighted by Holger Levsen (2007, 2008, "
-#| "2009, 2010, 2011, 2012, 2013, 2014, 2015), Petter Reinholdtsen (2001, "
-#| "2002, 2003, 2004, 2007, 2008, 2009, 2010, 2012, 2014), 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, "
-#| "2014), 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, 2014) 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, 2014, 2015), Petter Reinholdtsen (2001, 2002, 2003, "
@@ -10310,13 +10466,6 @@ msgstr ""
 "enige latere versie."
 
 #. type: Content of: <article><section><para>
-#| msgid ""
-#| "The Bokmål translation is copyrighted by Petter Reinholdtsen (2007, 2012, "
-#| "2014), Håvard Korsvoll (2007-2009), Tore Skogly (2008), Ole-Anders "
-#| "Andreassen (2010), Jan Roar Rød (2010), Ole-Erik Yrvin (2014), Ingrid "
-#| "Yrvin (2014) Hans Arthur Kielland Aanesen (2014), Knut Yrvin (2014), "
-#| "FourFire Le'bard (2014), Stefan Mitchell-Lauridsen (2014) and Ragnar "
-#| "Wisløff (2014) and is released under the GPL v2 or any later version."
 msgid ""
 "The Bokmål translation is copyrighted by Petter Reinholdtsen (2007, 2012, "
 "2014, 2015), Håvard Korsvoll (2007-2009), Tore Skogly (2008), Ole-Anders "
@@ -10334,14 +10483,6 @@ msgstr ""
 "of enige latere versie."
 
 #. type: Content of: <article><section><para>
-#| msgid ""
-#| "The German translation is copyrighted by Holger Levsen (2007), Patrick "
-#| "Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. Teichert "
-#| "(2007, 2008, 2009), Jürgen Leibner (2007, 2009, 2011, 2014), Ludger "
-#| "Sicking (2008, 2010), Kai Hatje (2008), Kurt Gramlich (2009), Franziska "
-#| "Teichert (2009), Philipp Hübner (2009), Andreas Mundt (2009, 2010) and "
-#| "Wolfgang Schweer (2012, 2013, 2014) and is released under the GPL v2 or "
-#| "any later version."
 msgid ""
 "The German translation is copyrighted by Holger Levsen (2007), Patrick "
 "Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. Teichert (2007, "
@@ -10371,12 +10512,6 @@ msgstr ""
 "of enige latere versie."
 
 #. type: Content of: <article><section><para>
-#| msgid ""
-#| "The French translation is copyrighted by Christophe Masson (2008), "
-#| "Olivier Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul "
-#| "Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the "
-#| "French l10n team (2009, 2010, 2012) and is released under the GPL v2 or "
-#| "any later version."
 msgid ""
 "The French translation is copyrighted by Christophe Masson (2008), Olivier "
 "Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015), Jean-Paul "
@@ -10391,9 +10526,6 @@ msgstr ""
 "de licentie GPL v2 of enige latere versie."
 
 #. type: Content of: <article><section><para>
-#| msgid ""
-#| "The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is "
-#| "released under the GPL v2 or any later version."
 msgid ""
 "The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014) and "
 "is released under the GPL v2 or any later version."
@@ -10403,9 +10535,6 @@ msgstr ""
 "latere versie."
 
 #. type: Content of: <article><section><para>
-#| msgid ""
-#| "The Dutch translation is copyrighted by Frans Spiesschaert (2014) and is "
-#| "released under the GPL v2 or any later version."
 msgid ""
 "The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015) and "
 "is released under the GPL v2 or any later version."
@@ -12972,6 +13101,54 @@ msgstr ""
 "Meer informatie over nog oudere uitgaven vindt men op <ulink url=\"http://"
 "developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
+#~ msgid ""
+#~ "FIXME: confirm this is really all what needs to be done for upgrades. "
+#~ "It's great if that's true! It could be..."
+#~ msgstr ""
+#~ "FIXME: confirm this is really all what needs to be done for upgrades. "
+#~ "It's great if that's true! It could be..."
+
+#~ msgid "The basic upgrade operation"
+#~ msgstr "Basishandelingen van een opwaardering"
+
+#~ msgid ""
+#~ "Edit <computeroutput>/etc/apt/sources.list</computeroutput> and replace "
+#~ "all occurrences of \"wheezy\" with \"jessie\"."
+#~ msgstr ""
+#~ "Bewerk het bestand <computeroutput>/etc/apt/sources.list</computeroutput> "
+#~ "en vervang overal het woord \"wheezy\" door het woord \"jessie\"."
+
+#~ msgid "run <computeroutput>apt-get update</computeroutput>"
+#~ msgstr "geef de opdracht <computeroutput>apt-get update</computeroutput>"
+
+#~ msgid "run <computeroutput>apt-get upgrade</computeroutput>"
+#~ msgstr "geef de opdracht <computeroutput>apt-get upgrade</computeroutput>"
+
+#~ msgid "run <computeroutput>apt-get dist-upgrade</computeroutput>"
+#~ msgstr ""
+#~ "geef de opdracht <computeroutput>apt-get dist-upgrade</computeroutput>"
+
+#~ msgid "LDAP service needs to be reconfigured"
+#~ msgstr "De dienst LDAP moet opnieuw geconfigureerd worden"
+
+#~ msgid ""
+#~ "The LDAP setup has only scarcely changed from Wheezy to Jessie so chances "
+#~ "are that LDAP hasn't to be rebuild from scratch. There's a script "
+#~ "<computeroutput>ldap-debian-edu-install</computeroutput> (in /usr/bin) "
+#~ "that could be used to achieve rebuilding LDAP if needed. Read the comment "
+#~ "at the beginning of that script carefully before doing anything."
+#~ msgstr ""
+#~ "Tussen de instellingen van LDAP in Wheezy en die in Jessie zijn er "
+#~ "slechts kleine verschillen. Er bestaat dus een kans dat LDAP niet "
+#~ "helemaal opnieuw moet opgebouwd worden. Men kan het script "
+#~ "<computeroutput>ldap-debian-edu-install</computeroutput> (in /usr/bin) "
+#~ "gebruiken om het heropbouwen van LDAP uit te voeren, mocht het toch nodig "
+#~ "blijken. Lees wel aandachtig de commentaarregels aan het begin van het "
+#~ "script alvorens concreet actie te ondernemen."
+
+#~ msgid "Of course you can also upgrade the chroot as usual."
+#~ msgstr "Natuurlijk kunt u ook zoals gewoonlijk de chroot opwaarderen."
+
 #~ msgid "Every user who wants to use KMail needs to configure it as follows."
 #~ msgstr ""
 #~ "Elke gebruiker die KMail wenst te gebruiken, moet het op de volgende "
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot b/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot
index b99a5c5..861a0a4 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-02-14 14:47+0000\n"
+"POT-Creation-Date: 2015-03-10 13:02+0000\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"
@@ -3410,49 +3410,259 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"FIXME: confirm this is really all what needs to be done for upgrades. It's "
-"great if that's true! It could be..."
+"Be prepared: make sure you have tested the upgrade from Wheezy in a test "
+"environment or have backups ready to be able to go back."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Be prepared: make sure you have tested the upgrade from Wheezy in a test "
-"environment or have backups ready to be able to go back."
+"Please note that the following recipe applies to a default Debian Edu main "
+"server installation (desktop=kde, profiles Main-Server, Workstation, Thin-"
+"Client-Server). (For a general overview concernig wheezy to jessie upgrade, "
+"see: <ulink url=\"https://www.debian.org/releases/jessie/releasenotes\"/>)"
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Don't use X, use a virtual console, log in as root. Read all debconf "
+"information carefully, choose 'keep the local version currently installed'; "
+"in most cases hitting return will be fine. Press 'q' to quit the apt-"
+"listchanges pager once you've read the information."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-msgid "The basic upgrade operation"
+msgid "Upgrade the server side"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Make sure the current system is up-to-date."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
 msgid ""
-"Edit <computeroutput>/etc/apt/sources.list</computeroutput> and replace all "
-"occurrences of \"wheezy\" with \"jessie\"."
+"apt-get update\n"
+"apt-get -y upgrade"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
-msgid "run <computeroutput>apt-get update</computeroutput>"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Remove diversion; debian-edu-config's postinst seems to do it too late "
+"(Debian bug <ulink url=\"https://bugs.debian.org/779641#\">779641</ulink>)."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
-msgid "run <computeroutput>apt-get upgrade</computeroutput>"
+#. type: CDATA
+#, no-wrap
+msgid ""
+"dpkg-divert --remove /usr/share/pam-configs/krb5\n"
+"rm /usr/share/pam-configs/edu-krb5"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
-msgid "run <computeroutput>apt-get dist-upgrade</computeroutput>"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Keep backup of Kerberos configuration file (Debian bug <ulink url=\"https://"
+"bugs.debian.org/779642#\">779642</ulink>)."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><title>
-msgid "LDAP service needs to be reconfigured"
+#. type: CDATA
+#, no-wrap
+msgid "cp /etc/krb5.conf /etc/krb5.conf.backup"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Do the actual upgrade."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"sed -i 's/wheezy/jessie/g' /etc/apt/sources.list\n"
+"apt-get update\n"
+"apt-get -y dist-upgrade\n"
+"apt-get -f install\n"
+"apt-get -y dist-upgrade"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"If apt-get still finishes with an error, try to fix it and/or run the apt-"
+"get commands again, esp. apt-get -f install."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Install additional package to make PXE work (Debian bug <ulink url=\"https://"
+"bugs.debian.org/779644#\">779644</ulink>)."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "apt-get -y install pxelinux"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Install squid3 as squid is deprecated and missing in jessie (Debian bug "
+"<ulink url=\"https://bugs.debian.org/779649#\">779649</ulink>)."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"apt-get -y install squid3\n"
+"service squid3 stop"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Apply debian-edu configuration (takes some time)."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "cfengine-debian-edu -D installation"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Replace squid with squid3, keep the cache; a new swap file will be generated "
+"and the cache index be rebuilt upon first squid3 start."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"service squid stop\n"
+"umount /var/spool/squid\n"
+"sed -i 's#/var/spool/squid#/var/spool/squid3#' /etc/fstab\n"
+"mount /var/spool/squid3\n"
+"service squid3 start\n"
+"apt-get -y purge squid squid-common"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Replace Kerberos file (messed up by cfengine) with the right one."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "cp /etc/krb5.conf.backup /etc/krb5.conf"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Regenerate gosa.secrets to make GOsa² work with new php version."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"rm /etc/gosa/gosa.secrets\n"
+"cp /etc/gosa/gosa.conf.orig /etc/gosa/gosa.conf\n"
+"gosa-encrypt-passwords"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Install newly split out cups package needed for networked printing (Debian "
+"bug <ulink url=\"https://bugs.debian.org/779645#\">779645</ulink>)."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "apt-get -y install cups-browsed"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Install missing packages; the package names were obtained using "
+"<computeroutput>/usr/lib/debian-edu-config/testsuite/taskpkgs | grep error:</"
+"computeroutput> after the step above (Debian bug <ulink url=\"https://bugs."
+"debian.org/779648#\">779648</ulink>)."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"apt-get -y install browser-plugin-libreoffice gosa-plugin-netgroups \\\n"
+"killer libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Check if the upgraded system works."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Reboot and test if it works like before: Log in as first user and test if "
+"the GOsa² gui is working, if you're able to connect LTSP clients and "
+"workstations, if you can add/remove a netgroup membership of a system, if "
+"you can send and receive internal email, if you can manage printers, and "
+"maybe other site specific things. Use the testsuite scripts if you spot an "
+"error."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Consider an optional step (Debian bug <ulink url=\"https://bugs.debian."
+"org/779646#\">779646</ulink>)."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"The LDAP setup has only scarcely changed from Wheezy to Jessie so chances "
-"are that LDAP hasn't to be rebuild from scratch. There's a script "
-"<computeroutput>ldap-debian-edu-install</computeroutput> (in /usr/bin) that "
-"could be used to achieve rebuilding LDAP if needed. Read the comment at the "
-"beginning of that script carefully before doing anything."
+"Clean up after cfengine has autoremoved packages without purging. This will "
+"remove configuration files of removed packages and should only be used with "
+"care; use <computeroutput>dpkg -l|grep ^rc</computeroutput> first to check "
+"what would be removed, then run <computeroutput>for i in $(dpkg -l|grep ^rc|"
+"cut -d' ' -f3);do dpkg -P $i;done</computeroutput>."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
+msgid "Upgrade LTSP chroot (default arch i386)"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"sed -i '/jessie/ s/deb/#deb/g' /opt/ltsp/i386/etc/apt/sources.list\n"
+"ltsp-chroot -m -a i386 apt-get update\n"
+"ltsp-chroot -m -a i386 apt-get -y upgrade\n"
+"sed -i 's/wheezy/jessie/g' /opt/ltsp/i386/etc/apt/sources.list\n"
+"ltsp-chroot -m -a i386 apt-get update\n"
+"ltsp-chroot -m -a i386 apt-get -y dist-upgrade\n"
+"ltsp-chroot -m -a i386 apt-get -f install\n"
+"ltsp-chroot -m -a i386 apt-get -y dist-upgrade"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Install missing packages in the LTSP chroot (Debian bug <ulink url=\"https://"
+"bugs.debian.org/779647#\">779647</ulink>)."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"ltsp-chroot -m -a i386 apt-get -y install browser-plugin-libreoffice killer \\\n"
+"libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Cleaning up."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "ltsp-chroot -m -a i386 apt-get --purge autoremove"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Update LTSP support on the server side."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"ltsp-update-kernels\n"
+"ltsp-update-sshkeys"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -3461,8 +3671,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"On the LTSP server(s) the LTSP chroot should be recreated. The new chroot "
-"will still support both thin-clients and diskless workstations."
+"On the LTSP server(s) the LTSP chroot could also be recreated. The new "
+"chroot will still support both thin-clients and diskless workstations."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -3474,12 +3684,9 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Recreate the chroot by running <computeroutput>debian-edu-ltsp</"
-"computeroutput> as root."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><para>
-msgid "Of course you can also upgrade the chroot as usual."
+"Recreate the chroot by running <computeroutput>debian-edu-ltsp --arch i386</"
+"computeroutput> (or <computeroutput>debian-edu-ltsp --arch amd64</"
+"computeroutput>) as root."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml b/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
index 3d986d2..6b5564d 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
@@ -1401,46 +1401,131 @@ ltsp-update-kernels # If a new kernel was installed]]></screen>
 <section id="Upgrades--Upgrades_from_Debian_Edu_Wheezy">
 <title>Upgrades from Debian Edu Wheezy
 </title>
-<para>
-FIXME: confirm this is really all what needs to be done for upgrades. It's great if that's true! It could be... <inlinemediaobject><imageobject><imagedata fileref="./images/smile.png"/></imageobject><textobject><phrase>:-)</phrase></textobject></inlinemediaobject> 
-</para>
 <para><inlinemediaobject><imageobject><imagedata fileref="./images/alert.png"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> Be prepared: make sure you have tested the upgrade from Wheezy in a test environment or have backups ready to be able to go back.  
 </para>
+<para>Please note that the following recipe applies to a default Debian Edu main server installation (desktop=kde, profiles Main-Server, Workstation, Thin-Client-Server). (For a general overview concernig wheezy to jessie upgrade, see: <ulink url="https://www.debian.org/releases/jessie/releasenotes"/>) 
+</para>
+<para>Don't use X, use a virtual console, log in as root. Read all debconf information carefully, choose 'keep the local version currently installed'; in most cases hitting return will be fine. Press 'q' to quit the apt-listchanges pager once you've read the information. 
+</para>
 
-<section id="Upgrades--The_basic_upgrade_operation">
-<title>The basic upgrade operation
-</title><orderedlist numeration="arabic">
+<section id="Upgrades--Upgrade_the_server_side">
+<title>Upgrade the server side
+</title>
+<itemizedlist>
 <listitem>
-<para>Edit <computeroutput>/etc/apt/sources.list</computeroutput> and replace all occurrences of "wheezy" with "jessie". 
-</para></listitem>
+<para>Make sure the current system is up-to-date. 
+</para></listitem></itemizedlist><screen><![CDATA[apt-get update
+apt-get -y upgrade]]></screen>
+<itemizedlist>
 <listitem>
-<para>run <computeroutput>apt-get update</computeroutput> 
-</para></listitem>
+<para>Remove diversion; debian-edu-config's postinst seems to do it too late (Debian bug <ulink url="https://bugs.debian.org/779641#">779641</ulink>). 
+</para></listitem></itemizedlist><screen><![CDATA[dpkg-divert --remove /usr/share/pam-configs/krb5
+rm /usr/share/pam-configs/edu-krb5]]></screen>
+<itemizedlist>
 <listitem>
-<para>run <computeroutput>apt-get upgrade</computeroutput> 
-</para></listitem>
+<para>Keep backup of Kerberos configuration file (Debian bug <ulink url="https://bugs.debian.org/779642#">779642</ulink>). 
+</para></listitem></itemizedlist><screen><![CDATA[cp /etc/krb5.conf /etc/krb5.conf.backup]]></screen>
+<itemizedlist>
 <listitem>
-<para>run <computeroutput>apt-get dist-upgrade</computeroutput>  
-</para></listitem></orderedlist>
+<para>Do the actual upgrade. 
+</para></listitem></itemizedlist><screen><![CDATA[sed -i 's/wheezy/jessie/g' /etc/apt/sources.list
+apt-get update
+apt-get -y dist-upgrade
+apt-get -f install
+apt-get -y dist-upgrade]]></screen>
+<para>If apt-get still finishes with an error, try to fix it and/or run the apt-get commands again, esp. apt-get -f install. 
+</para>
+<itemizedlist>
+<listitem>
+<para>Install additional package to make PXE work (Debian bug <ulink url="https://bugs.debian.org/779644#">779644</ulink>). 
+</para></listitem></itemizedlist><screen><![CDATA[apt-get -y install pxelinux]]></screen>
+<itemizedlist>
+<listitem>
+<para>Install squid3 as squid is deprecated and missing in jessie (Debian bug <ulink url="https://bugs.debian.org/779649#">779649</ulink>). 
+</para></listitem></itemizedlist><screen><![CDATA[apt-get -y install squid3
+service squid3 stop]]></screen>
+<itemizedlist>
+<listitem>
+<para>Apply debian-edu configuration (takes some time). 
+</para></listitem></itemizedlist><screen><![CDATA[cfengine-debian-edu -D installation]]></screen>
+<itemizedlist>
+<listitem>
+<para>Replace squid with squid3, keep the cache; a new swap file will be generated and the cache index be rebuilt upon first squid3 start. 
+</para></listitem></itemizedlist><screen><![CDATA[service squid stop
+umount /var/spool/squid
+sed -i 's#/var/spool/squid#/var/spool/squid3#' /etc/fstab
+mount /var/spool/squid3
+service squid3 start
+apt-get -y purge squid squid-common]]></screen>
+<itemizedlist>
+<listitem>
+<para>Replace Kerberos file (messed up by cfengine) with the right one. 
+</para></listitem></itemizedlist><screen><![CDATA[cp /etc/krb5.conf.backup /etc/krb5.conf]]></screen>
+<itemizedlist>
+<listitem>
+<para>Regenerate gosa.secrets to make GOsa² work with new php version. 
+</para></listitem></itemizedlist><screen><![CDATA[rm /etc/gosa/gosa.secrets
+cp /etc/gosa/gosa.conf.orig /etc/gosa/gosa.conf
+gosa-encrypt-passwords]]></screen>
+<itemizedlist>
+<listitem>
+<para>Install newly split out cups package needed for networked printing (Debian bug <ulink url="https://bugs.debian.org/779645#">779645</ulink>). 
+</para></listitem></itemizedlist><screen><![CDATA[apt-get -y install cups-browsed]]></screen>
+<itemizedlist>
+<listitem>
+<para>Install missing packages; the package names were obtained using <computeroutput>/usr/lib/debian-edu-config/testsuite/taskpkgs | grep error:</computeroutput> after the step above (Debian bug <ulink url="https://bugs.debian.org/779648#">779648</ulink>). 
+</para></listitem></itemizedlist><screen><![CDATA[apt-get -y install browser-plugin-libreoffice gosa-plugin-netgroups \
+killer libnss-myhostname goplay icedtea-7-plugin tmispell-voikko]]></screen>
+<itemizedlist>
+<listitem>
+<para>Check if the upgraded system works. 
+</para></listitem></itemizedlist>
+<para>Reboot and test if it works like before: Log in as first user and test if the GOsa² gui is working, if you're able to connect LTSP clients and workstations, if you can add/remove a netgroup membership of a system, if you can send and receive internal email, if you can manage printers, and maybe other site specific things. Use the testsuite scripts if you spot an error. 
+</para>
+<itemizedlist>
+<listitem>
+<para>Consider an optional step (Debian bug <ulink url="https://bugs.debian.org/779646#">779646</ulink>). 
+</para></listitem></itemizedlist>
+<para>Clean up after cfengine has autoremoved packages without purging. This will remove configuration files of removed packages and should only be used with care; use <computeroutput>dpkg -l|grep ^rc</computeroutput> first to check what would be removed, then run <computeroutput>for i in $(dpkg -l|grep ^rc|cut -d' ' -f3);do dpkg -P $i;done</computeroutput>. 
+</para>
 </section>
 
-<section id="Upgrades--LDAP_service_needs_to_be_reconfigured">
-<title>LDAP service needs to be reconfigured
-</title>
-<para>The LDAP setup has only scarcely changed from Wheezy to Jessie so chances are that LDAP hasn't to be rebuild from scratch. There's a script <computeroutput>ldap-debian-edu-install</computeroutput> (in /usr/bin) that could be used to achieve rebuilding LDAP if needed. Read the comment at the beginning of that script carefully before doing anything.       
+<section id="Upgrades--Upgrade_LTSP_chroot_.28default_arch_i386.29">
+<title>Upgrade LTSP chroot (default arch i386)
+</title><screen><![CDATA[sed -i '/jessie/ s/deb/#deb/g' /opt/ltsp/i386/etc/apt/sources.list
+ltsp-chroot -m -a i386 apt-get update
+ltsp-chroot -m -a i386 apt-get -y upgrade
+sed -i 's/wheezy/jessie/g' /opt/ltsp/i386/etc/apt/sources.list
+ltsp-chroot -m -a i386 apt-get update
+ltsp-chroot -m -a i386 apt-get -y dist-upgrade
+ltsp-chroot -m -a i386 apt-get -f install
+ltsp-chroot -m -a i386 apt-get -y dist-upgrade]]></screen>
+<para>If apt-get still finishes with an error, try to fix it and/or run the apt-get commands again, esp. apt-get -f install. 
 </para>
+<itemizedlist>
+<listitem>
+<para>Install missing packages in the LTSP chroot (Debian bug <ulink url="https://bugs.debian.org/779647#">779647</ulink>). 
+</para></listitem></itemizedlist><screen><![CDATA[ltsp-chroot -m -a i386 apt-get -y install browser-plugin-libreoffice killer \
+libnss-myhostname goplay icedtea-7-plugin tmispell-voikko]]></screen>
+<itemizedlist>
+<listitem>
+<para>Cleaning up. 
+</para></listitem></itemizedlist><screen><![CDATA[ltsp-chroot -m -a i386 apt-get --purge autoremove]]></screen>
+<itemizedlist>
+<listitem>
+<para>Update LTSP support on the server side. 
+</para></listitem></itemizedlist><screen><![CDATA[ltsp-update-kernels
+ltsp-update-sshkeys]]></screen>
 </section>
 
 <section id="Upgrades--Recreating_an_LTSP_chroot">
 <title>Recreating an LTSP chroot
 </title>
-<para>On the LTSP server(s) the LTSP chroot should be recreated. The new chroot will still  support both thin-clients and diskless workstations. 
+<para>On the LTSP server(s) the LTSP chroot could also be recreated. The new chroot will still  support both thin-clients and diskless workstations. 
 </para>
 <para>Remove <computeroutput>/opt/ltsp/i386</computeroutput> (or <computeroutput>/opt/ltsp/amd64</computeroutput>, depending on your setup). If you have enough diskspace, consider backing it up.  
 </para>
-<para>Recreate the chroot by running <computeroutput>debian-edu-ltsp</computeroutput> as root.  
-</para>
-<para>Of course you can also upgrade the chroot as usual. 
+<para>Recreate the chroot by running <computeroutput>debian-edu-ltsp --arch i386</computeroutput> (or <computeroutput>debian-edu-ltsp --arch amd64</computeroutput>) as root.  
 </para>
 </section>
 </section>
diff --git a/documentation/debian-edu-jessie/fixme-status.txt b/documentation/debian-edu-jessie/fixme-status.txt
index b18631f..581b0b9 100644
--- a/documentation/debian-edu-jessie/fixme-status.txt
+++ b/documentation/debian-edu-jessie/fixme-status.txt
@@ -1,7 +1,4 @@
 ----------------------------------
-https://wiki.debian.org/DebianEdu/Documentation/Jessie//Upgrades
-FIXME: confirm this is really all what needs to be done for upgrades. It's great if that's true! It could be... <inlinemediaobject><imageobject><imagedata depth="16" fileref="https://wiki.debian.org//htdocs/debwiki/img/smile.png" width="16"/></imageobject><textobject><phrase>:-)</phrase></textobject></inlinemediaobject> 
-----------------------------------
 https://wiki.debian.org/DebianEdu/Documentation/Jessie//HowTo/Administration
 FIXME: The HowTos from <ulink url="http://wiki.debian.org/DebianEdu/HowTo/"/> are either user- or developer-specific. Let's move the user-specific HowTos over here (and delete them over there)! (But first ask the authors (see the history of those pages to find them) if they are fine with moving the howto and putting it under the GPL.) 
 ----------------------------------
@@ -11,5 +8,5 @@ FIXME: Maybe it is better to purge the examples. People who want to use roaming
 FIXME: explain how to use profiles from global policies for Windows machines in the skolelinux network 
 FIXME: describe roaming profile key for the global policy editor here 
 ====================
-6 FIXMEs left to fix
+5 FIXMEs left to fix
 ====================
diff --git a/documentation/debian-edu-jessie/images/de/worldmap.png b/documentation/debian-edu-jessie/images/de/worldmap.png
index 4caf021..4d94007 100644
Binary files a/documentation/debian-edu-jessie/images/de/worldmap.png and b/documentation/debian-edu-jessie/images/de/worldmap.png differ
diff --git a/documentation/debian-edu-jessie/images/es/worldmap.png b/documentation/debian-edu-jessie/images/es/worldmap.png
index 999dfe9..eeff367 100644
Binary files a/documentation/debian-edu-jessie/images/es/worldmap.png and b/documentation/debian-edu-jessie/images/es/worldmap.png differ
diff --git a/documentation/debian-edu-jessie/images/fr/worldmap.png b/documentation/debian-edu-jessie/images/fr/worldmap.png
index 5200ce3..41a4295 100644
Binary files a/documentation/debian-edu-jessie/images/fr/worldmap.png and b/documentation/debian-edu-jessie/images/fr/worldmap.png differ
diff --git a/documentation/debian-edu-jessie/images/worldmap.png b/documentation/debian-edu-jessie/images/worldmap.png
index f601b8c..b1dab44 100644
Binary files a/documentation/debian-edu-jessie/images/worldmap.png and b/documentation/debian-edu-jessie/images/worldmap.png differ

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

