[debian-edu-commits] debian-edu/ 01/02: Update jessie manual and images from the wiki.
Wolfgang Schweer
schweer-guest at moszumanska.debian.org
Wed Nov 26 10:21:26 UTC 2014
This is an automated email from the git hooks/post-receive script.
schweer-guest pushed a commit to branch master
in repository debian-edu-doc.
commit f4d8a1b12566c5d9239ed996cbb374281cd81385
Author: Wolfgang Schweer <wschweer at arcor.de>
Date: Wed Nov 26 10:28:07 2014 +0100
Update jessie manual and images from the wiki.
---
.../debian-edu-jessie-manual.da.po | 164 +++++++++++++++++----
.../debian-edu-jessie-manual.de.po | 162 ++++++++++++++++----
.../debian-edu-jessie-manual.es.po | 139 ++++++++++++-----
.../debian-edu-jessie-manual.fr.po | 164 +++++++++++++++++----
.../debian-edu-jessie-manual.it.po | 164 +++++++++++++++++----
.../debian-edu-jessie-manual.nb.po | 92 ++++++++----
.../debian-edu-jessie-manual.nl.po | 164 +++++++++++++++++----
.../debian-edu-jessie/debian-edu-jessie-manual.pot | 68 +++++----
.../debian-edu-jessie/debian-edu-jessie-manual.xml | 33 +++--
.../debian-edu-jessie/images/de/worldmap.png | Bin 387059 -> 386971 bytes
.../debian-edu-jessie/images/es/worldmap.png | Bin 387164 -> 387075 bytes
.../debian-edu-jessie/images/fr/worldmap.png | Bin 387102 -> 387013 bytes
.../debian-edu-jessie/images/worldmap.png | Bin 387097 -> 387008 bytes
13 files changed, 906 insertions(+), 244 deletions(-)
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po
index 7cc8724..1f51413 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po
@@ -10,7 +10,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-jessie-manual\n"
-"POT-Creation-Date: 2014-11-24 21:54+0100\n"
+"POT-Creation-Date: 2014-11-26 10:26+0100\n"
"PO-Revision-Date: 2014-10-21 19:20+0100\n"
"Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -852,11 +852,17 @@ msgid "Administration"
msgstr "Administration"
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "All the Linux machines that are installed with the Skolelinux installer "
+#| "will be administrable from a central computer, most likely the server. It "
+#| "will be possible to log in to all machines via SSH, and thereby have full "
+#| "access to the machines."
msgid ""
"All the Linux machines that are installed with the Skolelinux installer will "
"be administrable from a central computer, most likely the server. It will be "
-"possible to log in to all machines via SSH, and thereby have full access to "
-"the machines."
+"possible to log in to all machines via SSH (root not allowed by default), "
+"and thereby have full access to the machines."
msgstr ""
"Alle Linuxmaskinerne, som er installeret via en cd eller dvd med Skolelinux, "
"vil kunne administreres fra en central computer, højst sandsynlig serveren. "
@@ -1052,9 +1058,13 @@ msgstr ""
"\"Architecture\">netværksarkitektur</link>."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "The computers running Debian Edu / Skolelinux must have either i386 or "
+#| "amd64 processors."
msgid ""
-"The computers running Debian Edu / Skolelinux must have either i386 or amd64 "
-"processors."
+"The computers running Debian Edu / Skolelinux must have either i386 (oldest "
+"supported processors: Intel Pentium/AMD K5) or amd64 processors."
msgstr ""
"Computerne der kører Debian Edu / Skolelinux skal have enten i386- eller "
"amd64-processorer."
@@ -1072,8 +1082,13 @@ msgid "eth0 is connected to the main network (10.0.0.0/8),"
msgstr "eth0 er forbundet til hovednetværket (10.0.0.0/8),"
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "eth1 is used for serving the thin-clients (192.168.0.0/24 or "
+#| "192.168.1.0/24)."
msgid ""
-"eth1 is used for serving the thin-clients (192.168.0.0/24 or 192.168.1.0/24)."
+"eth1 is used for serving LTSP clients (192.168.0.0/24 as default or "
+"192.168.1.0/24)."
msgstr ""
"eth1 bruges for betjening af tynde klienter (192.168.0.0/24 eller "
"192.168.1.0/24)."
@@ -1225,9 +1240,13 @@ msgid "You can have hundreds of workstations on the main network."
msgstr "Du kan have hundredvis af arbejdsstationer på hovednetværket."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "You can have a lot of LTSP servers on the main network; two different "
+#| "subnets are preconfigured in LDAP."
msgid ""
"You can have a lot of LTSP servers on the main network; two different "
-"subnets are preconfigured in LDAP."
+"subnets are preconfigured (DNS, DHCP) in LDAP, more could be added."
msgstr ""
"Du kan have en masse LTSP-servere på hovednetværket; to forskellige undernet "
"er prækonfigurerede i LDAP."
@@ -1391,11 +1410,15 @@ msgstr ""
"tilgængelig via"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
+#| "edu-8.0+edu0~alpha0-CD.iso\">debian-edu-8.0+edu0~alpha0-CD.iso</ulink>"
msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
"edu-8.0+edu0~alpha0-CD.iso\">debian-edu-8.0+edu0~alpha0-CD.iso</ulink>"
msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
"edu-8.0+edu0~alpha0-CD.iso\">debian-edu-8.0+edu0~alpha0-CD.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -1434,11 +1457,15 @@ msgstr ""
"FTP, HTTP eller rsync via:"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
+#| "edu-8.0+edu0~alpha0-USB.iso\">debian-edu-8.0+edu0~alpha0-USB.iso</ulink>"
msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
"edu-8.0+edu0~alpha0-USB.iso\">debian-edu-8.0+edu0~alpha0-USB.iso</ulink>"
msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
"edu-8.0+edu0~alpha0-USB.iso\">debian-edu-8.0+edu0~alpha0-USB.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -1525,11 +1552,19 @@ msgid "Installing Debian Edu"
msgstr "Installation af Debian Edu"
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "When you do a Debian Edu installation, you have a few options to choose "
+#| "from. Don't be afraid; there aren't many. We have done a good job of "
+#| "hiding the complexity of Debian during the installation and beyond. "
+#| "However, Debian Edu is Debian, and if you want there are more than 15,000 "
+#| "packages to choose from and a billion configuration options. For the "
+#| "majority of our users, our defaults should be fine."
msgid ""
"When you do a Debian Edu installation, you have a few options to choose "
"from. Don't be afraid; there aren't many. We have done a good job of hiding "
"the complexity of Debian during the installation and beyond. However, Debian "
-"Edu is Debian, and if you want there are more than 15,000 packages to choose "
+"Edu is Debian, and if you want there are more than 42,000 packages to choose "
"from and a billion configuration options. For the majority of our users, our "
"defaults should be fine."
msgstr ""
@@ -2176,12 +2211,19 @@ msgid "A note on thin-client-server installations"
msgstr "En bemærkning om installationer af servere for tynde klienter"
#. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "First of all, this profile name is confusing for historic reasons. "
+#| "Currently this profile actually installs an LTSP server environment for "
+#| "thin-clients and for workstations. Debian bug <ulink url=\"https://bugs."
+#| "debian.org/588510#\">588510</ulink> has been filed to change the name of "
+#| "the profile into a better suited one."
msgid ""
"First of all, this profile name is confusing for historic reasons. Currently "
"this profile actually installs an LTSP server environment for thin-clients "
-"and for workstations. Debian bug <ulink url=\"https://bugs.debian.org/588510#"
-"\">588510</ulink> has been filed to change the name of the profile into a "
-"better suited one."
+"and for diskless workstations. Debian bug <ulink url=\"https://bugs.debian."
+"org/588510#\">588510</ulink> has been filed to change the name of the "
+"profile into a better suited one."
msgstr ""
"For det første er dette profilnavn forvirrende af historiske årsager. "
"Aktuelt installerer denne profil rent faktisk et LTSP-servermiljø for tynde "
@@ -4015,11 +4057,18 @@ msgid "Backup Management"
msgstr "Sikkerhedshåndtering"
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "For backup management point your browser to <ulink url=\"https://www/"
+#| "slbackup-php\"/>. Please note that you need to access this site via SSL, "
+#| "since you have to enter the root password there. If you try to access "
+#| "this site without using SSL it will fail."
msgid ""
"For backup management point your browser to <ulink url=\"https://www/"
"slbackup-php\"/>. Please note that you need to access this site via SSL, "
"since you have to enter the root password there. If you try to access this "
-"site without using SSL it will fail."
+"site without using SSL it will fail. Note: the site will only work if you "
+"temporarily allow ssh root login on the backup server (tjener by default)."
msgstr ""
"For sikkerhedshåndtering så peg din browser på <ulink url=\"https://www/"
"slbackup-php\"/>. Bemærk venligst at du skal tilgå denne side via SSL, da du "
@@ -4576,12 +4625,19 @@ msgid "LDAP service needs to be reconfigured"
msgstr "LDAP-tjeneste skal konfigureres igen"
#. type: Content of: <article><section><section><section><para>
-msgid ""
-"The LDAP setup has changed slightly from Wheezy to Jessie. Nevertheless, "
-"LDAP has to be rebuild from scratch. There's a script <computeroutput>ldap-"
-"debian-edu-install</computeroutput> (in /usr/bin) that could be used to "
-"achieve this. Read the comment at the beginning of that script carefully "
-"before doing anything."
+#, fuzzy
+#| msgid ""
+#| "The LDAP setup has changed slightly from Wheezy to Jessie. Nevertheless, "
+#| "LDAP has to be rebuild from scratch. There's a script "
+#| "<computeroutput>ldap-debian-edu-install</computeroutput> (in /usr/bin) "
+#| "that could be used to achieve this. Read the comment at the beginning of "
+#| "that script carefully before doing anything."
+msgid ""
+"The LDAP setup has only scarcely changed from Wheezy to Jessie so chances "
+"are that LDAP hasn't to be rebuild from scratch. There's a script "
+"<computeroutput>ldap-debian-edu-install</computeroutput> (in /usr/bin) that "
+"could be used to achieve rebuilding LDAP if needed. Read the comment at the "
+"beginning of that script carefully before doing anything."
msgstr ""
"LDAP-opsætningen har ændret sig meget fra Wheezy til Jessie. Så LDAP skal "
"genbygges fra bunden af. Der er et skript <computeroutput>ldap-debian-edu-"
@@ -5031,9 +5087,14 @@ msgstr "JXplorer, en grafisk brugerflade for LDAP"
# engelsk fejl: wich -> which
#. 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, wich is installed by "
+#| "default. To get write access connect like this:"
msgid ""
"If you prefer a GUI to work with the LDAP database, check out the "
-"<computeroutput>jxplorer</computeroutput> package, wich is installed by "
+"<computeroutput>jxplorer</computeroutput> package, which is installed by "
"default. To get write access connect like this:"
msgstr ""
"Hvis du foretrækker en grafisk brugerflade til arbejdet med LDAP-databasen, "
@@ -6801,6 +6862,22 @@ msgstr ""
"Som et alternativ kan du bruge <computeroutput>ldapvi</computeroutput>, søg "
"efter »next server tjener« og erstat tjener med ltspserver00."
+#. type: Content of: <article><section><section><section><title>
+msgid "Use a different LTSP client network"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"192.168.0.0/24 is the default LTSP client network if a machine is installed "
+"using the Thin-Client-Server profile. If loads of LTSP clients are used or "
+"if different LTSP servers should serve both i386 and amd64 chroot "
+"environments the second preconfigured network 192.168.1.0/24 could be used "
+"as well. Edit the file <computeroutput>/etc/network/interfaces</"
+"computeroutput> and adjust the eth1 settings accordingly. Use "
+"<computeroutput>ldapvi</computeroutput> or any other LDAP editor to inspect "
+"DNS and DHCP configuration."
+msgstr ""
+
#. type: Content of: <article><section><section><title>
msgid "Changing network settings"
msgstr "Ændre netværksopsætning"
@@ -6820,11 +6897,17 @@ msgstr ""
"andre filer, som skal redigeres for at ændre undernettet."
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Note that changing to one of the subnets already used elsewhere in Debian "
+#| "Edu will not work. 192.168.1.0/24 is already set up as the thin client "
+#| "network. Changing to this subnet will require manual editing of "
+#| "configuration files to remove duplicate entries."
msgid ""
"Note that changing to one of the subnets already used elsewhere in Debian "
-"Edu will not work. 192.168.1.0/24 is already set up as the thin client "
-"network. Changing to this subnet will require manual editing of "
-"configuration files to remove duplicate entries."
+"Edu will not work. 192.168.0.0/24 and 192.168.1.0/24 are already set up as "
+"LTSP client networks. Changing to these subnets will require manual editing "
+"of configuration files to remove duplicate entries."
msgstr ""
"Bemærk at et skifte til en af undernettene allerede brugt andetsteds i "
"Debian Edu ikke vil fungere. 192.168.1.0/24 er allerede opsat som det tynde "
@@ -7068,12 +7151,21 @@ msgstr ""
"værtsnavn, skal du have en fungerende DNS. Husk at genstarte DHCP-tjenesten."
#. type: Content of: <article><section><section><section><section><para>
-msgid ""
-"Now you have to move your clients from the 192.168.1.0 network to the "
+#, fuzzy
+#| msgid ""
+#| "Now you have to move your clients from the 192.168.1.0 network to the "
+#| "10.0.0.0 network; attach them to the backbone network instead of the "
+#| "network attached to the LTSP server's second network card. This is "
+#| "because when you use load-balancing, the clients need direct access to "
+#| "the server chosen by LDM. If you leave your clients on the 192.168.1.0 "
+#| "network, all of the clients' traffic will go through that server before "
+#| "it reaches the chosen LDM server."
+msgid ""
+"Now you have to move your clients from the 192.168.0.0 network to the "
"10.0.0.0 network; attach them to the backbone network instead of the network "
"attached to the LTSP server's second network card. This is because when you "
"use load-balancing, the clients need direct access to the server chosen by "
-"LDM. If you leave your clients on the 192.168.1.0 network, all of the "
+"LDM. If you leave your clients on the 192.168.0.0 network, all of the "
"clients' traffic will go through that server before it reaches the chosen "
"LDM server."
msgstr ""
@@ -11968,6 +12060,20 @@ msgstr ""
"Yderligere information om endnu ældre versioner kan findes på <ulink url="
"\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
+#~ msgid ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
+#~ "edu-8.0+edu0~alpha0-CD.iso\">debian-edu-8.0+edu0~alpha0-CD.iso</ulink>"
+#~ msgstr ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
+#~ "edu-8.0+edu0~alpha0-CD.iso\">debian-edu-8.0+edu0~alpha0-CD.iso</ulink>"
+
+#~ msgid ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
+#~ "edu-8.0+edu0~alpha0-USB.iso\">debian-edu-8.0+edu0~alpha0-USB.iso</ulink>"
+#~ msgstr ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
+#~ "edu-8.0+edu0~alpha0-USB.iso\">debian-edu-8.0+edu0~alpha0-USB.iso</ulink>"
+
# engelsk fejl manglende punktum
#~ msgid ""
#~ "For Printer Management point your web browser to <ulink url=\"https://"
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po
index 2fa62e5..7d5e075 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-jessie-manual.de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-25 11:13+0100\n"
+"POT-Creation-Date: 2014-11-26 10:26+0100\n"
"PO-Revision-Date: 2014-11-25 01:04+0100\n"
"Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -878,11 +878,17 @@ msgid "Administration"
msgstr "Administration"
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "All the Linux machines that are installed with the Skolelinux installer "
+#| "will be administrable from a central computer, most likely the server. It "
+#| "will be possible to log in to all machines via SSH, and thereby have full "
+#| "access to the machines."
msgid ""
"All the Linux machines that are installed with the Skolelinux installer will "
"be administrable from a central computer, most likely the server. It will be "
-"possible to log in to all machines via SSH, and thereby have full access to "
-"the machines."
+"possible to log in to all machines via SSH (root not allowed by default), "
+"and thereby have full access to the machines."
msgstr ""
"Alle Linux-Rechner, die mittels Skolelinux-Installer installiert wurden, "
"können von einem zentralen Computer, üblicherweise dem Hauptserver, "
@@ -1084,9 +1090,13 @@ msgstr ""
"\"Architecture\">Netzwerk-Architektur</link> erläutert."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "The computers running Debian Edu / Skolelinux must have either i386 or "
+#| "amd64 processors."
msgid ""
-"The computers running Debian Edu / Skolelinux must have either i386 or amd64 "
-"processors."
+"The computers running Debian Edu / Skolelinux must have either i386 (oldest "
+"supported processors: Intel Pentium/AMD K5) or amd64 processors."
msgstr ""
"Rechner, auf denen Debian Edu / Skolelinux installiert werden soll, müssen "
"eine i386- oder amd64-Prozessor-Architektur haben."
@@ -1104,8 +1114,13 @@ msgid "eth0 is connected to the main network (10.0.0.0/8),"
msgstr "eth0 ist verbunden mit dem Hauptnetzwerk (10.0.0.0/8),"
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "eth1 is used for serving the thin-clients (192.168.0.0/24 or "
+#| "192.168.1.0/24)."
msgid ""
-"eth1 is used for serving the thin-clients (192.168.0.0/24 or 192.168.1.0/24)."
+"eth1 is used for serving LTSP clients (192.168.0.0/24 as default or "
+"192.168.1.0/24)."
msgstr "eth1 bedient Thin Clients (192.168.0.0/24 oder 192.168.1.0/24)."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -1265,9 +1280,13 @@ msgstr ""
"Sie können hunderte von Arbeitsplatzrechnern im Hauptnetzwerk einsetzen."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "You can have a lot of LTSP servers on the main network; two different "
+#| "subnets are preconfigured in LDAP."
msgid ""
"You can have a lot of LTSP servers on the main network; two different "
-"subnets are preconfigured in LDAP."
+"subnets are preconfigured (DNS, DHCP) in LDAP, more could be added."
msgstr ""
"Sie können eine Menge an LTSP-Servern im Hauptnetzwerk verwenden; zwei "
"verschiedene Subnetze sind in LDAP vorkonfiguriert."
@@ -1434,11 +1453,15 @@ msgstr ""
"Prozessorarchitektur geeignet. Sie ist so erhältlich:"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
+#| "edu-8.0+edu0~alpha0-CD.iso\">debian-edu-8.0+edu0~alpha0-CD.iso</ulink>"
msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
"edu-8.0+edu0~alpha0-CD.iso\">debian-edu-8.0+edu0~alpha0-CD.iso</ulink>"
msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
"edu-8.0+edu0~alpha0-CD.iso\">debian-edu-8.0+edu0~alpha0-CD.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -1476,11 +1499,15 @@ msgstr ""
"mittels FTP, HTTP oder rsync heruntergeladen werden:"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
+#| "edu-8.0+edu0~alpha0-USB.iso\">debian-edu-8.0+edu0~alpha0-USB.iso</ulink>"
msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
"edu-8.0+edu0~alpha0-USB.iso\">debian-edu-8.0+edu0~alpha0-USB.iso</ulink>"
msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
"edu-8.0+edu0~alpha0-USB.iso\">debian-edu-8.0+edu0~alpha0-USB.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -1567,11 +1594,19 @@ msgid "Installing Debian Edu"
msgstr "Die Installation von Debian Edu"
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "When you do a Debian Edu installation, you have a few options to choose "
+#| "from. Don't be afraid; there aren't many. We have done a good job of "
+#| "hiding the complexity of Debian during the installation and beyond. "
+#| "However, Debian Edu is Debian, and if you want there are more than 15,000 "
+#| "packages to choose from and a billion configuration options. For the "
+#| "majority of our users, our defaults should be fine."
msgid ""
"When you do a Debian Edu installation, you have a few options to choose "
"from. Don't be afraid; there aren't many. We have done a good job of hiding "
"the complexity of Debian during the installation and beyond. However, Debian "
-"Edu is Debian, and if you want there are more than 15,000 packages to choose "
+"Edu is Debian, and if you want there are more than 42,000 packages to choose "
"from and a billion configuration options. For the majority of our users, our "
"defaults should be fine."
msgstr ""
@@ -2223,12 +2258,19 @@ msgid "A note on thin-client-server installations"
msgstr "Bemerkung zur Installation des Profils Terminal-Server"
#. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "First of all, this profile name is confusing for historic reasons. "
+#| "Currently this profile actually installs an LTSP server environment for "
+#| "thin-clients and for workstations. Debian bug <ulink url=\"https://bugs."
+#| "debian.org/588510#\">588510</ulink> has been filed to change the name of "
+#| "the profile into a better suited one."
msgid ""
"First of all, this profile name is confusing for historic reasons. Currently "
"this profile actually installs an LTSP server environment for thin-clients "
-"and for workstations. Debian bug <ulink url=\"https://bugs.debian.org/588510#"
-"\">588510</ulink> has been filed to change the name of the profile into a "
-"better suited one."
+"and for diskless workstations. Debian bug <ulink url=\"https://bugs.debian."
+"org/588510#\">588510</ulink> has been filed to change the name of the "
+"profile into a better suited one."
msgstr ""
"Aus historischen Gründen trägt dieses Profil einen irreführenden Namen: "
"Gegenwärtig wird eine LTSP-Serverumgebung für Thin Clients und Diskless "
@@ -4111,11 +4153,18 @@ msgid "Backup Management"
msgstr "Verwaltung von Backups"
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "For backup management point your browser to <ulink url=\"https://www/"
+#| "slbackup-php\"/>. Please note that you need to access this site via SSL, "
+#| "since you have to enter the root password there. If you try to access "
+#| "this site without using SSL it will fail."
msgid ""
"For backup management point your browser to <ulink url=\"https://www/"
"slbackup-php\"/>. Please note that you need to access this site via SSL, "
"since you have to enter the root password there. If you try to access this "
-"site without using SSL it will fail."
+"site without using SSL it will fail. Note: the site will only work if you "
+"temporarily allow ssh root login on the backup server (tjener by default)."
msgstr ""
"Um Backups zu verwalten, gehen Sie mit Ihrem Browser auf <ulink url="
"\"https://www/slbackup-php\"/>. Diese Seite müssen Sie mit SSL aufrufen, da "
@@ -4692,12 +4741,19 @@ msgid "LDAP service needs to be reconfigured"
msgstr "Der LDAP-Service muss muss neu eingerichtet werden"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The LDAP setup has changed slightly from Wheezy to Jessie. Nevertheless, "
+#| "LDAP has to be rebuild from scratch. There's a script "
+#| "<computeroutput>ldap-debian-edu-install</computeroutput> (in /usr/bin) "
+#| "that could be used to achieve this. Read the comment at the beginning of "
+#| "that script carefully before doing anything."
msgid ""
-"The LDAP setup has changed slightly from Wheezy to Jessie. Nevertheless, "
-"LDAP has to be rebuild from scratch. There's a script <computeroutput>ldap-"
-"debian-edu-install</computeroutput> (in /usr/bin) that could be used to "
-"achieve this. Read the comment at the beginning of that script carefully "
-"before doing anything."
+"The LDAP setup has only scarcely changed from Wheezy to Jessie so chances "
+"are that LDAP hasn't to be rebuild from scratch. There's a script "
+"<computeroutput>ldap-debian-edu-install</computeroutput> (in /usr/bin) that "
+"could be used to achieve rebuilding LDAP if needed. Read the comment at the "
+"beginning of that script carefully before doing anything."
msgstr ""
"Mit dem Wechsel von Wheezy nach Jessie hat sich die LDAP-Einrichtung nur "
"wenig geändert; trotzdem muss LDAP vollständig neu eingerichtet werden. Dazu "
@@ -5159,9 +5215,14 @@ 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, wich is installed by "
+#| "default. To get write access connect like this:"
msgid ""
"If you prefer a GUI to work with the LDAP database, check out the "
-"<computeroutput>jxplorer</computeroutput> package, wich is installed by "
+"<computeroutput>jxplorer</computeroutput> package, which 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 "
@@ -6990,6 +7051,22 @@ msgstr ""
"Alternativ könnten Sie <computeroutput>ldapvi</computeroutput> benutzen, "
"nach 'next server tjener' suchen, und tjener durch ltspserver00 ersetzen."
+#. type: Content of: <article><section><section><section><title>
+msgid "Use a different LTSP client network"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"192.168.0.0/24 is the default LTSP client network if a machine is installed "
+"using the Thin-Client-Server profile. If loads of LTSP clients are used or "
+"if different LTSP servers should serve both i386 and amd64 chroot "
+"environments the second preconfigured network 192.168.1.0/24 could be used "
+"as well. Edit the file <computeroutput>/etc/network/interfaces</"
+"computeroutput> and adjust the eth1 settings accordingly. Use "
+"<computeroutput>ldapvi</computeroutput> or any other LDAP editor to inspect "
+"DNS and DHCP configuration."
+msgstr ""
+
#. type: Content of: <article><section><section><title>
msgid "Changing network settings"
msgstr "Netzwerkeinstellungen ändern"
@@ -7010,11 +7087,17 @@ msgstr ""
"aktualisieren, die für den Wechsel des Subnetzes bearbeitet werden müssen."
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Note that changing to one of the subnets already used elsewhere in Debian "
+#| "Edu will not work. 192.168.1.0/24 is already set up as the thin client "
+#| "network. Changing to this subnet will require manual editing of "
+#| "configuration files to remove duplicate entries."
msgid ""
"Note that changing to one of the subnets already used elsewhere in Debian "
-"Edu will not work. 192.168.1.0/24 is already set up as the thin client "
-"network. Changing to this subnet will require manual editing of "
-"configuration files to remove duplicate entries."
+"Edu will not work. 192.168.0.0/24 and 192.168.1.0/24 are already set up as "
+"LTSP client networks. Changing to these subnets will require manual editing "
+"of configuration files to remove duplicate entries."
msgstr ""
"Bitte beachten Sie, dass der Wechsel zu einem der bereits von Debian-Edu "
"benutzten Subnetze nicht funktionieren wird. 192.168.1.0/24 ist bereits als "
@@ -7265,12 +7348,21 @@ msgstr ""
"funktionieren. Bitte denken Sie daran, den DHCP-Server neu zu starten."
#. type: Content of: <article><section><section><section><section><para>
-msgid ""
-"Now you have to move your clients from the 192.168.1.0 network to the "
+#, fuzzy
+#| msgid ""
+#| "Now you have to move your clients from the 192.168.1.0 network to the "
+#| "10.0.0.0 network; attach them to the backbone network instead of the "
+#| "network attached to the LTSP server's second network card. This is "
+#| "because when you use load-balancing, the clients need direct access to "
+#| "the server chosen by LDM. If you leave your clients on the 192.168.1.0 "
+#| "network, all of the clients' traffic will go through that server before "
+#| "it reaches the chosen LDM server."
+msgid ""
+"Now you have to move your clients from the 192.168.0.0 network to the "
"10.0.0.0 network; attach them to the backbone network instead of the network "
"attached to the LTSP server's second network card. This is because when you "
"use load-balancing, the clients need direct access to the server chosen by "
-"LDM. If you leave your clients on the 192.168.1.0 network, all of the "
+"LDM. If you leave your clients on the 192.168.0.0 network, all of the "
"clients' traffic will go through that server before it reaches the chosen "
"LDM server."
msgstr ""
@@ -12273,3 +12365,17 @@ msgstr ""
"Mehr Informationen zu noch älteren Veröffentlichungen können unter <ulink "
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/> gefunden "
"werden."
+
+#~ msgid ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
+#~ "edu-8.0+edu0~alpha0-CD.iso\">debian-edu-8.0+edu0~alpha0-CD.iso</ulink>"
+#~ msgstr ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
+#~ "edu-8.0+edu0~alpha0-CD.iso\">debian-edu-8.0+edu0~alpha0-CD.iso</ulink>"
+
+#~ msgid ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
+#~ "edu-8.0+edu0~alpha0-USB.iso\">debian-edu-8.0+edu0~alpha0-USB.iso</ulink>"
+#~ msgstr ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
+#~ "edu-8.0+edu0~alpha0-USB.iso\">debian-edu-8.0+edu0~alpha0-USB.iso</ulink>"
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po
index 855a416..c0a649c 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: release-manual\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-24 21:54+0100\n"
+"POT-Creation-Date: 2014-11-26 10:26+0100\n"
"PO-Revision-Date: 2013-12-02 00:31-0600\n"
"Last-Translator: Norman Garcia Aguilar <norman at riseup.net>\n"
"Language-Team: Debian Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -870,11 +870,17 @@ msgid "Administration"
msgstr "Administración"
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "All the Linux machines that are installed with the Skolelinux installer "
+#| "will be administrable from a central computer, most likely the server. It "
+#| "will be possible to log in to all machines via SSH, and thereby have full "
+#| "access to the machines."
msgid ""
"All the Linux machines that are installed with the Skolelinux installer will "
"be administrable from a central computer, most likely the server. It will be "
-"possible to log in to all machines via SSH, and thereby have full access to "
-"the machines."
+"possible to log in to all machines via SSH (root not allowed by default), "
+"and thereby have full access to the machines."
msgstr ""
"Todas las máquinas Linux que se instalan con el instalador de Skolelinux se "
"pueden administrar desde una computadora central, es decir el servidor. Se "
@@ -1068,9 +1074,13 @@ msgstr ""
"linkend=\"Architecture\">Arquitecturas de red</link>."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "The computers running Debian Edu / Skolelinux must have either i386 or "
+#| "amd64 processors."
msgid ""
-"The computers running Debian Edu / Skolelinux must have either i386 or amd64 "
-"processors."
+"The computers running Debian Edu / Skolelinux must have either i386 (oldest "
+"supported processors: Intel Pentium/AMD K5) or amd64 processors."
msgstr ""
"Las computadoras corriendo Debian Edu / Skolelinux deben tener procesadores "
"i386, amd64 o powerpc."
@@ -1088,8 +1098,13 @@ msgid "eth0 is connected to the main network (10.0.0.0/8),"
msgstr "eth0 conectada a la red principal (10.0.0.0/8),"
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "eth1 is used for serving the thin-clients (192.168.0.0/24 or "
+#| "192.168.1.0/24)."
msgid ""
-"eth1 is used for serving the thin-clients (192.168.0.0/24 or 192.168.1.0/24)."
+"eth1 is used for serving LTSP clients (192.168.0.0/24 as default or "
+"192.168.1.0/24)."
msgstr ""
"eth1 es usada para servir la red de clientes ligeros (192.168.0.0/24 o "
"192.168.1.0/24)."
@@ -1253,9 +1268,13 @@ msgstr ""
"Puede tener hasta cientos de estaciones de trabajo en la red principal."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "You can have a lot of LTSP servers on the main network; two different "
+#| "subnets are preconfigured in LDAP."
msgid ""
"You can have a lot of LTSP servers on the main network; two different "
-"subnets are preconfigured in LDAP."
+"subnets are preconfigured (DNS, DHCP) in LDAP, more could be added."
msgstr ""
"Puede tener muchos servidores LTSP en la red principal; dos subredes "
"diferentes son preconfiguradas en LDAP."
@@ -1425,13 +1444,13 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#, fuzzy
#| msgid ""
-#| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
-#| "edu-8.0~alpha+edu0-CD.iso\">debian-edu-8.0~alpha+edu0-CD.iso</ulink>"
+#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0~alpha"
+#| "+edu0-CD.iso\">debian-edu-8.0~alpha+edu0-CD.iso</ulink>"
msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
"edu-8.0+edu0~alpha0-CD.iso\">debian-edu-8.0+edu0~alpha0-CD.iso</ulink>"
msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
"edu-8.0~alpha+edu0-CD.iso\">debian-edu-8.0~alpha+edu0-CD.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -1479,14 +1498,14 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#, fuzzy
#| msgid ""
-#| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
-#| "edu-8.0~alpha+edu0-USB.iso\">debian-edu-8.0~alpha+edu0-USB.iso</ulink>"
+#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0~alpha"
+#| "+edu0-USB.iso\">debian-edu-8.0~alpha+edu0-USB.iso</ulink>"
msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
"edu-8.0+edu0~alpha0-USB.iso\">debian-edu-8.0+edu0~alpha0-USB.iso</ulink>"
msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
-"edu-8.0~alpha+edu0-USB.iso\">debian-edu-8.0~alpha+edu0-USB.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0~alpha"
+"+edu0-USB.iso\">debian-edu-8.0~alpha+edu0-USB.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#, fuzzy
@@ -1593,11 +1612,19 @@ msgid "Installing Debian Edu"
msgstr "Instalacion de Debian Edu"
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "When you do a Debian Edu installation, you have a few options to choose "
+#| "from. Don't be afraid; there aren't many. We have done a good job of "
+#| "hiding the complexity of Debian during the installation and beyond. "
+#| "However, Debian Edu is Debian, and if you want there are more than 15,000 "
+#| "packages to choose from and a billion configuration options. For the "
+#| "majority of our users, our defaults should be fine."
msgid ""
"When you do a Debian Edu installation, you have a few options to choose "
"from. Don't be afraid; there aren't many. We have done a good job of hiding "
"the complexity of Debian during the installation and beyond. However, Debian "
-"Edu is Debian, and if you want there are more than 15,000 packages to choose "
+"Edu is Debian, and if you want there are more than 42,000 packages to choose "
"from and a billion configuration options. For the majority of our users, our "
"defaults should be fine."
msgstr ""
@@ -2262,9 +2289,9 @@ msgstr "Nota sobre la instalación de servidores de clientes ligeros"
msgid ""
"First of all, this profile name is confusing for historic reasons. Currently "
"this profile actually installs an LTSP server environment for thin-clients "
-"and for workstations. Debian bug <ulink url=\"https://bugs.debian.org/588510#"
-"\">588510</ulink> has been filed to change the name of the profile into a "
-"better suited one."
+"and for diskless workstations. Debian bug <ulink url=\"https://bugs.debian."
+"org/588510#\">588510</ulink> has been filed to change the name of the "
+"profile into a better suited one."
msgstr ""
"Antes que nada, el nombre del perfil es confuso debido a razones históricas. "
"Actualmente este perfil instala un entorno de servidor LTSP para clientes "
@@ -4012,7 +4039,8 @@ msgid ""
"For backup management point your browser to <ulink url=\"https://www/"
"slbackup-php\"/>. Please note that you need to access this site via SSL, "
"since you have to enter the root password there. If you try to access this "
-"site without using SSL it will fail."
+"site without using SSL it will fail. Note: the site will only work if you "
+"temporarily allow ssh root login on the backup server (tjener by default)."
msgstr ""
"Para gestionar las copias de seguridad dirija su navegador web a <ulink url= "
"\"https://www/slbackup-php\">https://www/slbackup-php</ulink>. Tenga en "
@@ -4561,12 +4589,19 @@ msgid "LDAP service needs to be reconfigured"
msgstr "El servicio LDAP necesita ser reconfigurado"
#. type: Content of: <article><section><section><section><para>
-msgid ""
-"The LDAP setup has changed slightly from Wheezy to Jessie. Nevertheless, "
-"LDAP has to be rebuild from scratch. There's a script <computeroutput>ldap-"
-"debian-edu-install</computeroutput> (in /usr/bin) that could be used to "
-"achieve this. Read the comment at the beginning of that script carefully "
-"before doing anything."
+#, fuzzy
+#| msgid ""
+#| "The LDAP setup has changed slightly from Wheezy to Jessie. Nevertheless, "
+#| "LDAP has to be rebuild from scratch. There's a script "
+#| "<computeroutput>ldap-debian-edu-install</computeroutput> (in /usr/bin) "
+#| "that could be used to achieve this. Read the comment at the beginning of "
+#| "that script carefully before doing anything."
+msgid ""
+"The LDAP setup has only scarcely changed from Wheezy to Jessie so chances "
+"are that LDAP hasn't to be rebuild from scratch. There's a script "
+"<computeroutput>ldap-debian-edu-install</computeroutput> (in /usr/bin) that "
+"could be used to achieve rebuilding LDAP if needed. Read the comment at the "
+"beginning of that script carefully before doing anything."
msgstr ""
"La configuración de LDAP ha cambiado ligeramente de Wheezy a Jessie. No "
"obstante, LDAP se debe reconstruir desde cero. Existe un script "
@@ -4972,7 +5007,7 @@ msgstr "JXplorer, una interfaz gráfica 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, wich is installed by "
+"<computeroutput>jxplorer</computeroutput> package, which is installed by "
"default. To get write access connect like this:"
msgstr ""
@@ -6505,6 +6540,22 @@ msgid ""
"search for 'next server tjener' and replace tjener with ltspserver00."
msgstr ""
+#. type: Content of: <article><section><section><section><title>
+msgid "Use a different LTSP client network"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"192.168.0.0/24 is the default LTSP client network if a machine is installed "
+"using the Thin-Client-Server profile. If loads of LTSP clients are used or "
+"if different LTSP servers should serve both i386 and amd64 chroot "
+"environments the second preconfigured network 192.168.1.0/24 could be used "
+"as well. Edit the file <computeroutput>/etc/network/interfaces</"
+"computeroutput> and adjust the eth1 settings accordingly. Use "
+"<computeroutput>ldapvi</computeroutput> or any other LDAP editor to inspect "
+"DNS and DHCP configuration."
+msgstr ""
+
#. type: Content of: <article><section><section><title>
#, fuzzy
msgid "Changing network settings"
@@ -6522,9 +6573,9 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
"Note that changing to one of the subnets already used elsewhere in Debian "
-"Edu will not work. 192.168.1.0/24 is already set up as the thin client "
-"network. Changing to this subnet will require manual editing of "
-"configuration files to remove duplicate entries."
+"Edu will not work. 192.168.0.0/24 and 192.168.1.0/24 are already set up as "
+"LTSP client networks. Changing to these subnets will require manual editing "
+"of configuration files to remove duplicate entries."
msgstr ""
#. type: Content of: <article><section><section><para>
@@ -6696,11 +6747,11 @@ msgstr ""
#. type: Content of: <article><section><section><section><section><para>
msgid ""
-"Now you have to move your clients from the 192.168.1.0 network to the "
+"Now you have to move your clients from the 192.168.0.0 network to the "
"10.0.0.0 network; attach them to the backbone network instead of the network "
"attached to the LTSP server's second network card. This is because when you "
"use load-balancing, the clients need direct access to the server chosen by "
-"LDM. If you leave your clients on the 192.168.1.0 network, all of the "
+"LDM. If you leave your clients on the 192.168.0.0 network, all of the "
"clients' traffic will go through that server before it reaches the chosen "
"LDM server."
msgstr ""
@@ -10945,6 +10996,28 @@ msgstr ""
"Más información sobre versiones más anteriores puede encontrarse en <ulink "
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
+#, fuzzy
+#~| msgid ""
+#~| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
+#~| "edu-8.0~alpha+edu0-CD.iso\">debian-edu-8.0~alpha+edu0-CD.iso</ulink>"
+#~ msgid ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
+#~ "edu-8.0+edu0~alpha0-CD.iso\">debian-edu-8.0+edu0~alpha0-CD.iso</ulink>"
+#~ msgstr ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
+#~ "edu-8.0~alpha+edu0-CD.iso\">debian-edu-8.0~alpha+edu0-CD.iso</ulink>"
+
+#, fuzzy
+#~| msgid ""
+#~| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
+#~| "edu-8.0~alpha+edu0-USB.iso\">debian-edu-8.0~alpha+edu0-USB.iso</ulink>"
+#~ msgid ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
+#~ "edu-8.0+edu0~alpha0-USB.iso\">debian-edu-8.0+edu0~alpha0-USB.iso</ulink>"
+#~ msgstr ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
+#~ "edu-8.0~alpha+edu0-USB.iso\">debian-edu-8.0~alpha+edu0-USB.iso</ulink>"
+
#~ msgid ""
#~ "For Printer Management point your web browser to <ulink url=\"https://"
#~ "www:631\"/> This is the normal CUPS management interface where you can "
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po
index 66504b2..d06477a 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2014-11-24 21:54+0100\n"
+"POT-Creation-Date: 2014-11-26 10:26+0100\n"
"PO-Revision-Date: 2014-09-23 07:24+0200\n"
"Last-Translator: Cédric Boutillier <boutil at debian.org>\n"
"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -871,11 +871,17 @@ msgid "Administration"
msgstr "Administration"
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "All the Linux machines that are installed with the Skolelinux installer "
+#| "will be administrable from a central computer, most likely the server. It "
+#| "will be possible to log in to all machines via SSH, and thereby have full "
+#| "access to the machines."
msgid ""
"All the Linux machines that are installed with the Skolelinux installer will "
"be administrable from a central computer, most likely the server. It will be "
-"possible to log in to all machines via SSH, and thereby have full access to "
-"the machines."
+"possible to log in to all machines via SSH (root not allowed by default), "
+"and thereby have full access to the machines."
msgstr ""
"Toutes les machines Linux installées avec l'installateur Skolelinux seront "
"administrables depuis un ordinateur central, très probablement le serveur. "
@@ -1084,9 +1090,13 @@ msgstr ""
"linkend=\"Architecture\">architecture réseau</link>."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "The computers running Debian Edu / Skolelinux must have either i386 or "
+#| "amd64 processors."
msgid ""
-"The computers running Debian Edu / Skolelinux must have either i386 or amd64 "
-"processors."
+"The computers running Debian Edu / Skolelinux must have either i386 (oldest "
+"supported processors: Intel Pentium/AMD K5) or amd64 processors."
msgstr ""
"Les ordinateurs exécutant Debian Edu / Skolelinux doivent avoir des "
"processeurs i386 ou amd64."
@@ -1104,8 +1114,13 @@ msgid "eth0 is connected to the main network (10.0.0.0/8),"
msgstr "eth0 reliée au réseau principal (10.0.0.0/8),"
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "eth1 is used for serving the thin-clients (192.168.0.0/24 or "
+#| "192.168.1.0/24)."
msgid ""
-"eth1 is used for serving the thin-clients (192.168.0.0/24 or 192.168.1.0/24)."
+"eth1 is used for serving LTSP clients (192.168.0.0/24 as default or "
+"192.168.1.0/24)."
msgstr ""
"eth1 est utilisée pour servir les clients légers (192.168.0.0/24 ou "
"192.168.1.0/24)."
@@ -1268,9 +1283,13 @@ msgstr ""
"principal."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "You can have a lot of LTSP servers on the main network; two different "
+#| "subnets are preconfigured in LDAP."
msgid ""
"You can have a lot of LTSP servers on the main network; two different "
-"subnets are preconfigured in LDAP."
+"subnets are preconfigured (DNS, DHCP) in LDAP, more could be added."
msgstr ""
"Vous pouvez avoir un grand nombre de serveurs LTSP sur le réseau principal. "
"Deux sous-réseaux différents sont préconfigurés dans LDAP."
@@ -1437,11 +1456,15 @@ msgstr ""
"machines i386 et amd64. Elle est disponible :"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
+#| "edu-8.0+edu0~alpha0-CD.iso\">debian-edu-8.0+edu0~alpha0-CD.iso</ulink>"
msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
"edu-8.0+edu0~alpha0-CD.iso\">debian-edu-8.0+edu0~alpha0-CD.iso</ulink>"
msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
"edu-8.0+edu0~alpha0-CD.iso\">debian-edu-8.0+edu0~alpha0-CD.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -1481,11 +1504,15 @@ msgstr ""
"utilisant FTP, HTTP ou rsync :"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
+#| "edu-8.0+edu0~alpha0-USB.iso\">debian-edu-8.0+edu0~alpha0-USB.iso</ulink>"
msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
"edu-8.0+edu0~alpha0-USB.iso\">debian-edu-8.0+edu0~alpha0-USB.iso</ulink>"
msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
"edu-8.0+edu0~alpha0-USB.iso\">debian-edu-8.0+edu0~alpha0-USB.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -1574,11 +1601,19 @@ msgid "Installing Debian Edu"
msgstr "Installer Debian Edu"
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "When you do a Debian Edu installation, you have a few options to choose "
+#| "from. Don't be afraid; there aren't many. We have done a good job of "
+#| "hiding the complexity of Debian during the installation and beyond. "
+#| "However, Debian Edu is Debian, and if you want there are more than 15,000 "
+#| "packages to choose from and a billion configuration options. For the "
+#| "majority of our users, our defaults should be fine."
msgid ""
"When you do a Debian Edu installation, you have a few options to choose "
"from. Don't be afraid; there aren't many. We have done a good job of hiding "
"the complexity of Debian during the installation and beyond. However, Debian "
-"Edu is Debian, and if you want there are more than 15,000 packages to choose "
+"Edu is Debian, and if you want there are more than 42,000 packages to choose "
"from and a billion configuration options. For the majority of our users, our "
"defaults should be fine."
msgstr ""
@@ -2245,12 +2280,19 @@ msgid "A note on thin-client-server installations"
msgstr "Note à propos des installations de serveur de clients légers"
#. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "First of all, this profile name is confusing for historic reasons. "
+#| "Currently this profile actually installs an LTSP server environment for "
+#| "thin-clients and for workstations. Debian bug <ulink url=\"https://bugs."
+#| "debian.org/588510#\">588510</ulink> has been filed to change the name of "
+#| "the profile into a better suited one."
msgid ""
"First of all, this profile name is confusing for historic reasons. Currently "
"this profile actually installs an LTSP server environment for thin-clients "
-"and for workstations. Debian bug <ulink url=\"https://bugs.debian.org/588510#"
-"\">588510</ulink> has been filed to change the name of the profile into a "
-"better suited one."
+"and for diskless workstations. Debian bug <ulink url=\"https://bugs.debian."
+"org/588510#\">588510</ulink> has been filed to change the name of the "
+"profile into a better suited one."
msgstr ""
"Premièrement, le nom de ce profil porte à confusion pour des raisons "
"historiques : il installe en fait un environnement de serveur LTSP pour les "
@@ -4157,11 +4199,18 @@ msgid "Backup Management"
msgstr "Gestion des sauvegardes"
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "For backup management point your browser to <ulink url=\"https://www/"
+#| "slbackup-php\"/>. Please note that you need to access this site via SSL, "
+#| "since you have to enter the root password there. If you try to access "
+#| "this site without using SSL it will fail."
msgid ""
"For backup management point your browser to <ulink url=\"https://www/"
"slbackup-php\"/>. Please note that you need to access this site via SSL, "
"since you have to enter the root password there. If you try to access this "
-"site without using SSL it will fail."
+"site without using SSL it will fail. Note: the site will only work if you "
+"temporarily allow ssh root login on the backup server (tjener by default)."
msgstr ""
"Pour la gestion des sauvegardes, faites pointer votre navigateur sur <ulink "
"url=\"https://www/slbackup-php\"/>. Veuillez noter que vous devez accéder à "
@@ -4740,12 +4789,19 @@ msgid "LDAP service needs to be reconfigured"
msgstr "Le service LDAP doit être reconfiguré"
#. type: Content of: <article><section><section><section><para>
-msgid ""
-"The LDAP setup has changed slightly from Wheezy to Jessie. Nevertheless, "
-"LDAP has to be rebuild from scratch. There's a script <computeroutput>ldap-"
-"debian-edu-install</computeroutput> (in /usr/bin) that could be used to "
-"achieve this. Read the comment at the beginning of that script carefully "
-"before doing anything."
+#, fuzzy
+#| msgid ""
+#| "The LDAP setup has changed slightly from Wheezy to Jessie. Nevertheless, "
+#| "LDAP has to be rebuild from scratch. There's a script "
+#| "<computeroutput>ldap-debian-edu-install</computeroutput> (in /usr/bin) "
+#| "that could be used to achieve this. Read the comment at the beginning of "
+#| "that script carefully before doing anything."
+msgid ""
+"The LDAP setup has only scarcely changed from Wheezy to Jessie so chances "
+"are that LDAP hasn't to be rebuild from scratch. There's a script "
+"<computeroutput>ldap-debian-edu-install</computeroutput> (in /usr/bin) that "
+"could be used to achieve rebuilding LDAP if needed. Read the comment at the "
+"beginning of that script carefully before doing anything."
msgstr ""
"La configuration LDAP n'a que légèrement changé entre Wheezy et Jessie. "
"Néanmoins, le service LDAP doit être reconstruit complètement. Il existe un "
@@ -5207,9 +5263,14 @@ 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, wich is installed by "
+#| "default. To get write access connect like this:"
msgid ""
"If you prefer a GUI to work with the LDAP database, check out the "
-"<computeroutput>jxplorer</computeroutput> package, wich is installed by "
+"<computeroutput>jxplorer</computeroutput> package, which 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 "
@@ -7030,6 +7091,22 @@ msgstr ""
"computeroutput>, chercher la chaîne « next server tjener » et remplacer "
"tjener par ltspserver00."
+#. type: Content of: <article><section><section><section><title>
+msgid "Use a different LTSP client network"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"192.168.0.0/24 is the default LTSP client network if a machine is installed "
+"using the Thin-Client-Server profile. If loads of LTSP clients are used or "
+"if different LTSP servers should serve both i386 and amd64 chroot "
+"environments the second preconfigured network 192.168.1.0/24 could be used "
+"as well. Edit the file <computeroutput>/etc/network/interfaces</"
+"computeroutput> and adjust the eth1 settings accordingly. Use "
+"<computeroutput>ldapvi</computeroutput> or any other LDAP editor to inspect "
+"DNS and DHCP configuration."
+msgstr ""
+
#. type: Content of: <article><section><section><title>
msgid "Changing network settings"
msgstr "Modifier les paramètres réseau"
@@ -7050,11 +7127,17 @@ msgstr ""
"sous-réseau."
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Note that changing to one of the subnets already used elsewhere in Debian "
+#| "Edu will not work. 192.168.1.0/24 is already set up as the thin client "
+#| "network. Changing to this subnet will require manual editing of "
+#| "configuration files to remove duplicate entries."
msgid ""
"Note that changing to one of the subnets already used elsewhere in Debian "
-"Edu will not work. 192.168.1.0/24 is already set up as the thin client "
-"network. Changing to this subnet will require manual editing of "
-"configuration files to remove duplicate entries."
+"Edu will not work. 192.168.0.0/24 and 192.168.1.0/24 are already set up as "
+"LTSP client networks. Changing to these subnets will require manual editing "
+"of configuration files to remove duplicate entries."
msgstr ""
"Notez que changer le sous-réseau pour un autre déjà utilisé ailleurs dans "
"Debian Edu ne fonctionnera pas. 192.168.1.0/24 est déjà réglé pour être le "
@@ -7307,12 +7390,21 @@ msgstr ""
"DHCP."
#. type: Content of: <article><section><section><section><section><para>
-msgid ""
-"Now you have to move your clients from the 192.168.1.0 network to the "
+#, fuzzy
+#| msgid ""
+#| "Now you have to move your clients from the 192.168.1.0 network to the "
+#| "10.0.0.0 network; attach them to the backbone network instead of the "
+#| "network attached to the LTSP server's second network card. This is "
+#| "because when you use load-balancing, the clients need direct access to "
+#| "the server chosen by LDM. If you leave your clients on the 192.168.1.0 "
+#| "network, all of the clients' traffic will go through that server before "
+#| "it reaches the chosen LDM server."
+msgid ""
+"Now you have to move your clients from the 192.168.0.0 network to the "
"10.0.0.0 network; attach them to the backbone network instead of the network "
"attached to the LTSP server's second network card. This is because when you "
"use load-balancing, the clients need direct access to the server chosen by "
-"LDM. If you leave your clients on the 192.168.1.0 network, all of the "
+"LDM. If you leave your clients on the 192.168.0.0 network, all of the "
"clients' traffic will go through that server before it reaches the chosen "
"LDM server."
msgstr ""
@@ -12362,6 +12454,20 @@ msgstr ""
"html'>http://developer.skolelinux.no/info/cdbygging/news.html</ulink>"
#~ msgid ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
+#~ "edu-8.0+edu0~alpha0-CD.iso\">debian-edu-8.0+edu0~alpha0-CD.iso</ulink>"
+#~ msgstr ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
+#~ "edu-8.0+edu0~alpha0-CD.iso\">debian-edu-8.0+edu0~alpha0-CD.iso</ulink>"
+
+#~ msgid ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
+#~ "edu-8.0+edu0~alpha0-USB.iso\">debian-edu-8.0+edu0~alpha0-USB.iso</ulink>"
+#~ msgstr ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
+#~ "edu-8.0+edu0~alpha0-USB.iso\">debian-edu-8.0+edu0~alpha0-USB.iso</ulink>"
+
+#~ msgid ""
#~ "For Printer Management point your web browser to <ulink url=\"https://"
#~ "www:631\"/> This is the normal CUPS management interface where you can "
#~ "add/delete/modify your printers and can clean up the printing queue. "
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po
index fdba4da..62785fd 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-wheezy-manual\n"
-"POT-Creation-Date: 2014-11-24 21:54+0100\n"
+"POT-Creation-Date: 2014-11-26 10:26+0100\n"
"PO-Revision-Date: 2014-10-23 23:32+0200\n"
"Last-Translator: Claudio Carboncini <claudio.carboncini at gmail.com>\n"
"Language-Team: Italian <debian-l10n-italian at list.debian.org>\n"
@@ -860,11 +860,17 @@ msgid "Administration"
msgstr "Amministrazione"
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "All the Linux machines that are installed with the Skolelinux installer "
+#| "will be administrable from a central computer, most likely the server. It "
+#| "will be possible to log in to all machines via SSH, and thereby have full "
+#| "access to the machines."
msgid ""
"All the Linux machines that are installed with the Skolelinux installer will "
"be administrable from a central computer, most likely the server. It will be "
-"possible to log in to all machines via SSH, and thereby have full access to "
-"the machines."
+"possible to log in to all machines via SSH (root not allowed by default), "
+"and thereby have full access to the machines."
msgstr ""
"Tutte le macchine Linux che sono installate usando l'installatore di "
"Skolelinux, saranno amministrabili da un computer centrale, probabilmente il "
@@ -1068,9 +1074,13 @@ msgstr ""
"\"Architecture\">architettura della rete</link>."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "The computers running Debian Edu / Skolelinux must have either i386 or "
+#| "amd64 processors."
msgid ""
-"The computers running Debian Edu / Skolelinux must have either i386 or amd64 "
-"processors."
+"The computers running Debian Edu / Skolelinux must have either i386 (oldest "
+"supported processors: Intel Pentium/AMD K5) or amd64 processors."
msgstr ""
"i computer su cui eseguire Debian Edu / Skolelinux devono aver processori "
"i386 o amd64."
@@ -1088,8 +1098,13 @@ msgid "eth0 is connected to the main network (10.0.0.0/8),"
msgstr "eth0 connessa alla rete principale (10.0.0.0/8)"
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "eth1 is used for serving the thin-clients (192.168.0.0/24 or "
+#| "192.168.1.0/24)."
msgid ""
-"eth1 is used for serving the thin-clients (192.168.0.0/24 or 192.168.1.0/24)."
+"eth1 is used for serving LTSP clients (192.168.0.0/24 as default or "
+"192.168.1.0/24)."
msgstr "eth1 usata per i thin-client (192.168.0.0/24 o ) 192.168.1.0/24)."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -1242,9 +1257,13 @@ msgid "You can have hundreds of workstations on the main network."
msgstr "Si possono avere centinaia di workstation sulla rete principale."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "You can have a lot of LTSP servers on the main network; two different "
+#| "subnets are preconfigured in LDAP."
msgid ""
"You can have a lot of LTSP servers on the main network; two different "
-"subnets are preconfigured in LDAP."
+"subnets are preconfigured (DNS, DHCP) in LDAP, more could be added."
msgstr ""
"Si possono avere molti server LTSP sulla rete principale: due diverse "
"sottoreti sono preconfigurate in LDAP."
@@ -1409,11 +1428,15 @@ msgstr ""
"scaricare da:"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
+#| "edu-8.0+edu0~alpha0-CD.iso\">debian-edu-8.0+edu0~alpha0-CD.iso</ulink>"
msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
"edu-8.0+edu0~alpha0-CD.iso\">debian-edu-8.0+edu0~alpha0-CD.iso</ulink>"
msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
"edu-8.0+edu0~alpha0-CD.iso\">debian-edu-8.0+edu0~alpha0-CD.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -1452,11 +1475,15 @@ msgstr ""
"o da:"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
+#| "edu-8.0+edu0~alpha0-USB.iso\">debian-edu-8.0+edu0~alpha0-USB.iso</ulink>"
msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
"edu-8.0+edu0~alpha0-USB.iso\">debian-edu-8.0+edu0~alpha0-USB.iso</ulink>"
msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
"edu-8.0+edu0~alpha0-USB.iso\">debian-edu-8.0+edu0~alpha0-USB.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -1545,11 +1572,19 @@ msgid "Installing Debian Edu"
msgstr "Installare Debian Edu"
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "When you do a Debian Edu installation, you have a few options to choose "
+#| "from. Don't be afraid; there aren't many. We have done a good job of "
+#| "hiding the complexity of Debian during the installation and beyond. "
+#| "However, Debian Edu is Debian, and if you want there are more than 15,000 "
+#| "packages to choose from and a billion configuration options. For the "
+#| "majority of our users, our defaults should be fine."
msgid ""
"When you do a Debian Edu installation, you have a few options to choose "
"from. Don't be afraid; there aren't many. We have done a good job of hiding "
"the complexity of Debian during the installation and beyond. However, Debian "
-"Edu is Debian, and if you want there are more than 15,000 packages to choose "
+"Edu is Debian, and if you want there are more than 42,000 packages to choose "
"from and a billion configuration options. For the majority of our users, our "
"defaults should be fine."
msgstr ""
@@ -2211,12 +2246,19 @@ msgid "A note on thin-client-server installations"
msgstr "Nota sull'installazione dei thin-client-server"
#. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "First of all, this profile name is confusing for historic reasons. "
+#| "Currently this profile actually installs an LTSP server environment for "
+#| "thin-clients and for workstations. Debian bug <ulink url=\"https://bugs."
+#| "debian.org/588510#\">588510</ulink> has been filed to change the name of "
+#| "the profile into a better suited one."
msgid ""
"First of all, this profile name is confusing for historic reasons. Currently "
"this profile actually installs an LTSP server environment for thin-clients "
-"and for workstations. Debian bug <ulink url=\"https://bugs.debian.org/588510#"
-"\">588510</ulink> has been filed to change the name of the profile into a "
-"better suited one."
+"and for diskless workstations. Debian bug <ulink url=\"https://bugs.debian."
+"org/588510#\">588510</ulink> has been filed to change the name of the "
+"profile into a better suited one."
msgstr ""
"Prima di tutto, questo profilo ha un nome che può confondere, per ragioni "
"storiche: il profilo installa effettivamente un ambiente server LTSP per "
@@ -4066,11 +4108,18 @@ msgid "Backup Management"
msgstr "Gestione dei backup"
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "For backup management point your browser to <ulink url=\"https://www/"
+#| "slbackup-php\"/>. Please note that you need to access this site via SSL, "
+#| "since you have to enter the root password there. If you try to access "
+#| "this site without using SSL it will fail."
msgid ""
"For backup management point your browser to <ulink url=\"https://www/"
"slbackup-php\"/>. Please note that you need to access this site via SSL, "
"since you have to enter the root password there. If you try to access this "
-"site without using SSL it will fail."
+"site without using SSL it will fail. Note: the site will only work if you "
+"temporarily allow ssh root login on the backup server (tjener by default)."
msgstr ""
"Per l'amministrazione dei backup occorre puntare il browser a <ulink url="
"\"https://www/slbackup-php\"/>. Occorre fare attenzione che si deve accedere "
@@ -4634,12 +4683,19 @@ msgid "LDAP service needs to be reconfigured"
msgstr "Il servizio LDAP ha bisogno di essere riconfigurato"
#. type: Content of: <article><section><section><section><para>
-msgid ""
-"The LDAP setup has changed slightly from Wheezy to Jessie. Nevertheless, "
-"LDAP has to be rebuild from scratch. There's a script <computeroutput>ldap-"
-"debian-edu-install</computeroutput> (in /usr/bin) that could be used to "
-"achieve this. Read the comment at the beginning of that script carefully "
-"before doing anything."
+#, fuzzy
+#| msgid ""
+#| "The LDAP setup has changed slightly from Wheezy to Jessie. Nevertheless, "
+#| "LDAP has to be rebuild from scratch. There's a script "
+#| "<computeroutput>ldap-debian-edu-install</computeroutput> (in /usr/bin) "
+#| "that could be used to achieve this. Read the comment at the beginning of "
+#| "that script carefully before doing anything."
+msgid ""
+"The LDAP setup has only scarcely changed from Wheezy to Jessie so chances "
+"are that LDAP hasn't to be rebuild from scratch. There's a script "
+"<computeroutput>ldap-debian-edu-install</computeroutput> (in /usr/bin) that "
+"could be used to achieve rebuilding LDAP if needed. Read the comment at the "
+"beginning of that script carefully before doing anything."
msgstr ""
"La configurazione di LDAP è cambiata di poco da Wheezy a Jessie. Nonostante "
"ciò LDAP deve essere ricostruito da zero. C'è lo script <computeroutput>ldap-"
@@ -5087,9 +5143,14 @@ msgid "JXplorer, an LDAP GUI"
msgstr "JXplorer, una GUI per 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, wich is installed by "
+#| "default. To get write access connect like this:"
msgid ""
"If you prefer a GUI to work with the LDAP database, check out the "
-"<computeroutput>jxplorer</computeroutput> package, wich is installed by "
+"<computeroutput>jxplorer</computeroutput> package, which is installed by "
"default. To get write access connect like this:"
msgstr ""
"Se si preferisce un'interfaccia grafica per lavorare con il database LDAP, "
@@ -6875,6 +6936,22 @@ msgstr ""
"computeroutput>, cercare \"next server tjener\" e sostituire tjener con "
"ltspserver00."
+#. type: Content of: <article><section><section><section><title>
+msgid "Use a different LTSP client network"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"192.168.0.0/24 is the default LTSP client network if a machine is installed "
+"using the Thin-Client-Server profile. If loads of LTSP clients are used or "
+"if different LTSP servers should serve both i386 and amd64 chroot "
+"environments the second preconfigured network 192.168.1.0/24 could be used "
+"as well. Edit the file <computeroutput>/etc/network/interfaces</"
+"computeroutput> and adjust the eth1 settings accordingly. Use "
+"<computeroutput>ldapvi</computeroutput> or any other LDAP editor to inspect "
+"DNS and DHCP configuration."
+msgstr ""
+
#. type: Content of: <article><section><section><title>
msgid "Changing network settings"
msgstr "Cambiare la configurazione della rete"
@@ -6895,11 +6972,17 @@ msgstr ""
"la sottorete."
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Note that changing to one of the subnets already used elsewhere in Debian "
+#| "Edu will not work. 192.168.1.0/24 is already set up as the thin client "
+#| "network. Changing to this subnet will require manual editing of "
+#| "configuration files to remove duplicate entries."
msgid ""
"Note that changing to one of the subnets already used elsewhere in Debian "
-"Edu will not work. 192.168.1.0/24 is already set up as the thin client "
-"network. Changing to this subnet will require manual editing of "
-"configuration files to remove duplicate entries."
+"Edu will not work. 192.168.0.0/24 and 192.168.1.0/24 are already set up as "
+"LTSP client networks. Changing to these subnets will require manual editing "
+"of configuration files to remove duplicate entries."
msgstr ""
"Si noti che la modifica di una delle sottoreti già utilizzate in Debian Edu "
"non funzionerà. 192.168.1.0/24 è già impostata come rete per i thin-client. "
@@ -7142,12 +7225,21 @@ msgstr ""
"funzionante. Ricordarsi di riavviare il servizio DHCP."
#. type: Content of: <article><section><section><section><section><para>
-msgid ""
-"Now you have to move your clients from the 192.168.1.0 network to the "
+#, fuzzy
+#| msgid ""
+#| "Now you have to move your clients from the 192.168.1.0 network to the "
+#| "10.0.0.0 network; attach them to the backbone network instead of the "
+#| "network attached to the LTSP server's second network card. This is "
+#| "because when you use load-balancing, the clients need direct access to "
+#| "the server chosen by LDM. If you leave your clients on the 192.168.1.0 "
+#| "network, all of the clients' traffic will go through that server before "
+#| "it reaches the chosen LDM server."
+msgid ""
+"Now you have to move your clients from the 192.168.0.0 network to the "
"10.0.0.0 network; attach them to the backbone network instead of the network "
"attached to the LTSP server's second network card. This is because when you "
"use load-balancing, the clients need direct access to the server chosen by "
-"LDM. If you leave your clients on the 192.168.1.0 network, all of the "
+"LDM. If you leave your clients on the 192.168.0.0 network, all of the "
"clients' traffic will go through that server before it reaches the chosen "
"LDM server."
msgstr ""
@@ -12097,6 +12189,20 @@ msgstr ""
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
#~ msgid ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
+#~ "edu-8.0+edu0~alpha0-CD.iso\">debian-edu-8.0+edu0~alpha0-CD.iso</ulink>"
+#~ msgstr ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
+#~ "edu-8.0+edu0~alpha0-CD.iso\">debian-edu-8.0+edu0~alpha0-CD.iso</ulink>"
+
+#~ msgid ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
+#~ "edu-8.0+edu0~alpha0-USB.iso\">debian-edu-8.0+edu0~alpha0-USB.iso</ulink>"
+#~ msgstr ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
+#~ "edu-8.0+edu0~alpha0-USB.iso\">debian-edu-8.0+edu0~alpha0-USB.iso</ulink>"
+
+#~ msgid ""
#~ "For Printer Management point your web browser to <ulink url=\"https://"
#~ "www:631\"/> This is the normal CUPS management interface where you can "
#~ "add/delete/modify your printers and can clean up the printing queue. "
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
index 0f81879..c036f6c 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
@@ -11,7 +11,7 @@
msgid ""
msgstr ""
"Project-Id-Version: release-manual.nb\n"
-"POT-Creation-Date: 2014-11-24 21:54+0100\n"
+"POT-Creation-Date: 2014-11-26 10:26+0100\n"
"PO-Revision-Date: 2014-06-15 16:48+0200\n"
"Last-Translator: Ole-Erik Yrvin <oeyrvin at hagan.no>\n"
"Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
@@ -882,8 +882,8 @@ msgstr "Administrasjon"
msgid ""
"All the Linux machines that are installed with the Skolelinux installer will "
"be administrable from a central computer, most likely the server. It will be "
-"possible to log in to all machines via SSH, and thereby have full access to "
-"the machines."
+"possible to log in to all machines via SSH (root not allowed by default), "
+"and thereby have full access to the machines."
msgstr ""
"Alle linuxmaskinene som er installert ved hjelp av en Skolelinux-CD eller "
"DVD vil være satt opp til å administreres fra en sentral maskin, mest trolig "
@@ -1076,8 +1076,8 @@ msgstr ""
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
#, fuzzy
msgid ""
-"The computers running Debian Edu / Skolelinux must have either i386 or amd64 "
-"processors."
+"The computers running Debian Edu / Skolelinux must have either i386 (oldest "
+"supported processors: Intel Pentium/AMD K5) or amd64 processors."
msgstr ""
"maskiner som kjører Debian Edu / Skolelinux må ha enten i386, amd64 eller "
"powerpc-prosessorer."
@@ -1098,7 +1098,8 @@ msgstr "eth0 koblet til hovednettverket (10.0.2.0/23)"
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
#, fuzzy
msgid ""
-"eth1 is used for serving the thin-clients (192.168.0.0/24 or 192.168.1.0/24)."
+"eth1 is used for serving LTSP clients (192.168.0.0/24 as default or "
+"192.168.1.0/24)."
msgstr "eth1 brukes for å dele ut tynnklientnettet (192.168.0.0/24)."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -1268,7 +1269,7 @@ msgstr "man kan ha opp til 50 (diskløse) arbeidsstasoner på hovednettverket"
#, fuzzy
msgid ""
"You can have a lot of LTSP servers on the main network; two different "
-"subnets are preconfigured in LDAP."
+"subnets are preconfigured (DNS, DHCP) in LDAP, more could be added."
msgstr "man kan ha opp til 20 ltsp-tjenere på hovednettverket"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -1438,11 +1439,11 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#, fuzzy
msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
"edu-8.0+edu0~alpha0-CD.iso\">debian-edu-8.0+edu0~alpha0-CD.iso</ulink>"
msgstr ""
-"<computeroutput>ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-5.0.4+edu0-"
-"source-USB.iso</computeroutput>"
+"<computeroutput>http://ftp.skolelinux.org/skolelinux-cd/debian-"
+"edu-5.0.4+edu0-source-USB.iso</computeroutput>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#, fuzzy
@@ -1482,11 +1483,11 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#, fuzzy
msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
"edu-8.0+edu0~alpha0-USB.iso\">debian-edu-8.0+edu0~alpha0-USB.iso</ulink>"
msgstr ""
-"<computeroutput>ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-5.0.4+edu0-"
-"source-USB.iso</computeroutput>"
+"<computeroutput>http://ftp.skolelinux.org/skolelinux-cd/debian-"
+"edu-5.0.4+edu0-source-USB.iso</computeroutput>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#, fuzzy
@@ -1584,7 +1585,7 @@ msgid ""
"When you do a Debian Edu installation, you have a few options to choose "
"from. Don't be afraid; there aren't many. We have done a good job of hiding "
"the complexity of Debian during the installation and beyond. However, Debian "
-"Edu is Debian, and if you want there are more than 15,000 packages to choose "
+"Edu is Debian, and if you want there are more than 42,000 packages to choose "
"from and a billion configuration options. For the majority of our users, our "
"defaults should be fine."
msgstr ""
@@ -2268,9 +2269,9 @@ msgstr "En kommentar om installasjon av tynnklienttjenere"
msgid ""
"First of all, this profile name is confusing for historic reasons. Currently "
"this profile actually installs an LTSP server environment for thin-clients "
-"and for workstations. Debian bug <ulink url=\"https://bugs.debian.org/588510#"
-"\">588510</ulink> has been filed to change the name of the profile into a "
-"better suited one."
+"and for diskless workstations. Debian bug <ulink url=\"https://bugs.debian."
+"org/588510#\">588510</ulink> has been filed to change the name of the "
+"profile into a better suited one."
msgstr ""
"Først, så er denne profilen navngitt på en forvirrende måte av historiske "
"årsaker. Profilen installerer et LTSP miljø for tynnklienter og "
@@ -4133,7 +4134,8 @@ msgid ""
"For backup management point your browser to <ulink url=\"https://www/"
"slbackup-php\"/>. Please note that you need to access this site via SSL, "
"since you have to enter the root password there. If you try to access this "
-"site without using SSL it will fail."
+"site without using SSL it will fail. Note: the site will only work if you "
+"temporarily allow ssh root login on the backup server (tjener by default)."
msgstr ""
"For håndtering av sikkerhetskopier, så går du til adressen <ulink "
"url='https://www/slbackup-php'>https://www/slbackup-php</ulink> med "
@@ -4732,11 +4734,11 @@ msgstr "LDAP-tjenesten trenger å bli reparert"
#. type: Content of: <article><section><section><section><para>
#, fuzzy
msgid ""
-"The LDAP setup has changed slightly from Wheezy to Jessie. Nevertheless, "
-"LDAP has to be rebuild from scratch. There's a script <computeroutput>ldap-"
-"debian-edu-install</computeroutput> (in /usr/bin) that could be used to "
-"achieve this. Read the comment at the beginning of that script carefully "
-"before doing anything."
+"The LDAP setup has only scarcely changed from Wheezy to Jessie so chances "
+"are that LDAP hasn't to be rebuild from scratch. There's a script "
+"<computeroutput>ldap-debian-edu-install</computeroutput> (in /usr/bin) that "
+"could be used to achieve rebuilding LDAP if needed. Read the comment at the "
+"beginning of that script carefully before doing anything."
msgstr ""
"LDAP-oppsettet har endret seg noe fra Wheezy til Jessie. Likevel, LDAP må "
"gjenoppbygges fra bunnen av. Det er et script som kan få til dette i "
@@ -5210,7 +5212,7 @@ msgstr "JXplorer, en LDAP GUI"
#, fuzzy
msgid ""
"If you prefer a GUI to work with the LDAP database, check out the "
-"<computeroutput>jxplorer</computeroutput> package, wich is installed by "
+"<computeroutput>jxplorer</computeroutput> package, which is installed by "
"default. To get write access connect like this:"
msgstr ""
"Her er et eksempel som aktiverer temaet i <computeroutput>desktop-base</"
@@ -6996,6 +6998,22 @@ msgstr ""
"Som et alternativ kan du bruke <computeroutput>ldapvi</computeroutput>, søk "
"med 'next server tjener' og erstatt tjener med ltspserver00."
+#. type: Content of: <article><section><section><section><title>
+msgid "Use a different LTSP client network"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"192.168.0.0/24 is the default LTSP client network if a machine is installed "
+"using the Thin-Client-Server profile. If loads of LTSP clients are used or "
+"if different LTSP servers should serve both i386 and amd64 chroot "
+"environments the second preconfigured network 192.168.1.0/24 could be used "
+"as well. Edit the file <computeroutput>/etc/network/interfaces</"
+"computeroutput> and adjust the eth1 settings accordingly. Use "
+"<computeroutput>ldapvi</computeroutput> or any other LDAP editor to inspect "
+"DNS and DHCP configuration."
+msgstr ""
+
#. type: Content of: <article><section><section><title>
msgid "Changing network settings"
msgstr "Endre nettverksoppsett"
@@ -7019,9 +7037,9 @@ msgstr ""
#, fuzzy
msgid ""
"Note that changing to one of the subnets already used elsewhere in Debian "
-"Edu will not work. 192.168.1.0/24 is already set up as the thin client "
-"network. Changing to this subnet will require manual editing of "
-"configuration files to remove duplicate entries."
+"Edu will not work. 192.168.0.0/24 and 192.168.1.0/24 are already set up as "
+"LTSP client networks. Changing to these subnets will require manual editing "
+"of configuration files to remove duplicate entries."
msgstr ""
"Merk at endring til ett av de subnett som allerede brukes andre steder i "
"Debian Edu ikke vil fungere. 192.168.1.0/24 allerede er satt opp som "
@@ -7283,11 +7301,11 @@ msgstr ""
#. type: Content of: <article><section><section><section><section><para>
#, fuzzy
msgid ""
-"Now you have to move your clients from the 192.168.1.0 network to the "
+"Now you have to move your clients from the 192.168.0.0 network to the "
"10.0.0.0 network; attach them to the backbone network instead of the network "
"attached to the LTSP server's second network card. This is because when you "
"use load-balancing, the clients need direct access to the server chosen by "
-"LDM. If you leave your clients on the 192.168.1.0 network, all of the "
+"LDM. If you leave your clients on the 192.168.0.0 network, all of the "
"clients' traffic will go through that server before it reaches the chosen "
"LDM server."
msgstr ""
@@ -12255,6 +12273,22 @@ msgstr ""
#, fuzzy
#~ msgid ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
+#~ "edu-8.0+edu0~alpha0-CD.iso\">debian-edu-8.0+edu0~alpha0-CD.iso</ulink>"
+#~ msgstr ""
+#~ "<computeroutput>ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
+#~ "edu-5.0.4+edu0-source-USB.iso</computeroutput>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
+#~ "edu-8.0+edu0~alpha0-USB.iso\">debian-edu-8.0+edu0~alpha0-USB.iso</ulink>"
+#~ msgstr ""
+#~ "<computeroutput>ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
+#~ "edu-5.0.4+edu0-source-USB.iso</computeroutput>"
+
+#, fuzzy
+#~ msgid ""
#~ "For Printer Management point your web browser to <ulink url=\"https://"
#~ "www:631\"/> This is the normal CUPS management interface where you can "
#~ "add/delete/modify your printers and can clean up the printing queue. "
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
index dff1325..e928df2 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2014-11-24 21:54+0100\n"
+"POT-Creation-Date: 2014-11-26 10:26+0100\n"
"PO-Revision-Date: 2014-10-24 14:51+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"
@@ -880,11 +880,17 @@ msgid "Administration"
msgstr "Beheer"
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "All the Linux machines that are installed with the Skolelinux installer "
+#| "will be administrable from a central computer, most likely the server. It "
+#| "will be possible to log in to all machines via SSH, and thereby have full "
+#| "access to the machines."
msgid ""
"All the Linux machines that are installed with the Skolelinux installer will "
"be administrable from a central computer, most likely the server. It will be "
-"possible to log in to all machines via SSH, and thereby have full access to "
-"the machines."
+"possible to log in to all machines via SSH (root not allowed by default), "
+"and thereby have full access to the machines."
msgstr ""
"Alle Linuxmachines die met behulp van het installatieprogramma van "
"Skolelinux geïnstalleerd werden, kunnen vanaf een centrale computer, meestal "
@@ -1096,9 +1102,13 @@ msgstr ""
"hoofdstuk <link linkend=\"Architecture\">Architectuur van het netwerk</link>."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "The computers running Debian Edu / Skolelinux must have either i386 or "
+#| "amd64 processors."
msgid ""
-"The computers running Debian Edu / Skolelinux must have either i386 or amd64 "
-"processors."
+"The computers running Debian Edu / Skolelinux must have either i386 (oldest "
+"supported processors: Intel Pentium/AMD K5) or amd64 processors."
msgstr ""
"Om Debian Edu / Skolelinux te kunnen draaien moeten computers uitgerust zijn "
"met een processor van het type i386 of amd64."
@@ -1116,8 +1126,13 @@ msgid "eth0 is connected to the main network (10.0.0.0/8),"
msgstr "eth0 is verbonden met het hoofdnetwerk (10.0.0.0/8),"
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "eth1 is used for serving the thin-clients (192.168.0.0/24 or "
+#| "192.168.1.0/24)."
msgid ""
-"eth1 is used for serving the thin-clients (192.168.0.0/24 or 192.168.1.0/24)."
+"eth1 is used for serving LTSP clients (192.168.0.0/24 as default or "
+"192.168.1.0/24)."
msgstr ""
"eth1 wordt gebruikt om de thin clients (192.168.0.0/24 of 192.168.1.0/24) te "
"bedienen."
@@ -1281,9 +1296,13 @@ msgstr ""
"Er kunnen honderden werkstations aangesloten worden op het hoofdnetwerk."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "You can have a lot of LTSP servers on the main network; two different "
+#| "subnets are preconfigured in LDAP."
msgid ""
"You can have a lot of LTSP servers on the main network; two different "
-"subnets are preconfigured in LDAP."
+"subnets are preconfigured (DNS, DHCP) in LDAP, more could be added."
msgstr ""
"U kunt meerdere LTSP-servers aansluiten op het hoofdnetwerk. In LDAP werden "
"twee verschillende subnetten voorgeconfigureerd."
@@ -1452,11 +1471,15 @@ msgstr ""
"amd64-machines. Het wordt beschikbaar gesteld via"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
+#| "edu-8.0+edu0~alpha0-CD.iso\">debian-edu-8.0+edu0~alpha0-CD.iso</ulink>"
msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
"edu-8.0+edu0~alpha0-CD.iso\">debian-edu-8.0+edu0~alpha0-CD.iso</ulink>"
msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
"edu-8.0+edu0~alpha0-CD.iso\">debian-edu-8.0+edu0~alpha0-CD.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -1495,11 +1518,15 @@ msgstr ""
"downloaden via FTP, HTTP of rsync:"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
+#| "edu-8.0+edu0~alpha0-USB.iso\">debian-edu-8.0+edu0~alpha0-USB.iso</ulink>"
msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
"edu-8.0+edu0~alpha0-USB.iso\">debian-edu-8.0+edu0~alpha0-USB.iso</ulink>"
msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
"edu-8.0+edu0~alpha0-USB.iso\">debian-edu-8.0+edu0~alpha0-USB.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -1589,11 +1616,19 @@ msgid "Installing Debian Edu"
msgstr "Debian Edu installeren"
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "When you do a Debian Edu installation, you have a few options to choose "
+#| "from. Don't be afraid; there aren't many. We have done a good job of "
+#| "hiding the complexity of Debian during the installation and beyond. "
+#| "However, Debian Edu is Debian, and if you want there are more than 15,000 "
+#| "packages to choose from and a billion configuration options. For the "
+#| "majority of our users, our defaults should be fine."
msgid ""
"When you do a Debian Edu installation, you have a few options to choose "
"from. Don't be afraid; there aren't many. We have done a good job of hiding "
"the complexity of Debian during the installation and beyond. However, Debian "
-"Edu is Debian, and if you want there are more than 15,000 packages to choose "
+"Edu is Debian, and if you want there are more than 42,000 packages to choose "
"from and a billion configuration options. For the majority of our users, our "
"defaults should be fine."
msgstr ""
@@ -2277,12 +2312,19 @@ msgid "A note on thin-client-server installations"
msgstr "Een noot bij installaties van thin-clientservers"
#. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "First of all, this profile name is confusing for historic reasons. "
+#| "Currently this profile actually installs an LTSP server environment for "
+#| "thin-clients and for workstations. Debian bug <ulink url=\"https://bugs."
+#| "debian.org/588510#\">588510</ulink> has been filed to change the name of "
+#| "the profile into a better suited one."
msgid ""
"First of all, this profile name is confusing for historic reasons. Currently "
"this profile actually installs an LTSP server environment for thin-clients "
-"and for workstations. Debian bug <ulink url=\"https://bugs.debian.org/588510#"
-"\">588510</ulink> has been filed to change the name of the profile into a "
-"better suited one."
+"and for diskless workstations. Debian bug <ulink url=\"https://bugs.debian."
+"org/588510#\">588510</ulink> has been filed to change the name of the "
+"profile into a better suited one."
msgstr ""
"Vooreerst: de benaming voor dit profiel is om historische redenen "
"verwarrend. Momenteel installeert dit profiel feitelijk een LTSP-"
@@ -4193,11 +4235,18 @@ msgid "Backup Management"
msgstr "Reservekopieën beheren"
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "For backup management point your browser to <ulink url=\"https://www/"
+#| "slbackup-php\"/>. Please note that you need to access this site via SSL, "
+#| "since you have to enter the root password there. If you try to access "
+#| "this site without using SSL it will fail."
msgid ""
"For backup management point your browser to <ulink url=\"https://www/"
"slbackup-php\"/>. Please note that you need to access this site via SSL, "
"since you have to enter the root password there. If you try to access this "
-"site without using SSL it will fail."
+"site without using SSL it will fail. Note: the site will only work if you "
+"temporarily allow ssh root login on the backup server (tjener by default)."
msgstr ""
"Voor het beheer van reservekopieën gaat u met de browser naar het adres "
"<ulink url=\"https://www/slbackup-php\"/>. Denk eraan om een SSL-verbinding "
@@ -4783,12 +4832,19 @@ msgid "LDAP service needs to be reconfigured"
msgstr "De dienst LDAP moet opnieuw geconfigureerd worden"
#. type: Content of: <article><section><section><section><para>
-msgid ""
-"The LDAP setup has changed slightly from Wheezy to Jessie. Nevertheless, "
-"LDAP has to be rebuild from scratch. There's a script <computeroutput>ldap-"
-"debian-edu-install</computeroutput> (in /usr/bin) that could be used to "
-"achieve this. Read the comment at the beginning of that script carefully "
-"before doing anything."
+#, fuzzy
+#| msgid ""
+#| "The LDAP setup has changed slightly from Wheezy to Jessie. Nevertheless, "
+#| "LDAP has to be rebuild from scratch. There's a script "
+#| "<computeroutput>ldap-debian-edu-install</computeroutput> (in /usr/bin) "
+#| "that could be used to achieve this. Read the comment at the beginning of "
+#| "that script carefully before doing anything."
+msgid ""
+"The LDAP setup has only scarcely changed from Wheezy to Jessie so chances "
+"are that LDAP hasn't to be rebuild from scratch. There's a script "
+"<computeroutput>ldap-debian-edu-install</computeroutput> (in /usr/bin) that "
+"could be used to achieve rebuilding LDAP if needed. Read the comment at the "
+"beginning of that script carefully before doing anything."
msgstr ""
"Tussen de instellingen van LDAP in Wheezy en in Jessie zijn er slechts "
"kleine verschillen. Toch moet het register van LDAP helemaal opnieuw "
@@ -5260,9 +5316,14 @@ msgid "JXplorer, an LDAP GUI"
msgstr "JXplorer, een grafische gebruikersinterface voor 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, wich is installed by "
+#| "default. To get write access connect like this:"
msgid ""
"If you prefer a GUI to work with the LDAP database, check out the "
-"<computeroutput>jxplorer</computeroutput> package, wich is installed by "
+"<computeroutput>jxplorer</computeroutput> package, which is installed by "
"default. To get write access connect like this:"
msgstr ""
"Indien u een grafische gebruikersinterface verkiest om bewerkingen uit te "
@@ -7112,6 +7173,22 @@ msgstr ""
"gebruiken, zoeken naar de tekst 'next server tjener' en daar tjener "
"vervangen door ltspserver00."
+#. type: Content of: <article><section><section><section><title>
+msgid "Use a different LTSP client network"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"192.168.0.0/24 is the default LTSP client network if a machine is installed "
+"using the Thin-Client-Server profile. If loads of LTSP clients are used or "
+"if different LTSP servers should serve both i386 and amd64 chroot "
+"environments the second preconfigured network 192.168.1.0/24 could be used "
+"as well. Edit the file <computeroutput>/etc/network/interfaces</"
+"computeroutput> and adjust the eth1 settings accordingly. Use "
+"<computeroutput>ldapvi</computeroutput> or any other LDAP editor to inspect "
+"DNS and DHCP configuration."
+msgstr ""
+
#. type: Content of: <article><section><section><title>
msgid "Changing network settings"
msgstr "Netwerkinstellingen aanpassen"
@@ -7132,11 +7209,17 @@ msgstr ""
"worden om het subnet te wijzigen."
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Note that changing to one of the subnets already used elsewhere in Debian "
+#| "Edu will not work. 192.168.1.0/24 is already set up as the thin client "
+#| "network. Changing to this subnet will require manual editing of "
+#| "configuration files to remove duplicate entries."
msgid ""
"Note that changing to one of the subnets already used elsewhere in Debian "
-"Edu will not work. 192.168.1.0/24 is already set up as the thin client "
-"network. Changing to this subnet will require manual editing of "
-"configuration files to remove duplicate entries."
+"Edu will not work. 192.168.0.0/24 and 192.168.1.0/24 are already set up as "
+"LTSP client networks. Changing to these subnets will require manual editing "
+"of configuration files to remove duplicate entries."
msgstr ""
"Weet dat kiezen voor een van de subnets die reeds elders in Debian Edu "
"gebruikt worden, niet zal werken. 192.168.1.0/24 bestaat reeds als het "
@@ -7391,12 +7474,21 @@ msgstr ""
"opnieuw te starten."
#. type: Content of: <article><section><section><section><section><para>
-msgid ""
-"Now you have to move your clients from the 192.168.1.0 network to the "
+#, fuzzy
+#| msgid ""
+#| "Now you have to move your clients from the 192.168.1.0 network to the "
+#| "10.0.0.0 network; attach them to the backbone network instead of the "
+#| "network attached to the LTSP server's second network card. This is "
+#| "because when you use load-balancing, the clients need direct access to "
+#| "the server chosen by LDM. If you leave your clients on the 192.168.1.0 "
+#| "network, all of the clients' traffic will go through that server before "
+#| "it reaches the chosen LDM server."
+msgid ""
+"Now you have to move your clients from the 192.168.0.0 network to the "
"10.0.0.0 network; attach them to the backbone network instead of the network "
"attached to the LTSP server's second network card. This is because when you "
"use load-balancing, the clients need direct access to the server chosen by "
-"LDM. If you leave your clients on the 192.168.1.0 network, all of the "
+"LDM. If you leave your clients on the 192.168.0.0 network, all of the "
"clients' traffic will go through that server before it reaches the chosen "
"LDM server."
msgstr ""
@@ -12510,6 +12602,20 @@ msgstr ""
"developer.skolelinux.no/info/cdbygging/news.html\"/>."
#~ msgid ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
+#~ "edu-8.0+edu0~alpha0-CD.iso\">debian-edu-8.0+edu0~alpha0-CD.iso</ulink>"
+#~ msgstr ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
+#~ "edu-8.0+edu0~alpha0-CD.iso\">debian-edu-8.0+edu0~alpha0-CD.iso</ulink>"
+
+#~ msgid ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
+#~ "edu-8.0+edu0~alpha0-USB.iso\">debian-edu-8.0+edu0~alpha0-USB.iso</ulink>"
+#~ msgstr ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
+#~ "edu-8.0+edu0~alpha0-USB.iso\">debian-edu-8.0+edu0~alpha0-USB.iso</ulink>"
+
+#~ msgid ""
#~ "For Printer Management point your web browser to <ulink url=\"https://"
#~ "www:631\"/> This is the normal CUPS management interface where you can "
#~ "add/delete/modify your printers and can clean up the printing queue. "
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot b/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot
index bb105d7..1f5c159 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-11-24 21:54+0100\n"
+"POT-Creation-Date: 2014-11-26 10:26+0100\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"
@@ -658,8 +658,8 @@ msgstr ""
msgid ""
"All the Linux machines that are installed with the Skolelinux installer will "
"be administrable from a central computer, most likely the server. It will be "
-"possible to log in to all machines via SSH, and thereby have full access to "
-"the machines."
+"possible to log in to all machines via SSH (root not allowed by default), "
+"and thereby have full access to the machines."
msgstr ""
#. type: Content of: <article><section><section><para>
@@ -790,8 +790,8 @@ msgstr ""
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid ""
-"The computers running Debian Edu / Skolelinux must have either i386 or amd64 "
-"processors."
+"The computers running Debian Edu / Skolelinux must have either i386 (oldest "
+"supported processors: Intel Pentium/AMD K5) or amd64 processors."
msgstr ""
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -806,7 +806,8 @@ msgstr ""
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid ""
-"eth1 is used for serving the thin-clients (192.168.0.0/24 or 192.168.1.0/24)."
+"eth1 is used for serving LTSP clients (192.168.0.0/24 as default or "
+"192.168.1.0/24)."
msgstr ""
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -924,7 +925,7 @@ msgstr ""
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid ""
"You can have a lot of LTSP servers on the main network; two different "
-"subnets are preconfigured in LDAP."
+"subnets are preconfigured (DNS, DHCP) in LDAP, more could be added."
msgstr ""
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -1047,7 +1048,7 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
"edu-8.0+edu0~alpha0-CD.iso\">debian-edu-8.0+edu0~alpha0-CD.iso</ulink>"
msgstr ""
@@ -1078,7 +1079,7 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
"edu-8.0+edu0~alpha0-USB.iso\">debian-edu-8.0+edu0~alpha0-USB.iso</ulink>"
msgstr ""
@@ -1151,7 +1152,7 @@ msgid ""
"When you do a Debian Edu installation, you have a few options to choose "
"from. Don't be afraid; there aren't many. We have done a good job of hiding "
"the complexity of Debian during the installation and beyond. However, Debian "
-"Edu is Debian, and if you want there are more than 15,000 packages to choose "
+"Edu is Debian, and if you want there are more than 42,000 packages to choose "
"from and a billion configuration options. For the majority of our users, our "
"defaults should be fine."
msgstr ""
@@ -1623,9 +1624,9 @@ msgstr ""
msgid ""
"First of all, this profile name is confusing for historic reasons. Currently "
"this profile actually installs an LTSP server environment for thin-clients "
-"and for workstations. Debian bug <ulink url=\"https://bugs.debian.org/588510#"
-"\">588510</ulink> has been filed to change the name of the profile into a "
-"better suited one."
+"and for diskless workstations. Debian bug <ulink url=\"https://bugs.debian."
+"org/588510#\">588510</ulink> has been filed to change the name of the "
+"profile into a better suited one."
msgstr ""
#. type: Content of: <article><section><section><section><section><para>
@@ -3036,7 +3037,8 @@ msgid ""
"For backup management point your browser to <ulink url=\"https://www/"
"slbackup-php\"/>. Please note that you need to access this site via SSL, "
"since you have to enter the root password there. If you try to access this "
-"site without using SSL it will fail."
+"site without using SSL it will fail. Note: the site will only work if you "
+"temporarily allow ssh root login on the backup server (tjener by default)."
msgstr ""
#. type: Content of: <article><section><section><para>
@@ -3433,11 +3435,11 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"The LDAP setup has changed slightly from Wheezy to Jessie. Nevertheless, "
-"LDAP has to be rebuild from scratch. There's a script <computeroutput>ldap-"
-"debian-edu-install</computeroutput> (in /usr/bin) that could be used to "
-"achieve this. Read the comment at the beginning of that script carefully "
-"before doing anything."
+"The LDAP setup has only scarcely changed from Wheezy to Jessie so chances "
+"are that LDAP hasn't to be rebuild from scratch. There's a script "
+"<computeroutput>ldap-debian-edu-install</computeroutput> (in /usr/bin) that "
+"could be used to achieve rebuilding LDAP if needed. Read the comment at the "
+"beginning of that script carefully before doing anything."
msgstr ""
#. type: Content of: <article><section><section><section><title>
@@ -3771,7 +3773,7 @@ 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, wich is installed by "
+"<computeroutput>jxplorer</computeroutput> package, which is installed by "
"default. To get write access connect like this:"
msgstr ""
@@ -5062,6 +5064,22 @@ msgid ""
"search for 'next server tjener' and replace tjener with ltspserver00."
msgstr ""
+#. type: Content of: <article><section><section><section><title>
+msgid "Use a different LTSP client network"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"192.168.0.0/24 is the default LTSP client network if a machine is installed "
+"using the Thin-Client-Server profile. If loads of LTSP clients are used or "
+"if different LTSP servers should serve both i386 and amd64 chroot "
+"environments the second preconfigured network 192.168.1.0/24 could be used "
+"as well. Edit the file <computeroutput>/etc/network/interfaces</"
+"computeroutput> and adjust the eth1 settings accordingly. Use "
+"<computeroutput>ldapvi</computeroutput> or any other LDAP editor to inspect "
+"DNS and DHCP configuration."
+msgstr ""
+
#. type: Content of: <article><section><section><title>
msgid "Changing network settings"
msgstr ""
@@ -5078,9 +5096,9 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
"Note that changing to one of the subnets already used elsewhere in Debian "
-"Edu will not work. 192.168.1.0/24 is already set up as the thin client "
-"network. Changing to this subnet will require manual editing of "
-"configuration files to remove duplicate entries."
+"Edu will not work. 192.168.0.0/24 and 192.168.1.0/24 are already set up as "
+"LTSP client networks. Changing to these subnets will require manual editing "
+"of configuration files to remove duplicate entries."
msgstr ""
#. type: Content of: <article><section><section><para>
@@ -5251,11 +5269,11 @@ msgstr ""
#. type: Content of: <article><section><section><section><section><para>
msgid ""
-"Now you have to move your clients from the 192.168.1.0 network to the "
+"Now you have to move your clients from the 192.168.0.0 network to the "
"10.0.0.0 network; attach them to the backbone network instead of the network "
"attached to the LTSP server's second network card. This is because when you "
"use load-balancing, the clients need direct access to the server chosen by "
-"LDM. If you leave your clients on the 192.168.1.0 network, all of the "
+"LDM. If you leave your clients on the 192.168.0.0 network, all of the "
"clients' traffic will go through that server before it reaches the chosen "
"LDM server."
msgstr ""
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml b/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
index 66c508b..9b90979 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
@@ -258,7 +258,7 @@
<section id="Architecture--Administration">
<title>Administration
</title>
-<para>All the Linux machines that are installed with the Skolelinux installer will be administrable from a central computer, most likely the server. It will be possible to log in to all machines via SSH, and thereby have full access to the machines.
+<para>All the Linux machines that are installed with the Skolelinux installer will be administrable from a central computer, most likely the server. It will be possible to log in to all machines via SSH (root not allowed by default), and thereby have full access to the machines.
</para>
<para>We use cfengine to edit configuration files. These files are updated from the server to the clients. In order to change the client configuration, it suffices to edit the server configuration and let the automation distribute the changes.
</para>
@@ -307,7 +307,7 @@
</para>
<itemizedlist>
<listitem>
-<para>The computers running Debian Edu / Skolelinux must have either i386 or amd64 processors.
+<para>The computers running Debian Edu / Skolelinux must have either i386 (oldest supported processors: Intel Pentium/AMD K5) or amd64 processors.
</para></listitem>
<listitem>
<para>Thin client servers need two network cards when using the default network architecture:
@@ -317,7 +317,7 @@
<para>eth0 is connected to the main network (10.0.0.0/8),
</para></listitem>
<listitem>
-<para>eth1 is used for serving the thin-clients (192.168.0.0/24 or 192.168.1.0/24).
+<para>eth1 is used for serving LTSP clients (192.168.0.0/24 as default or 192.168.1.0/24).
</para></listitem></itemizedlist></listitem>
<listitem>
<para>Consider 2 GB RAM for 30 clients and 4 GB RAM for 50-60 clients.
@@ -380,7 +380,7 @@
<para>You can have hundreds of workstations on the main network.
</para></listitem>
<listitem>
-<para>You can have a lot of LTSP servers on the main network; two different subnets are preconfigured in LDAP.
+<para>You can have a lot of LTSP servers on the main network; two different subnets are preconfigured (DNS, DHCP) in LDAP, more could be added.
</para></listitem>
<listitem>
<para>You can have hundreds of thin clients and/or diskless workstations on each LTSP server network.
@@ -435,7 +435,7 @@
<para>The netinstall CD, which also can be used for installation from USB flash drives, is suited to install on i386 and amd64 machines. It's available via
</para>
<itemizedlist><listitem override="none">
-<para><ulink url="ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-edu-8.0+edu0~alpha0-CD.iso">debian-edu-8.0+edu0~alpha0-CD.iso</ulink>
+<para><ulink url="ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0~alpha0-CD.iso">debian-edu-8.0+edu0~alpha0-CD.iso</ulink>
</para>
<para><ulink url="http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0~alpha0-CD.iso">debian-edu-8.0+edu0~alpha0-CD.iso</ulink>
</para>
@@ -449,7 +449,7 @@
<para>The multi-architecture ISO image is 5.2 GiB large and can be used for installation of amd64 and i386 machines. It behaves like the former DVD image which means it doesn't use internet access during installation. Like the others it can be downloaded over FTP, HTTP or rsync via:
</para>
<itemizedlist><listitem override="none">
-<para><ulink url="ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-edu-8.0+edu0~alpha0-USB.iso">debian-edu-8.0+edu0~alpha0-USB.iso</ulink>
+<para><ulink url="ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0~alpha0-USB.iso">debian-edu-8.0+edu0~alpha0-USB.iso</ulink>
</para>
<para><ulink url="http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0~alpha0-USB.iso">debian-edu-8.0+edu0~alpha0-USB.iso</ulink>
</para>
@@ -482,7 +482,7 @@
<section id="Installation--Installing_Debian_Edu">
<title>Installing Debian Edu
</title>
-<para>When you do a Debian Edu installation, you have a few options to choose from. Don't be afraid; there aren't many. We have done a good job of hiding the complexity of Debian during the installation and beyond. However, Debian Edu is Debian, and if you want there are more than 15,000 packages to choose from and a billion configuration options. For the majority of our users, our defaults should be fine.
+<para>When you do a Debian Edu installation, you have a few options to choose from. Don't be afraid; there aren't many. We have done a good job of hiding the complexity of Debian during the installation and beyond. However, Debian Edu is Debian, and if you want there are more than 42,000 packages to choose from and a billion configuration options. For the majority of our users, our defaults should be fine.
</para>
<section id="Installation--Select_type_of_installation">
@@ -685,7 +685,7 @@ deb http://ftp.skolelinux.org/skolelinux jessie local]]></screen>
<section id="Installation--A_note_on_thin-client-server_installations">
<title>A note on thin-client-server installations
</title>
-<para>First of all, this profile name is confusing for historic reasons. Currently this profile actually installs an LTSP server environment for thin-clients and for workstations. Debian bug <ulink url="https://bugs.debian.org/588510#">588510</ulink> has been filed to change the name of the profile into a better suited one.
+<para>First of all, this profile name is confusing for historic reasons. Currently this profile actually installs an LTSP server environment for thin-clients and for diskless workstations. Debian bug <ulink url="https://bugs.debian.org/588510#">588510</ulink> has been filed to change the name of the profile into a better suited one.
</para>
<para>Providing the kernel boot parameter <computeroutput>edu-skip-ltsp-make-client</computeroutput> makes it possible to skip the step which converts the LTSP chroot from a thin-client chroot into a combined thin-client/diskless workstation chroot.
</para>
@@ -1251,7 +1251,7 @@ ltsp-update-kernels # If a new kernel was installed]]></screen>
<section id="Maintenance--Backup_Management">
<title>Backup Management
</title>
-<para>For backup management point your browser to <ulink url="https://www/slbackup-php"/>. Please note that you need to access this site via SSL, since you have to enter the root password there. If you try to access this site without using SSL it will fail.
+<para>For backup management point your browser to <ulink url="https://www/slbackup-php"/>. Please note that you need to access this site via SSL, since you have to enter the root password there. If you try to access this site without using SSL it will fail. Note: the site will only work if you temporarily allow ssh root login on the backup server (tjener by default).
</para>
<para>By default tjener will back up <computeroutput>/skole/tjener/home0</computeroutput>, <computeroutput>/etc/</computeroutput>, <computeroutput>/root/.svk</computeroutput> and LDAP to /skole/backup which is under the LVM. If you only want to have spare copies of things (in case you delete them) this setup should be fine for you.
</para>
@@ -1419,7 +1419,7 @@ FIXME: confirm this is really all what needs to be done for upgrades. It's great
<section id="Upgrades--LDAP_service_needs_to_be_reconfigured">
<title>LDAP service needs to be reconfigured
</title>
-<para>The LDAP setup has changed slightly from Wheezy to Jessie. Nevertheless, LDAP has to be rebuild from scratch. There's a script <computeroutput>ldap-debian-edu-install</computeroutput> (in /usr/bin) that could be used to achieve this. Read the comment at the beginning of that script carefully before doing anything.
+<para>The LDAP setup has only scarcely changed from Wheezy to Jessie so chances are that LDAP hasn't to be rebuild from scratch. There's a script <computeroutput>ldap-debian-edu-install</computeroutput> (in /usr/bin) that could be used to achieve rebuilding LDAP if needed. Read the comment at the beginning of that script carefully before doing anything.
</para>
</section>
@@ -1568,7 +1568,7 @@ resize2fs /dev/vg_system/skole+tjener+home0]]></screen>
<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, wich is installed by default. To get write access connect like this:
+<para>If you prefer a GUI to work with the LDAP database, check out the <computeroutput>jxplorer</computeroutput> package, which 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
@@ -2182,6 +2182,13 @@ d-i apt-setup/local1/key string http://example.org/key.asc]]></s
<para>As an alternative, you could use <computeroutput>ldapvi</computeroutput>, search for 'next server tjener' and replace tjener with ltspserver00.
</para>
</section>
+
+<section id="NetworkClients--Use_a_different_LTSP_client_network">
+<title>Use a different LTSP client network
+</title>
+<para>192.168.0.0/24 is the default LTSP client network if a machine is installed using the Thin-Client-Server profile. If loads of LTSP clients are used or if different LTSP servers should serve both i386 and amd64 chroot environments the second preconfigured network 192.168.1.0/24 could be used as well. Edit the file <computeroutput>/etc/network/interfaces</computeroutput> and adjust the eth1 settings accordingly. Use <computeroutput>ldapvi</computeroutput> or any other LDAP editor to [...]
+</para>
+</section>
</section>
<section id="NetworkClients--Changing_network_settings">
@@ -2189,7 +2196,7 @@ d-i apt-setup/local1/key string http://example.org/key.asc]]></s
</title>
<para>The debian-edu-config package comes with a tool which helps in changing the network from 10.0.0.0/8 to something else. Have a look at <computeroutput>/usr/share/debian-edu-config/tools/subnet-change</computeroutput>. It is intended for use just after installation on the main server, to update LDAP and other files that need to be edited to change the subnet.
</para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/alert.png"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> Note that changing to one of the subnets already used elsewhere in Debian Edu will not work. 192.168.1.0/24 is already set up as the thin client network. Changing to this subnet will require manual editing of configuration files to remove duplicate entries.
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/alert.png"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> Note that changing to one of the subnets already used elsewhere in Debian Edu will not work. 192.168.0.0/24 and 192.168.1.0/24 are already set up as LTSP client networks. Changing to these subnets will require manual editing of configuration files to remove duplicate entries.
</para>
<para>There is no easy way to change the DNS domain name. Changing it would require changes to both the LDAP structure and several files in the main server file system. There is also no easy way to change the host and DNS name of the main server (tjener.intern). To do so would also require changes to LDAP and files in the main-server and client file system. In both cases the Kerberos setup would have to be changed, too.
</para>
@@ -2250,7 +2257,7 @@ XSERVER = nvidia]]></screen>
</para>
<para>The load-balancing server must be announced to the clients as the "next-server" via DHCP. As DHCP configuration is in LDAP, modifications have to be done there. Use <computeroutput>ldapvi --ldap-conf -ZD '(cn=admin)'</computeroutput> to edit the appropriate entry in LDAP. (Enter the main server's root password at the prompt; if VISUAL isn't set, the default editor will be nano.) Search for a line reading <computeroutput>dhcpStatements: next-server tjener</computeroutput> Next-serve [...]
</para>
-<para>Now you have to move your clients from the 192.168.1.0 network to the 10.0.0.0 network; attach them to the backbone network instead of the network attached to the LTSP server's second network card. This is because when you use load-balancing, the clients need direct access to the server chosen by LDM. If you leave your clients on the 192.168.1.0 network, all of the clients' traffic will go through that server before it reaches the chosen LDM server.
+<para>Now you have to move your clients from the 192.168.0.0 network to the 10.0.0.0 network; attach them to the backbone network instead of the network attached to the LTSP server's second network card. This is because when you use load-balancing, the clients need direct access to the server chosen by LDM. If you leave your clients on the 192.168.0.0 network, all of the clients' traffic will go through that server before it reaches the chosen LDM server.
</para>
</section>
diff --git a/documentation/debian-edu-jessie/images/de/worldmap.png b/documentation/debian-edu-jessie/images/de/worldmap.png
index 2b7fbbe..bfe1d35 100644
Binary files a/documentation/debian-edu-jessie/images/de/worldmap.png and b/documentation/debian-edu-jessie/images/de/worldmap.png differ
diff --git a/documentation/debian-edu-jessie/images/es/worldmap.png b/documentation/debian-edu-jessie/images/es/worldmap.png
index 1690306..505a1e6 100644
Binary files a/documentation/debian-edu-jessie/images/es/worldmap.png and b/documentation/debian-edu-jessie/images/es/worldmap.png differ
diff --git a/documentation/debian-edu-jessie/images/fr/worldmap.png b/documentation/debian-edu-jessie/images/fr/worldmap.png
index 2c44e45..a6f5b45 100644
Binary files a/documentation/debian-edu-jessie/images/fr/worldmap.png and b/documentation/debian-edu-jessie/images/fr/worldmap.png differ
diff --git a/documentation/debian-edu-jessie/images/worldmap.png b/documentation/debian-edu-jessie/images/worldmap.png
index b39d3dd..b7ca975 100644
Binary files a/documentation/debian-edu-jessie/images/worldmap.png and b/documentation/debian-edu-jessie/images/worldmap.png differ
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-doc.git
More information about the debian-edu-commits
mailing list