[debian-edu-commits] [Git][debian-edu/debian-edu-doc][master] Update Debian Edu Bullseye manual from the wiki

Thu Jun 17 22:05:32 BST 2021


Wolfgang Schweer pushed to branch master at Debian Edu / debian-edu-doc


Commits:
d0e0847f by Wolfgang Schweer at 2021-06-17T22:51:03+02:00
Update Debian Edu Bullseye manual from the wiki

Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>

- - - - -


20 changed files:

- documentation/debian-edu-bullseye/debian-edu-bullseye-manual-stripped.xml
- documentation/debian-edu-bullseye/debian-edu-bullseye-manual.da.po
- documentation/debian-edu-bullseye/debian-edu-bullseye-manual.de.po
- documentation/debian-edu-bullseye/debian-edu-bullseye-manual.es.po
- documentation/debian-edu-bullseye/debian-edu-bullseye-manual.fr.po
- documentation/debian-edu-bullseye/debian-edu-bullseye-manual.it.po
- documentation/debian-edu-bullseye/debian-edu-bullseye-manual.ja.po
- documentation/debian-edu-bullseye/debian-edu-bullseye-manual.nb-no.po
- documentation/debian-edu-bullseye/debian-edu-bullseye-manual.nl.po
- documentation/debian-edu-bullseye/debian-edu-bullseye-manual.pl.po
- documentation/debian-edu-bullseye/debian-edu-bullseye-manual.pot
- documentation/debian-edu-bullseye/debian-edu-bullseye-manual.pt-br.po
- documentation/debian-edu-bullseye/debian-edu-bullseye-manual.pt-pt.po
- documentation/debian-edu-bullseye/debian-edu-bullseye-manual.pt.po
- documentation/debian-edu-bullseye/debian-edu-bullseye-manual.ro.po
- documentation/debian-edu-bullseye/debian-edu-bullseye-manual.sv.po
- documentation/debian-edu-bullseye/debian-edu-bullseye-manual.xml
- documentation/debian-edu-bullseye/debian-edu-bullseye-manual.zh-cn.po
- documentation/debian-edu-bullseye/debian-edu-bullseye-manual.zh-tw.po
- documentation/debian-edu-bullseye/source/AllInOne-debian-edu-bullseye-manual.xml


Changes:

=====================================
documentation/debian-edu-bullseye/debian-edu-bullseye-manual-stripped.xml
=====================================
@@ -1593,7 +1593,7 @@ apt full-upgrade]]></screen>
 apt purge debian-edu-artwork-buster      # unless Buster artwork should be kept as an alternative]]></screen>
 <itemizedlist>
 <listitem>
-<para>Cope with new LTSP and related changes, run: 
+<para>Cope with new LTSP and related changes: 
 </para></listitem></itemizedlist><screen><![CDATA[rm -f /etc/default/tftpd-hpa        # to remove no longer needed modifications
 rm -rf /var/lib/tftpboot            # to remove no longer used tftp base directory
 dpkg-reconfigure -p low tftpd-hpa   # first prompt: keep ''tftp'' as system account, second: change TFTP root directory to ''/srv/tftp''
@@ -1607,21 +1607,23 @@ debian-edu-ltsp-install --diskless_workstation yes   # to create diskless workst
 debian-edu-pxeinstall                                # to add PXE installation files and related iPXE menu items ]]></screen>
 <itemizedlist>
 <listitem>
-<para>Cope with move to iPXE - modify DHCP settings in LDAP, e.g. using an editor like ldapvi. Make sure, DHCP related entries match those contained in the <emphasis>/etc/ldap/gosa-server.ldif</emphasis> file. Entries concerned are: 
+<para>Cope with move to iPXE: 
 </para>
-<itemizedlist>
-<listitem>
-<para>60 cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no 
-</para></listitem>
-<listitem>
-<para>81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no 
-</para></listitem>
-<listitem>
-<para>83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no 
-</para></listitem>
-<listitem>
-<para>85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no 
-</para></listitem></itemizedlist></listitem>
+<para>Create a file <emphasis>ipxe.ldif</emphasis> with the following content: 
+</para><screen><![CDATA[dn: cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no
+changetype: modify
+add: dhcpOption
+dhcpOption: space ipxe
+dhcpOption: ipxe-encap-opts code 175 = encapsulate ipxe
+dhcpOption: ipxe.menu code 39 = unsigned integer 8
+dhcpOption: ipxe.no-pxedhcp code 176 = unsigned integer 8
+dhcpOption: arch code 93 = unsigned integer 16  ]]></screen>
+<para>Then run <computeroutput>ldapadd -ZD 'cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no' -W -f ipxe.ldif</computeroutput> to apply the changes. 
+</para>
+<para>Modify some more DHCP settings in LDAP, e.g. using an editor like ldapvi. Make sure, DHCP related entries match those contained in the <emphasis>/etc/ldap/gosa-server.ldif</emphasis> file. Entries concerned are: 
+</para><screen><![CDATA[81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no
+83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no
+85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no]]></screen></listitem>
 <listitem>
 <para>Cope with GOsa changes - use new gosa.conf, fix LDAP access: 
 </para>
@@ -1649,10 +1651,7 @@ debian-edu-pxeinstall                                # to add PXE installation f
 </para>
 <itemizedlist>
 <listitem>
-<para>cp /etc/krb5kdc/kdc.conf_non-edu /etc/krb5kdc/kdc.conf 
-</para></listitem>
-<listitem>
-<para>sed -i 's/#supported_enctypes/supported_enctypes/' /etc/krb5kdc/kdc.conf 
+<para>sed -i 's/supported_enctypes/#supported_enctypes/' /etc/krb5kdc/kdc.conf 
 </para></listitem>
 <listitem>
 <para>Run <computeroutput>service krb5-kdc restart</computeroutput> 


=====================================
documentation/debian-edu-bullseye/debian-edu-bullseye-manual.da.po
=====================================
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-bullseye-manual\n"
-"POT-Creation-Date: 2021-06-16 12:01+0200\n"
+"POT-Creation-Date: 2021-06-17 22:49+0200\n"
 "PO-Revision-Date: 2019-07-07 20:30+0100\n"
 "Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -4796,7 +4796,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Cope with new LTSP and related changes, run:"
+msgid "Cope with new LTSP and related changes:"
 msgstr ""
 
 #. type: CDATA
@@ -4815,33 +4815,53 @@ msgid ""
 "debian-edu-pxeinstall                                # to add PXE installation files and related iPXE menu items"
 msgstr ""
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Cope with move to iPXE:"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Cope with move to iPXE - modify DHCP settings in LDAP, e.g. using an editor "
-"like ldapvi. Make sure, DHCP related entries match those contained in the "
-"<emphasis>/etc/ldap/gosa-server.ldif</emphasis> file. Entries concerned are:"
+"Create a file <emphasis>ipxe.ldif</emphasis> with the following content:"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "60 cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
+#. type: CDATA
+#, no-wrap
+msgid ""
+"dn: cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no\n"
+"changetype: modify\n"
+"add: dhcpOption\n"
+"dhcpOption: space ipxe\n"
+"dhcpOption: ipxe-encap-opts code 175 = encapsulate ipxe\n"
+"dhcpOption: ipxe.menu code 39 = unsigned integer 8\n"
+"dhcpOption: ipxe.no-pxedhcp code 176 = unsigned integer 8\n"
+"dhcpOption: arch code 93 = unsigned integer 16"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>ldapvi --ldap-conf -ZD '(cn=admin)' -b ou=automount,"
+#| "dc=skole,dc=skolelinux,dc=no</computeroutput>"
 msgid ""
-"81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,"
-"dc=no"
+"Then run <computeroutput>ldapadd -ZD 'cn=admin,ou=ldap-access,dc=skole,"
+"dc=skolelinux,dc=no' -W -f ipxe.ldif</computeroutput> to apply the changes."
 msgstr ""
+"<computeroutput>ldapvi --ldap-conf -ZD '(cn=admin)' -b ou=automount,dc=skole,"
+"dc=skolelinux,dc=no</computeroutput>"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
-"dc=skolelinux,dc=no"
+"Modify some more DHCP settings in LDAP, e.g. using an editor like ldapvi. "
+"Make sure, DHCP related entries match those contained in the <emphasis>/etc/"
+"ldap/gosa-server.ldif</emphasis> file. Entries concerned are:"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: CDATA
+#, no-wrap
 msgid ""
-"85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
-"dc=skolelinux,dc=no"
+"81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no\n"
+"83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no\n"
+"85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -4881,13 +4901,9 @@ msgstr "Kør <computeroutput>service apache2 restart</computeroutput>"
 msgid "Cope with Kerberos encryption type changes:"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "cp /etc/krb5kdc/kdc.conf_non-edu /etc/krb5kdc/kdc.conf"
-msgstr ""
-
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"sed -i 's/#supported_enctypes/supported_enctypes/' /etc/krb5kdc/kdc.conf"
+"sed -i 's/supported_enctypes/#supported_enctypes/' /etc/krb5kdc/kdc.conf"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>


=====================================
documentation/debian-edu-bullseye/debian-edu-bullseye-manual.de.po
=====================================
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-buster-manual.de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-06-16 12:01+0200\n"
+"POT-Creation-Date: 2021-06-17 22:49+0200\n"
 "PO-Revision-Date: 2021-04-07 20:04+0200\n"
 "Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -4750,7 +4750,9 @@ msgstr ""
 "apt purge debian-edu-artwork-buster      # es sei denn, Buster-Artwork sollte als Alternative beibehalten werden"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Cope with new LTSP and related changes, run:"
+#, fuzzy
+#| msgid "Cope with new LTSP and related changes, run:"
+msgid "Cope with new LTSP and related changes:"
 msgstr ""
 "Führen Sie das folgende aus, um mit dem neuen LTSP und den damit verbundenen "
 "Änderungen umzugehen:"
@@ -4783,45 +4785,64 @@ msgstr ""
 "debian-edu-ltsp-install --diskless_workstation yes   # um ein Image für Diskless Workstations aus dem Dateisystem des Servers zu erstellen\n"
 "debian-edu-pxeinstall                                # zum Hinzufügen von PXE-Installationsdateien und zugehöriger iPXE-Menüpunkte"
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Cope with move to iPXE:"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Cope with move to iPXE - modify DHCP settings in LDAP, e.g. using an editor "
-"like ldapvi. Make sure, DHCP related entries match those contained in the "
-"<emphasis>/etc/ldap/gosa-server.ldif</emphasis> file. Entries concerned are:"
+"Create a file <emphasis>ipxe.ldif</emphasis> with the following content:"
 msgstr ""
-"Umstellung auf iPXE: Ändern Sie die DHCP-Einstellungen im LDAP, z. B. mit "
-"einem Editor wie ldapvi. Stellen Sie sicher, dass die DHCP-bezogenen "
-"Einträge mit denen übereinstimmen, die in der Datei <emphasis>/etc/ldap/gosa-"
-"server.ldif</emphasis> enthalten sind. Die betroffenen Einträge sind:"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "60 cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
+#. type: CDATA
+#, no-wrap
+msgid ""
+"dn: cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no\n"
+"changetype: modify\n"
+"add: dhcpOption\n"
+"dhcpOption: space ipxe\n"
+"dhcpOption: ipxe-encap-opts code 175 = encapsulate ipxe\n"
+"dhcpOption: ipxe.menu code 39 = unsigned integer 8\n"
+"dhcpOption: ipxe.no-pxedhcp code 176 = unsigned integer 8\n"
+"dhcpOption: arch code 93 = unsigned integer 16"
 msgstr ""
-"60 cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>ldapvi --ldap-conf -ZD '(cn=admin)' -b ou=automount,"
+#| "dc=skole,dc=skolelinux,dc=no</computeroutput>"
 msgid ""
-"81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,"
-"dc=no"
+"Then run <computeroutput>ldapadd -ZD 'cn=admin,ou=ldap-access,dc=skole,"
+"dc=skolelinux,dc=no' -W -f ipxe.ldif</computeroutput> to apply the changes."
 msgstr ""
-"81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,"
-"dc=no"
+"<computeroutput>ldapvi --ldap-conf -ZD '(cn=admin)' -b ou=automount,dc=skole,"
+"dc=skolelinux,dc=no</computeroutput>"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Cope with move to iPXE - modify DHCP settings in LDAP, e.g. using an "
+#| "editor like ldapvi. Make sure, DHCP related entries match those contained "
+#| "in the <emphasis>/etc/ldap/gosa-server.ldif</emphasis> file. Entries "
+#| "concerned are:"
 msgid ""
-"83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
-"dc=skolelinux,dc=no"
+"Modify some more DHCP settings in LDAP, e.g. using an editor like ldapvi. "
+"Make sure, DHCP related entries match those contained in the <emphasis>/etc/"
+"ldap/gosa-server.ldif</emphasis> file. Entries concerned are:"
 msgstr ""
-"83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
-"dc=skolelinux,dc=no"
+"Umstellung auf iPXE: Ändern Sie die DHCP-Einstellungen im LDAP, z. B. mit "
+"einem Editor wie ldapvi. Stellen Sie sicher, dass die DHCP-bezogenen "
+"Einträge mit denen übereinstimmen, die in der Datei <emphasis>/etc/ldap/gosa-"
+"server.ldif</emphasis> enthalten sind. Die betroffenen Einträge sind:"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: CDATA
+#, no-wrap
 msgid ""
-"85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
-"dc=skolelinux,dc=no"
+"81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no\n"
+"83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no\n"
+"85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
 msgstr ""
-"85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
-"dc=skolelinux,dc=no"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Cope with GOsa changes - use new gosa.conf, fix LDAP access:"
@@ -4869,12 +4890,11 @@ msgid "Cope with Kerberos encryption type changes:"
 msgstr "Umgang mit Änderungen der Kerberos-Verschlüsselungsarten:"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "cp /etc/krb5kdc/kdc.conf_non-edu /etc/krb5kdc/kdc.conf"
-msgstr "cp /etc/krb5kdc/kdc.conf_non-edu /etc/krb5kdc/kdc.conf"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "sed -i 's/#supported_enctypes/supported_enctypes/' /etc/krb5kdc/kdc.conf"
 msgid ""
-"sed -i 's/#supported_enctypes/supported_enctypes/' /etc/krb5kdc/kdc.conf"
+"sed -i 's/supported_enctypes/#supported_enctypes/' /etc/krb5kdc/kdc.conf"
 msgstr ""
 "sed -i 's/#supported_enctypes/supported_enctypes/' /etc/krb5kdc/kdc.conf"
 
@@ -9152,6 +9172,35 @@ msgstr ""
 "Release-Handbücher auch auf der <ulink url=\"https://wiki.debian.org/"
 "DebianEdu/Documentation\">Dokumentations-Übersichtsseite</ulink>."
 
+#~ msgid ""
+#~ "60 cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
+#~ msgstr ""
+#~ "60 cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
+
+#~ msgid ""
+#~ "81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
+#~ "dc=skolelinux,dc=no"
+#~ msgstr ""
+#~ "81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
+#~ "dc=skolelinux,dc=no"
+
+#~ msgid ""
+#~ "83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
+#~ "dc=skolelinux,dc=no"
+#~ msgstr ""
+#~ "83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
+#~ "dc=skolelinux,dc=no"
+
+#~ msgid ""
+#~ "85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
+#~ "dc=skolelinux,dc=no"
+#~ msgstr ""
+#~ "85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
+#~ "dc=skolelinux,dc=no"
+
+#~ msgid "cp /etc/krb5kdc/kdc.conf_non-edu /etc/krb5kdc/kdc.conf"
+#~ msgstr "cp /etc/krb5kdc/kdc.conf_non-edu /etc/krb5kdc/kdc.conf"
+
 #~ msgid "Network Block Device Server"
 #~ msgstr "Netzwerk-Blockgerät-Server"
 


=====================================
documentation/debian-edu-bullseye/debian-edu-bullseye-manual.es.po
=====================================
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-06-16 12:01+0200\n"
+"POT-Creation-Date: 2021-06-17 22:49+0200\n"
 "PO-Revision-Date: 2021-05-23 13:30+0000\n"
 "Last-Translator: Adolfo Jayme Barrientos <fitojb at ubuntu.com>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/debian-edu-"
@@ -4257,7 +4257,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Cope with new LTSP and related changes, run:"
+msgid "Cope with new LTSP and related changes:"
 msgstr ""
 
 #. type: CDATA
@@ -4276,33 +4276,47 @@ msgid ""
 "debian-edu-pxeinstall                                # to add PXE installation files and related iPXE menu items"
 msgstr ""
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Cope with move to iPXE:"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Cope with move to iPXE - modify DHCP settings in LDAP, e.g. using an editor "
-"like ldapvi. Make sure, DHCP related entries match those contained in the "
-"<emphasis>/etc/ldap/gosa-server.ldif</emphasis> file. Entries concerned are:"
+"Create a file <emphasis>ipxe.ldif</emphasis> with the following content:"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "60 cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
+#. type: CDATA
+#, no-wrap
+msgid ""
+"dn: cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no\n"
+"changetype: modify\n"
+"add: dhcpOption\n"
+"dhcpOption: space ipxe\n"
+"dhcpOption: ipxe-encap-opts code 175 = encapsulate ipxe\n"
+"dhcpOption: ipxe.menu code 39 = unsigned integer 8\n"
+"dhcpOption: ipxe.no-pxedhcp code 176 = unsigned integer 8\n"
+"dhcpOption: arch code 93 = unsigned integer 16"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,"
-"dc=no"
+"Then run <computeroutput>ldapadd -ZD 'cn=admin,ou=ldap-access,dc=skole,"
+"dc=skolelinux,dc=no' -W -f ipxe.ldif</computeroutput> to apply the changes."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
-"dc=skolelinux,dc=no"
+"Modify some more DHCP settings in LDAP, e.g. using an editor like ldapvi. "
+"Make sure, DHCP related entries match those contained in the <emphasis>/etc/"
+"ldap/gosa-server.ldif</emphasis> file. Entries concerned are:"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: CDATA
+#, no-wrap
 msgid ""
-"85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
-"dc=skolelinux,dc=no"
+"81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no\n"
+"83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no\n"
+"85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -4344,13 +4358,9 @@ msgstr "ejecute <computeroutput>exportfs -r</computeroutput>"
 msgid "Cope with Kerberos encryption type changes:"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "cp /etc/krb5kdc/kdc.conf_non-edu /etc/krb5kdc/kdc.conf"
-msgstr ""
-
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"sed -i 's/#supported_enctypes/supported_enctypes/' /etc/krb5kdc/kdc.conf"
+"sed -i 's/supported_enctypes/#supported_enctypes/' /etc/krb5kdc/kdc.conf"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>


=====================================
documentation/debian-edu-bullseye/debian-edu-bullseye-manual.fr.po
=====================================
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2021-06-16 12:01+0200\n"
+"POT-Creation-Date: 2021-06-17 22:49+0200\n"
 "PO-Revision-Date: 2021-03-04 22:21+0100\n"
 "Last-Translator: Jean-Pierre Giraud <jean-pierregiraud at neuf.fr>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -4778,7 +4778,9 @@ msgstr ""
 "apt purge debian-edu-artwork-buster      # sauf si le thème de Buster doit être gardé comme alternative"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Cope with new LTSP and related changes, run:"
+#, fuzzy
+#| msgid "Cope with new LTSP and related changes, run:"
+msgid "Cope with new LTSP and related changes:"
 msgstr ""
 "Gérer la nouvelle version de LTSP et des modifications liées, exécuter :"
 
@@ -4810,45 +4812,64 @@ msgstr ""
 "debian-edu-ltsp-install --diskless_workstation yes   # pour créer l'image de station de travail sans disque à partir du système de fichiers du serveur\n"
 "debian-edu-pxeinstall                                # pour ajouter les fichiers d'installation PXE et les entrées de menu iPXE liées"
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Cope with move to iPXE:"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Cope with move to iPXE - modify DHCP settings in LDAP, e.g. using an editor "
-"like ldapvi. Make sure, DHCP related entries match those contained in the "
-"<emphasis>/etc/ldap/gosa-server.ldif</emphasis> file. Entries concerned are:"
+"Create a file <emphasis>ipxe.ldif</emphasis> with the following content:"
 msgstr ""
-"Gérer le passage à iPXE – modifier les réglages dans LDAP, par exemple en "
-"utilisant un éditeur comme ldapvi. Assurez-vous que les entrées liées à DHCP "
-"correspondent à celles contenues dans le fichier <emphasis>/etc/ldap/gosa-"
-"server.ldif</emphasis>. Les entrées concernées sont les suivantes :"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "60 cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
+#. type: CDATA
+#, no-wrap
+msgid ""
+"dn: cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no\n"
+"changetype: modify\n"
+"add: dhcpOption\n"
+"dhcpOption: space ipxe\n"
+"dhcpOption: ipxe-encap-opts code 175 = encapsulate ipxe\n"
+"dhcpOption: ipxe.menu code 39 = unsigned integer 8\n"
+"dhcpOption: ipxe.no-pxedhcp code 176 = unsigned integer 8\n"
+"dhcpOption: arch code 93 = unsigned integer 16"
 msgstr ""
-"60 cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>ldapvi --ldap-conf -ZD '(cn=admin)' -b ou=automount,"
+#| "dc=skole,dc=skolelinux,dc=no</computeroutput>"
 msgid ""
-"81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,"
-"dc=no"
+"Then run <computeroutput>ldapadd -ZD 'cn=admin,ou=ldap-access,dc=skole,"
+"dc=skolelinux,dc=no' -W -f ipxe.ldif</computeroutput> to apply the changes."
 msgstr ""
-"81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,"
-"dc=no"
+"<computeroutput>ldapvi --ldap-conf -ZD '(cn=admin)' -b ou=automount,dc=skole,"
+"dc=skolelinux,dc=no</computeroutput>"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Cope with move to iPXE - modify DHCP settings in LDAP, e.g. using an "
+#| "editor like ldapvi. Make sure, DHCP related entries match those contained "
+#| "in the <emphasis>/etc/ldap/gosa-server.ldif</emphasis> file. Entries "
+#| "concerned are:"
 msgid ""
-"83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
-"dc=skolelinux,dc=no"
+"Modify some more DHCP settings in LDAP, e.g. using an editor like ldapvi. "
+"Make sure, DHCP related entries match those contained in the <emphasis>/etc/"
+"ldap/gosa-server.ldif</emphasis> file. Entries concerned are:"
 msgstr ""
-"83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
-"dc=skolelinux,dc=no"
+"Gérer le passage à iPXE – modifier les réglages dans LDAP, par exemple en "
+"utilisant un éditeur comme ldapvi. Assurez-vous que les entrées liées à DHCP "
+"correspondent à celles contenues dans le fichier <emphasis>/etc/ldap/gosa-"
+"server.ldif</emphasis>. Les entrées concernées sont les suivantes :"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: CDATA
+#, no-wrap
 msgid ""
-"85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
-"dc=skolelinux,dc=no"
+"81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no\n"
+"83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no\n"
+"85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
 msgstr ""
-"85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
-"dc=skolelinux,dc=no"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Cope with GOsa changes - use new gosa.conf, fix LDAP access:"
@@ -4895,12 +4916,11 @@ msgid "Cope with Kerberos encryption type changes:"
 msgstr "Gérer les changements de type de chiffrement de Kerberos :"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "cp /etc/krb5kdc/kdc.conf_non-edu /etc/krb5kdc/kdc.conf"
-msgstr "cp /etc/krb5kdc/kdc.conf_non-edu /etc/krb5kdc/kdc.conf"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "sed -i 's/#supported_enctypes/supported_enctypes/' /etc/krb5kdc/kdc.conf"
 msgid ""
-"sed -i 's/#supported_enctypes/supported_enctypes/' /etc/krb5kdc/kdc.conf"
+"sed -i 's/supported_enctypes/#supported_enctypes/' /etc/krb5kdc/kdc.conf"
 msgstr ""
 "sed -i 's/#supported_enctypes/supported_enctypes/' /etc/krb5kdc/kdc.conf"
 
@@ -9208,6 +9228,35 @@ msgstr ""
 "\"https://wiki.debian.org/DebianEdu/Documentation\">manuels de publication</"
 "ulink>."
 
+#~ msgid ""
+#~ "60 cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
+#~ msgstr ""
+#~ "60 cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
+
+#~ msgid ""
+#~ "81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
+#~ "dc=skolelinux,dc=no"
+#~ msgstr ""
+#~ "81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
+#~ "dc=skolelinux,dc=no"
+
+#~ msgid ""
+#~ "83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
+#~ "dc=skolelinux,dc=no"
+#~ msgstr ""
+#~ "83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
+#~ "dc=skolelinux,dc=no"
+
+#~ msgid ""
+#~ "85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
+#~ "dc=skolelinux,dc=no"
+#~ msgstr ""
+#~ "85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
+#~ "dc=skolelinux,dc=no"
+
+#~ msgid "cp /etc/krb5kdc/kdc.conf_non-edu /etc/krb5kdc/kdc.conf"
+#~ msgstr "cp /etc/krb5kdc/kdc.conf_non-edu /etc/krb5kdc/kdc.conf"
+
 #~ msgid "Network Block Device Server"
 #~ msgstr "Serveur de périphériques blocs en réseau"
 


=====================================
documentation/debian-edu-bullseye/debian-edu-bullseye-manual.it.po
=====================================
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-wheezy-manual\n"
-"POT-Creation-Date: 2021-06-16 12:01+0200\n"
+"POT-Creation-Date: 2021-06-17 22:49+0200\n"
 "PO-Revision-Date: 2021-03-15 19:00+0100\n"
 "Last-Translator: claudio <claudio.carboncini at gmail.com>\n"
 "Language-Team: Italian <debian-l10n-italian at lists.debian.org>\n"
@@ -4682,7 +4682,9 @@ msgstr ""
 "apt purge debian-edu-artwork-buster      # unless Buster artwork should be kept as an alternative"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Cope with new LTSP and related changes, run:"
+#, fuzzy
+#| msgid "Cope with new LTSP and related changes, run:"
+msgid "Cope with new LTSP and related changes:"
 msgstr "Gestire il nuovo LTSP e i relativi cambiamenti, eseguire:"
 
 #. type: CDATA
@@ -4712,45 +4714,64 @@ msgstr ""
 "debian-edu-ltsp-install --diskless_workstation yes   # to create diskless workstation image from the server's file system\n"
 "debian-edu-pxeinstall                                # to add PXE installation files and related iPXE menu items"
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Cope with move to iPXE:"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Cope with move to iPXE - modify DHCP settings in LDAP, e.g. using an editor "
-"like ldapvi. Make sure, DHCP related entries match those contained in the "
-"<emphasis>/etc/ldap/gosa-server.ldif</emphasis> file. Entries concerned are:"
+"Create a file <emphasis>ipxe.ldif</emphasis> with the following content:"
 msgstr ""
-"Gestire il passaggio a iPXE - modificare le impostazioni DHCP in LDAP, per "
-"esempio usando un editor come ldapvi. Assicurarsi che le voci relative al "
-"DHCP corrispondano a quelle contenute nel file <emphasis>/etc/ldap/gosa-"
-"server.ldif</emphasis>. Le voci interessate sono:"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "60 cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
+#. type: CDATA
+#, no-wrap
+msgid ""
+"dn: cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no\n"
+"changetype: modify\n"
+"add: dhcpOption\n"
+"dhcpOption: space ipxe\n"
+"dhcpOption: ipxe-encap-opts code 175 = encapsulate ipxe\n"
+"dhcpOption: ipxe.menu code 39 = unsigned integer 8\n"
+"dhcpOption: ipxe.no-pxedhcp code 176 = unsigned integer 8\n"
+"dhcpOption: arch code 93 = unsigned integer 16"
 msgstr ""
-"60 cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>ldapvi --ldap-conf -ZD '(cn=admin)' -b ou=automount,"
+#| "dc=skole,dc=skolelinux,dc=no</computeroutput>"
 msgid ""
-"81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,"
-"dc=no"
+"Then run <computeroutput>ldapadd -ZD 'cn=admin,ou=ldap-access,dc=skole,"
+"dc=skolelinux,dc=no' -W -f ipxe.ldif</computeroutput> to apply the changes."
 msgstr ""
-"81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,"
-"dc=no"
+"<computeroutput>ldapvi --ldap-conf -ZD '(cn=admin)' -b ou=automount,dc=skole,"
+"dc=skolelinux,dc=no</computeroutput>"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Cope with move to iPXE - modify DHCP settings in LDAP, e.g. using an "
+#| "editor like ldapvi. Make sure, DHCP related entries match those contained "
+#| "in the <emphasis>/etc/ldap/gosa-server.ldif</emphasis> file. Entries "
+#| "concerned are:"
 msgid ""
-"83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
-"dc=skolelinux,dc=no"
+"Modify some more DHCP settings in LDAP, e.g. using an editor like ldapvi. "
+"Make sure, DHCP related entries match those contained in the <emphasis>/etc/"
+"ldap/gosa-server.ldif</emphasis> file. Entries concerned are:"
 msgstr ""
-"83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
-"dc=skolelinux,dc=no"
+"Gestire il passaggio a iPXE - modificare le impostazioni DHCP in LDAP, per "
+"esempio usando un editor come ldapvi. Assicurarsi che le voci relative al "
+"DHCP corrispondano a quelle contenute nel file <emphasis>/etc/ldap/gosa-"
+"server.ldif</emphasis>. Le voci interessate sono:"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: CDATA
+#, no-wrap
 msgid ""
-"85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
-"dc=skolelinux,dc=no"
+"81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no\n"
+"83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no\n"
+"85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
 msgstr ""
-"85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
-"dc=skolelinux,dc=no"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Cope with GOsa changes - use new gosa.conf, fix LDAP access:"
@@ -4797,12 +4818,11 @@ msgid "Cope with Kerberos encryption type changes:"
 msgstr "Gestire i cambiamenti del tipo di crittografia Kerberos:"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "cp /etc/krb5kdc/kdc.conf_non-edu /etc/krb5kdc/kdc.conf"
-msgstr "cp /etc/krb5kdc/kdc.conf_non-edu /etc/krb5kdc/kdc.conf"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "sed -i 's/#supported_enctypes/supported_enctypes/' /etc/krb5kdc/kdc.conf"
 msgid ""
-"sed -i 's/#supported_enctypes/supported_enctypes/' /etc/krb5kdc/kdc.conf"
+"sed -i 's/supported_enctypes/#supported_enctypes/' /etc/krb5kdc/kdc.conf"
 msgstr ""
 "sed -i 's/#supported_enctypes/supported_enctypes/' /etc/krb5kdc/kdc.conf"
 
@@ -9024,6 +9044,35 @@ msgstr ""
 "delle relative versioni sui <ulink url=\"https://wiki.debian.org/DebianEdu/"
 "Documentation\">manuali delle versioni</ulink>."
 
+#~ msgid ""
+#~ "60 cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
+#~ msgstr ""
+#~ "60 cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
+
+#~ msgid ""
+#~ "81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
+#~ "dc=skolelinux,dc=no"
+#~ msgstr ""
+#~ "81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
+#~ "dc=skolelinux,dc=no"
+
+#~ msgid ""
+#~ "83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
+#~ "dc=skolelinux,dc=no"
+#~ msgstr ""
+#~ "83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
+#~ "dc=skolelinux,dc=no"
+
+#~ msgid ""
+#~ "85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
+#~ "dc=skolelinux,dc=no"
+#~ msgstr ""
+#~ "85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
+#~ "dc=skolelinux,dc=no"
+
+#~ msgid "cp /etc/krb5kdc/kdc.conf_non-edu /etc/krb5kdc/kdc.conf"
+#~ msgstr "cp /etc/krb5kdc/kdc.conf_non-edu /etc/krb5kdc/kdc.conf"
+
 #~ msgid "Network Block Device Server"
 #~ msgstr "Network Block Device Server"
 


=====================================
documentation/debian-edu-bullseye/debian-edu-bullseye-manual.ja.po
=====================================
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-stretch\n"
-"POT-Creation-Date: 2021-06-16 12:01+0200\n"
+"POT-Creation-Date: 2021-06-17 22:49+0200\n"
 "PO-Revision-Date: 2021-06-16 17:11+0000\n"
 "Last-Translator: hoxp18 <hoxp18 at noramail.jp>\n"
 "Language-Team: Japanese <https://hosted.weblate.org/projects/debian-edu-"
@@ -4528,7 +4528,9 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Cope with new LTSP and related changes, run:"
+#, fuzzy
+#| msgid "Cope with new LTSP and related changes, run:"
+msgid "Cope with new LTSP and related changes:"
 msgstr "新しい LTSP の変更点に対する修正:"
 
 #. type: CDATA
@@ -4547,36 +4549,62 @@ msgid ""
 "debian-edu-pxeinstall                                # to add PXE installation files and related iPXE menu items"
 msgstr ""
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Cope with move to iPXE:"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Cope with move to iPXE - modify DHCP settings in LDAP, e.g. using an editor "
-"like ldapvi. Make sure, DHCP related entries match those contained in the "
-"<emphasis>/etc/ldap/gosa-server.ldif</emphasis> file. Entries concerned are:"
+"Create a file <emphasis>ipxe.ldif</emphasis> with the following content:"
 msgstr ""
-"iPXE への移行に関する修正 - DHCP 設定を LDAP 上で変更します (e.g. ldapvi など"
-"を用います)。DHCP 関連の項目を <emphasis>/etc/ldap/gosa-server.ldif</"
-"emphasis> ファイルと一致させます。 該当するのは:"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "60 cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
+#. type: CDATA
+#, no-wrap
+msgid ""
+"dn: cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no\n"
+"changetype: modify\n"
+"add: dhcpOption\n"
+"dhcpOption: space ipxe\n"
+"dhcpOption: ipxe-encap-opts code 175 = encapsulate ipxe\n"
+"dhcpOption: ipxe.menu code 39 = unsigned integer 8\n"
+"dhcpOption: ipxe.no-pxedhcp code 176 = unsigned integer 8\n"
+"dhcpOption: arch code 93 = unsigned integer 16"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>ldapvi --ldap-conf -ZD '(cn=admin)' -b ou=automount,"
+#| "dc=skole,dc=skolelinux,dc=no</computeroutput>"
 msgid ""
-"81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,"
-"dc=no"
+"Then run <computeroutput>ldapadd -ZD 'cn=admin,ou=ldap-access,dc=skole,"
+"dc=skolelinux,dc=no' -W -f ipxe.ldif</computeroutput> to apply the changes."
 msgstr ""
+"<computeroutput>ldapvi --ldap-conf -ZD '(cn=admin)' -b ou=automount,dc=skole,"
+"dc=skolelinux,dc=no</computeroutput>"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Cope with move to iPXE - modify DHCP settings in LDAP, e.g. using an "
+#| "editor like ldapvi. Make sure, DHCP related entries match those contained "
+#| "in the <emphasis>/etc/ldap/gosa-server.ldif</emphasis> file. Entries "
+#| "concerned are:"
 msgid ""
-"83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
-"dc=skolelinux,dc=no"
+"Modify some more DHCP settings in LDAP, e.g. using an editor like ldapvi. "
+"Make sure, DHCP related entries match those contained in the <emphasis>/etc/"
+"ldap/gosa-server.ldif</emphasis> file. Entries concerned are:"
 msgstr ""
+"iPXE への移行に関する修正 - DHCP 設定を LDAP 上で変更します (e.g. ldapvi など"
+"を用います)。DHCP 関連の項目を <emphasis>/etc/ldap/gosa-server.ldif</"
+"emphasis> ファイルと一致させます。 該当するのは:"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: CDATA
+#, no-wrap
 msgid ""
-"85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
-"dc=skolelinux,dc=no"
+"81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no\n"
+"83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no\n"
+"85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -4619,13 +4647,9 @@ msgstr ""
 msgid "Cope with Kerberos encryption type changes:"
 msgstr "Kerberous 暗号化の変更点への対応:"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "cp /etc/krb5kdc/kdc.conf_non-edu /etc/krb5kdc/kdc.conf"
-msgstr ""
-
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"sed -i 's/#supported_enctypes/supported_enctypes/' /etc/krb5kdc/kdc.conf"
+"sed -i 's/supported_enctypes/#supported_enctypes/' /etc/krb5kdc/kdc.conf"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>


=====================================
documentation/debian-edu-bullseye/debian-edu-bullseye-manual.nb-no.po
=====================================
@@ -21,7 +21,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2021-06-16 12:01+0200\n"
+"POT-Creation-Date: 2021-06-17 22:49+0200\n"
 "PO-Revision-Date: 2020-10-16 02:26+0000\n"
 "Last-Translator: Allan Nordhøy <epost at anotheragency.no>\n"
 "Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/debian-"
@@ -4891,7 +4891,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
 #| msgid "Other LDAP related changes"
-msgid "Cope with new LTSP and related changes, run:"
+msgid "Cope with new LTSP and related changes:"
 msgstr "Andre LDAP-relaterte endringer"
 
 #. type: CDATA
@@ -4910,33 +4910,53 @@ msgid ""
 "debian-edu-pxeinstall                                # to add PXE installation files and related iPXE menu items"
 msgstr ""
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Cope with move to iPXE:"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Cope with move to iPXE - modify DHCP settings in LDAP, e.g. using an editor "
-"like ldapvi. Make sure, DHCP related entries match those contained in the "
-"<emphasis>/etc/ldap/gosa-server.ldif</emphasis> file. Entries concerned are:"
+"Create a file <emphasis>ipxe.ldif</emphasis> with the following content:"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "60 cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
+#. type: CDATA
+#, no-wrap
+msgid ""
+"dn: cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no\n"
+"changetype: modify\n"
+"add: dhcpOption\n"
+"dhcpOption: space ipxe\n"
+"dhcpOption: ipxe-encap-opts code 175 = encapsulate ipxe\n"
+"dhcpOption: ipxe.menu code 39 = unsigned integer 8\n"
+"dhcpOption: ipxe.no-pxedhcp code 176 = unsigned integer 8\n"
+"dhcpOption: arch code 93 = unsigned integer 16"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>ldapvi --ldap-conf -ZD '(cn=admin)' -b ou=automount,"
+#| "dc=skole,dc=skolelinux,dc=no</computeroutput>"
 msgid ""
-"81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,"
-"dc=no"
+"Then run <computeroutput>ldapadd -ZD 'cn=admin,ou=ldap-access,dc=skole,"
+"dc=skolelinux,dc=no' -W -f ipxe.ldif</computeroutput> to apply the changes."
 msgstr ""
+"<computeroutput>ldapvi --ldap-conf -ZD '(cn=admin)' -b ou=automount,dc=skole,"
+"dc=skolelinux,dc=no</computeroutput>"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
-"dc=skolelinux,dc=no"
+"Modify some more DHCP settings in LDAP, e.g. using an editor like ldapvi. "
+"Make sure, DHCP related entries match those contained in the <emphasis>/etc/"
+"ldap/gosa-server.ldif</emphasis> file. Entries concerned are:"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: CDATA
+#, no-wrap
 msgid ""
-"85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
-"dc=skolelinux,dc=no"
+"81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no\n"
+"83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no\n"
+"85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -4982,15 +5002,9 @@ msgstr "Kall den <computeroutput>ExcludeProfileDirs</computeroutput>."
 msgid "Cope with Kerberos encryption type changes:"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "cp /etc/krb5.conf.backup /etc/krb5.conf"
-msgid "cp /etc/krb5kdc/kdc.conf_non-edu /etc/krb5kdc/kdc.conf"
-msgstr "cp /etc/krb5.conf.backup /etc/krb5.conf"
-
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"sed -i 's/#supported_enctypes/supported_enctypes/' /etc/krb5kdc/kdc.conf"
+"sed -i 's/supported_enctypes/#supported_enctypes/' /etc/krb5kdc/kdc.conf"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -9201,6 +9215,11 @@ msgstr ""
 "håndbokutgivelser på <ulink url=\"https://wiki.debian.org/DebianEdu/"
 "Documentation\">release manuals page</ulink>."
 
+#, fuzzy
+#~| msgid "cp /etc/krb5.conf.backup /etc/krb5.conf"
+#~ msgid "cp /etc/krb5kdc/kdc.conf_non-edu /etc/krb5kdc/kdc.conf"
+#~ msgstr "cp /etc/krb5.conf.backup /etc/krb5.conf"
+
 #~ msgid "Network Block Device Server"
 #~ msgstr "Network Block Device tjener"
 


=====================================
documentation/debian-edu-bullseye/debian-edu-bullseye-manual.nl.po
=====================================
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-bullseye-manual\n"
 "Report-Msgid-Bugs-To: debian-edu-doc at packages.debian.org\n"
-"POT-Creation-Date: 2021-06-16 12:01+0200\n"
+"POT-Creation-Date: 2021-06-17 22:49+0200\n"
 "PO-Revision-Date: 2021-04-07 17:38+0200\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"
@@ -4827,7 +4827,9 @@ msgstr ""
 "apt purge debian-edu-artwork-buster      # tenzij de grafische vormgeving van Buster als alternatief behouden moet blijven"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Cope with new LTSP and related changes, run:"
+#, fuzzy
+#| msgid "Cope with new LTSP and related changes, run:"
+msgid "Cope with new LTSP and related changes:"
 msgstr ""
 "Om met het nieuwe LTSP en daarmee verband houdende wijzigingen om te gaan, "
 "moet u het volgende commando uitvoeren:"
@@ -4859,46 +4861,65 @@ msgstr ""
 "debian-edu-ltsp-install --diskless_workstation yes   # om het image voor schijfloze werkstations te bouwen vanuit het bestandssysteem van de server\n"
 "debian-edu-pxeinstall                                # om PXE-installatiebestanden en ermee verband houdende iPXE-menu-items toe te voegen"
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Cope with move to iPXE:"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Cope with move to iPXE - modify DHCP settings in LDAP, e.g. using an editor "
-"like ldapvi. Make sure, DHCP related entries match those contained in the "
-"<emphasis>/etc/ldap/gosa-server.ldif</emphasis> file. Entries concerned are:"
+"Create a file <emphasis>ipxe.ldif</emphasis> with the following content:"
 msgstr ""
-"Om met de overgang naar iPXE om te gaan - DHCP-instellingen in LDAP "
-"aanpassen, bijv. met een editor zoals ldapvi. Zorg ervoor dat de met DHCP "
-"verband houdende elementen overeenkomen met deze welke in het bestand "
-"<emphasis>/etc/ldap/gosa-server.ldif</emphasis> te vinden zijn. De betrokken "
-"vermeldingen zijn:"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "60 cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
+#. type: CDATA
+#, no-wrap
+msgid ""
+"dn: cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no\n"
+"changetype: modify\n"
+"add: dhcpOption\n"
+"dhcpOption: space ipxe\n"
+"dhcpOption: ipxe-encap-opts code 175 = encapsulate ipxe\n"
+"dhcpOption: ipxe.menu code 39 = unsigned integer 8\n"
+"dhcpOption: ipxe.no-pxedhcp code 176 = unsigned integer 8\n"
+"dhcpOption: arch code 93 = unsigned integer 16"
 msgstr ""
-"60 cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>ldapvi --ldap-conf -ZD '(cn=admin)' -b ou=automount,"
+#| "dc=skole,dc=skolelinux,dc=no</computeroutput>"
 msgid ""
-"81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,"
-"dc=no"
+"Then run <computeroutput>ldapadd -ZD 'cn=admin,ou=ldap-access,dc=skole,"
+"dc=skolelinux,dc=no' -W -f ipxe.ldif</computeroutput> to apply the changes."
 msgstr ""
-"81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,"
-"dc=no"
+"<computeroutput>ldapvi --ldap-conf -ZD '(cn=admin)' -b ou=automount,dc=skole,"
+"dc=skolelinux,dc=no</computeroutput>"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Cope with move to iPXE - modify DHCP settings in LDAP, e.g. using an "
+#| "editor like ldapvi. Make sure, DHCP related entries match those contained "
+#| "in the <emphasis>/etc/ldap/gosa-server.ldif</emphasis> file. Entries "
+#| "concerned are:"
 msgid ""
-"83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
-"dc=skolelinux,dc=no"
+"Modify some more DHCP settings in LDAP, e.g. using an editor like ldapvi. "
+"Make sure, DHCP related entries match those contained in the <emphasis>/etc/"
+"ldap/gosa-server.ldif</emphasis> file. Entries concerned are:"
 msgstr ""
-"83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
-"dc=skolelinux,dc=no"
+"Om met de overgang naar iPXE om te gaan - DHCP-instellingen in LDAP "
+"aanpassen, bijv. met een editor zoals ldapvi. Zorg ervoor dat de met DHCP "
+"verband houdende elementen overeenkomen met deze welke in het bestand "
+"<emphasis>/etc/ldap/gosa-server.ldif</emphasis> te vinden zijn. De betrokken "
+"vermeldingen zijn:"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: CDATA
+#, no-wrap
 msgid ""
-"85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
-"dc=skolelinux,dc=no"
+"81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no\n"
+"83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no\n"
+"85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
 msgstr ""
-"85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
-"dc=skolelinux,dc=no"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Cope with GOsa changes - use new gosa.conf, fix LDAP access:"
@@ -4947,12 +4968,11 @@ msgid "Cope with Kerberos encryption type changes:"
 msgstr "Om met de wijzigingen aan het encryptietype van Kerberos om te gaan:"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "cp /etc/krb5kdc/kdc.conf_non-edu /etc/krb5kdc/kdc.conf"
-msgstr "cp /etc/krb5kdc/kdc.conf_non-edu /etc/krb5kdc/kdc.conf"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "sed -i 's/#supported_enctypes/supported_enctypes/' /etc/krb5kdc/kdc.conf"
 msgid ""
-"sed -i 's/#supported_enctypes/supported_enctypes/' /etc/krb5kdc/kdc.conf"
+"sed -i 's/supported_enctypes/#supported_enctypes/' /etc/krb5kdc/kdc.conf"
 msgstr ""
 "sed -i 's/#supported_enctypes/supported_enctypes/' /etc/krb5kdc/kdc.conf"
 
@@ -9298,6 +9318,35 @@ msgstr ""
 "<ulink url=\"https://wiki.debian.org/DebianEdu/Documentation"
 "\">handleidingen</ulink>."
 
+#~ msgid ""
+#~ "60 cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
+#~ msgstr ""
+#~ "60 cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
+
+#~ msgid ""
+#~ "81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
+#~ "dc=skolelinux,dc=no"
+#~ msgstr ""
+#~ "81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
+#~ "dc=skolelinux,dc=no"
+
+#~ msgid ""
+#~ "83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
+#~ "dc=skolelinux,dc=no"
+#~ msgstr ""
+#~ "83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
+#~ "dc=skolelinux,dc=no"
+
+#~ msgid ""
+#~ "85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
+#~ "dc=skolelinux,dc=no"
+#~ msgstr ""
+#~ "85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
+#~ "dc=skolelinux,dc=no"
+
+#~ msgid "cp /etc/krb5kdc/kdc.conf_non-edu /etc/krb5kdc/kdc.conf"
+#~ msgstr "cp /etc/krb5kdc/kdc.conf_non-edu /etc/krb5kdc/kdc.conf"
+
 #~ msgid "Network Block Device Server"
 #~ msgstr "Netwerk-blokapparaat-server"
 


=====================================
documentation/debian-edu-bullseye/debian-edu-bullseye-manual.pl.po
=====================================
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Polish (Debian Edu Documentation)\n"
-"POT-Creation-Date: 2021-06-16 12:01+0200\n"
+"POT-Creation-Date: 2021-06-17 22:49+0200\n"
 "PO-Revision-Date: 2021-03-31 19:01+0000\n"
 "Last-Translator: WaldiS <sto at tutanota.de>\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/debian-edu-"
@@ -4089,7 +4089,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Cope with new LTSP and related changes, run:"
+msgid "Cope with new LTSP and related changes:"
 msgstr ""
 
 #. type: CDATA
@@ -4108,33 +4108,47 @@ msgid ""
 "debian-edu-pxeinstall                                # to add PXE installation files and related iPXE menu items"
 msgstr ""
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Cope with move to iPXE:"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Cope with move to iPXE - modify DHCP settings in LDAP, e.g. using an editor "
-"like ldapvi. Make sure, DHCP related entries match those contained in the "
-"<emphasis>/etc/ldap/gosa-server.ldif</emphasis> file. Entries concerned are:"
+"Create a file <emphasis>ipxe.ldif</emphasis> with the following content:"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "60 cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
+#. type: CDATA
+#, no-wrap
+msgid ""
+"dn: cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no\n"
+"changetype: modify\n"
+"add: dhcpOption\n"
+"dhcpOption: space ipxe\n"
+"dhcpOption: ipxe-encap-opts code 175 = encapsulate ipxe\n"
+"dhcpOption: ipxe.menu code 39 = unsigned integer 8\n"
+"dhcpOption: ipxe.no-pxedhcp code 176 = unsigned integer 8\n"
+"dhcpOption: arch code 93 = unsigned integer 16"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,"
-"dc=no"
+"Then run <computeroutput>ldapadd -ZD 'cn=admin,ou=ldap-access,dc=skole,"
+"dc=skolelinux,dc=no' -W -f ipxe.ldif</computeroutput> to apply the changes."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
-"dc=skolelinux,dc=no"
+"Modify some more DHCP settings in LDAP, e.g. using an editor like ldapvi. "
+"Make sure, DHCP related entries match those contained in the <emphasis>/etc/"
+"ldap/gosa-server.ldif</emphasis> file. Entries concerned are:"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: CDATA
+#, no-wrap
 msgid ""
-"85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
-"dc=skolelinux,dc=no"
+"81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no\n"
+"83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no\n"
+"85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -4174,13 +4188,9 @@ msgstr ""
 msgid "Cope with Kerberos encryption type changes:"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "cp /etc/krb5kdc/kdc.conf_non-edu /etc/krb5kdc/kdc.conf"
-msgstr ""
-
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"sed -i 's/#supported_enctypes/supported_enctypes/' /etc/krb5kdc/kdc.conf"
+"sed -i 's/supported_enctypes/#supported_enctypes/' /etc/krb5kdc/kdc.conf"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>


=====================================
documentation/debian-edu-bullseye/debian-edu-bullseye-manual.pot
=====================================
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2021-06-16 12:01+0200\n"
+"POT-Creation-Date: 2021-06-17 22:49+0200\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"
@@ -3449,7 +3449,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Cope with new LTSP and related changes, run:"
+msgid "Cope with new LTSP and related changes:"
 msgstr ""
 
 #. type: CDATA
@@ -3468,33 +3468,47 @@ msgid ""
 "debian-edu-pxeinstall                                # to add PXE installation files and related iPXE menu items"
 msgstr ""
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Cope with move to iPXE:"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Cope with move to iPXE - modify DHCP settings in LDAP, e.g. using an editor "
-"like ldapvi. Make sure, DHCP related entries match those contained in the "
-"<emphasis>/etc/ldap/gosa-server.ldif</emphasis> file. Entries concerned are:"
+"Create a file <emphasis>ipxe.ldif</emphasis> with the following content:"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "60 cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
+#. type: CDATA
+#, no-wrap
+msgid ""
+"dn: cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no\n"
+"changetype: modify\n"
+"add: dhcpOption\n"
+"dhcpOption: space ipxe\n"
+"dhcpOption: ipxe-encap-opts code 175 = encapsulate ipxe\n"
+"dhcpOption: ipxe.menu code 39 = unsigned integer 8\n"
+"dhcpOption: ipxe.no-pxedhcp code 176 = unsigned integer 8\n"
+"dhcpOption: arch code 93 = unsigned integer 16"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,"
-"dc=no"
+"Then run <computeroutput>ldapadd -ZD 'cn=admin,ou=ldap-access,dc=skole,"
+"dc=skolelinux,dc=no' -W -f ipxe.ldif</computeroutput> to apply the changes."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
-"dc=skolelinux,dc=no"
+"Modify some more DHCP settings in LDAP, e.g. using an editor like ldapvi. "
+"Make sure, DHCP related entries match those contained in the <emphasis>/etc/"
+"ldap/gosa-server.ldif</emphasis> file. Entries concerned are:"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: CDATA
+#, no-wrap
 msgid ""
-"85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
-"dc=skolelinux,dc=no"
+"81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no\n"
+"83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no\n"
+"85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -3534,13 +3548,9 @@ msgstr ""
 msgid "Cope with Kerberos encryption type changes:"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "cp /etc/krb5kdc/kdc.conf_non-edu /etc/krb5kdc/kdc.conf"
-msgstr ""
-
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"sed -i 's/#supported_enctypes/supported_enctypes/' /etc/krb5kdc/kdc.conf"
+"sed -i 's/supported_enctypes/#supported_enctypes/' /etc/krb5kdc/kdc.conf"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>


=====================================
documentation/debian-edu-bullseye/debian-edu-bullseye-manual.pt-br.po
=====================================
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2021-06-16 12:01+0200\n"
+"POT-Creation-Date: 2021-06-17 22:49+0200\n"
 "PO-Revision-Date: 2021-06-11 18:33+0000\n"
 "Last-Translator: Barbara Tostes <barbaratostes at gmail.com>\n"
 "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/"
@@ -4733,7 +4733,9 @@ msgstr ""
 "apt purge debian-edu-artwork-buster # a menos que se queira manter as imagens do Buster como alternativa"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Cope with new LTSP and related changes, run:"
+#, fuzzy
+#| msgid "Cope with new LTSP and related changes, run:"
+msgid "Cope with new LTSP and related changes:"
 msgstr "Lidar com o novo LTSP e alterações relacionadas; executar:"
 
 #. type: CDATA
@@ -4763,45 +4765,64 @@ msgstr ""
 "debian-edu-ltsp-install --diskless_workstation yes # para criar imagem de estação de trabalho sem disco a partir do sistema de arquivos do servidor\n"
 "debian-edu-pxeinstall # para adicionar arquivos de instalação PXE e respectivos itens de menu iPXE"
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Cope with move to iPXE:"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Cope with move to iPXE - modify DHCP settings in LDAP, e.g. using an editor "
-"like ldapvi. Make sure, DHCP related entries match those contained in the "
-"<emphasis>/etc/ldap/gosa-server.ldif</emphasis> file. Entries concerned are:"
+"Create a file <emphasis>ipxe.ldif</emphasis> with the following content:"
 msgstr ""
-"Lidar com a mudança para o iPXE - modificar as definições de DHCP em LDAP, "
-"por exemplo, usando um editor como ldapvi. Garantir que as entradas "
-"relacionadas com o DHCP correspondem às contidas no arquivo <emphasis>/etc/"
-"ldap/gosa-server.ldif</emphasis>. As entradas em questão são:"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "60 cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
+#. type: CDATA
+#, no-wrap
+msgid ""
+"dn: cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no\n"
+"changetype: modify\n"
+"add: dhcpOption\n"
+"dhcpOption: space ipxe\n"
+"dhcpOption: ipxe-encap-opts code 175 = encapsulate ipxe\n"
+"dhcpOption: ipxe.menu code 39 = unsigned integer 8\n"
+"dhcpOption: ipxe.no-pxedhcp code 176 = unsigned integer 8\n"
+"dhcpOption: arch code 93 = unsigned integer 16"
 msgstr ""
-"60 cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>ldapvi --ldap-conf -ZD '(cn=admin)' -b ou=automount,"
+#| "dc=skole,dc=skolelinux,dc=no</computeroutput>"
 msgid ""
-"81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,"
-"dc=no"
+"Then run <computeroutput>ldapadd -ZD 'cn=admin,ou=ldap-access,dc=skole,"
+"dc=skolelinux,dc=no' -W -f ipxe.ldif</computeroutput> to apply the changes."
 msgstr ""
-"81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,"
-"dc=no"
+"<computeroutput>ldapvi --ldap-conf -ZD '(cn=admin)' -b ou=automount,dc=skole,"
+"dc=skolelinux,dc=no</computeroutput>"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Cope with move to iPXE - modify DHCP settings in LDAP, e.g. using an "
+#| "editor like ldapvi. Make sure, DHCP related entries match those contained "
+#| "in the <emphasis>/etc/ldap/gosa-server.ldif</emphasis> file. Entries "
+#| "concerned are:"
 msgid ""
-"83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
-"dc=skolelinux,dc=no"
+"Modify some more DHCP settings in LDAP, e.g. using an editor like ldapvi. "
+"Make sure, DHCP related entries match those contained in the <emphasis>/etc/"
+"ldap/gosa-server.ldif</emphasis> file. Entries concerned are:"
 msgstr ""
-"83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
-"dc=skolelinux,dc=no"
+"Lidar com a mudança para o iPXE - modificar as definições de DHCP em LDAP, "
+"por exemplo, usando um editor como ldapvi. Garantir que as entradas "
+"relacionadas com o DHCP correspondem às contidas no arquivo <emphasis>/etc/"
+"ldap/gosa-server.ldif</emphasis>. As entradas em questão são:"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: CDATA
+#, no-wrap
 msgid ""
-"85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
-"dc=skolelinux,dc=no"
+"81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no\n"
+"83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no\n"
+"85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
 msgstr ""
-"85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
-"dc=skolelinux,dc=no"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Cope with GOsa changes - use new gosa.conf, fix LDAP access:"
@@ -4848,12 +4869,11 @@ msgid "Cope with Kerberos encryption type changes:"
 msgstr "Lidar com alterações no tipo de encriptação Kerberos:"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "cp /etc/krb5kdc/kdc.conf_non-edu /etc/krb5kdc/kdc.conf"
-msgstr "cp /etc/krb5kdc/kdc.conf_non-edu /etc/krb5kdc/kdc.conf"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "sed -i 's/#supported_enctypes/supported_enctypes/' /etc/krb5kdc/kdc.conf"
 msgid ""
-"sed -i 's/#supported_enctypes/supported_enctypes/' /etc/krb5kdc/kdc.conf"
+"sed -i 's/supported_enctypes/#supported_enctypes/' /etc/krb5kdc/kdc.conf"
 msgstr ""
 "sed -i 's/#supported_enctypes/supported_enctypes/' /etc/krb5kdc/kdc.conf"
 
@@ -9216,6 +9236,35 @@ msgstr ""
 "versões na página <ulink url=\"https://wiki.debian.org/DebianEdu/"
 "Documentation\">manuais das diferentes versões</ulink>."
 
+#~ msgid ""
+#~ "60 cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
+#~ msgstr ""
+#~ "60 cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
+
+#~ msgid ""
+#~ "81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
+#~ "dc=skolelinux,dc=no"
+#~ msgstr ""
+#~ "81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
+#~ "dc=skolelinux,dc=no"
+
+#~ msgid ""
+#~ "83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
+#~ "dc=skolelinux,dc=no"
+#~ msgstr ""
+#~ "83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
+#~ "dc=skolelinux,dc=no"
+
+#~ msgid ""
+#~ "85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
+#~ "dc=skolelinux,dc=no"
+#~ msgstr ""
+#~ "85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
+#~ "dc=skolelinux,dc=no"
+
+#~ msgid "cp /etc/krb5kdc/kdc.conf_non-edu /etc/krb5kdc/kdc.conf"
+#~ msgstr "cp /etc/krb5kdc/kdc.conf_non-edu /etc/krb5kdc/kdc.conf"
+
 #~ msgid "Network Block Device Server"
 #~ msgstr "Servidor de dispositivos de blocos de rede"
 


=====================================
documentation/debian-edu-bullseye/debian-edu-bullseye-manual.pt-pt.po
=====================================
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2021-06-16 12:01+0200\n"
+"POT-Creation-Date: 2021-06-17 22:49+0200\n"
 "PO-Revision-Date: 2021-04-19 22:29+0000\n"
 "Last-Translator: José Vieira <jvieira33 at sapo.pt>\n"
 "Language-Team: Portuguese (Portugal) <https://hosted.weblate.org/projects/"
@@ -4731,7 +4731,9 @@ msgstr ""
 "apt purge debian-edu-artwork-buster      # a menos que se queira manter as imagens do Buster como alternativa"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Cope with new LTSP and related changes, run:"
+#, fuzzy
+#| msgid "Cope with new LTSP and related changes, run:"
+msgid "Cope with new LTSP and related changes:"
 msgstr "Lidar com o novo LTSP e alterações relacionadas; executar:"
 
 #. type: CDATA
@@ -4761,45 +4763,64 @@ msgstr ""
 "debian-edu-ltsp-install --diskless_workstation yes   # para criar imagem de estação de trabalho sem disco a partir do sistema de ficheiros do servidor\n"
 "debian-edu-pxeinstall                                # para adicionar ficheiros de instalação PXE e respectivos itens de menu iPXE"
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Cope with move to iPXE:"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Cope with move to iPXE - modify DHCP settings in LDAP, e.g. using an editor "
-"like ldapvi. Make sure, DHCP related entries match those contained in the "
-"<emphasis>/etc/ldap/gosa-server.ldif</emphasis> file. Entries concerned are:"
+"Create a file <emphasis>ipxe.ldif</emphasis> with the following content:"
 msgstr ""
-"Lidar com a mudança para o iPXE - modificar as definições de DHCP em LDAP, "
-"por exemplo, usando um editor como ldapvi. Garantir que as entradas "
-"relacionadas com o DHCP correspondem às contidas no ficheiro <emphasis>/etc/"
-"ldap/gosa-server.ldif</emphasis>. As entradas em causa são:"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "60 cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
+#. type: CDATA
+#, no-wrap
+msgid ""
+"dn: cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no\n"
+"changetype: modify\n"
+"add: dhcpOption\n"
+"dhcpOption: space ipxe\n"
+"dhcpOption: ipxe-encap-opts code 175 = encapsulate ipxe\n"
+"dhcpOption: ipxe.menu code 39 = unsigned integer 8\n"
+"dhcpOption: ipxe.no-pxedhcp code 176 = unsigned integer 8\n"
+"dhcpOption: arch code 93 = unsigned integer 16"
 msgstr ""
-"60 cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>ldapvi --ldap-conf -ZD '(cn=admin)' -b ou=automount,"
+#| "dc=skole,dc=skolelinux,dc=no</computeroutput>"
 msgid ""
-"81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,"
-"dc=no"
+"Then run <computeroutput>ldapadd -ZD 'cn=admin,ou=ldap-access,dc=skole,"
+"dc=skolelinux,dc=no' -W -f ipxe.ldif</computeroutput> to apply the changes."
 msgstr ""
-"81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,"
-"dc=no"
+"<computeroutput>ldapvi --ldap-conf -ZD '(cn=admin)' -b ou=automount,dc=skole,"
+"dc=skolelinux,dc=no</computeroutput>"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Cope with move to iPXE - modify DHCP settings in LDAP, e.g. using an "
+#| "editor like ldapvi. Make sure, DHCP related entries match those contained "
+#| "in the <emphasis>/etc/ldap/gosa-server.ldif</emphasis> file. Entries "
+#| "concerned are:"
 msgid ""
-"83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
-"dc=skolelinux,dc=no"
+"Modify some more DHCP settings in LDAP, e.g. using an editor like ldapvi. "
+"Make sure, DHCP related entries match those contained in the <emphasis>/etc/"
+"ldap/gosa-server.ldif</emphasis> file. Entries concerned are:"
 msgstr ""
-"83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
-"dc=skolelinux,dc=no"
+"Lidar com a mudança para o iPXE - modificar as definições de DHCP em LDAP, "
+"por exemplo, usando um editor como ldapvi. Garantir que as entradas "
+"relacionadas com o DHCP correspondem às contidas no ficheiro <emphasis>/etc/"
+"ldap/gosa-server.ldif</emphasis>. As entradas em causa são:"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: CDATA
+#, no-wrap
 msgid ""
-"85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
-"dc=skolelinux,dc=no"
+"81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no\n"
+"83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no\n"
+"85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
 msgstr ""
-"85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
-"dc=skolelinux,dc=no"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Cope with GOsa changes - use new gosa.conf, fix LDAP access:"
@@ -4846,12 +4867,11 @@ msgid "Cope with Kerberos encryption type changes:"
 msgstr "Lidar com alterações no tipo de encriptação Kerberos:"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "cp /etc/krb5kdc/kdc.conf_non-edu /etc/krb5kdc/kdc.conf"
-msgstr "cp /etc/krb5kdc/kdc.conf_non-edu /etc/krb5kdc/kdc.conf"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "sed -i 's/#supported_enctypes/supported_enctypes/' /etc/krb5kdc/kdc.conf"
 msgid ""
-"sed -i 's/#supported_enctypes/supported_enctypes/' /etc/krb5kdc/kdc.conf"
+"sed -i 's/supported_enctypes/#supported_enctypes/' /etc/krb5kdc/kdc.conf"
 msgstr ""
 "sed -i 's/#supported_enctypes/supported_enctypes/' /etc/krb5kdc/kdc.conf"
 
@@ -9095,6 +9115,35 @@ msgstr ""
 "versões na página <ulink url=\"https://wiki.debian.org/DebianEdu/"
 "Documentation\">manuais das diferentes versões</ulink>."
 
+#~ msgid ""
+#~ "60 cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
+#~ msgstr ""
+#~ "60 cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
+
+#~ msgid ""
+#~ "81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
+#~ "dc=skolelinux,dc=no"
+#~ msgstr ""
+#~ "81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
+#~ "dc=skolelinux,dc=no"
+
+#~ msgid ""
+#~ "83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
+#~ "dc=skolelinux,dc=no"
+#~ msgstr ""
+#~ "83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
+#~ "dc=skolelinux,dc=no"
+
+#~ msgid ""
+#~ "85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
+#~ "dc=skolelinux,dc=no"
+#~ msgstr ""
+#~ "85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
+#~ "dc=skolelinux,dc=no"
+
+#~ msgid "cp /etc/krb5kdc/kdc.conf_non-edu /etc/krb5kdc/kdc.conf"
+#~ msgstr "cp /etc/krb5kdc/kdc.conf_non-edu /etc/krb5kdc/kdc.conf"
+
 #~ msgid "Network Block Device Server"
 #~ msgstr "Servidor Network Block Device"
 


=====================================
documentation/debian-edu-bullseye/debian-edu-bullseye-manual.pt.po
=====================================
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2021-06-16 12:01+0200\n"
+"POT-Creation-Date: 2021-06-17 22:49+0200\n"
 "PO-Revision-Date: 2021-05-15 18:32+0000\n"
 "Last-Translator: ssantos <ssantos at web.de>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/debian-edu-"
@@ -4734,7 +4734,9 @@ msgstr ""
 "apt purge debian-edu-artwork-buster      # a menos que se queira manter as imagens do Buster como alternativa"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Cope with new LTSP and related changes, run:"
+#, fuzzy
+#| msgid "Cope with new LTSP and related changes, run:"
+msgid "Cope with new LTSP and related changes:"
 msgstr "Lidar com o novo LTSP e alterações relacionadas; executar:"
 
 #. type: CDATA
@@ -4764,45 +4766,64 @@ msgstr ""
 "debian-edu-ltsp-install --diskless_workstation yes   # para criar imagem de estação de trabalho sem disco a partir do sistema de ficheiros do servidor\n"
 "debian-edu-pxeinstall                                # para adicionar ficheiros de instalação PXE e respectivos itens de menu iPXE"
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Cope with move to iPXE:"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Cope with move to iPXE - modify DHCP settings in LDAP, e.g. using an editor "
-"like ldapvi. Make sure, DHCP related entries match those contained in the "
-"<emphasis>/etc/ldap/gosa-server.ldif</emphasis> file. Entries concerned are:"
+"Create a file <emphasis>ipxe.ldif</emphasis> with the following content:"
 msgstr ""
-"Lidar com a mudança para o iPXE – modificar as definições de DHCP em LDAP, "
-"por exemplo, usando um editor como ldapvi. Garantir que as entradas "
-"relacionadas com o DHCP correspondem às contidas no ficheiro <emphasis>/etc/"
-"ldap/gosa-server.ldif</emphasis>. As entradas em causa são:"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "60 cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
+#. type: CDATA
+#, no-wrap
+msgid ""
+"dn: cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no\n"
+"changetype: modify\n"
+"add: dhcpOption\n"
+"dhcpOption: space ipxe\n"
+"dhcpOption: ipxe-encap-opts code 175 = encapsulate ipxe\n"
+"dhcpOption: ipxe.menu code 39 = unsigned integer 8\n"
+"dhcpOption: ipxe.no-pxedhcp code 176 = unsigned integer 8\n"
+"dhcpOption: arch code 93 = unsigned integer 16"
 msgstr ""
-"60 cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>ldapvi --ldap-conf -ZD '(cn=admin)' -b ou=automount,"
+#| "dc=skole,dc=skolelinux,dc=no</computeroutput>"
 msgid ""
-"81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,"
-"dc=no"
+"Then run <computeroutput>ldapadd -ZD 'cn=admin,ou=ldap-access,dc=skole,"
+"dc=skolelinux,dc=no' -W -f ipxe.ldif</computeroutput> to apply the changes."
 msgstr ""
-"81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,"
-"dc=no"
+"<computeroutput>ldapvi --ldap-conf -ZD '(cn=admin)' -b ou=automount,dc=skole,"
+"dc=skolelinux,dc=no</computeroutput>"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Cope with move to iPXE - modify DHCP settings in LDAP, e.g. using an "
+#| "editor like ldapvi. Make sure, DHCP related entries match those contained "
+#| "in the <emphasis>/etc/ldap/gosa-server.ldif</emphasis> file. Entries "
+#| "concerned are:"
 msgid ""
-"83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
-"dc=skolelinux,dc=no"
+"Modify some more DHCP settings in LDAP, e.g. using an editor like ldapvi. "
+"Make sure, DHCP related entries match those contained in the <emphasis>/etc/"
+"ldap/gosa-server.ldif</emphasis> file. Entries concerned are:"
 msgstr ""
-"83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
-"dc=skolelinux,dc=no"
+"Lidar com a mudança para o iPXE – modificar as definições de DHCP em LDAP, "
+"por exemplo, usando um editor como ldapvi. Garantir que as entradas "
+"relacionadas com o DHCP correspondem às contidas no ficheiro <emphasis>/etc/"
+"ldap/gosa-server.ldif</emphasis>. As entradas em causa são:"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: CDATA
+#, no-wrap
 msgid ""
-"85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
-"dc=skolelinux,dc=no"
+"81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no\n"
+"83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no\n"
+"85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
 msgstr ""
-"85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
-"dc=skolelinux,dc=no"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Cope with GOsa changes - use new gosa.conf, fix LDAP access:"
@@ -4849,12 +4870,11 @@ msgid "Cope with Kerberos encryption type changes:"
 msgstr "Lidar com alterações no tipo de encriptação Kerberos:"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "cp /etc/krb5kdc/kdc.conf_non-edu /etc/krb5kdc/kdc.conf"
-msgstr "cp /etc/krb5kdc/kdc.conf_non-edu /etc/krb5kdc/kdc.conf"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "sed -i 's/#supported_enctypes/supported_enctypes/' /etc/krb5kdc/kdc.conf"
 msgid ""
-"sed -i 's/#supported_enctypes/supported_enctypes/' /etc/krb5kdc/kdc.conf"
+"sed -i 's/supported_enctypes/#supported_enctypes/' /etc/krb5kdc/kdc.conf"
 msgstr ""
 "sed -i 's/#supported_enctypes/supported_enctypes/' /etc/krb5kdc/kdc.conf"
 
@@ -9096,6 +9116,35 @@ msgstr ""
 "versões na página <ulink url=\"https://wiki.debian.org/DebianEdu/"
 "Documentation\">manuais das diferentes versões</ulink>."
 
+#~ msgid ""
+#~ "60 cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
+#~ msgstr ""
+#~ "60 cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
+
+#~ msgid ""
+#~ "81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
+#~ "dc=skolelinux,dc=no"
+#~ msgstr ""
+#~ "81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
+#~ "dc=skolelinux,dc=no"
+
+#~ msgid ""
+#~ "83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
+#~ "dc=skolelinux,dc=no"
+#~ msgstr ""
+#~ "83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
+#~ "dc=skolelinux,dc=no"
+
+#~ msgid ""
+#~ "85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
+#~ "dc=skolelinux,dc=no"
+#~ msgstr ""
+#~ "85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
+#~ "dc=skolelinux,dc=no"
+
+#~ msgid "cp /etc/krb5kdc/kdc.conf_non-edu /etc/krb5kdc/kdc.conf"
+#~ msgstr "cp /etc/krb5kdc/kdc.conf_non-edu /etc/krb5kdc/kdc.conf"
+
 #~ msgid "Network Block Device Server"
 #~ msgstr "Servidor de aparelhos de blocos pela rede"
 


=====================================
documentation/debian-edu-bullseye/debian-edu-bullseye-manual.ro.po
=====================================
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2021-06-16 12:01+0200\n"
+"POT-Creation-Date: 2021-06-17 22:49+0200\n"
 "PO-Revision-Date: 2019-12-11 17:02+0000\n"
 "Last-Translator: Catalin ENE <catalin.ene73 at gmail.com>\n"
 "Language-Team: Romanian <https://hosted.weblate.org/projects/debian-edu-"
@@ -4976,7 +4976,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Cope with new LTSP and related changes, run:"
+msgid "Cope with new LTSP and related changes:"
 msgstr ""
 
 #. type: CDATA
@@ -4995,33 +4995,47 @@ msgid ""
 "debian-edu-pxeinstall                                # to add PXE installation files and related iPXE menu items"
 msgstr ""
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Cope with move to iPXE:"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Cope with move to iPXE - modify DHCP settings in LDAP, e.g. using an editor "
-"like ldapvi. Make sure, DHCP related entries match those contained in the "
-"<emphasis>/etc/ldap/gosa-server.ldif</emphasis> file. Entries concerned are:"
+"Create a file <emphasis>ipxe.ldif</emphasis> with the following content:"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "60 cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
+#. type: CDATA
+#, no-wrap
+msgid ""
+"dn: cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no\n"
+"changetype: modify\n"
+"add: dhcpOption\n"
+"dhcpOption: space ipxe\n"
+"dhcpOption: ipxe-encap-opts code 175 = encapsulate ipxe\n"
+"dhcpOption: ipxe.menu code 39 = unsigned integer 8\n"
+"dhcpOption: ipxe.no-pxedhcp code 176 = unsigned integer 8\n"
+"dhcpOption: arch code 93 = unsigned integer 16"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,"
-"dc=no"
+"Then run <computeroutput>ldapadd -ZD 'cn=admin,ou=ldap-access,dc=skole,"
+"dc=skolelinux,dc=no' -W -f ipxe.ldif</computeroutput> to apply the changes."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
-"dc=skolelinux,dc=no"
+"Modify some more DHCP settings in LDAP, e.g. using an editor like ldapvi. "
+"Make sure, DHCP related entries match those contained in the <emphasis>/etc/"
+"ldap/gosa-server.ldif</emphasis> file. Entries concerned are:"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: CDATA
+#, no-wrap
 msgid ""
-"85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
-"dc=skolelinux,dc=no"
+"81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no\n"
+"83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no\n"
+"85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -5065,13 +5079,9 @@ msgstr "<computeroutput>lsblk -p</computeroutput>"
 msgid "Cope with Kerberos encryption type changes:"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "cp /etc/krb5kdc/kdc.conf_non-edu /etc/krb5kdc/kdc.conf"
-msgstr ""
-
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"sed -i 's/#supported_enctypes/supported_enctypes/' /etc/krb5kdc/kdc.conf"
+"sed -i 's/supported_enctypes/#supported_enctypes/' /etc/krb5kdc/kdc.conf"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>


=====================================
documentation/debian-edu-bullseye/debian-edu-bullseye-manual.sv.po
=====================================
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2021-06-16 12:01+0200\n"
+"POT-Creation-Date: 2021-06-17 22:49+0200\n"
 "PO-Revision-Date: 2020-08-21 10:36+0000\n"
 "Last-Translator: Luna Jernberg <droidbittin at gmail.com>\n"
 "Language-Team: Swedish <https://hosted.weblate.org/projects/debian-edu-"
@@ -3539,7 +3539,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Cope with new LTSP and related changes, run:"
+msgid "Cope with new LTSP and related changes:"
 msgstr ""
 
 #. type: CDATA
@@ -3558,33 +3558,53 @@ msgid ""
 "debian-edu-pxeinstall                                # to add PXE installation files and related iPXE menu items"
 msgstr ""
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Cope with move to iPXE:"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Cope with move to iPXE - modify DHCP settings in LDAP, e.g. using an editor "
-"like ldapvi. Make sure, DHCP related entries match those contained in the "
-"<emphasis>/etc/ldap/gosa-server.ldif</emphasis> file. Entries concerned are:"
+"Create a file <emphasis>ipxe.ldif</emphasis> with the following content:"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "60 cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
+#. type: CDATA
+#, no-wrap
+msgid ""
+"dn: cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no\n"
+"changetype: modify\n"
+"add: dhcpOption\n"
+"dhcpOption: space ipxe\n"
+"dhcpOption: ipxe-encap-opts code 175 = encapsulate ipxe\n"
+"dhcpOption: ipxe.menu code 39 = unsigned integer 8\n"
+"dhcpOption: ipxe.no-pxedhcp code 176 = unsigned integer 8\n"
+"dhcpOption: arch code 93 = unsigned integer 16"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>ldapvi --ldap-conf -ZD '(cn=admin)' -b ou=automount,"
+#| "dc=skole,dc=skolelinux,dc=no</computeroutput>"
 msgid ""
-"81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,"
-"dc=no"
+"Then run <computeroutput>ldapadd -ZD 'cn=admin,ou=ldap-access,dc=skole,"
+"dc=skolelinux,dc=no' -W -f ipxe.ldif</computeroutput> to apply the changes."
 msgstr ""
+"<computeroutput>ldapvi --ldap-conf -ZD '(cn=admin)' -b ou=automount,dc=skole,"
+"dc=skolelinux,dc=no</computeroutput>"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
-"dc=skolelinux,dc=no"
+"Modify some more DHCP settings in LDAP, e.g. using an editor like ldapvi. "
+"Make sure, DHCP related entries match those contained in the <emphasis>/etc/"
+"ldap/gosa-server.ldif</emphasis> file. Entries concerned are:"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: CDATA
+#, no-wrap
 msgid ""
-"85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
-"dc=skolelinux,dc=no"
+"81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no\n"
+"83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no\n"
+"85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -3628,13 +3648,9 @@ msgstr "kör <computeroutput>exportfs -r</computeroutput>"
 msgid "Cope with Kerberos encryption type changes:"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "cp /etc/krb5kdc/kdc.conf_non-edu /etc/krb5kdc/kdc.conf"
-msgstr ""
-
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"sed -i 's/#supported_enctypes/supported_enctypes/' /etc/krb5kdc/kdc.conf"
+"sed -i 's/supported_enctypes/#supported_enctypes/' /etc/krb5kdc/kdc.conf"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>


=====================================
documentation/debian-edu-bullseye/debian-edu-bullseye-manual.xml
=====================================
@@ -1593,7 +1593,7 @@ apt full-upgrade]]></screen>
 apt purge debian-edu-artwork-buster      # unless Buster artwork should be kept as an alternative]]></screen>
 <itemizedlist>
 <listitem>
-<para>Cope with new LTSP and related changes, run: 
+<para>Cope with new LTSP and related changes: 
 </para></listitem></itemizedlist><screen><![CDATA[rm -f /etc/default/tftpd-hpa        # to remove no longer needed modifications
 rm -rf /var/lib/tftpboot            # to remove no longer used tftp base directory
 dpkg-reconfigure -p low tftpd-hpa   # first prompt: keep ''tftp'' as system account, second: change TFTP root directory to ''/srv/tftp''
@@ -1607,21 +1607,23 @@ debian-edu-ltsp-install --diskless_workstation yes   # to create diskless workst
 debian-edu-pxeinstall                                # to add PXE installation files and related iPXE menu items ]]></screen>
 <itemizedlist>
 <listitem>
-<para>Cope with move to iPXE - modify DHCP settings in LDAP, e.g. using an editor like ldapvi. Make sure, DHCP related entries match those contained in the <emphasis>/etc/ldap/gosa-server.ldif</emphasis> file. Entries concerned are: 
+<para>Cope with move to iPXE: 
 </para>
-<itemizedlist>
-<listitem>
-<para>60 cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no 
-</para></listitem>
-<listitem>
-<para>81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no 
-</para></listitem>
-<listitem>
-<para>83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no 
-</para></listitem>
-<listitem>
-<para>85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no 
-</para></listitem></itemizedlist></listitem>
+<para>Create a file <emphasis>ipxe.ldif</emphasis> with the following content: 
+</para><screen><![CDATA[dn: cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no
+changetype: modify
+add: dhcpOption
+dhcpOption: space ipxe
+dhcpOption: ipxe-encap-opts code 175 = encapsulate ipxe
+dhcpOption: ipxe.menu code 39 = unsigned integer 8
+dhcpOption: ipxe.no-pxedhcp code 176 = unsigned integer 8
+dhcpOption: arch code 93 = unsigned integer 16  ]]></screen>
+<para>Then run <computeroutput>ldapadd -ZD 'cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no' -W -f ipxe.ldif</computeroutput> to apply the changes. 
+</para>
+<para>Modify some more DHCP settings in LDAP, e.g. using an editor like ldapvi. Make sure, DHCP related entries match those contained in the <emphasis>/etc/ldap/gosa-server.ldif</emphasis> file. Entries concerned are: 
+</para><screen><![CDATA[81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no
+83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no
+85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no]]></screen></listitem>
 <listitem>
 <para>Cope with GOsa changes - use new gosa.conf, fix LDAP access: 
 </para>
@@ -1649,10 +1651,7 @@ debian-edu-pxeinstall                                # to add PXE installation f
 </para>
 <itemizedlist>
 <listitem>
-<para>cp /etc/krb5kdc/kdc.conf_non-edu /etc/krb5kdc/kdc.conf 
-</para></listitem>
-<listitem>
-<para>sed -i 's/#supported_enctypes/supported_enctypes/' /etc/krb5kdc/kdc.conf 
+<para>sed -i 's/supported_enctypes/#supported_enctypes/' /etc/krb5kdc/kdc.conf 
 </para></listitem>
 <listitem>
 <para>Run <computeroutput>service krb5-kdc restart</computeroutput> 


=====================================
documentation/debian-edu-bullseye/debian-edu-bullseye-manual.zh-cn.po
=====================================
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2021-06-16 12:01+0200\n"
+"POT-Creation-Date: 2021-06-17 22:49+0200\n"
 "PO-Revision-Date: 2021-03-18 22:18+0000\n"
 "Last-Translator: Ma Yong <debuser at yeah.net>\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
@@ -4200,8 +4200,10 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Cope with new LTSP and related changes, run:"
-msgstr ""
+#, fuzzy
+#| msgid "LDAP related changes"
+msgid "Cope with new LTSP and related changes:"
+msgstr "LDAP 相关变化"
 
 #. type: CDATA
 #, no-wrap
@@ -4219,41 +4221,54 @@ msgid ""
 "debian-edu-pxeinstall                                # to add PXE installation files and related iPXE menu items"
 msgstr ""
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Cope with move to iPXE:"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Cope with move to iPXE - modify DHCP settings in LDAP, e.g. using an editor "
-"like ldapvi. Make sure, DHCP related entries match those contained in the "
-"<emphasis>/etc/ldap/gosa-server.ldif</emphasis> file. Entries concerned are:"
+"Create a file <emphasis>ipxe.ldif</emphasis> with the following content:"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "60 cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
+#. type: CDATA
+#, no-wrap
+msgid ""
+"dn: cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no\n"
+"changetype: modify\n"
+"add: dhcpOption\n"
+"dhcpOption: space ipxe\n"
+"dhcpOption: ipxe-encap-opts code 175 = encapsulate ipxe\n"
+"dhcpOption: ipxe.menu code 39 = unsigned integer 8\n"
+"dhcpOption: ipxe.no-pxedhcp code 176 = unsigned integer 8\n"
+"dhcpOption: arch code 93 = unsigned integer 16"
 msgstr ""
-"60 cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>ldapvi --ldap-conf -ZD '(cn=admin)' -b ou=automount,"
+#| "dc=skole,dc=skolelinux,dc=no</computeroutput>"
 msgid ""
-"81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,"
-"dc=no"
+"Then run <computeroutput>ldapadd -ZD 'cn=admin,ou=ldap-access,dc=skole,"
+"dc=skolelinux,dc=no' -W -f ipxe.ldif</computeroutput> to apply the changes."
 msgstr ""
-"81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,"
-"dc=no"
+"<computeroutput>ldapvi --ldap-conf -ZD '(cn=admin)' -b ou=automount,dc=skole,"
+"dc=skolelinux,dc=no</computeroutput>"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
-"dc=skolelinux,dc=no"
+"Modify some more DHCP settings in LDAP, e.g. using an editor like ldapvi. "
+"Make sure, DHCP related entries match those contained in the <emphasis>/etc/"
+"ldap/gosa-server.ldif</emphasis> file. Entries concerned are:"
 msgstr ""
-"83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
-"dc=skolelinux,dc=no"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: CDATA
+#, no-wrap
 msgid ""
-"85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
-"dc=skolelinux,dc=no"
+"81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no\n"
+"83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no\n"
+"85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
 msgstr ""
-"85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
-"dc=skolelinux,dc=no"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Cope with GOsa changes - use new gosa.conf, fix LDAP access:"
@@ -4295,13 +4310,9 @@ msgstr "运行 <computeroutput>service apache2 restart</computeroutput>"
 msgid "Cope with Kerberos encryption type changes:"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "cp /etc/krb5kdc/kdc.conf_non-edu /etc/krb5kdc/kdc.conf"
-msgstr ""
-
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"sed -i 's/#supported_enctypes/supported_enctypes/' /etc/krb5kdc/kdc.conf"
+"sed -i 's/supported_enctypes/#supported_enctypes/' /etc/krb5kdc/kdc.conf"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -8112,6 +8123,32 @@ msgstr ""
 "述；或参阅<ulink url=\"https://wiki.debian.org/DebianEdu/Documentation\">发行"
 "手册页面</ulink>上相关的发行手册。"
 
+#~ msgid ""
+#~ "60 cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
+#~ msgstr ""
+#~ "60 cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
+
+#~ msgid ""
+#~ "81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
+#~ "dc=skolelinux,dc=no"
+#~ msgstr ""
+#~ "81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
+#~ "dc=skolelinux,dc=no"
+
+#~ msgid ""
+#~ "83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
+#~ "dc=skolelinux,dc=no"
+#~ msgstr ""
+#~ "83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
+#~ "dc=skolelinux,dc=no"
+
+#~ msgid ""
+#~ "85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
+#~ "dc=skolelinux,dc=no"
+#~ msgstr ""
+#~ "85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
+#~ "dc=skolelinux,dc=no"
+
 #~ msgid "Network Block Device Server"
 #~ msgstr "网络块设备服务器"
 
@@ -9776,9 +9813,6 @@ msgstr ""
 #~ msgid "User visible changes"
 #~ msgstr "使用者看得到的变化"
 
-#~ msgid "LDAP related changes"
-#~ msgstr "LDAP 相关变化"
-
 #~ msgid "Other changes"
 #~ msgstr "其他变化"
 


=====================================
documentation/debian-edu-bullseye/debian-edu-bullseye-manual.zh-tw.po
=====================================
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2021-06-16 12:01+0200\n"
+"POT-Creation-Date: 2021-06-17 22:49+0200\n"
 "PO-Revision-Date: 2019-01-28 08:11+0000\n"
 "Last-Translator: Louies <louies0623 at gmail.com>\n"
 "Language-Team: Chinese (Traditional) <https://hosted.weblate.org/projects/"
@@ -3532,7 +3532,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Cope with new LTSP and related changes, run:"
+msgid "Cope with new LTSP and related changes:"
 msgstr ""
 
 #. type: CDATA
@@ -3551,33 +3551,47 @@ msgid ""
 "debian-edu-pxeinstall                                # to add PXE installation files and related iPXE menu items"
 msgstr ""
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Cope with move to iPXE:"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Cope with move to iPXE - modify DHCP settings in LDAP, e.g. using an editor "
-"like ldapvi. Make sure, DHCP related entries match those contained in the "
-"<emphasis>/etc/ldap/gosa-server.ldif</emphasis> file. Entries concerned are:"
+"Create a file <emphasis>ipxe.ldif</emphasis> with the following content:"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "60 cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
+#. type: CDATA
+#, no-wrap
+msgid ""
+"dn: cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no\n"
+"changetype: modify\n"
+"add: dhcpOption\n"
+"dhcpOption: space ipxe\n"
+"dhcpOption: ipxe-encap-opts code 175 = encapsulate ipxe\n"
+"dhcpOption: ipxe.menu code 39 = unsigned integer 8\n"
+"dhcpOption: ipxe.no-pxedhcp code 176 = unsigned integer 8\n"
+"dhcpOption: arch code 93 = unsigned integer 16"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,"
-"dc=no"
+"Then run <computeroutput>ldapadd -ZD 'cn=admin,ou=ldap-access,dc=skole,"
+"dc=skolelinux,dc=no' -W -f ipxe.ldif</computeroutput> to apply the changes."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
-"dc=skolelinux,dc=no"
+"Modify some more DHCP settings in LDAP, e.g. using an editor like ldapvi. "
+"Make sure, DHCP related entries match those contained in the <emphasis>/etc/"
+"ldap/gosa-server.ldif</emphasis> file. Entries concerned are:"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: CDATA
+#, no-wrap
 msgid ""
-"85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,"
-"dc=skolelinux,dc=no"
+"81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no\n"
+"83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no\n"
+"85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -3617,13 +3631,9 @@ msgstr ""
 msgid "Cope with Kerberos encryption type changes:"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "cp /etc/krb5kdc/kdc.conf_non-edu /etc/krb5kdc/kdc.conf"
-msgstr ""
-
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"sed -i 's/#supported_enctypes/supported_enctypes/' /etc/krb5kdc/kdc.conf"
+"sed -i 's/supported_enctypes/#supported_enctypes/' /etc/krb5kdc/kdc.conf"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>


=====================================
documentation/debian-edu-bullseye/source/AllInOne-debian-edu-bullseye-manual.xml
=====================================
@@ -17,7 +17,7 @@ sed -i 's#/debian-security bullseye/updates# bullseye-security#g' /etc/apt/sourc
 export LC_ALL=C        # optional (to get English output)
 apt update
 apt full-upgrade]]></screen><itemizedlist><listitem><para>apt-list-changes: be prepared for a lot of NEWS to read; press <return> to scroll down, <q> to leave the pager. All information will be mailed to root so that you can read it again (using <emphasis>mailx</emphasis> or <emphasis>mutt</emphasis>). </para></listitem><listitem><para>Read all debconf information carefully, choose 'keep the local version currently installed' unless stated differently below; in most cases hitting return will be fine. </para><itemizedlist><listitem><para>restart services: Choose yes. </para></listitem><listitem><para>base-passwd: Choose yes. </para></listitem><listitem><para>Samba server and utilities: Choose 'keep the local version currently installed'. </para></listitem><listitem><para>Kerberos servers: Enter 'kerberos' and hit 'OK'. </para></listitem><listitem><para>/etc/default/slapd: Choose N. </para></listitem><listitem><para>openssh-server: Choose 'keep the local version currently installed'. </para></listitem><listitem><para>/etc/cups/cups-files.conf: Choose N. </para></listitem><listitem><para>/etc/munin/munin.conf: Choose N. </para></listitem></itemizedlist></listitem><listitem><para>Apply and adjust configuration: </para></listitem></itemizedlist><screen><![CDATA[cf-agent -v -D di,installation]]></screen><itemizedlist><listitem><para>Setup and configure the Icinga2 web interface: </para><itemizedlist><listitem><para>Run <code>apt install icinga2-ido-mysql</code>, always choose <emphasis role="strong">No</emphasis> if asked by debconf. </para></listitem><listitem><para>Ignore an error message about the <emphasis>icingadb</emphasis> existence. </para></listitem><listitem><para>Run <code>/usr/share/tools/edu-icinga-setup</code> </para></listitem></itemizedlist></listitem><listitem><para>Get the new Debian Edu Homeworld artwork: </para></listitem></itemizedlist><screen><![CDATA[apt install debian-edu-artwork-homeworld
-apt purge debian-edu-artwork-buster      # unless Buster artwork should be kept as an alternative]]></screen><itemizedlist><listitem><para>Cope with new LTSP and related changes, run: </para></listitem></itemizedlist><screen><![CDATA[rm -f /etc/default/tftpd-hpa        # to remove no longer needed modifications
+apt purge debian-edu-artwork-buster      # unless Buster artwork should be kept as an alternative]]></screen><itemizedlist><listitem><para>Cope with new LTSP and related changes: </para></listitem></itemizedlist><screen><![CDATA[rm -f /etc/default/tftpd-hpa        # to remove no longer needed modifications
 rm -rf /var/lib/tftpboot            # to remove no longer used tftp base directory
 dpkg-reconfigure -p low tftpd-hpa   # first prompt: keep ''tftp'' as system account, second: change TFTP root directory to ''/srv/tftp''
                                     # third: keep address and port, last one: enter ''--secure'' as additional option 
@@ -27,7 +27,16 @@ rm -rf /opt/ltsp                    # cleanup old LTSP base directory
 debian-edu-ltsp-install --arch amd64 --diskless_workstation no thin_type bare   # if 64-Bit thin client support is wanted
 debian-edu-ltsp-install --arch i386 --diskless_workstation no thin_type bare    # if 32-Bit thin client support is wanted
 debian-edu-ltsp-install --diskless_workstation yes   # to create diskless workstation image from the server's file system
-debian-edu-pxeinstall                                # to add PXE installation files and related iPXE menu items ]]></screen><itemizedlist><listitem><para>Cope with move to iPXE - modify DHCP settings in LDAP, e.g. using an editor like ldapvi. Make sure, DHCP related entries match those contained in the <emphasis>/etc/ldap/gosa-server.ldif</emphasis> file. Entries concerned are: </para><itemizedlist><listitem><para>60 cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no </para></listitem><listitem><para>81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no </para></listitem><listitem><para>83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no </para></listitem><listitem><para>85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no </para></listitem></itemizedlist></listitem><listitem><para>Cope with GOsa changes - use new gosa.conf, fix LDAP access: </para><itemizedlist><listitem><para>cp /etc/gosa/gosa.conf /etc/gosa/gosa.conf.buster # backup </para></listitem><listitem><para>cp /usr/share/debian-edu-config/gosa.conf.template /etc/gosa/gosa.conf # new gosa.conf file </para></listitem><listitem><para>Search for adminPassword and snapshotAdminPassword in /etc/gosa/gosa.conf and replace $GOSAPWD with the random password found in /etc/gosa/gosa.conf.orig for those entries. </para></listitem><listitem><para>rm /etc/gosa/gosa.secrets </para></listitem><listitem><para>Run <code>gosa-encrypt-passwords</code> </para></listitem><listitem><para>Run <code>service apache2 restart</code> </para></listitem></itemizedlist></listitem><listitem><para>Cope with Kerberos encryption type changes: </para><itemizedlist><listitem><para>cp /etc/krb5kdc/kdc.conf_non-edu /etc/krb5kdc/kdc.conf </para></listitem><listitem><para>sed -i 's/#supported_enctypes/supported_enctypes/' /etc/krb5kdc/kdc.conf </para></listitem><listitem><para>Run <code>service krb5-kdc restart</code> </para></listitem></itemizedlist></listitem><listitem><para>Cope with Samba changes: </para><itemizedlist><listitem><para>Add first user's Samba account: <code>smbpasswd -a <first username></code>. Once users change their password, the related Samba account will be created. </para></listitem></itemizedlist></listitem><listitem><para>Check if the upgraded system works: </para></listitem></itemizedlist><para>Reboot; log in as first user and test </para><itemizedlist><listitem><para>if the GOsa² gui is working, </para></listitem><listitem><para>if one is able to connect LTSP clients and workstations, </para></listitem><listitem><para>if one can add/remove a netgroup membership of a system, </para></listitem><listitem><para>if one can send and receive internal email, </para></listitem><listitem><para>if one can manage printers, </para></listitem><listitem><para>and if other site specific things are working. </para></listitem></itemizedlist></section><section><title>Upgrading a workstation</title><para>Do all the basic things like on the main-server and without doing the things not needed. If not yet done, configure the machine to use Kerberos for mounting home directories, see the <ulink url="https://wiki.debian.org/DebianEdu/Documentation/Bullseye/AllInOne/DebianEdu/Documentation/Bullseye/GettingStarted#">getting started</ulink> chapter for details.  </para></section></section><section><title>Upgrades from older Debian Edu / Skolelinux installations (before Buster)</title><para>To upgrade from any older release, you will need to upgrade to the Buster based Debian Edu release first, before you can follow the instructions provided above. Instructions are given in the <ulink url="https://wiki.debian.org/DebianEdu/Documentation/Bullseye/AllInOne/DebianEdu/Documentation/Buster#">Manual for Debian Edu Buster</ulink> about how to upgrade to Buster from the previous release, Stretch. Likewise the Stretch manual describes how to upgrade from Jessie. </para><para><ulink url="https://wiki.debian.org/DebianEdu/Documentation/Bullseye/AllInOne/CategoryPermalink#">CategoryPermalink</ulink> </para></section></section><para><anchor id="HowTo"/> </para><section><title>HowTo</title><itemizedlist><listitem><para>HowTos for <ulink url="https://wiki.debian.org/DebianEdu/Documentation/Bullseye/AllInOne/DebianEdu/Documentation/Bullseye/HowTo/Administration#">general administration</ulink> </para></listitem><listitem><para>HowTos for <ulink url="https://wiki.debian.org/DebianEdu/Documentation/Bullseye/AllInOne/DebianEdu/Documentation/Bullseye/HowTo/AdvancedAdministration#">advanced administration</ulink> </para></listitem><listitem><para>HowTos for <ulink url="https://wiki.debian.org/DebianEdu/Documentation/Bullseye/AllInOne/DebianEdu/Documentation/Bullseye/HowTo/Desktop#">the desktop</ulink> </para></listitem><listitem><para>HowTos for <ulink url="https://wiki.debian.org/DebianEdu/Documentation/Bullseye/AllInOne/DebianEdu/Documentation/Bullseye/HowTo/NetworkClients#">networked clients</ulink> </para></listitem><listitem><para>HowTos for <ulink url="https://wiki.debian.org/DebianEdu/Documentation/Bullseye/AllInOne/DebianEdu/Documentation/Bullseye/HowTo/Samba#">Samba</ulink> </para></listitem><listitem><para>HowTos for <ulink url="https://wiki.debian.org/DebianEdu/Documentation/Bullseye/AllInOne/DebianEdu/Documentation/Bullseye/HowTo/TeachAndLearn#">teaching and learning</ulink> </para></listitem><listitem><para>HowTos for <ulink url="https://wiki.debian.org/DebianEdu/Documentation/Bullseye/AllInOne/DebianEdu/Documentation/Bullseye/HowTo/Users#">users</ulink> </para></listitem></itemizedlist><para><ulink url="https://wiki.debian.org/DebianEdu/Documentation/Bullseye/AllInOne/CategoryPermalink#">CategoryPermalink</ulink> </para></section><para><anchor id="Administration"/> </para><section><title>HowTos for general administration</title><para>The <ulink url="https://wiki.debian.org/DebianEdu/Documentation/Bullseye/AllInOne/DebianEdu/Documentation/Bullseye/GettingStarted#">Getting Started</ulink> and <ulink url="https://wiki.debian.org/DebianEdu/Documentation/Bullseye/AllInOne/DebianEdu/Documentation/Bullseye/Maintenance#">Maintenance</ulink> chapters describe how to get started with Debian Edu and how to do the basic maintenance work. The howtos in this chapter have some more "advanced" tips and tricks. </para><section><title>Configuration history: tracking /etc/ using the git version control system</title><para>Using <code>etckeeper</code>, all files in <code>/etc/</code> are tracked using <ulink url="https://www.git-scm.com/">Git</ulink> as a version control system.  </para><para>This makes it possible to see when a file is added, changed and removed, as well as what was changed if the file is a text file. The git repository is stored in <code>/etc/.git/</code>. </para><para>Every hour, any changes are automatically recorded, allowing configuration history to be extracted and reviewed.  </para><para>To look at the history, the command <code>etckeeper vcs log</code> is used.  To check the differences between two points in time, a command like <code>etckeeper vcs diff </code> can be used.   </para><para>See the output of <code>man etckeeper</code> for more information. </para><para>List of useful commands: </para><screen><![CDATA[etckeeper vcs log
+debian-edu-pxeinstall                                # to add PXE installation files and related iPXE menu items ]]></screen><itemizedlist><listitem><para>Cope with move to iPXE: </para><para>Create a file <emphasis>ipxe.ldif</emphasis> with the following content: </para><screen><![CDATA[dn: cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no
+changetype: modify
+add: dhcpOption
+dhcpOption: space ipxe
+dhcpOption: ipxe-encap-opts code 175 = encapsulate ipxe
+dhcpOption: ipxe.menu code 39 = unsigned integer 8
+dhcpOption: ipxe.no-pxedhcp code 176 = unsigned integer 8
+dhcpOption: arch code 93 = unsigned integer 16  ]]></screen><para>Then run <code>ldapadd -ZD 'cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no' -W -f ipxe.ldif</code> to apply the changes. </para><para>Modify some more DHCP settings in LDAP, e.g. using an editor like ldapvi. Make sure, DHCP related entries match those contained in the <emphasis>/etc/ldap/gosa-server.ldif</emphasis> file. Entries concerned are: </para><screen><![CDATA[81 cn=intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no
+83 cn=subnet00.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no
+85 cn=subnet01.intern,cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no]]></screen></listitem><listitem><para>Cope with GOsa changes - use new gosa.conf, fix LDAP access: </para><itemizedlist><listitem><para>cp /etc/gosa/gosa.conf /etc/gosa/gosa.conf.buster # backup </para></listitem><listitem><para>cp /usr/share/debian-edu-config/gosa.conf.template /etc/gosa/gosa.conf # new gosa.conf file </para></listitem><listitem><para>Search for adminPassword and snapshotAdminPassword in /etc/gosa/gosa.conf and replace $GOSAPWD with the random password found in /etc/gosa/gosa.conf.orig for those entries. </para></listitem><listitem><para>rm /etc/gosa/gosa.secrets </para></listitem><listitem><para>Run <code>gosa-encrypt-passwords</code> </para></listitem><listitem><para>Run <code>service apache2 restart</code> </para></listitem></itemizedlist></listitem><listitem><para>Cope with Kerberos encryption type changes: </para><itemizedlist><listitem><para>sed -i 's/supported_enctypes/#supported_enctypes/' /etc/krb5kdc/kdc.conf </para></listitem><listitem><para>Run <code>service krb5-kdc restart</code> </para></listitem></itemizedlist></listitem><listitem><para>Cope with Samba changes: </para><itemizedlist><listitem><para>Add first user's Samba account: <code>smbpasswd -a <first username></code>. Once users change their password, the related Samba account will be created. </para></listitem></itemizedlist></listitem><listitem><para>Check if the upgraded system works: </para></listitem></itemizedlist><para>Reboot; log in as first user and test </para><itemizedlist><listitem><para>if the GOsa² gui is working, </para></listitem><listitem><para>if one is able to connect LTSP clients and workstations, </para></listitem><listitem><para>if one can add/remove a netgroup membership of a system, </para></listitem><listitem><para>if one can send and receive internal email, </para></listitem><listitem><para>if one can manage printers, </para></listitem><listitem><para>and if other site specific things are working. </para></listitem></itemizedlist></section><section><title>Upgrading a workstation</title><para>Do all the basic things like on the main-server and without doing the things not needed. If not yet done, configure the machine to use Kerberos for mounting home directories, see the <ulink url="https://wiki.debian.org/DebianEdu/Documentation/Bullseye/AllInOne/DebianEdu/Documentation/Bullseye/GettingStarted#">getting started</ulink> chapter for details.  </para></section></section><section><title>Upgrades from older Debian Edu / Skolelinux installations (before Buster)</title><para>To upgrade from any older release, you will need to upgrade to the Buster based Debian Edu release first, before you can follow the instructions provided above. Instructions are given in the <ulink url="https://wiki.debian.org/DebianEdu/Documentation/Bullseye/AllInOne/DebianEdu/Documentation/Buster#">Manual for Debian Edu Buster</ulink> about how to upgrade to Buster from the previous release, Stretch. Likewise the Stretch manual describes how to upgrade from Jessie. </para><para><ulink url="https://wiki.debian.org/DebianEdu/Documentation/Bullseye/AllInOne/CategoryPermalink#">CategoryPermalink</ulink> </para></section></section><para><anchor id="HowTo"/> </para><section><title>HowTo</title><itemizedlist><listitem><para>HowTos for <ulink url="https://wiki.debian.org/DebianEdu/Documentation/Bullseye/AllInOne/DebianEdu/Documentation/Bullseye/HowTo/Administration#">general administration</ulink> </para></listitem><listitem><para>HowTos for <ulink url="https://wiki.debian.org/DebianEdu/Documentation/Bullseye/AllInOne/DebianEdu/Documentation/Bullseye/HowTo/AdvancedAdministration#">advanced administration</ulink> </para></listitem><listitem><para>HowTos for <ulink url="https://wiki.debian.org/DebianEdu/Documentation/Bullseye/AllInOne/DebianEdu/Documentation/Bullseye/HowTo/Desktop#">the desktop</ulink> </para></listitem><listitem><para>HowTos for <ulink url="https://wiki.debian.org/DebianEdu/Documentation/Bullseye/AllInOne/DebianEdu/Documentation/Bullseye/HowTo/NetworkClients#">networked clients</ulink> </para></listitem><listitem><para>HowTos for <ulink url="https://wiki.debian.org/DebianEdu/Documentation/Bullseye/AllInOne/DebianEdu/Documentation/Bullseye/HowTo/Samba#">Samba</ulink> </para></listitem><listitem><para>HowTos for <ulink url="https://wiki.debian.org/DebianEdu/Documentation/Bullseye/AllInOne/DebianEdu/Documentation/Bullseye/HowTo/TeachAndLearn#">teaching and learning</ulink> </para></listitem><listitem><para>HowTos for <ulink url="https://wiki.debian.org/DebianEdu/Documentation/Bullseye/AllInOne/DebianEdu/Documentation/Bullseye/HowTo/Users#">users</ulink> </para></listitem></itemizedlist><para><ulink url="https://wiki.debian.org/DebianEdu/Documentation/Bullseye/AllInOne/CategoryPermalink#">CategoryPermalink</ulink> </para></section><para><anchor id="Administration"/> </para><section><title>HowTos for general administration</title><para>The <ulink url="https://wiki.debian.org/DebianEdu/Documentation/Bullseye/AllInOne/DebianEdu/Documentation/Bullseye/GettingStarted#">Getting Started</ulink> and <ulink url="https://wiki.debian.org/DebianEdu/Documentation/Bullseye/AllInOne/DebianEdu/Documentation/Bullseye/Maintenance#">Maintenance</ulink> chapters describe how to get started with Debian Edu and how to do the basic maintenance work. The howtos in this chapter have some more "advanced" tips and tricks. </para><section><title>Configuration history: tracking /etc/ using the git version control system</title><para>Using <code>etckeeper</code>, all files in <code>/etc/</code> are tracked using <ulink url="https://www.git-scm.com/">Git</ulink> as a version control system.  </para><para>This makes it possible to see when a file is added, changed and removed, as well as what was changed if the file is a text file. The git repository is stored in <code>/etc/.git/</code>. </para><para>Every hour, any changes are automatically recorded, allowing configuration history to be extracted and reviewed.  </para><para>To look at the history, the command <code>etckeeper vcs log</code> is used.  To check the differences between two points in time, a command like <code>etckeeper vcs diff </code> can be used.   </para><para>See the output of <code>man etckeeper</code> for more information. </para><para>List of useful commands: </para><screen><![CDATA[etckeeper vcs log
 etckeeper vcs status
 etckeeper vcs diff
 etckeeper vcs add .



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/commit/d0e0847fa49c2e2a6caa4d03259f31769782cc46

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/commit/d0e0847fa49c2e2a6caa4d03259f31769782cc46
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20210617/0b3acc12/attachment-0001.htm>
