[debian-edu-commits] debian-edu/debian-edu-doc.git (#1470) - master (branch) updated: 1.5_20130228_7.0-6-gc6f4755
David Prévot
taffit at alioth.debian.org
Sat May 11 22:32:36 UTC 2013
The branch, master has been updated
via c6f4755edd8dfd9f59455d56915086e28c28a136 (commit)
from 650433c516a57ee1210dc9f5ac9c39a0b4b611ed (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit c6f4755edd8dfd9f59455d56915086e28c28a136
Author: David Prévot <taffit at debian.org>
Date: Sat May 11 18:32:07 2013 -0400
Update manuals and images from wiki; PO files +7f +5u
-----------------------------------------------------------------------
Summary of changes:
.../debian-edu-squeeze/images/de/worldmap.png | Bin 386732 -> 386809 bytes
.../debian-edu-squeeze/images/es/worldmap.png | Bin 386838 -> 386913 bytes
.../debian-edu-squeeze/images/fr/worldmap.png | Bin 386773 -> 386850 bytes
.../debian-edu-squeeze/images/worldmap.png | Bin 386766 -> 386843 bytes
.../debian-edu-wheezy-manual.da.po | 75 ++++++++++++---
.../debian-edu-wheezy-manual.de.po | 105 +++++++++++++++-----
.../debian-edu-wheezy-manual.es.po | 62 +++++++++---
.../debian-edu-wheezy-manual.fr.po | 75 ++++++++++++---
.../debian-edu-wheezy-manual.it.po | 75 ++++++++++++---
.../debian-edu-wheezy-manual.nb.po | 64 ++++++++++---
.../debian-edu-wheezy/debian-edu-wheezy-manual.pot | 60 +++++++++---
.../debian-edu-wheezy/debian-edu-wheezy-manual.xml | 32 ++++--
.../debian-edu-wheezy/images/de/worldmap.png | Bin 386732 -> 386809 bytes
.../debian-edu-wheezy/images/es/worldmap.png | Bin 386838 -> 386913 bytes
.../debian-edu-wheezy/images/fr/worldmap.png | Bin 386773 -> 386850 bytes
.../debian-edu-wheezy/images/worldmap.png | Bin 386766 -> 386843 bytes
16 files changed, 437 insertions(+), 111 deletions(-)
The diff of changes is:
diff --git a/documentation/debian-edu-squeeze/images/de/worldmap.png b/documentation/debian-edu-squeeze/images/de/worldmap.png
index f05f2c5..7cb5fe7 100644
Binary files a/documentation/debian-edu-squeeze/images/de/worldmap.png and b/documentation/debian-edu-squeeze/images/de/worldmap.png differ
diff --git a/documentation/debian-edu-squeeze/images/es/worldmap.png b/documentation/debian-edu-squeeze/images/es/worldmap.png
index 1b67525..f38113e 100644
Binary files a/documentation/debian-edu-squeeze/images/es/worldmap.png and b/documentation/debian-edu-squeeze/images/es/worldmap.png differ
diff --git a/documentation/debian-edu-squeeze/images/fr/worldmap.png b/documentation/debian-edu-squeeze/images/fr/worldmap.png
index facd526..c3433f6 100644
Binary files a/documentation/debian-edu-squeeze/images/fr/worldmap.png and b/documentation/debian-edu-squeeze/images/fr/worldmap.png differ
diff --git a/documentation/debian-edu-squeeze/images/worldmap.png b/documentation/debian-edu-squeeze/images/worldmap.png
index 0dc9e52..ea77c11 100644
Binary files a/documentation/debian-edu-squeeze/images/worldmap.png and b/documentation/debian-edu-squeeze/images/worldmap.png differ
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po
index 1aedb38..d67fbdd 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-wheezy-manual\n"
-"POT-Creation-Date: 2013-05-09 12:17-0400\n"
+"POT-Creation-Date: 2013-05-11 18:29-0400\n"
"PO-Revision-Date: 2013-02-15 11:20+0100\n"
"Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -4788,9 +4788,13 @@ msgstr ""
"strengen <computeroutput>add</computeroutput> foran det nye LDAP-objekt."
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Warning: <computeroutput>ldapvi</computeroutput> is a very powerful tool. "
+#| "Be careful and don't mess up the LDAP database."
msgid ""
"Warning: <computeroutput>ldapvi</computeroutput> is a very powerful tool. Be "
-"careful and don't mess up the LDAP database."
+"careful and don't mess up the LDAP database, same applies for jxplorer."
msgstr ""
"Advarsel: <computeroutput>ldapvi</computeroutput> er et meget funktionsrigt "
"værktøj. Vær forsigtig og ødelæg ikke LDAP-databasen."
@@ -4800,13 +4804,30 @@ msgid "jxplorer, an LDAP GUI"
msgstr "jxplorer, en grafisk brugerflade for LDAP"
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If you prefer a GUI to work with the LDAP database, check out the "
+#| "<computeroutput>jxplorer</computeroutput> package."
msgid ""
"If you prefer a GUI to work with the LDAP database, check out the "
-"<computeroutput>jxplorer</computeroutput> package."
+"<computeroutput>jxplorer</computeroutput> package, wich is installed by "
+"default. To get write access connect like this:"
msgstr ""
"Hvis du foretrækker en grafisk brugerflade til arbejdet med LDAP-databasen, "
"så se pakken <computeroutput>jxplorer</computeroutput>."
+#. type: CDATA
+#, no-wrap
+msgid ""
+"host: ldap.intern\n"
+"port:636\n"
+"Base dn:dc=skole,dc=skolelinux,dc=no \n"
+"Security level: ssl + user + password\n"
+"User dn: cn=admin,ou=ldap-access\n"
+"\n"
+"Click \"This session only\" if asked for the certificate."
+msgstr ""
+
#. type: Content of: <article><section><section><title>
msgid "ldap-createuser-krb, a command-line tool"
msgstr "ldap-createuser-krb, et kommandolinjeværktøj"
@@ -5819,6 +5840,17 @@ msgstr ""
"ltsp-update-kernels"
#. type: Content of: <article><section><section><para>
+msgid ""
+"As a shorter alternative -- installing all available firmware and updating "
+"the tftpboot directory -- you could execute:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "/usr/share/debian-edu-config/tools/ltsp-addfirmware"
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
msgid "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
msgstr "<emphasis role=\"strong\">LTSP-klientkerne</emphasis>"
@@ -5866,11 +5898,17 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"Using the default PXE menu, a machine could be started as diskless "
-"workstation or thin client in the main subnet 10.0.0.0/8. By default clients "
-"in the separate subnet 192.168.0.0/24 will run as diskless workstations if "
-"the amount of RAM is sufficient. If all clients in the subnet should run as "
-"thin clients, the following has to be done."
+"On the main subnet the complete PXE menu is provided; the separate subnet "
+"for each LTSP server allows only diskless and thin LTSP client selection."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Using the default PXE menu on the main subnet 10.0.0.0/8, a machine could be "
+"started as diskless workstation or thin client. By default clients in the "
+"separate subnet 192.168.0.0/24 will run as diskless workstations if the "
+"amount of RAM is sufficient. If all clients in this LTSP client subnet "
+"should run as thin clients, the following has to be done."
msgstr ""
#. type: CDATA
@@ -5880,7 +5918,7 @@ msgid ""
"and replace the line\n"
"CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp quiet\"\n"
"with\n"
-"CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp LTSP_FATCLIENT=false quiet\"\n"
+"CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp LTSP_FATCLIENT=False quiet\"\n"
"(2)Execute 'ltsp-update-kernels'"
msgstr ""
@@ -6000,7 +6038,9 @@ msgstr ""
"en gang."
#. type: Content of: <article><section><section><section><title>
-msgid "Changing the PXE menu on an LTSP server"
+#, fuzzy
+#| msgid "Changing the PXE menu on an LTSP server"
+msgid "Changing the PXE menu on a combined (main and LTSP) server"
msgstr "Ændring af PXE-menuen på en LTSP-server"
#. type: Content of: <article><section><section><section><para>
@@ -6055,7 +6095,9 @@ msgstr ""
"wiki/index.php/PXELINUX\"/> ."
#. type: Content of: <article><section><section><section><title>
-msgid "Separate main- and LTSP servers"
+#, fuzzy
+#| msgid "Separate main- and LTSP servers"
+msgid "Separate main and LTSP server"
msgstr "Adskil hoved- og LTSP-servere"
#. type: Content of: <article><section><section><section><para>
@@ -6104,8 +6146,9 @@ msgstr ""
"hovednetværket:"
#. type: CDATA
-#, no-wrap
-msgid "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 boot=nfs ro quiet 3"
+#, fuzzy, no-wrap
+#| msgid "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 boot=nfs ro quiet 3"
+msgid "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 init=/sbin/init-ltsp boot=nfs ro quiet ipappend 2"
msgstr "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 boot=nfs ro quiet 3"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -6118,6 +6161,12 @@ msgstr ""
"cfg</computeroutput> på tjener til at pege på <computeroutput>/var/lib/"
"tftpboot/debian-edu/default-diskless.cfg</computeroutput>."
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"As an alternative, you could use <computeroutput>ldapvi</computeroutput>, "
+"search for 'next server tjener' and replace tjener with ltspserver00."
+msgstr ""
+
#. type: Content of: <article><section><section><title>
msgid "Changing network settings"
msgstr "Ændre netværksopsætning"
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po
index 2456589..49b748f 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-wheezy-manual.de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-09 12:17-0400\n"
+"POT-Creation-Date: 2013-05-11 18:29-0400\n"
"PO-Revision-Date: 2013-05-09 22:14+0100\n"
"Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -2011,12 +2011,6 @@ msgstr ""
"damit sie dem Zweck entsprechend genutzt werden kann."
#. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "The ordering of the network cards after installation can differ from the "
-#| "ordering during installation. The wanted ordering could be achieved by "
-#| "editing <computeroutput>/etc/udev/rules.d/70-persistent-net.rules</"
-#| "computeroutput>: Replace eth0 with eth1 and eth1 with eth0; a reboot is "
-#| "needed for the changes to take effect."
msgid ""
"The ordering of the network cards after installation might differ from the "
"ordering during installation. The wanted ordering can be achieved by editing "
@@ -2317,10 +2311,6 @@ msgid "[attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png]"
msgstr "[attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png]"
#. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "This setup also allows diskless workstations and thin clients to be "
-#| "booted on the main network. Unlike workstations, diskless workstations "
-#| "don't need to be added with GOsa² (but could be)."
msgid ""
"This setup also allows diskless workstations and thin clients to be booted "
"on the main network. Unlike workstations, diskless workstations don't have "
@@ -4835,9 +4825,13 @@ msgstr ""
"LDAP-Objekt."
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Warning: <computeroutput>ldapvi</computeroutput> is a very powerful tool. "
+#| "Be careful and don't mess up the LDAP database."
msgid ""
"Warning: <computeroutput>ldapvi</computeroutput> is a very powerful tool. Be "
-"careful and don't mess up the LDAP database."
+"careful and don't mess up the LDAP database, same applies for jxplorer."
msgstr ""
"Achtung: <computeroutput>ldapvi</computeroutput> ist ein mächtiges Werkzeug. "
"Verwenden Sie es vorsichtig und richten Sie kein Durcheinander in der LDAP-"
@@ -4848,14 +4842,31 @@ msgid "jxplorer, an LDAP GUI"
msgstr "jxplorer, ein LDAP-Editor mit graphischer Benutzeroberfläche"
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If you prefer a GUI to work with the LDAP database, check out the "
+#| "<computeroutput>jxplorer</computeroutput> package."
msgid ""
"If you prefer a GUI to work with the LDAP database, check out the "
-"<computeroutput>jxplorer</computeroutput> package."
+"<computeroutput>jxplorer</computeroutput> package, wich is installed by "
+"default. To get write access connect like this:"
msgstr ""
"Wenn Sie für die Bearbeitung von Daten in LDAP einen Editor mit graphischer "
"Benutzeroberfläche bevorzugen, bietet sich die Installation von "
"<computeroutput>jxplorer</computeroutput> an."
+#. type: CDATA
+#, no-wrap
+msgid ""
+"host: ldap.intern\n"
+"port:636\n"
+"Base dn:dc=skole,dc=skolelinux,dc=no \n"
+"Security level: ssl + user + password\n"
+"User dn: cn=admin,ou=ldap-access\n"
+"\n"
+"Click \"This session only\" if asked for the certificate."
+msgstr ""
+
#. type: Content of: <article><section><section><title>
msgid "ldap-createuser-krb, a command-line tool"
msgstr "ldap-createuser-krb, ein Werkzeug für die Befehlszeile"
@@ -5881,6 +5892,17 @@ msgstr ""
"ltsp-update-kernels"
#. type: Content of: <article><section><section><para>
+msgid ""
+"As a shorter alternative -- installing all available firmware and updating "
+"the tftpboot directory -- you could execute:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "/usr/share/debian-edu-config/tools/ltsp-addfirmware"
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
msgid "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
msgstr "<emphasis role=\"strong\">Kernel der LTSP-Clients</emphasis>"
@@ -5922,11 +5944,24 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"Using the default PXE menu, a machine could be started as diskless "
-"workstation or thin client in the main subnet 10.0.0.0/8. By default clients "
-"in the separate subnet 192.168.0.0/24 will run as diskless workstations if "
-"the amount of RAM is sufficient. If all clients in the subnet should run as "
-"thin clients, the following has to be done."
+"On the main subnet the complete PXE menu is provided; the separate subnet "
+"for each LTSP server allows only diskless and thin LTSP client selection."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Using the default PXE menu, a machine could be started as diskless "
+#| "workstation or thin client in the main subnet 10.0.0.0/8. By default "
+#| "clients in the separate subnet 192.168.0.0/24 will run as diskless "
+#| "workstations if the amount of RAM is sufficient. If all clients in the "
+#| "subnet should run as thin clients, the following has to be done."
+msgid ""
+"Using the default PXE menu on the main subnet 10.0.0.0/8, a machine could be "
+"started as diskless workstation or thin client. By default clients in the "
+"separate subnet 192.168.0.0/24 will run as diskless workstations if the "
+"amount of RAM is sufficient. If all clients in this LTSP client subnet "
+"should run as thin clients, the following has to be done."
msgstr ""
"Mittels PXE-Menü kann eine Maschine im Hauptsubnetz 10.0.0.0/8 als Diskless "
"Workstation oder Thin Client gestartet werden. Voreingestellt laufen alle "
@@ -5935,13 +5970,20 @@ msgstr ""
"laufen sollen, sind die folgenden Schritte erforderlich."
#. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "(1)Open the file /opt/ltsp/i386/etc/ltsp/update-kernels.conf with an editor\n"
+#| "and replace the line\n"
+#| "CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp quiet\"\n"
+#| "with\n"
+#| "CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp LTSP_FATCLIENT=false quiet\"\n"
+#| "(2)Execute 'ltsp-update-kernels'"
msgid ""
"(1)Open the file /opt/ltsp/i386/etc/ltsp/update-kernels.conf with an editor\n"
"and replace the line\n"
"CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp quiet\"\n"
"with\n"
-"CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp LTSP_FATCLIENT=false quiet\"\n"
+"CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp LTSP_FATCLIENT=False quiet\"\n"
"(2)Execute 'ltsp-update-kernels'"
msgstr ""
"(1)Öffnen Sie die Datei /opt/ltsp/i386/etc/ltsp/update-kernels.conf mit einem Editor\n"
@@ -6068,7 +6110,9 @@ msgstr ""
"computeroutput> ausführen."
#. type: Content of: <article><section><section><section><title>
-msgid "Changing the PXE menu on an LTSP server"
+#, fuzzy
+#| msgid "Changing the PXE menu on an LTSP server"
+msgid "Changing the PXE menu on a combined (main and LTSP) server"
msgstr "Verändern des PXE-Menüs auf LTSP-Servern"
#. type: Content of: <article><section><section><section><para>
@@ -6123,7 +6167,9 @@ msgstr ""
"zytor.com/wiki/index.php/PXELINUX\"/> ."
#. type: Content of: <article><section><section><section><title>
-msgid "Separate main- and LTSP servers"
+#, fuzzy
+#| msgid "Separate main- and LTSP servers"
+msgid "Separate main and LTSP server"
msgstr "Trennung von Hauptserver und LTSP-Servern"
#. type: Content of: <article><section><section><section><para>
@@ -6174,8 +6220,9 @@ msgstr ""
"ltspserver00 im Hauptnetzwerk:"
#. type: CDATA
-#, no-wrap
-msgid "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 boot=nfs ro quiet 3"
+#, fuzzy, no-wrap
+#| msgid "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 boot=nfs ro quiet 3"
+msgid "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 init=/sbin/init-ltsp boot=nfs ro quiet ipappend 2"
msgstr "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 boot=nfs ro quiet 3"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -6188,6 +6235,12 @@ msgstr ""
"tftpboot/pxelinux.cfg</computeroutput> auf <computeroutput>/var/lib/tftpboot/"
"debian-edu/default-diskless.cfg</computeroutput> zeigen."
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"As an alternative, you could use <computeroutput>ldapvi</computeroutput>, "
+"search for 'next server tjener' and replace tjener with ltspserver00."
+msgstr ""
+
#. type: Content of: <article><section><section><title>
msgid "Changing network settings"
msgstr "Netzwerkeinstellungen ändern"
@@ -9067,8 +9120,8 @@ msgstr ""
"translations, wenn Sie eine neue PO-Datei für Ihre Sprache anlegen oder "
"Übersetzungen aktualisieren wollen."
-#. <remark>
-#. status ignore</remark>
+#. <remark>
+#. status ignore</remark>
#. type: Content of: <article><section><section><para>
msgid ""
"Please keep in mind that this manual is still under development, so don't "
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po
index 959c579..2a25120 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: release-manual\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-09 12:17-0400\n"
+"POT-Creation-Date: 2013-05-11 18:29-0400\n"
"PO-Revision-Date: 2012-06-16 18:34-0600\n"
"Last-Translator: Norman Garcia Aguilar <norman at riseup.net>\n"
"Language-Team: Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -5251,7 +5251,7 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
"Warning: <computeroutput>ldapvi</computeroutput> is a very powerful tool. Be "
-"careful and don't mess up the LDAP database."
+"careful and don't mess up the LDAP database, same applies for jxplorer."
msgstr ""
#. type: Content of: <article><section><section><title>
@@ -5261,7 +5261,20 @@ msgstr "jxplorer, una GUI para LDAP"
#. type: Content of: <article><section><section><para>
msgid ""
"If you prefer a GUI to work with the LDAP database, check out the "
-"<computeroutput>jxplorer</computeroutput> package."
+"<computeroutput>jxplorer</computeroutput> package, wich is installed by "
+"default. To get write access connect like this:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"host: ldap.intern\n"
+"port:636\n"
+"Base dn:dc=skole,dc=skolelinux,dc=no \n"
+"Security level: ssl + user + password\n"
+"User dn: cn=admin,ou=ldap-access\n"
+"\n"
+"Click \"This session only\" if asked for the certificate."
msgstr ""
#. type: Content of: <article><section><section><title>
@@ -6076,6 +6089,17 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><para>
+msgid ""
+"As a shorter alternative -- installing all available firmware and updating "
+"the tftpboot directory -- you could execute:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "/usr/share/debian-edu-config/tools/ltsp-addfirmware"
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
#, fuzzy
msgid "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
msgstr ""
@@ -6118,11 +6142,17 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"Using the default PXE menu, a machine could be started as diskless "
-"workstation or thin client in the main subnet 10.0.0.0/8. By default clients "
-"in the separate subnet 192.168.0.0/24 will run as diskless workstations if "
-"the amount of RAM is sufficient. If all clients in the subnet should run as "
-"thin clients, the following has to be done."
+"On the main subnet the complete PXE menu is provided; the separate subnet "
+"for each LTSP server allows only diskless and thin LTSP client selection."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Using the default PXE menu on the main subnet 10.0.0.0/8, a machine could be "
+"started as diskless workstation or thin client. By default clients in the "
+"separate subnet 192.168.0.0/24 will run as diskless workstations if the "
+"amount of RAM is sufficient. If all clients in this LTSP client subnet "
+"should run as thin clients, the following has to be done."
msgstr ""
#. type: CDATA
@@ -6132,7 +6162,7 @@ msgid ""
"and replace the line\n"
"CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp quiet\"\n"
"with\n"
-"CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp LTSP_FATCLIENT=false quiet\"\n"
+"CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp LTSP_FATCLIENT=False quiet\"\n"
"(2)Execute 'ltsp-update-kernels'"
msgstr ""
@@ -6232,7 +6262,9 @@ msgstr ""
"computeroutput>"
#. type: Content of: <article><section><section><section><title>
-msgid "Changing the PXE menu on an LTSP server"
+#, fuzzy
+#| msgid "Changing the PXE menu on an LTSP server"
+msgid "Changing the PXE menu on a combined (main and LTSP) server"
msgstr "Cambiar el menú PXE en un servidor LTSP"
#. type: Content of: <article><section><section><section><para>
@@ -6275,7 +6307,7 @@ msgstr ""
#. type: Content of: <article><section><section><section><title>
#, fuzzy
-msgid "Separate main- and LTSP servers"
+msgid "Separate main and LTSP server"
msgstr "Separar el servidor principal y el LTSP"
#. type: Content of: <article><section><section><section><para>
@@ -6318,7 +6350,7 @@ msgstr ""
#. type: CDATA
#, no-wrap
-msgid "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 boot=nfs ro quiet 3"
+msgid "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 init=/sbin/init-ltsp boot=nfs ro quiet ipappend 2"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -6328,6 +6360,12 @@ msgid ""
"debian-edu/default-diskless.cfg</computeroutput>."
msgstr ""
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"As an alternative, you could use <computeroutput>ldapvi</computeroutput>, "
+"search for 'next server tjener' and replace tjener with ltspserver00."
+msgstr ""
+
#. type: Content of: <article><section><section><title>
#, fuzzy
msgid "Changing network settings"
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po
index 7584787..213e371 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: 0.9.20071124\n"
-"POT-Creation-Date: 2013-05-09 12:17-0400\n"
+"POT-Creation-Date: 2013-05-11 18:29-0400\n"
"PO-Revision-Date: 2013-01-20 22:51+0100\n"
"Last-Translator: Cédric Boutillier <cedric.boutillier at gmail.com>\n"
"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -4920,9 +4920,13 @@ msgstr ""
"<computeroutput>add</computeroutput>."
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Warning: <computeroutput>ldapvi</computeroutput> is a very powerful tool. "
+#| "Be careful and don't mess up the LDAP database."
msgid ""
"Warning: <computeroutput>ldapvi</computeroutput> is a very powerful tool. Be "
-"careful and don't mess up the LDAP database."
+"careful and don't mess up the LDAP database, same applies for jxplorer."
msgstr ""
"Attention :<computeroutput>ldapvi</computeroutput> est un outil très "
"puissant. Utilisez-le avec précaution pour ne pas endommager la base de "
@@ -4933,13 +4937,30 @@ msgid "jxplorer, an LDAP GUI"
msgstr "jxplorer, une interface graphique à LDAP"
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If you prefer a GUI to work with the LDAP database, check out the "
+#| "<computeroutput>jxplorer</computeroutput> package."
msgid ""
"If you prefer a GUI to work with the LDAP database, check out the "
-"<computeroutput>jxplorer</computeroutput> package."
+"<computeroutput>jxplorer</computeroutput> package, wich is installed by "
+"default. To get write access connect like this:"
msgstr ""
"Si vous préférez une interface graphique pour manipuler la base de données "
"LDAP, regardez du côté du paquet <computeroutput>jxplorer</computeroutput>."
+#. type: CDATA
+#, no-wrap
+msgid ""
+"host: ldap.intern\n"
+"port:636\n"
+"Base dn:dc=skole,dc=skolelinux,dc=no \n"
+"Security level: ssl + user + password\n"
+"User dn: cn=admin,ou=ldap-access\n"
+"\n"
+"Click \"This session only\" if asked for the certificate."
+msgstr ""
+
#. type: Content of: <article><section><section><title>
msgid "ldap-createuser-krb, a command-line tool"
msgstr "ldap-createuser-krb, un outil en ligne de commande"
@@ -5977,6 +5998,17 @@ msgstr ""
"ltsp-update-kernels"
#. type: Content of: <article><section><section><para>
+msgid ""
+"As a shorter alternative -- installing all available firmware and updating "
+"the tftpboot directory -- you could execute:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "/usr/share/debian-edu-config/tools/ltsp-addfirmware"
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
msgid "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
msgstr "<emphasis role=\"strong\">Noyau des clients légers</emphasis>"
@@ -6026,11 +6058,17 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"Using the default PXE menu, a machine could be started as diskless "
-"workstation or thin client in the main subnet 10.0.0.0/8. By default clients "
-"in the separate subnet 192.168.0.0/24 will run as diskless workstations if "
-"the amount of RAM is sufficient. If all clients in the subnet should run as "
-"thin clients, the following has to be done."
+"On the main subnet the complete PXE menu is provided; the separate subnet "
+"for each LTSP server allows only diskless and thin LTSP client selection."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Using the default PXE menu on the main subnet 10.0.0.0/8, a machine could be "
+"started as diskless workstation or thin client. By default clients in the "
+"separate subnet 192.168.0.0/24 will run as diskless workstations if the "
+"amount of RAM is sufficient. If all clients in this LTSP client subnet "
+"should run as thin clients, the following has to be done."
msgstr ""
#. type: CDATA
@@ -6040,7 +6078,7 @@ msgid ""
"and replace the line\n"
"CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp quiet\"\n"
"with\n"
-"CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp LTSP_FATCLIENT=false quiet\"\n"
+"CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp LTSP_FATCLIENT=False quiet\"\n"
"(2)Execute 'ltsp-update-kernels'"
msgstr ""
@@ -6163,7 +6201,9 @@ msgstr ""
"computeroutput>."
#. type: Content of: <article><section><section><section><title>
-msgid "Changing the PXE menu on an LTSP server"
+#, fuzzy
+#| msgid "Changing the PXE menu on an LTSP server"
+msgid "Changing the PXE menu on a combined (main and LTSP) server"
msgstr "Changer le menu PXE sur un serveur LTSP"
#. type: Content of: <article><section><section><section><para>
@@ -6218,7 +6258,9 @@ msgstr ""
"zytor.com/wiki/index.php/PXELINUX\"/>."
#. type: Content of: <article><section><section><section><title>
-msgid "Separate main- and LTSP servers"
+#, fuzzy
+#| msgid "Separate main- and LTSP servers"
+msgid "Separate main and LTSP server"
msgstr "Séparer le serveur principal du serveur LTSP"
#. type: Content of: <article><section><section><section><para>
@@ -6269,8 +6311,9 @@ msgstr ""
"principal :"
#. type: CDATA
-#, no-wrap
-msgid "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 boot=nfs ro quiet 3"
+#, fuzzy, no-wrap
+#| msgid "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 boot=nfs ro quiet 3"
+msgid "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 init=/sbin/init-ltsp boot=nfs ro quiet ipappend 2"
msgstr "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 boot=nfs ro quiet 3"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -6283,6 +6326,12 @@ msgstr ""
"computeroutput> sur tjener pour pointer vers <computeroutput>/var/lib/"
"tftpboot/debian-edu/default-diskless.cfg</computeroutput>."
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"As an alternative, you could use <computeroutput>ldapvi</computeroutput>, "
+"search for 'next server tjener' and replace tjener with ltspserver00."
+msgstr ""
+
#. type: Content of: <article><section><section><title>
msgid "Changing network settings"
msgstr "Modifier les paramètres réseau"
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
index 9b3473e..f5551f8 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-squeeze-manual\n"
-"POT-Creation-Date: 2013-05-09 12:17-0400\n"
+"POT-Creation-Date: 2013-05-11 18:29-0400\n"
"PO-Revision-Date: 2013-01-23 19:02+0100\n"
"Last-Translator: Claudio Carboncini <claudio.carboncini at gmail.com>\n"
"Language-Team: Italian <>\n"
@@ -4812,9 +4812,13 @@ msgstr ""
"LDAP."
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Warning: <computeroutput>ldapvi</computeroutput> is a very powerful tool. "
+#| "Be careful and don't mess up the LDAP database."
msgid ""
"Warning: <computeroutput>ldapvi</computeroutput> is a very powerful tool. Be "
-"careful and don't mess up the LDAP database."
+"careful and don't mess up the LDAP database, same applies for jxplorer."
msgstr ""
"Attenzione: <computeroutput>ldapvi</computeroutput> è uno strumento molto "
"potente. Fare attenzione a non rovinare tutto il database LDAP."
@@ -4824,13 +4828,30 @@ msgid "jxplorer, an LDAP GUI"
msgstr "jxplorer, una GUI LDAP"
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If you prefer a GUI to work with the LDAP database, check out the "
+#| "<computeroutput>jxplorer</computeroutput> package."
msgid ""
"If you prefer a GUI to work with the LDAP database, check out the "
-"<computeroutput>jxplorer</computeroutput> package."
+"<computeroutput>jxplorer</computeroutput> package, wich is installed by "
+"default. To get write access connect like this:"
msgstr ""
"Se si preferisce un'interfaccia grafica per lavorare con il database LDAP, "
"si può provare il pacchetto <computeroutput>jxplorer</computeroutput> ."
+#. type: CDATA
+#, no-wrap
+msgid ""
+"host: ldap.intern\n"
+"port:636\n"
+"Base dn:dc=skole,dc=skolelinux,dc=no \n"
+"Security level: ssl + user + password\n"
+"User dn: cn=admin,ou=ldap-access\n"
+"\n"
+"Click \"This session only\" if asked for the certificate."
+msgstr ""
+
#. type: Content of: <article><section><section><title>
msgid "ldap-createuser-krb, a command-line tool"
msgstr "ldap-createuser-krb, un tool command-line"
@@ -5843,6 +5864,17 @@ msgstr ""
"ltsp-update-kernels"
#. type: Content of: <article><section><section><para>
+msgid ""
+"As a shorter alternative -- installing all available firmware and updating "
+"the tftpboot directory -- you could execute:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "/usr/share/debian-edu-config/tools/ltsp-addfirmware"
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
msgid "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
msgstr "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
@@ -5891,11 +5923,17 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"Using the default PXE menu, a machine could be started as diskless "
-"workstation or thin client in the main subnet 10.0.0.0/8. By default clients "
-"in the separate subnet 192.168.0.0/24 will run as diskless workstations if "
-"the amount of RAM is sufficient. If all clients in the subnet should run as "
-"thin clients, the following has to be done."
+"On the main subnet the complete PXE menu is provided; the separate subnet "
+"for each LTSP server allows only diskless and thin LTSP client selection."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Using the default PXE menu on the main subnet 10.0.0.0/8, a machine could be "
+"started as diskless workstation or thin client. By default clients in the "
+"separate subnet 192.168.0.0/24 will run as diskless workstations if the "
+"amount of RAM is sufficient. If all clients in this LTSP client subnet "
+"should run as thin clients, the following has to be done."
msgstr ""
#. type: CDATA
@@ -5905,7 +5943,7 @@ msgid ""
"and replace the line\n"
"CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp quiet\"\n"
"with\n"
-"CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp LTSP_FATCLIENT=false quiet\"\n"
+"CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp LTSP_FATCLIENT=False quiet\"\n"
"(2)Execute 'ltsp-update-kernels'"
msgstr ""
@@ -6025,7 +6063,9 @@ msgstr ""
"computeroutput> una volta."
#. type: Content of: <article><section><section><section><title>
-msgid "Changing the PXE menu on an LTSP server"
+#, fuzzy
+#| msgid "Changing the PXE menu on an LTSP server"
+msgid "Changing the PXE menu on a combined (main and LTSP) server"
msgstr "Cambiare il menu PXE sul server LTSP"
#. type: Content of: <article><section><section><section><para>
@@ -6079,7 +6119,9 @@ msgstr ""
"com/wiki/index.php/PXELINUX\"/> ."
#. type: Content of: <article><section><section><section><title>
-msgid "Separate main- and LTSP servers"
+#, fuzzy
+#| msgid "Separate main- and LTSP servers"
+msgid "Separate main and LTSP server"
msgstr "Separare il server principale e i server LTSP"
#. type: Content of: <article><section><section><section><para>
@@ -6129,8 +6171,9 @@ msgstr ""
"principale:"
#. type: CDATA
-#, no-wrap
-msgid "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 boot=nfs ro quiet 3"
+#, fuzzy, no-wrap
+#| msgid "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 boot=nfs ro quiet 3"
+msgid "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 init=/sbin/init-ltsp boot=nfs ro quiet ipappend 2"
msgstr "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 boot=nfs ro quiet 3"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -6143,6 +6186,12 @@ msgstr ""
"computeroutput> su tjener che punti a <computeroutput>/var/lib/tftpboot/"
"debian-edu/default-diskless.cfg</computeroutput>."
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"As an alternative, you could use <computeroutput>ldapvi</computeroutput>, "
+"search for 'next server tjener' and replace tjener with ltspserver00."
+msgstr ""
+
#. type: Content of: <article><section><section><title>
msgid "Changing network settings"
msgstr "Cambiare la configurazione della rete"
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
index 64922a9..4c3bef0 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: release-manual.nb\n"
-"POT-Creation-Date: 2013-05-09 12:17-0400\n"
+"POT-Creation-Date: 2013-05-11 18:29-0400\n"
"PO-Revision-Date: 2012-03-10 18:32+0100\n"
"Last-Translator: Petter Reinholdtsen <pere at hungry.com>\n"
"Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
@@ -5279,7 +5279,7 @@ msgstr ""
#, fuzzy
msgid ""
"Warning: <computeroutput>ldapvi</computeroutput> is a very powerful tool. Be "
-"careful and don't mess up the LDAP database."
+"careful and don't mess up the LDAP database, same applies for jxplorer."
msgstr ""
"</inlinemediaobject> NB: lokale enheter med <computeroutput>ltspfs</"
"computeroutput> vil ikke fungere lenger uten LDM."
@@ -5292,11 +5292,24 @@ msgstr ""
#, fuzzy
msgid ""
"If you prefer a GUI to work with the LDAP database, check out the "
-"<computeroutput>jxplorer</computeroutput> package."
+"<computeroutput>jxplorer</computeroutput> package, wich is installed by "
+"default. To get write access connect like this:"
msgstr ""
"Her er et eksempel som aktiverer temaet i <computeroutput>desktop-base</"
"computeroutput>-pakken:"
+#. type: CDATA
+#, no-wrap
+msgid ""
+"host: ldap.intern\n"
+"port:636\n"
+"Base dn:dc=skole,dc=skolelinux,dc=no \n"
+"Security level: ssl + user + password\n"
+"User dn: cn=admin,ou=ldap-access\n"
+"\n"
+"Click \"This session only\" if asked for the certificate."
+msgstr ""
+
#. type: Content of: <article><section><section><title>
msgid "ldap-createuser-krb, a command-line tool"
msgstr ""
@@ -6324,6 +6337,17 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><para>
+msgid ""
+"As a shorter alternative -- installing all available firmware and updating "
+"the tftpboot directory -- you could execute:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "/usr/share/debian-edu-config/tools/ltsp-addfirmware"
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
#, fuzzy
#| msgid "<emphasis role=\"strong\">Thin client</emphasis>"
msgid "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
@@ -6371,11 +6395,17 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"Using the default PXE menu, a machine could be started as diskless "
-"workstation or thin client in the main subnet 10.0.0.0/8. By default clients "
-"in the separate subnet 192.168.0.0/24 will run as diskless workstations if "
-"the amount of RAM is sufficient. If all clients in the subnet should run as "
-"thin clients, the following has to be done."
+"On the main subnet the complete PXE menu is provided; the separate subnet "
+"for each LTSP server allows only diskless and thin LTSP client selection."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Using the default PXE menu on the main subnet 10.0.0.0/8, a machine could be "
+"started as diskless workstation or thin client. By default clients in the "
+"separate subnet 192.168.0.0/24 will run as diskless workstations if the "
+"amount of RAM is sufficient. If all clients in this LTSP client subnet "
+"should run as thin clients, the following has to be done."
msgstr ""
#. type: CDATA
@@ -6385,7 +6415,7 @@ msgid ""
"and replace the line\n"
"CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp quiet\"\n"
"with\n"
-"CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp LTSP_FATCLIENT=false quiet\"\n"
+"CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp LTSP_FATCLIENT=False quiet\"\n"
"(2)Execute 'ltsp-update-kernels'"
msgstr ""
@@ -6509,7 +6539,9 @@ msgstr ""
"edu/www/debian-edu-install.dat</computeroutput>"
#. type: Content of: <article><section><section><section><title>
-msgid "Changing the PXE menu on an LTSP server"
+#, fuzzy
+#| msgid "Changing the PXE menu on an LTSP server"
+msgid "Changing the PXE menu on a combined (main and LTSP) server"
msgstr "Endrer PXE-menyen på en LTSP-server"
#. type: Content of: <article><section><section><section><para>
@@ -6576,7 +6608,9 @@ msgstr ""
"wiki/index.php/PXELINUX\"/> ."
#. type: Content of: <article><section><section><section><title>
-msgid "Separate main- and LTSP servers"
+#, fuzzy
+#| msgid "Separate main- and LTSP servers"
+msgid "Separate main and LTSP server"
msgstr "Adskilte hoved- og LTSP-tjenere"
#. type: Content of: <article><section><section><section><para>
@@ -6629,7 +6663,7 @@ msgstr ""
#. type: CDATA
#, no-wrap
-msgid "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 boot=nfs ro quiet 3"
+msgid "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 init=/sbin/init-ltsp boot=nfs ro quiet ipappend 2"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -6642,6 +6676,12 @@ msgstr ""
"Dette dokumentet ble plassert i pakken <computeroutput>debian-edu-doc</"
"computeroutput> på tidspunktet <computeroutput>209-01-15</computeroutput>."
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"As an alternative, you could use <computeroutput>ldapvi</computeroutput>, "
+"search for 'next server tjener' and replace tjener with ltspserver00."
+msgstr ""
+
#. type: Content of: <article><section><section><title>
msgid "Changing network settings"
msgstr "Endre nettverksoppsett"
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
index 58f863b..78b8a39 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-05-09 12:17-0400\n"
+"POT-Creation-Date: 2013-05-11 18:29-0400\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"
@@ -3509,7 +3509,7 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
"Warning: <computeroutput>ldapvi</computeroutput> is a very powerful tool. Be "
-"careful and don't mess up the LDAP database."
+"careful and don't mess up the LDAP database, same applies for jxplorer."
msgstr ""
#. type: Content of: <article><section><section><title>
@@ -3519,7 +3519,20 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
"If you prefer a GUI to work with the LDAP database, check out the "
-"<computeroutput>jxplorer</computeroutput> package."
+"<computeroutput>jxplorer</computeroutput> package, wich is installed by "
+"default. To get write access connect like this:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"host: ldap.intern\n"
+"port:636\n"
+"Base dn:dc=skole,dc=skolelinux,dc=no \n"
+"Security level: ssl + user + password\n"
+"User dn: cn=admin,ou=ldap-access\n"
+"\n"
+"Click \"This session only\" if asked for the certificate."
msgstr ""
#. type: Content of: <article><section><section><title>
@@ -4249,6 +4262,17 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><para>
+msgid ""
+"As a shorter alternative -- installing all available firmware and updating "
+"the tftpboot directory -- you could execute:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "/usr/share/debian-edu-config/tools/ltsp-addfirmware"
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
msgid "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
msgstr ""
@@ -4280,11 +4304,17 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"Using the default PXE menu, a machine could be started as diskless "
-"workstation or thin client in the main subnet 10.0.0.0/8. By default clients "
-"in the separate subnet 192.168.0.0/24 will run as diskless workstations if "
-"the amount of RAM is sufficient. If all clients in the subnet should run as "
-"thin clients, the following has to be done."
+"On the main subnet the complete PXE menu is provided; the separate subnet "
+"for each LTSP server allows only diskless and thin LTSP client selection."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Using the default PXE menu on the main subnet 10.0.0.0/8, a machine could be "
+"started as diskless workstation or thin client. By default clients in the "
+"separate subnet 192.168.0.0/24 will run as diskless workstations if the "
+"amount of RAM is sufficient. If all clients in this LTSP client subnet "
+"should run as thin clients, the following has to be done."
msgstr ""
#. type: CDATA
@@ -4294,7 +4324,7 @@ msgid ""
"and replace the line\n"
"CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp quiet\"\n"
"with\n"
-"CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp LTSP_FATCLIENT=false quiet\"\n"
+"CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp LTSP_FATCLIENT=False quiet\"\n"
"(2)Execute 'ltsp-update-kernels'"
msgstr ""
@@ -4379,7 +4409,7 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><title>
-msgid "Changing the PXE menu on an LTSP server"
+msgid "Changing the PXE menu on a combined (main and LTSP) server"
msgstr ""
#. type: Content of: <article><section><section><section><para>
@@ -4421,7 +4451,7 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><title>
-msgid "Separate main- and LTSP servers"
+msgid "Separate main and LTSP server"
msgstr ""
#. type: Content of: <article><section><section><section><para>
@@ -4458,7 +4488,7 @@ msgstr ""
#. type: CDATA
#, no-wrap
-msgid "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 boot=nfs ro quiet 3"
+msgid "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 init=/sbin/init-ltsp boot=nfs ro quiet ipappend 2"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -4468,6 +4498,12 @@ msgid ""
"debian-edu/default-diskless.cfg</computeroutput>."
msgstr ""
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"As an alternative, you could use <computeroutput>ldapvi</computeroutput>, "
+"search for 'next server tjener' and replace tjener with ltspserver00."
+msgstr ""
+
#. type: Content of: <article><section><section><title>
msgid "Changing network settings"
msgstr ""
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
index e222676..75093de 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
@@ -1558,15 +1558,21 @@ resize2fs /dev/vg_system/skole+tjener+home0]]></screen>
</para>
<para>To add an LDAP object using ldapvi, use object sequence number with the string <computeroutput>add</computeroutput> in front of the new LDAP object.
</para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/alert.png"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> Warning: <computeroutput>ldapvi</computeroutput> is a very powerful tool. Be careful and don't mess up the LDAP database.
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/alert.png"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> Warning: <computeroutput>ldapvi</computeroutput> is a very powerful tool. Be careful and don't mess up the LDAP database, same applies for jxplorer.
</para>
</section>
<section id="Administration--jxplorer.2C_an_LDAP_GUI">
<title>jxplorer, an LDAP GUI
</title>
-<para>If you prefer a GUI to work with the LDAP database, check out the <computeroutput>jxplorer</computeroutput> package.
-</para>
+<para>If you prefer a GUI to work with the LDAP database, check out the <computeroutput>jxplorer</computeroutput> package, wich is installed by default. To get write access connect like this:
+</para><screen><![CDATA[host: ldap.intern
+port:636
+Base dn:dc=skole,dc=skolelinux,dc=no
+Security level: ssl + user + password
+User dn: cn=admin,ou=ldap-access
+
+Click "This session only" if asked for the certificate.]]></screen>
</section>
<section id="Administration--ldap-createuser-krb.2C_a_command-line_tool">
@@ -1921,6 +1927,8 @@ ltsp-chroot -d -a i386 apt-get -y -q install <package name>
# copy the new initrd to the server's tftpboot directory
ltsp-update-kernels]]></screen>
+<para>As a shorter alternative -- installing all available firmware and updating the tftpboot directory -- you could execute:
+</para><screen><![CDATA[/usr/share/debian-edu-config/tools/ltsp-addfirmware]]></screen>
<para><emphasis role="strong">LTSP client kernel</emphasis>
</para>
<itemizedlist><listitem override="none">
@@ -1934,12 +1942,14 @@ ltsp-update-kernels]]></screen>
</title>
<para>Each LTSP server has two ethernet cards: one configured in the main 10.0.0.0/8 subnet (which is shared with the main server), and another forming a local 192.168.0.0/24 subnet (a separate subnet for each LTSP server).
</para>
-<para>Using the default PXE menu, a machine could be started as diskless workstation or thin client in the main subnet 10.0.0.0/8. By default clients in the separate subnet 192.168.0.0/24 will run as diskless workstations if the amount of RAM is sufficient. If all clients in the subnet should run as thin clients, the following has to be done.
+<para>On the main subnet the complete PXE menu is provided; the separate subnet for each LTSP server allows only diskless and thin LTSP client selection.
+</para>
+<para>Using the default PXE menu on the main subnet 10.0.0.0/8, a machine could be started as diskless workstation or thin client. By default clients in the separate subnet 192.168.0.0/24 will run as diskless workstations if the amount of RAM is sufficient. If all clients in this LTSP client subnet should run as thin clients, the following has to be done.
</para><screen><![CDATA[(1)Open the file /opt/ltsp/i386/etc/ltsp/update-kernels.conf with an editor
and replace the line
CMDLINE_LINUX_DEFAULT="init=/sbin/init-ltsp quiet"
with
-CMDLINE_LINUX_DEFAULT="init=/sbin/init-ltsp LTSP_FATCLIENT=false quiet"
+CMDLINE_LINUX_DEFAULT="init=/sbin/init-ltsp LTSP_FATCLIENT=False quiet"
(2)Execute 'ltsp-update-kernels']]></screen>
</section>
</section>
@@ -1974,8 +1984,8 @@ d-i apt-setup/local1/key string http://example.org/key.asc]]></s
</para>
</section>
-<section id="NetworkClients--Changing_the_PXE_menu_on_an_LTSP_server">
-<title>Changing the PXE menu on an LTSP server
+<section id="NetworkClients--Changing_the_PXE_menu_on_a_combined_.28main_and_LTSP.29_server">
+<title>Changing the PXE menu on a combined (main and LTSP) server
</title>
<para>The PXE menu allows network booting of LTSP clients, the installer and other alternatives. The file <computeroutput>/var/lib/tftpboot/pxelinux.cfg/default</computeroutput> is used by default if no other file in that directory matches the client, and out of the box it is set to link to <computeroutput>/var/lib/tftpboot/debian-edu/default-menu.cfg</computeroutput>.
</para>
@@ -1987,8 +1997,8 @@ d-i apt-setup/local1/key string http://example.org/key.asc]]></s
</para>
</section>
-<section id="NetworkClients--Separate_main-_and_LTSP_servers">
-<title>Separate main- and LTSP servers
+<section id="NetworkClients--Separate_main_and_LTSP_server">
+<title>Separate main and LTSP server
</title>
<para>For performance and security considerations it might be desired to set up a separate main server which doesn't act as LTSP server.
</para>
@@ -2003,11 +2013,13 @@ d-i apt-setup/local1/key string http://example.org/key.asc]]></s
</para></listitem>
<listitem>
<para>edit <computeroutput>/var/lib/tftpboot/debian-edu/default-diskless.cfg</computeroutput> to use the IP address of ltspserver00; the following example uses 10.0.2.10 for the IP address of ltspserver00 on the main network:
-</para></listitem></itemizedlist><screen><![CDATA[ DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 boot=nfs ro quiet 3]]></screen>
+</para></listitem></itemizedlist><screen><![CDATA[ DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 init=/sbin/init-ltsp boot=nfs ro quiet ipappend 2]]></screen>
<itemizedlist>
<listitem>
<para>set the symlink in <computeroutput>/var/lib/tftpboot/pxelinux.cfg</computeroutput> on tjener to point to <computeroutput>/var/lib/tftpboot/debian-edu/default-diskless.cfg</computeroutput>.
</para></listitem></itemizedlist>
+<para>As an alternative, you could use <computeroutput>ldapvi</computeroutput>, search for 'next server tjener' and replace tjener with ltspserver00.
+</para>
</section>
</section>
diff --git a/documentation/debian-edu-wheezy/images/de/worldmap.png b/documentation/debian-edu-wheezy/images/de/worldmap.png
index f05f2c5..7cb5fe7 100644
Binary files a/documentation/debian-edu-wheezy/images/de/worldmap.png and b/documentation/debian-edu-wheezy/images/de/worldmap.png differ
diff --git a/documentation/debian-edu-wheezy/images/es/worldmap.png b/documentation/debian-edu-wheezy/images/es/worldmap.png
index 1b67525..f38113e 100644
Binary files a/documentation/debian-edu-wheezy/images/es/worldmap.png and b/documentation/debian-edu-wheezy/images/es/worldmap.png differ
diff --git a/documentation/debian-edu-wheezy/images/fr/worldmap.png b/documentation/debian-edu-wheezy/images/fr/worldmap.png
index facd526..c3433f6 100644
Binary files a/documentation/debian-edu-wheezy/images/fr/worldmap.png and b/documentation/debian-edu-wheezy/images/fr/worldmap.png differ
diff --git a/documentation/debian-edu-wheezy/images/worldmap.png b/documentation/debian-edu-wheezy/images/worldmap.png
index 0dc9e52..ea77c11 100644
Binary files a/documentation/debian-edu-wheezy/images/worldmap.png and b/documentation/debian-edu-wheezy/images/worldmap.png differ
hooks/post-receive
--
debian-edu-doc.git (Debian package debian-edu-doc)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "debian-edu-doc.git" (Debian package debian-edu-doc).
More information about the debian-edu-commits
mailing list