[debian-edu-commits] debian-edu/debian-edu-doc.git (#140) - wheezy (branch) updated: 0.6.20070721-14-gde59567

David Prévot taffit at alioth.debian.org
Sat Oct 5 12:13:12 UTC 2013


The branch, wheezy has been updated
       via  de59567fe0c2e945a802dd7da67169be5a540760 (commit)
      from  b3dc9cdeb121b1b33f5b5b01324950f6b8735bc6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 documentation/release-manual/release-manual.de.po |  957 ++++++++++++---------
 documentation/release-manual/release-manual.es.po |  838 ++++++++++--------
 documentation/release-manual/release-manual.nb.po |  785 +++++++++--------
 documentation/release-manual/release-manual.xml   |  128 +--
 4 files changed, 1496 insertions(+), 1212 deletions(-)

The diff of changes is:
diff --git a/documentation/release-manual/release-manual.de.po b/documentation/release-manual/release-manual.de.po
index 11be6bb..47b08da 100644
--- a/documentation/release-manual/release-manual.de.po
+++ b/documentation/release-manual/release-manual.de.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: release-manual\n"
-"POT-Creation-Date: 2007-07-24  9:25+0200\n"
+"POT-Creation-Date: 2007-07-27  0:13+0200\n"
 "PO-Revision-Date: 2007-07-26 22:49+0200\n"
 "Last-Translator: RalfGesellensetter <rages at arcor.de>\n"
 "Language-Team:  <de at li.org>\n"
@@ -60,23 +60,15 @@ msgstr ""
 "ulink> ist ein wiki und wird ständig aktualisiert.) <ulink url='/DebianEdu/"
 "Documentation/Etch/Translations'>Übersetzungen </ulink> sind Teil des "
 
-# type: Content of: <article><para><section><para><inlinemediaobject>
+# type: Content of: <article><para><section><para>
 #: release-manual.xml:10
 msgid ""
-"package, which can be installed on a webserver. (FIXME: do it "
-"<inlinemediaobject>"
+"package, which can be <ulink url='http://maintainer.skolelinux.no/debian-edu-"
+"doc/'>installed on a webserver </ulink>."
 msgstr ""
-"Pakets, das auf einen Webserver installiert werden kann.  (FIXME: do it "
-"<inlinemediaobject>"
-
-# type: Content of: <article><para><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:11 release-manual.xml:350 release-manual.xml:516
-#: release-manual.xml:871
-msgid "<phrase>:)  </phrase>"
-msgstr "<phrase>:)  </phrase>"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:15
+#: release-manual.xml:12
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/AboutDebianEdu'>About </ulink> "
 "Debian-Edu and Skolelinux"
@@ -85,7 +77,7 @@ msgstr ""
 "andere Grundlagen"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:18
+#: release-manual.xml:15
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/Architecture'>Architecture </"
 "ulink> - the design principles of Debian-Edu"
@@ -94,14 +86,16 @@ msgstr ""
 "ulink> - Grundlagen der Architektur von Debian-Edu"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:21
+#: release-manual.xml:18
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/Features'>Features </ulink> - new "
 "Features in this release and old ones"
-msgstr "<ulink url='/DebianEdu/Documentation/Etch/Features'>Features </ulink> - alte und neue Funktionen in diesem Release"
+msgstr ""
+"<ulink url='/DebianEdu/Documentation/Etch/Features'>Features </ulink> - alte "
+"und neue Funktionen in diesem Release"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:24
+#: release-manual.xml:21
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/Requirements'>Requirements </"
 "ulink> to run Debian-Edu"
@@ -110,7 +104,7 @@ msgstr ""
 "ulink> zum Betrieb von Debian-Edu"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:27
+#: release-manual.xml:24
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/Installation'>Installation </"
 "ulink> - how to install"
@@ -119,7 +113,7 @@ msgstr ""
 "ulink> - Hinweise zur Installation"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:30
+#: release-manual.xml:27
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/GettingStarted'>Getting started </"
 "ulink> - what needs to be done after Installation"
@@ -128,25 +122,26 @@ msgstr ""
 "ulink> - notwendige Maßnahmen nach der Installation"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:33
+#: release-manual.xml:30
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/Maintainance'>Maintainance </"
 "ulink> - Security updates, Backups and monitoring the systems"
 msgstr ""
-"<ulink url='/DebianEdu/Documentation/Etch/Maintainance'>Wartung </"
-"ulink> - Sicherheitsupdates, Backups und Systemüberwachung"
+"<ulink url='/DebianEdu/Documentation/Etch/Maintainance'>Wartung </ulink> - "
+"Sicherheitsupdates, Backups und Systemüberwachung"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:36
+#: release-manual.xml:33
+#, fuzzy
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/Upgrades'>Upgrades </ulink> from "
-"<ulink url='/DebianEdu'>DebianEdu </ulink> sarge and woody"
+"Debian-Edu sarge and woody"
 msgstr ""
 "<ulink url='/DebianEdu/Documentation/Etch/Upgrades'>Upgrade </ulink> von "
 "<ulink url='/DebianEdu'>DebianEdu </ulink> sarge und woody"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:40
+#: release-manual.xml:36
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/HowTo'>HowTo </ulink> - simple "
 "step by step Howtos"
@@ -155,30 +150,34 @@ msgstr ""
 "Schritt-fuer-Schritt Anleitungen"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:43
+#: release-manual.xml:39
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/Contribute'>Contribute </ulink> to "
 "Debian-Edu"
 msgstr ""
-"<ulink url='/DebianEdu/Documentation/Etch/Contribute'>Mitmachen </ulink> bei"
-"Debian-Edu"
+"<ulink url='/DebianEdu/Documentation/Etch/Contribute'>Mitmachen </ulink> "
+"beiDebian-Edu"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:46
+#: release-manual.xml:42
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/Support'>Support </ulink> - how"
 "+where to find help"
-msgstr "<ulink url='/DebianEdu/Documentation/Etch/Support'>Support </ulink> - hier wird Ihnen geholfen"
+msgstr ""
+"<ulink url='/DebianEdu/Documentation/Etch/Support'>Support </ulink> - hier "
+"wird Ihnen geholfen"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:49
+#: release-manual.xml:45
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/CopyRight'>Copyright </ulink> and "
 "Authors of this document"
-msgstr "<ulink url='/DebianEdu/Documentation/Etch/CopyRight'>Copyright </ulink> und Autoren dieses Dokuments"
+msgstr ""
+"<ulink url='/DebianEdu/Documentation/Etch/CopyRight'>Copyright </ulink> und "
+"Autoren dieses Dokuments"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:52
+#: release-manual.xml:48
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/Translations'>Translations </"
 "ulink> of this document"
@@ -187,16 +186,16 @@ msgstr ""
 "ulink> dieses Dokuments"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:55
+#: release-manual.xml:51
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/AppendixA'>Appendix A </ulink> - "
 "The GNU Public Licence"
 msgstr ""
-"<ulink url='/DebianEdu/Documentation/Etch/AppendixA'>Anhang A </ulink> - "
-"The GNU Public Licence"
+"<ulink url='/DebianEdu/Documentation/Etch/AppendixA'>Anhang A </ulink> - The "
+"GNU Public Licence"
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:59
+#: release-manual.xml:55
 msgid ""
 "Special pages: <ulink url='/DebianEdu/Documentation/Etch'>Index page </"
 "ulink> - <ulink url='/DebianEdu/Documentation/Etch/AllInOne'>All in one page "
@@ -207,19 +206,20 @@ msgstr ""
 "ulink>"
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:63
+#: release-manual.xml:59
 msgid "About Debian-Edu and Skolelinux"
 msgstr "Über DebianEdu und Skolelinux"
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:64
+#: release-manual.xml:60
+#, fuzzy
 msgid ""
 "Skolelinux is the Debian-edu project's <ulink url='http://wiki.debian.net/"
 "index.cgi?CustomDebian'>Custom Debian Distribution </ulink> (CDD) in "
 "development. What this means is that Skolelinux is a version of Debian whose "
 "out-of-the box environment gives you a completely configured school-network "
 "In Norway, where Skolelinux was started, the main target group is schools "
-"serving the 6-16 years age bracket)."
+"serving the 6-16 years age bracket."
 msgstr ""
 "Skolelinux ist vom Debian-edu Projekt <ulink url='http://wiki.debian.net/"
 "index.cgi?CustomDebian'> die Custom Debian Distribution </ulink> (CDD) in "
@@ -229,67 +229,76 @@ msgstr ""
 "schools serving the 6-16 years age bracket)."
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:66
+#: release-manual.xml:62
+#, fuzzy
 msgid ""
-"The system is in use in several countries around the world, with most users "
-"in Norway, Germany and France."
+"The system is in use in several countries around the world, with most "
+"installations in Norway, Germany and France."
 msgstr ""
 "Das System wird in einigen Ländern in der ganzen Welt benutzt, mit den "
 "meisten Benutzern in Norwegen, Deitschland und Frankreich."
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:68
+#: release-manual.xml:64
 msgid "Architecture"
 msgstr "Architektur"
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:69
+#: release-manual.xml:65
+#, fuzzy
 msgid ""
-"This secton of the document describes the network architecture and services "
+"This section of the document describes the network architecture and services "
 "provided by a Skolelinux installation."
-msgstr "Dieser Abschnitt erläutert die Netzwerktopologie und die Serverdienste einer Skolelinux-Installation."
+msgstr ""
+"Dieser Abschnitt erläutert die Netzwerktopologie und die Serverdienste einer "
+"Skolelinux-Installation."
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:70 release-manual.xml:232
+#: release-manual.xml:66 release-manual.xml:231
 msgid "Network"
 msgstr "Netzwerk"
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:72
+#: release-manual.xml:68
 msgid "<phrase>attachment:network-arch_en.png </phrase>"
 msgstr "<phrase>attachment:network-arch_en.png </phrase>"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:76
+#: release-manual.xml:72
 msgid ""
 "Network architecture as dia file: <ulink url='/DebianEdu/Documentation/Etch/"
 "Architecture?action=AttachFile&do=get&target=network-arch_en."
 "dia'>attachment:network-arch_en.dia </ulink>"
 msgstr ""
-"Netzwerktopologie ('Architektur') als dia-Datei: <ulink url='/DebianEdu/Documentation/"
-"Etch/Architecture?action=AttachFile&do=get&target=network-arch_en."
-"dia'>attachment:network-arch_en.dia </ulink>"
+"Netzwerktopologie ('Architektur') als dia-Datei: <ulink url='/DebianEdu/"
+"Documentation/Etch/Architecture?action=AttachFile&do=get&"
+"target=network-arch_en.dia'>attachment:network-arch_en.dia </ulink>"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:78
+#: release-manual.xml:74
+#, fuzzy
 msgid ""
 "The figure is a sketch of the assumed network topology. The default setup of "
 "a Skolelinux assumes that there is one (and only one) main-server, while "
 "allowing the inclusion of both normal workstations and thin-client-servers "
 "(with associated thin-clients). The number of workstations can be as large "
 "or small as you want (starting from none to a lot). The same goes for the "
-"thin-client-serves, each of which is on a seperate network so that the "
+"thin-client-serves, each of which is on a separate network so that the "
 "traffic between the thin-clients and the thin-client-server doesn't affect "
 "the rest of the network services."
 msgstr ""
 "Die Abbildung ist eine Skizze der angenommenen Netzwerktopologie. Die "
-"Grundeinstellungen von Skolelinux gehen davon, dass es genau einen Hauptserver ('Tjener') gibt, während normale Arbeitsstationen und Terminalserver "
-"(mit ihren zugehörigen Thin-Client-Terminals) eingebunden werden können. Die Anzahl "
-"der Arbeitsstationen ist beliebig (zwischen 0 und 400).  Gleiches gilt für Terminalserver, die ihre Thin-Clients jeweils auf einem separaten Netzwerksegment bedienen, so "
-"dass der Netzwerkverkehr zwischen den Thin-Clients und ihrem Terminalserver den Rest der Netzwerkdienste nicht stört."
+"Grundeinstellungen von Skolelinux gehen davon, dass es genau einen "
+"Hauptserver ('Tjener') gibt, während normale Arbeitsstationen und "
+"Terminalserver (mit ihren zugehörigen Thin-Client-Terminals) eingebunden "
+"werden können. Die Anzahl der Arbeitsstationen ist beliebig (zwischen 0 und "
+"400).  Gleiches gilt für Terminalserver, die ihre Thin-Clients jeweils auf "
+"einem separaten Netzwerksegment bedienen, so dass der Netzwerkverkehr "
+"zwischen den Thin-Clients und ihrem Terminalserver den Rest der "
+"Netzwerkdienste nicht stört."
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:79
+#: release-manual.xml:75
 msgid ""
 "The reason that there can only be one main-server in each school network is "
 "that the main-server provides DHCP, and there can be only one machine doing "
@@ -306,13 +315,14 @@ msgstr ""
 "DNS-Alias für die geänderten Dienste auf die richtige Maschine zeigt. "
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:80
+#: release-manual.xml:76
+#, fuzzy
 msgid ""
 "In order to simplify the standard setup of Skolelinux the Internet "
-"connection runs over a seperate router. It is possible to set up Debian with "
+"connection runs over a separate router. It is possible to set up Debian with "
 "both a modem as an ISDN connection, however no attempt is made to make such "
 "a setup work out-of-the box for Skolelinux (the setup needed to adjust "
-"default situation to this should be documented seperately)."
+"default situation to this should be documented separately)."
 msgstr ""
 "Um die Standardinstallation von Skolelinux einfach zu halten, läuft die "
 "Internetverbindung über einen separaten Router. Es besteht die Möglichkeit, "
@@ -321,80 +331,109 @@ msgstr ""
 "konfigurieren."
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:82
+#: release-manual.xml:78
 msgid "Services"
 msgstr "Dienste"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:83
+#: release-manual.xml:79
+#, fuzzy
 msgid ""
 "With the exception of the control of the thin-clients, all services are "
 "initially set up on one central computer (the main-server). Because of "
-"performance reasons the thin-client-server should be a sepperate machine "
+"performance reasons the thin-client-server should be a separate machine "
 "(though it is possible to install both the main-server and thin-client-"
 "server profiles on the same machine), All services are allocated a dedicated "
-"DNS-name and are offered exclusivly over IPv4. The allocated DNS name makes "
+"DNS-name and are offered exclusively over IPv4. The allocated DNS name makes "
 "it easy to move individual machines from the main-server to a different "
 "machine, by simply stopping the service on the main-server, and changing the "
 "DNS configuration to point to the new location of the service (which should "
 "be setup on that machine first off course)."
-msgstr "Abgesehen von der Steuerung der Thin-Client-Terminals, werden alle Netzwerkdienste von einem zentralen Server (Hauptserver oder 'Tjener') bereitgestellt. Es ist möglich, das Terminalserver-Profil ebenfalls auf dem Hauptserver zu installieren (Kombiserver), wovon aus Performanzgründen abzuraten ist. Den unterschiedlichen Diensten wird ein zuständiger DNS-Name zugewiesen (IPv4). Dadurch lassen sich einzelne Dienste leicht auf dezidierte Server auslagern, indem man sie auf dem Hauptserver abschaltet und die DNS-Konfiguration entsprechend anpasst. "
+msgstr ""
+"Abgesehen von der Steuerung der Thin-Client-Terminals, werden alle "
+"Netzwerkdienste von einem zentralen Server (Hauptserver oder 'Tjener') "
+"bereitgestellt. Es ist möglich, das Terminalserver-Profil ebenfalls auf dem "
+"Hauptserver zu installieren (Kombiserver), wovon aus Performanzgründen "
+"abzuraten ist. Den unterschiedlichen Diensten wird ein zuständiger DNS-Name "
+"zugewiesen (IPv4). Dadurch lassen sich einzelne Dienste leicht auf "
+"dezidierte Server auslagern, indem man sie auf dem Hauptserver abschaltet "
+"und die DNS-Konfiguration entsprechend anpasst. "
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:84
+#: release-manual.xml:80
 msgid ""
 "To ensure security all connections where passwords are transmitted over the "
 "network are encrypted, so no passwords are send over the network as plain "
 "text."
-msgstr "Aus Sicherheitsgründen werden Passwörter stets verschlüsselt übertragen , so dass keine Klartextpasswörter in das Netzwerk gelangen."
+msgstr ""
+"Aus Sicherheitsgründen werden Passwörter stets verschlüsselt übertragen , so "
+"dass keine Klartextpasswörter in das Netzwerk gelangen."
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:85
+#: release-manual.xml:81
+#, fuzzy
 msgid ""
 "Below is a list of the services that are set up by default in a Skolelinux "
-"networki, with the DNS name of eache service given in square brackets. Where "
+"network, with the DNS name of each service given in square brackets. Where "
 "possible the DNS name correspond to the service name in"
-msgstr "Im folgenden findet sich eine Liste der Netzwerkdienste, mit denen Skolelinux standardmäßig ausgeliefert wird, einschließlich DNS-Name (in eckigen Klammern). Wo möglich entspricht der DNS-Name dem Dienstnamen"
+msgstr ""
+"Im folgenden findet sich eine Liste der Netzwerkdienste, mit denen "
+"Skolelinux standardmäßig ausgeliefert wird, einschließlich DNS-Name (in "
+"eckigen Klammern). Wo möglich entspricht der DNS-Name dem Dienstnamen"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:86
+#: release-manual.xml:82
+#, fuzzy
 msgid ""
 ", where this is not possible the common name of the service is used as the "
 "DNS name. All configuration files will, if possible, refer to the service by "
 "name (without the domain name) thus making it easy for schools to change "
-"either their domain (if they have an own DNS domain), or their ip-adress."
-msgstr "sonst wurde die allgemeine Bezeichnung des Dienstes als DNS-Name verwendet. Alle Konfigurationsdateien verwenden möglichst  den DNS namen (ohne Domäne) um die Änderung von IP-Bereichen oder Domänennamen zu erleichtern."
+"either their domain (if they have an own DNS domain), or their IP address."
+msgstr ""
+"sonst wurde die allgemeine Bezeichnung des Dienstes als DNS-Name verwendet. "
+"Alle Konfigurationsdateien verwenden möglichst  den DNS namen (ohne Domäne) "
+"um die Änderung von IP-Bereichen oder Domänennamen zu erleichtern."
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:104
+#: release-manual.xml:100
+#, fuzzy
 msgid ""
 "Each user stores his personal files in his home folder which is made "
-"availble by the server. Home folders are accessible from all machines, "
+"available by the server. Home folders are accessible from all machines, "
 "giving users access to the same files regardless of which machine they are "
 "using. The server is operating system agnostic in offering access using NFS "
 "for Unix Clients, SMB for Windows and Macintosh clients."
-msgstr "Jeder Nutzer speichert seine persönlichen Dateien in seinem Nutzerverzeichnis, die der Server bereitstellt. Nutzerverzeichnisse sind von jedem Rechner aus verfügbar, unabhängig vom Arbeitsplatz, an dem ein Nutzer gerade sitzt. Der Server lässt sich plattformübergreifend nutzen, da er neben NFS für Unix-Clients per SMB auch Windows- und Macintosh-Clients bedient."
+msgstr ""
+"Jeder Nutzer speichert seine persönlichen Dateien in seinem "
+"Nutzerverzeichnis, die der Server bereitstellt. Nutzerverzeichnisse sind von "
+"jedem Rechner aus verfügbar, unabhängig vom Arbeitsplatz, an dem ein Nutzer "
+"gerade sitzt. Der Server lässt sich plattformübergreifend nutzen, da er "
+"neben NFS für Unix-Clients per SMB auch Windows- und Macintosh-Clients "
+"bedient."
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:105
+#: release-manual.xml:101
 msgid ""
 "By default e-mail is set up for local delivery (i.e. within the school) "
 "only, though e-mail delivery to the wider Internet may be set up if the "
-"school has a fixed Internet-connection. Mailinglists are set up based on the "
-"user database, giving each class their own mailinglist. Clients are set up "
-"to deliver mail to the server (using \"smarthost\"), and users can access "
+"school has a fixed Internet-connection. Mailing lists are set up based on "
+"the user database, giving each class their own mailing list. Clients are set "
+"up to deliver mail to the server (using 'smarthost'), and users can access "
 "their personal mail through either POP3 or IMAP."
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:106
+#: release-manual.xml:102
+#, fuzzy
 msgid ""
-"All services are accesible using the same username and password, thanks to "
+"All services are accessible using the same username and password, thanks to "
 "the central user database for authentication and authorization."
-msgstr "Eine zentralen Nutzerdatenbank (LDAP) ermöglicht, dass alle Dienste mit einheitlichen Zugangsdaten (Nutzername/Kennwort) genutzt werden können."
+msgstr ""
+"Eine zentralen Nutzerdatenbank (LDAP) ermöglicht, dass alle Dienste mit "
+"einheitlichen Zugangsdaten (Nutzername/Kennwort) genutzt werden können."
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:107
+#: release-manual.xml:103
 msgid ""
 "To increase performance on frequently accessed sites a web proxy that caches "
 "files locally (Squid) is used. In conjunction with blocking web-traffic in "
@@ -403,17 +442,17 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:108
+#: release-manual.xml:104
 msgid ""
-"Network configuration on the clients is done automatigically using DHCP. "
-"Normal clients are allocated IP adresses in the private subnet 10.0.2.0/23, "
+"Network configuration on the clients is done automagically using DHCP. "
+"Normal clients are allocated IP addresses in the private subnet 10.0.2.0/23, "
 "while thin clients are connected to the corresponding thin-client-server via "
 "the seperate subnet 192.168.0.0/24 (this to ensure that the network traffic "
 "of the thin clients doesn't interfere with the rest of the network services)."
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:109
+#: release-manual.xml:105
 msgid ""
 "Centralized logging is set up so that all machines send their syslog "
 "messages to the server. The syslog service is set up so that it only accepts "
@@ -421,7 +460,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:110
+#: release-manual.xml:106
 msgid ""
 "By default the DNS server is set up with a domain for internal use only (*."
 "intern), until a real (\"external\") DNS domain can be set up. The DNS "
@@ -430,17 +469,17 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:111
+#: release-manual.xml:107
 msgid ""
-"Pupils and teachers have the possibilty to publish websites. The webserver "
+"Pupils and teachers have the possibility to publish websites. The web server "
 "provides mechanisms for authenticating users, and for limiting access to "
 "individual pages and subdiretories to certain users and groups. Users will "
-"have the possibility to create dynamic webpages, as the webserver will be "
+"have the possibility to create dynamic web pages, as the web server will be "
 "programmable on the server side."
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:112
+#: release-manual.xml:108
 msgid ""
 "Information on users and machines can be changed in one central location, "
 "and is made accessible to all computers on the network automatically. To "
@@ -449,11 +488,11 @@ msgid ""
 "avoid user confusion there won't be any difference between file groups, "
 "mailing lists, and network groups. This implies that groups of machines "
 "which have to be network groups, have the same namespace as user groups and "
-"mailinglists."
+"mailing lists."
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:113
+#: release-manual.xml:109
 msgid ""
 "Administration of services and users will by and large be via web, and "
 "follow established standards, functioning well in the webbrowsers which are "
@@ -462,43 +501,43 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:114
+#: release-manual.xml:110
 msgid ""
 "In order to avoid certain problems with NFS, and to make it simpler to debug "
 "problems, the clocks of the different machines need to be synchronized. To "
 "achieve this the Skolelinux server is set up as a local Network Time "
 "Protocol (NTP) server, and all workstations and clients are set up to "
-"synchronize their clock with the server. The server itselve should "
+"synchronize their clock with the server. The server itself should "
 "synchronize its clock via NTP against machines on the Internet, thus "
 "ensuring the whole network has the correct time."
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:115
+#: release-manual.xml:111
 msgid ""
 "Printers are connected where convenient, either directly onto the network, "
 "or connected to a server, workstation or thin-client-server. Access to "
-"printers can be controled for individual users according to the groups they "
-"belong to, this will be achieved by using quota and acces control for "
+"printers can be controlled for individual users according to the groups they "
+"belong to, this will be achieved by using quota and access control for "
 "printers."
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:116
+#: release-manual.xml:112
 msgid "Thin client services"
 msgstr "Thin-Client Dienste"
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:117
+#: release-manual.xml:113
 msgid ""
 "A thin client setup enables a ordinary PC to function as an (X-)terminal. "
 "This means that that machine boots from a diskette or directly from the "
-"server using network-PROM without using the local client harddrive. The thin "
-"client setup used is that of the Linux Terminal Server Project (LTSP)."
+"server using network-PROM without using the local client hard drive. The "
+"thin client setup used is that of the Linux Terminal Server Project (LTSP)."
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:118
+#: release-manual.xml:114
 msgid ""
 "Thin clients are a good way to make use of older, weaker machines as they "
 "effectively run all programs on the LTSP-Server. This works as follows: The "
@@ -509,7 +548,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:119
+#: release-manual.xml:115
 msgid ""
 "The thin client server is set up to receive syslog from the thin clients, "
 "and forward these messages to the central syslog recipient. (Oops, the thin "
@@ -518,12 +557,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:122
+#: release-manual.xml:118
 msgid "Administration"
 msgstr "Verwaltung"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:123
+#: release-manual.xml:119
 msgid ""
 "All the linux machines that are installed by means of a Skolelinux CD or DVD "
 "will be administrable from a central computer, most likely the server. It "
@@ -532,7 +571,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:124
+#: release-manual.xml:120
 msgid ""
 "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 "
@@ -541,7 +580,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:125
+#: release-manual.xml:121
 msgid ""
 "All user information is kept in an LDAP directory. Updates of user accounts "
 "are made against this database and is used by the clients for user "
@@ -549,17 +588,17 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:127 release-manual.xml:243
+#: release-manual.xml:123 release-manual.xml:242
 msgid "Installation"
 msgstr "Installation"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:128
+#: release-manual.xml:124
 msgid "Installation is possible either from a CD or DVD."
 msgstr "Die Installation ist von CD oder DVD möglich."
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:129
+#: release-manual.xml:125
 msgid ""
 "The aim is to be able to install a server from CD/DVD, and install clients "
 "over the network by booting all other machines from the network. The DVD "
@@ -567,7 +606,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:130
+#: release-manual.xml:126
 msgid ""
 "The installation should not ask any questions, with the exception of desired "
 "language (e.g. Norwegian Bokmal, Nynorsk, Sami) and machine profile (server, "
@@ -577,12 +616,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:132
+#: release-manual.xml:128
 msgid "File system access configuration"
 msgstr "Konfiguration des Dateisystem-Zugriffs"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:133
+#: release-manual.xml:129
 msgid ""
 "Each Skolelinux user account is assigned a section of the file system on the "
 "file server. This section (home directory) contains the user's configuration "
@@ -593,7 +632,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:134
+#: release-manual.xml:130
 msgid ""
 "To ensure that all disks that are used for user directories or shared "
 "directories can be uniquely named across all the computers in the "
@@ -601,12 +640,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:135
+#: release-manual.xml:131
 msgid ". Initially, one directory is created on the file server,"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:136
+#: release-manual.xml:132
 msgid ""
 ", in which all the user accounts are created. More directories may then be "
 "created when needed, to accomodate particular user groups or particular "
@@ -614,7 +653,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:137
+#: release-manual.xml:133
 msgid ""
 "To enable shared file access control using the file groups, each user must "
 "be assigned a primary group with no other members. The name of this private "
@@ -630,12 +669,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:139
+#: release-manual.xml:135
 msgid ""
 "The initial access settings for newly created files is a matter of policy. "
 "They may either be set to give read access to everybody, which can later be "
 "removed by explicit user action, or they may be initially blocked, "
-"necessiating user action to make them accessible. The first approach "
+"necessitating user action to make them accessible. The first approach "
 "encourages knowledge sharing, and makes the system more transparent, whereas "
 "the second method decreases the risk of unwanted spreading of sensitive "
 "information. The problem with the first solution is that it is not apparent "
@@ -649,7 +688,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:140
+#: release-manual.xml:136
 msgid ""
 "Suggestion: The files are initially set to be readable by all, but "
 "particular directories are created in which the content is initially "
@@ -662,101 +701,104 @@ msgstr ""
 "nicht. Konkret sollte umask auf 002 gesetzt sein und"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:141
-msgid "created with priviliges 0775,"
+#: release-manual.xml:137
+#, fuzzy
+msgid "created with privileges 0775,"
 msgstr "erzeugt mit den Rechten 0775."
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:142
+#: release-manual.xml:138
 msgid "given 0750,and"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:143
-msgid "given 0775. Files that should not be readable by others should be put in"
+#: release-manual.xml:139
+msgid ""
+"given 0775. Files that should not be readable by others should be put in"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:144
+#: release-manual.xml:140
 msgid ", whereas public files will be put in"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:145
-msgid ". Other files will initially be accessible, but may be blocked as needed."
+#: release-manual.xml:141
+msgid ""
+". Other files will initially be accessible, but may be blocked as needed."
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:146
+#: release-manual.xml:142
 msgid ""
 "ssh requires that the home directory can only be written to by the owner, "
 "thus the maximum access privilege for"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:147
+#: release-manual.xml:143
 msgid "is 755."
 msgstr "ist 755."
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:151
+#: release-manual.xml:147
 msgid "random notes"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:152
+#: release-manual.xml:148
 msgid ""
 "These are random notes concerning things which should be included in this "
 "document."
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:164
+#: release-manual.xml:160
 msgid "Features"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:165
+#: release-manual.xml:161
 msgid "New features in the \"3.0 Terra\" release 2007-07-22"
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:174
+#: release-manual.xml:170
 msgid "OpenOffice.org version 2.0."
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:185
+#: release-manual.xml:181
 msgid "Regression: A new web based user administration tool are included named"
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:186
+#: release-manual.xml:182
 msgid ". The old one named wlus required"
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:187
+#: release-manual.xml:183
 msgid ". Webmin is now removed from Debian because of problems supporting it."
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:191
+#: release-manual.xml:187
 msgid "Features in 2.0 release 2006-03-14"
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:196
+#: release-manual.xml:192
 msgid "OpenOffice.org 1.1."
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:201
+#: release-manual.xml:197
 msgid "Features in \"1.0 Venus\" release 2004-06-20"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:208
+#: release-manual.xml:204
 msgid ""
 "(Information on the older releases can be found on <ulink url='http://"
 "developer.skolelinux.no/info/cdbygging/news.html'>http://developer."
@@ -764,12 +806,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:212
+#: release-manual.xml:208
 msgid "Requirements"
 msgstr "Vorraussetzungen"
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:213
+#: release-manual.xml:209
 msgid ""
 "There are different ways of set up a Skolelinux solution. It can be "
 "installed on just one standalone PC or a regional wide solution at many "
@@ -779,28 +821,49 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:220
+#: release-manual.xml:216
 msgid ""
-"for diskless workstations, which are also know as <ulink url='/"
-"LowFat'>LowFat </ulink> clients, 256 MB RAM and 800 MHz or more is "
-"recommended minimum requirements. Swap is required"
+"for diskless workstations (also known as <ulink url='/LowFat'>LowFat </"
+"ulink> clients) 256 MB RAM and 800 MHz or more is recommended minimum "
+"requirements. Swap is required"
 msgstr ""
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:225
+#: release-manual.xml:221
 msgid "FIXME: add links to explainations of main-server and thinclient-server"
 msgstr ""
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:228
+#: release-manual.xml:224
 msgid ""
-"Some municipalities provides a remote desktop in addition what's default "
+"Some municipalities provide a remote desktop in addition to what defaults "
 "with Skolelinux. That way students and teachers can access Skolelinux from "
 "their home computer running Windows, Mac or Linux."
 msgstr ""
 
+# type: Content of: <article><para><section><para>
+#: release-manual.xml:228
+msgid ""
+"Some schools use control tools like Controlaula or Italc to supervise their "
+"students."
+msgstr ""
+
+# type: Content of: <article><para><section><para>
+#: release-manual.xml:229
+msgid ""
+"Some schools use squidguard or dansguardian to restrict internet access."
+msgstr ""
+
+# type: Content of: <article><para><section><para>
+#: release-manual.xml:230
+msgid ""
+"Some schools use alternative user administration tools like CipUX for "
+"extended features. In France, this is combined with moodle to keep track of "
+"students' facilities and credit points."
+msgstr ""
+
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:233
+#: release-manual.xml:232
 msgid ""
 "Skolelinux network services are made pluggable with several different client "
 "alternatives as <ulink url='/LowFat'>LowFat </ulink> clients (Diskless), "
@@ -810,31 +873,31 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:237
+#: release-manual.xml:236
 msgid ""
 "A router/gateway, connected to the internet on the external interface and "
 "running on the IP address 10.0.2.1 on the internal interface."
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:238
+#: release-manual.xml:237
 msgid "FIXME: We suggest coyote (link) or or. link to setup documentation"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:239
+#: release-manual.xml:238
 msgid ""
 "FIXME: also link to <ulink url='/HowTo'>HowTo </ulink> change IP setup of "
 "Debian-Edu - but recommend against doing so."
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:244
+#: release-manual.xml:243
 msgid "Where to find more information"
 msgstr "Wo sie weiter Informationen finden können"
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject>
-#: release-manual.xml:245
+#: release-manual.xml:244
 msgid ""
 "We recommend to read or at least take a look at the <ulink url='http://www."
 "debian.org/releases/stable/releasenotes'>release notes for Debian etch </"
@@ -844,12 +907,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:247 release-manual.xml:778
+#: release-manual.xml:246 release-manual.xml:784
 msgid "<phrase>:-)  </phrase>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:251
+#: release-manual.xml:250
 msgid ""
 "Even more <ulink url='http://www.debian.org/releases/stable/"
 "installmanual'>information about the Debian etch release </ulink> is "
@@ -857,39 +920,39 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:254
+#: release-manual.xml:253
 msgid "Download an installation media for Debian-edu etch 3.0r0"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:255
+#: release-manual.xml:254
 msgid "DVDs for i386, amd64 and powerpc"
 msgstr "DVD's für i386, amd64 und powerpc"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:256
+#: release-manual.xml:255
 msgid ""
 "The multiarch dvd ISO image is 4.4 GiB large. To download it, use either of "
 "these methods:"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:265
+#: release-manual.xml:264
 msgid "or for the netinstall cd you can download for i386"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:274
+#: release-manual.xml:273
 msgid "amd64"
 msgstr "amd64"
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:283
+#: release-manual.xml:282
 msgid "and powerpc"
 msgstr "und powerpc"
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:292
+#: release-manual.xml:291
 msgid ""
 "The powerpc port has not been tested as much as the other architectures, "
 "though it should work just fine and has been reported to work. Still, we "
@@ -898,17 +961,17 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:293
+#: release-manual.xml:292
 msgid "The source code for this release is available on a DVD image"
 msgstr "Der Quellcode für dieses Release ist auf einem DVD-Image verfügbar"
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:304
+#: release-manual.xml:303
 msgid "Installation from CD"
 msgstr "Installation von CD"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:305
+#: release-manual.xml:304
 msgid ""
 "The netinst installation will fetch some packages from the CD and the rest "
 "from the net.  The amount of packages fetched from the net varies from "
@@ -916,12 +979,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:315
+#: release-manual.xml:314
 msgid "Installation options"
 msgstr "Installations Optionen"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:316
+#: release-manual.xml:315
 msgid ""
 "When you do an Debian-Edu installation you have a few options to choose. But "
 "don't be afraid, there aren't many. We have done a good job hiding the "
@@ -932,24 +995,24 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:318
+#: release-manual.xml:317
 msgid ""
 "Normal graphical installation is the default on i386 and amd64. The powerpc "
 "installer does not support graphical installation. Enter"
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:319
+#: release-manual.xml:318
 msgid "at the boot prompt to do a text-mode install."
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:321
+#: release-manual.xml:320
 msgid "The"
 msgstr "Die"
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:322
+#: release-manual.xml:321
 msgid ""
 "option adds the barebone profile to the profile options, and switches to "
 "manual partitioning. Enter"
@@ -958,17 +1021,17 @@ msgstr ""
 "manuelle Partitionierung an. Gebe ... ein"
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:323
+#: release-manual.xml:322
 msgid "or"
 msgstr "oder"
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:324
+#: release-manual.xml:323
 msgid "at the syslinux/yaboot prompt to enter expert mode."
 msgstr "an dem syslinux/yaboot Prompt, um in den Experten modus zu gelangen."
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para><inlinemediaobject>
-#: release-manual.xml:348
+#: release-manual.xml:347
 msgid ""
 "please say yes to submit information to <ulink url='http://popcon.skolelinux."
 "org/'>http://popcon.skolelinux.org/ </ulink> - though you dont have to "
@@ -978,8 +1041,13 @@ msgstr ""
 "skolelinux.org/'>http://popcon.skolelinux.org/ </ulink> zu übertragen - sie "
 "müssen dies aber nicht <inlinemediaobject>"
 
+# type: Content of: <article><para><section><para><inlinemediaobject><textobject>
+#: release-manual.xml:349 release-manual.xml:515 release-manual.xml:877
+msgid "<phrase>:)  </phrase>"
+msgstr "<phrase>:)  </phrase>"
+
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:358
+#: release-manual.xml:357
 msgid ""
 "FIXME: this section lacks info how to install half-thick clients, which we "
 "marketing as great feature...! half-thick clients (aka diskless workstation "
@@ -988,111 +1056,112 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:360
-msgid "Screenshot tour through an i386 main-server + thin-client-server installation"
+#: release-manual.xml:359
+msgid ""
+"Screenshot tour through an i386 main-server + thin-client-server installation"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:362
+#: release-manual.xml:361
 msgid "<phrase>attachment:debian-edu-bootopt.png </phrase>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:367
+#: release-manual.xml:366
 msgid "<phrase>attachment:debian-edu-lang-en.png </phrase>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:372
+#: release-manual.xml:371
 msgid "<phrase>attachment:debian-edu-region-en.png </phrase>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:377
+#: release-manual.xml:376
 msgid "<phrase>attachment:debian-edu-keyboard-en.png </phrase>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:382
+#: release-manual.xml:381
 msgid "<phrase>attachment:debian-edu-profile-ms-tcs-en.png </phrase>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:387
+#: release-manual.xml:386
 msgid "<phrase>attachment:debian-edu-autopartition-en.png </phrase>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:392
+#: release-manual.xml:391
 msgid "<phrase>attachment:debian-edu-popcon-en.png </phrase>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:397
+#: release-manual.xml:396
 msgid "<phrase>attachment:debian-edu-timezone-en.png </phrase>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:402
+#: release-manual.xml:401
 msgid "<phrase>attachment:debian-edu-rootpw-en.png </phrase>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:407
+#: release-manual.xml:406
 msgid "<phrase>attachment:debian-edu-baseinstall-en.png </phrase>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:412
+#: release-manual.xml:411
 msgid "<phrase>attachment:debian-edu-pkginstall-ms-tcs-en.png </phrase>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:417
+#: release-manual.xml:416
 msgid "<phrase>attachment:debian-edu-finished-en.png </phrase>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:422
+#: release-manual.xml:421
 msgid "<phrase>attachment:debian-edu-grub.png </phrase>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:427
+#: release-manual.xml:426
 msgid "<phrase>attachment:debian-edu-usplash.png </phrase>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:431
+#: release-manual.xml:430
 msgid ""
 "The KDM login screen was manually adjusted to reduce the resolution for this "
 "screen shot."
 msgstr ""
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:433
+#: release-manual.xml:432
 msgid "<phrase>attachment:debian-edu-kdm-small-en.png </phrase>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:437
+#: release-manual.xml:436
 msgid "FIXME"
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:440
+#: release-manual.xml:439
 msgid "Getting started"
 msgstr ""
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:441
+#: release-manual.xml:440
 msgid ""
 "FIXME: Describe here, what needs to be done after the installation to use "
 "Debian-Edu for real."
 msgstr ""
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:442
+#: release-manual.xml:441
 msgid ""
 "The <ulink url='/DebianEdu/Documentation/Etch/HowTo'>howto </ulink> chapter "
 "describes more tips and tricks and frequently asked questions, while this is "
@@ -1100,24 +1169,24 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:444
+#: release-manual.xml:443
 msgid "Services running on the main server"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:445
+#: release-manual.xml:444
 msgid ""
 "There are several services running on the main server which can be managed "
 "via a web management interface.  We'll describe each service here."
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:446
+#: release-manual.xml:445
 msgid "User Management"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:447
+#: release-manual.xml:446
 msgid ""
 "Point your webbrowser to <ulink url='https://www/lwat'>https://www/lwat </"
 "ulink> and you'll get an login screen where you can login with your admin "
@@ -1126,13 +1195,13 @@ msgid ""
 msgstr ""
 
 # type: CDATA
-#: release-manual.xml:449
+#: release-manual.xml:448
 #, no-wrap
 msgid "admin]]"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:450
+#: release-manual.xml:449
 msgid ""
 "and the password is the password you entered during the installation for the "
 "root account. Here you can manage your users and your user groups. For "
@@ -1142,17 +1211,17 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:456
+#: release-manual.xml:455
 msgid "User Administration"
 msgstr "Benutzerverwaltung"
 
 # type: Content of: <article><para><section><section><section><section><para>
-#: release-manual.xml:457
+#: release-manual.xml:456
 msgid "There are 4 kind of possible users:"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><section><para>
-#: release-manual.xml:463
+#: release-manual.xml:462
 msgid ""
 "If you want to add an user you'll recognise that you can't provide an "
 "password for your users. For Security Reasons we disabled this. The "
@@ -1162,17 +1231,17 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><section><para>
-#: release-manual.xml:464
+#: release-manual.xml:463
 msgid "FIXME: describe Groups, Machine and Machine Administration here."
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:467
+#: release-manual.xml:466
 msgid "Printer Managment"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:468
+#: release-manual.xml:467
 msgid ""
 "For Printer Management point your webbrowser to <ulink url='https://www/"
 "cups'>https://www/cups </ulink>.  This is the normal cups management site "
@@ -1182,17 +1251,17 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:470
+#: release-manual.xml:469
 msgid "FIXME: Go further"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:473
+#: release-manual.xml:472
 msgid "Adding debian-edu machines to the LDAP domain"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:474
+#: release-manual.xml:473
 msgid ""
 "FIXME: add how, is that the right headline for this? (The [.<ulink url='/"
 "DebianEdu/Documentation/Etch/GettingStarted/HowTo'>/HowTo </ulink>] Chapter "
@@ -1202,12 +1271,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:478
+#: release-manual.xml:477
 msgid "HowTo"
 msgstr "Anleitung"
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:479
+#: release-manual.xml:478
 msgid ""
 "The <ulink url='/HowTos'>HowTos </ulink> from <ulink url='http://wiki.debian."
 "org/DebianEdu/HowTo/'>http://wiki.debian.org/DebianEdu/HowTo/ </ulink> are "
@@ -1220,12 +1289,12 @@ msgstr ""
 "Anwenderspezifischen <ulink url='/HowTos'>HowTos </ulink> hierhin schieben!"
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:483
+#: release-manual.xml:482
 msgid "Those are not that many:"
 msgstr ""
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:499
+#: release-manual.xml:498
 msgid ""
 "<ulink url='http://wiki.debian.org/DebianEdu/HowTo/"
 "LtspDisklessWorkstation'>http://wiki.debian.org/DebianEdu/HowTo/"
@@ -1234,7 +1303,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:508
+#: release-manual.xml:507
 msgid ""
 "<ulink url='http://wiki.debian.org/DebianEdu/HowTo/TeacherFirstStep'>http://"
 "wiki.debian.org/DebianEdu/HowTo/TeacherFirstStep </ulink> - incomplete but "
@@ -1242,38 +1311,38 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:512
+#: release-manual.xml:511
 msgid ""
 "(see the history of those wiki pages and ask the authors if they are fine "
 "with moving the howto and putting it under the GPL)"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:513
+#: release-manual.xml:512
 msgid "Other topics"
 msgstr ""
 
 # type: Content of: <article><para><section><para><inlinemediaobject>
-#: release-manual.xml:514
+#: release-manual.xml:513
 msgid ""
 "Other topics the documentation should cover, not neccessarily in the <ulink "
 "url='/HowTo'>HowTo </ulink> Chapter though <inlinemediaobject>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject>
-#: release-manual.xml:519
+#: release-manual.xml:518
 msgid ""
 "</inlinemediaobject> This <ulink url='/HowTo'>HowTo </ulink> chapter "
 "definitly needs reorganisation - sorry translators <inlinemediaobject>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:521
+#: release-manual.xml:520
 msgid "<phrase>:( </phrase>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:525
+#: release-manual.xml:524
 msgid ""
 "Somewhere we also need to document lwat basics (howto create users, access "
 "home dirs (or rather export them to machines) and (give a pointer to) italc "
@@ -1281,37 +1350,38 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:527
-msgid "Installing single service machines for spreading the load from main-server"
+#: release-manual.xml:526
+msgid ""
+"Installing single service machines for spreading the load from main-server"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:535
+#: release-manual.xml:534
 msgid "LDAP Setup"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:537
+#: release-manual.xml:536
 msgid "/etc/ in svk"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:539
+#: release-manual.xml:538
 msgid "modify Kiosk mode"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:541
+#: release-manual.xml:540
 msgid "Flash"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:542
+#: release-manual.xml:541
 msgid "To install the Adobe Flash Player web browser plugin, install the"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:543
+#: release-manual.xml:542
 msgid ""
 "debian package.  It require a working Internet connection, and will download "
 "the precompiled binary from Adobe and convert it into a Debian package "
@@ -1320,36 +1390,36 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:545
+#: release-manual.xml:544
 msgid "<phrase>/!\\ </phrase>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:548
+#: release-manual.xml:547
 msgid ""
 "</inlinemediaobject> Version 9.0.31.0.1 of the package do not work in Etch "
 "[pere 2007-07-12]"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:549
+#: release-manual.xml:548
 msgid ""
 "An alternative is to install flashplayer-mozilla from debian-multimedia.  It "
 "work with both konqueror and firefox."
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:551
+#: release-manual.xml:550
 msgid "Java"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:555
+#: release-manual.xml:554
 msgid "Sound & Video"
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:556
+#: release-manual.xml:555
 msgid ""
 "- where to find libdvdcss for playing dvds.  Should we promote <ulink "
 "url='http://www.debian-multimedia.org/'>http://www.debian-multimedia.org/ </"
@@ -1357,12 +1427,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:561
+#: release-manual.xml:560
 msgid "Thin Clients vs Diskless workstations"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:562
+#: release-manual.xml:561
 msgid ""
 "Instructions on how to enable diskless workstations / stateless "
 "workstations / lowfat clients / half-thick clients are available from <ulink "
@@ -1371,27 +1441,27 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:565
+#: release-manual.xml:564
 msgid "printer managing"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:567
+#: release-manual.xml:566
 msgid "Firewall setup (coyote linux)"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:569
+#: release-manual.xml:568
 msgid "LTSP in detail"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:571
+#: release-manual.xml:570
 msgid "Connecting windows machines to the network / windows integration"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:572
+#: release-manual.xml:571
 msgid ""
 "For Windows clients the Windows domain \"SKOLELINUX\" is available to be "
 "joined. A special service called Samba, installed on the main-server tjener, "
@@ -1400,21 +1470,21 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:573
+#: release-manual.xml:572
 msgid ""
 "In order to make Windows clients join the domain some (few) steps are "
 "required:"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:574
+#: release-manual.xml:573
 msgid ""
 "1. Create a user with membership in the \"admins\" group (if not already "
 "existing)"
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:575
+#: release-manual.xml:574
 msgid ""
 "In order to be able to join the \"SKOLELINUX\" domain a member of the admins "
 "group needs to authorize the process. If not yet existing a user with that "
@@ -1424,12 +1494,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:579
+#: release-manual.xml:578
 msgid "2. Configure the Windows client as static host"
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:580
+#: release-manual.xml:579
 msgid ""
 "When joining a samba domain some special data is stored on the domain "
 "controller (tjener). This data is needed to recognize the Windows client "
@@ -1442,19 +1512,19 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:583
+#: release-manual.xml:582
 msgid ""
 "3. On the Windows client: Make sure the network and system configuration "
 "matches the data stored on tjener (hostname and ip configuration)"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:586
+#: release-manual.xml:585
 msgid "4. Join the domain as usual using the user added in step 1."
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:589
+#: release-manual.xml:588
 msgid ""
 "Windows will sync the profile of domain users on every login and logout. "
 "Depending on how much data stored in the profile this could take some time. "
@@ -1463,33 +1533,49 @@ msgid ""
 "and save file into the H: volume instead of \"Own files\"."
 msgstr ""
 
+# type: Content of: <article><para><section><section><title>
+#: release-manual.xml:590
+msgid "Using volatile.debian.org and backports.org"
+msgstr ""
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:591
+msgid "FIXME: describe howto..."
+msgstr ""
+
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:592
+#: release-manual.xml:594
 msgid "Maintainance"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:593
+#: release-manual.xml:595
 msgid "Updating the software"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:594
-msgid "document how to use aptitude upgrade / kde-update-notifier"
+#: release-manual.xml:596
+msgid "This section explains how to use"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:595
-msgid "are cron-apt and apt-listchanges installed and configured?"
+#: release-manual.xml:597
+msgid "and kde-update-notifier"
+msgstr ""
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:598
+msgid ""
+"FIXME: are cron-apt, apt-proxy and apt-listchanges installed and configured?"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:597
+#: release-manual.xml:600
 msgid "Backup Management"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:598
+#: release-manual.xml:601
 msgid ""
 "For the backup management point your browser to <ulink url='https://www/"
 "slbackup-php'>https://www/slbackup-php </ulink>. Please note that you have "
@@ -1498,34 +1584,34 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:600
+#: release-manual.xml:603
 msgid ""
 "FIXME: I have to have a look on the webpage of slbackup-php to describe this "
 "further"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:602
+#: release-manual.xml:605
 msgid "Server Monitoring"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:603
+#: release-manual.xml:606
 msgid "Munin"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:605
+#: release-manual.xml:608
 msgid "Nagios"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:607
+#: release-manual.xml:610
 msgid "Sitesummary"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:608
+#: release-manual.xml:611
 msgid ""
 "Some documentation on sitesummary is available from <ulink url='http://wiki."
 "debian.org/DebianEdu/HowTo/SiteSummary'>http://wiki.debian.org/DebianEdu/"
@@ -1533,17 +1619,17 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:610
+#: release-manual.xml:613
 msgid "give pointers to munin, sitesummary and nagios doc"
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:614
+#: release-manual.xml:617
 msgid "Upgrades"
 msgstr ""
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:615
+#: release-manual.xml:618
 msgid ""
 "Before explaining how to upgrade, please note, that you do this update on "
 "your productive server on your own risk. <emphasis role='strong'>Debian-Edu/"
@@ -1552,7 +1638,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:617
+#: release-manual.xml:620
 msgid ""
 "More <ulink url='http://www.debian.org/releases/stable/"
 "installmanual'>information about the Debian etch release </ulink> is "
@@ -1560,7 +1646,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:619
+#: release-manual.xml:622
 msgid ""
 "If you want to be sure that after the upgrade everything works like before , "
 "you should test the upgrade on a test server, which is configured the same "
@@ -1569,7 +1655,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:620
+#: release-manual.xml:623
 msgid ""
 "Also it might be wise to wait a bit and keep running sarge for some more "
 "weeks, so that others can test the upgrade, experience problems and document "
@@ -1579,17 +1665,18 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:621
+#: release-manual.xml:624
 msgid "Upgrades from Debian-Edu sarge"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:622
-msgid "Please read this chapter completly before you start upgrading your systems."
+#: release-manual.xml:625
+msgid ""
+"Please read this chapter completly before you start upgrading your systems."
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:623
+#: release-manual.xml:626
 msgid ""
 "In case of problems you could also read the <ulink url='http://www.debian."
 "org/releases/stable/releasenotes'>releasenotes for Debian etch </ulink>. "
@@ -1601,12 +1688,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:627
+#: release-manual.xml:630
 msgid "Partioning scheme changed"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:628
+#: release-manual.xml:631
 msgid ""
 "The main problem upgrading from the sarge-based Release to Terra is that the "
 "Partition Scheme changed completly. The sarge-based Release has two volume "
@@ -1614,14 +1701,14 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:632
+#: release-manual.xml:635
 msgid ""
 "But the etch based release has only 1 Volume Group due to internal changes "
 "of the Installer."
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:633
+#: release-manual.xml:636
 msgid ""
 "The main problem is here that the System Volumegroup is quit small since the "
 "data in this Partitions is mostly static. When trying the upgrade on an 8GB "
@@ -1632,19 +1719,19 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:635
+#: release-manual.xml:638
 msgid "Prepare the System"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:636
+#: release-manual.xml:639
 msgid ""
 "If you have enough space in the vg_system Volumegroup but not in the lv_var- "
 "Partition you have to resize this partition:"
 msgstr ""
 
 # type: CDATA
-#: release-manual.xml:637
+#: release-manual.xml:640
 #, no-wrap
 msgid ""
 "/etc/init.d/squid stop \n"
@@ -1653,25 +1740,25 @@ msgid ""
 msgstr ""
 
 # type: CDATA
-#: release-manual.xml:642
+#: release-manual.xml:645
 #, no-wrap
 msgid "e2fsck -f /dev/vg_system/lv_data ]]"
 msgstr ""
 
 # type: CDATA
-#: release-manual.xml:645
+#: release-manual.xml:648
 #, no-wrap
 msgid "lvextend -L +1GB /dev/vg_system/lv_data ]]"
 msgstr ""
 
 # type: CDATA
-#: release-manual.xml:648
+#: release-manual.xml:651
 #, no-wrap
 msgid "resize2fs /dev/vg_system/lv_data]]"
 msgstr ""
 
 # type: CDATA
-#: release-manual.xml:651
+#: release-manual.xml:654
 #, no-wrap
 msgid ""
 "mount /var \n"
@@ -1680,12 +1767,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:658
+#: release-manual.xml:661
 msgid "Now start the upgrade with:"
 msgstr ""
 
 # type: CDATA
-#: release-manual.xml:659
+#: release-manual.xml:662
 #, no-wrap
 msgid ""
 "apt-get update \n"
@@ -1693,12 +1780,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:663
+#: release-manual.xml:666
 msgid "after you have modified your sources.list:"
 msgstr ""
 
 # type: CDATA
-#: release-manual.xml:664
+#: release-manual.xml:667
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian etch main contrib non-free \n"
@@ -1706,12 +1793,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:669
+#: release-manual.xml:672
 msgid "Answers to Debconf Questions raising during upgrade"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:670
+#: release-manual.xml:673
 msgid ""
 "Okay we'll give yo here some hints, what you should answer when some debconf "
 "Questions comes up. But please note. This upgrade <ulink url='/HowTo'>HowTo "
@@ -1726,71 +1813,72 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:674
+#: release-manual.xml:677
 msgid "* Configure nagios-common."
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:675
+#: release-manual.xml:678
 msgid ""
 "Here you have to enter an passwort for the <emphasis>nagiosadmin </emphasis> "
 "user."
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:679
+#: release-manual.xml:682
 msgid "* Configure console-data"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:682
+#: release-manual.xml:685
 msgid "* Configure openssh-server"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:685
+#: release-manual.xml:688
 msgid "* Configure systat"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:688
+#: release-manual.xml:691
 msgid "* Configure popularity-contest"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:691
+#: release-manual.xml:694
 msgid "* Configure libnss-ldap"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><orderedlist><listitem><para>
-#: release-manual.xml:692
+#: release-manual.xml:695
 msgid "Change the prompt to: <emphasis>ldaps://ldap/ </emphasis>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><orderedlist><listitem><para>
-#: release-manual.xml:695
-msgid "Change the prompt to: <emphasis>dc=skole,dc=skolelinux,dc=no </emphasis>"
+#: release-manual.xml:698
+msgid ""
+"Change the prompt to: <emphasis>dc=skole,dc=skolelinux,dc=no </emphasis>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:702
+#: release-manual.xml:705
 msgid "* Upgrade glibc now. Answer Yes here."
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:703
+#: release-manual.xml:706
 msgid "* Restart Services. Answer Yes here."
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:704
+#: release-manual.xml:707
 msgid ""
 "Okay. This should be all if you have no additional packages installed. Now "
 "the upgrade process start to replace the packages."
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:705
+#: release-manual.xml:708
 msgid ""
 "Please note here: The Installer will ask several times if you want to keep "
 "your old modified Version of an Configfile or if you want to get the latest. "
@@ -1799,12 +1887,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:706
+#: release-manual.xml:709
 msgid "The upgrade will fail with this error message:"
 msgstr ""
 
 # type: CDATA
-#: release-manual.xml:707
+#: release-manual.xml:710
 #, no-wrap
 msgid ""
 "Errors were encountered while processing: \n"
@@ -1815,7 +1903,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:712
+#: release-manual.xml:715
 msgid ""
 "To fix this you have to edit these two files: <emphasis>/var/lib/dpkg/info/"
 "mozilla-firefox-locale-it.postrm </emphasis> and <emphasis>/var/lib/dpkg/"
@@ -1825,28 +1913,28 @@ msgid ""
 msgstr ""
 
 # type: CDATA
-#: release-manual.xml:716
+#: release-manual.xml:719
 #, no-wrap
 msgid "apt-get -f install]]"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:717
+#: release-manual.xml:720
 msgid "Now the upgrade work again:"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:718
+#: release-manual.xml:721
 msgid "* Several Modified configuration files (nagios)"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:721
+#: release-manual.xml:724
 msgid "Then the installation failed another time:"
 msgstr ""
 
 # type: CDATA
-#: release-manual.xml:722
+#: release-manual.xml:725
 #, no-wrap
 msgid ""
 "Errors were encountered while processing: \n"
@@ -1856,7 +1944,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:726
+#: release-manual.xml:729
 msgid ""
 "In order to fix this rename this directory: <emphasis>/var/backups/dc=skole,"
 "dc=skolelinux,dc=no-2.2.23-8.ldapdb </emphasis> and since ldap now runs not "
@@ -1865,7 +1953,7 @@ msgid ""
 msgstr ""
 
 # type: CDATA
-#: release-manual.xml:729
+#: release-manual.xml:732
 #, no-wrap
 msgid ""
 "chown -R openldap:openldap /etc/ldap/ \n"
@@ -1873,7 +1961,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:731
+#: release-manual.xml:734
 msgid ""
 "Then the installation should finish <emphasis role='strong'>without </"
 "emphasis> an error.  Since now many packages are not upgrades please restart "
@@ -1881,18 +1969,18 @@ msgid ""
 msgstr ""
 
 # type: CDATA
-#: release-manual.xml:733
+#: release-manual.xml:736
 #, no-wrap
 msgid "apt-get dist-upgrade]]"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:734
+#: release-manual.xml:737
 msgid "The next error raising up is this one:"
 msgstr ""
 
 # type: CDATA
-#: release-manual.xml:735
+#: release-manual.xml:738
 #, no-wrap
 msgid ""
 "Errors were encountered while processing: \n"
@@ -1901,23 +1989,24 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:738
+#: release-manual.xml:741
 msgid "Please remove the package: <emphasis>courier-ldap </emphasis> with"
 msgstr ""
 
 # type: CDATA
-#: release-manual.xml:740
+#: release-manual.xml:743
 #, no-wrap
 msgid "apt-get remove courier-ldap]]"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:741
-msgid "and wait until it is finished.Then restart the dist-upgrade process again."
+#: release-manual.xml:744
+msgid ""
+"and wait until it is finished.Then restart the dist-upgrade process again."
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:742
+#: release-manual.xml:745
 msgid ""
 "If you have only the default packages installed the upgrade process should "
 "now finish without raising more errors. The only remaining upgrade issue is "
@@ -1926,18 +2015,18 @@ msgid ""
 msgstr ""
 
 # type: CDATA
-#: release-manual.xml:743
+#: release-manual.xml:746
 #, no-wrap
 msgid "chown bind:root -R /etc/bind ]]"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:746
+#: release-manual.xml:749
 msgid "Upgrades from older Debian-Edu / Skolelinux installations"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:747
+#: release-manual.xml:750
 msgid ""
 "Upgrades from the woody based Debian-Edu / Skolelinux installation are not "
 "supported. Upgrade to the sarge based version first, a howto can be found at "
@@ -1947,28 +2036,27 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:751
+#: release-manual.xml:754
 msgid "Contribute"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:752
+#: release-manual.xml:755
 msgid "Let us know you exist"
 msgstr ""
 
-# type: Content of: <article><para><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:754
-#, fuzzy
-msgid "<phrase>skolelinux-world </phrase>"
-msgstr "<phrase>:)  </phrase>"
+# type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
+#: release-manual.xml:757
+msgid "<phrase>worldmapphp?lang=en&foo=bar </phrase>"
+msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:758
+#: release-manual.xml:761
 msgid "There are Debian Edu users all over the world."
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:759
+#: release-manual.xml:762
 msgid ""
 "The Debian Edu project provide a database of schools and users of the system "
 "to help the users find each other, and also to have an idea about where the "
@@ -1979,41 +2067,48 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:762
+#: release-manual.xml:765
 msgid "Resources"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:763
+#: release-manual.xml:766
 msgid "<emphasis role='strong'>FIXME </emphasis>, for now some basic pointers:"
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:765
+#: release-manual.xml:768
 msgid ""
 "<ulink url='http://wiki.debian.org/DebianEdu'>http://wiki.debian.org/"
 "DebianEdu </ulink> - mostly developer centric wiki"
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:768
+#: release-manual.xml:771
 msgid ""
 "<ulink url='http://lists.debian.org/debian-edu'>http://lists.debian.org/"
 "debian-edu </ulink> - developer centric mailing list"
 msgstr ""
 
+# type: Content of: <article><para><section><section><itemizedlist><listitem><para>
+#: release-manual.xml:775
+msgid ""
+"we are organized in <ulink url='http://wiki.debian.org/DebianEdu/"
+"Teams/'>different teams </ulink> working on different subjects."
+msgstr ""
+
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:773
-msgid "FIXME: add info how developers and testers can contribute."
+#: release-manual.xml:779
+msgid "FIXME: add link to Support chapter"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:775
+#: release-manual.xml:781
 msgid "Documentation writers"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject>
-#: release-manual.xml:776
+#: release-manual.xml:782
 msgid ""
 "This document needs your help. You can help at <ulink url='http://wiki."
 "skolelinux.no/DebianEdu/Documentation/Etch/'>http://wiki.skolelinux.no/"
@@ -2021,12 +2116,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:783
+#: release-manual.xml:789
 msgid "Translations wanted"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:784
+#: release-manual.xml:790
 msgid ""
 "Another good way to help is by translating software and documentation. "
 "Information how to translate the documentation can be found in the <ulink "
@@ -2036,24 +2131,24 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:787
+#: release-manual.xml:793
 msgid "Join a local Debian-Edu team"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:788
+#: release-manual.xml:794
 msgid ""
 "<emphasis role='strong'>FIXME </emphasis>: in Norway, Germany, France, Spain "
 "(the region of Extremadura)."
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:791
+#: release-manual.xml:797
 msgid "Start a new local Debian-Edu team"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:792
+#: release-manual.xml:798
 msgid ""
 "<emphasis role='strong'>FIXME: </emphasis> \"isolated\" contributors and "
 "users in schools exist in Greece, the Netherlands, Japan and elsewhere. Meet "
@@ -2061,22 +2156,22 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:796
+#: release-manual.xml:802
 msgid "Support"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:797
+#: release-manual.xml:803
 msgid "Volunteer based support"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:798
+#: release-manual.xml:804
 msgid "in english"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:799
+#: release-manual.xml:805
 msgid ""
 "<ulink url='https://init.linpro.no/mailman/skolelinux.no/listinfo/admin-"
 "discuss'>https://init.linpro.no/mailman/skolelinux.no/listinfo/admin-discuss "
@@ -2084,7 +2179,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: release-manual.xml:802
+#: release-manual.xml:808
 msgid ""
 "<ulink url='http://lists.debian.org/debian-edu'>http://lists.debian.org/"
 "debian-edu </ulink> - developer centric mailing list, more useful to report "
@@ -2092,12 +2187,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:808
+#: release-manual.xml:814
 msgid "in norwegian"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:809
+#: release-manual.xml:815
 msgid ""
 "<ulink url='https://init.linpro.no/mailman/skolelinux.no/listinfo/"
 "bruker'>https://init.linpro.no/mailman/skolelinux.no/listinfo/bruker </"
@@ -2105,7 +2200,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:812
+#: release-manual.xml:818
 msgid ""
 "<ulink url='https://init.linpro.no/mailman/skolelinux.no/listinfo/"
 "linuxiskolen'>https://init.linpro.no/mailman/skolelinux.no/listinfo/"
@@ -2113,12 +2208,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:818
+#: release-manual.xml:824
 msgid "in german"
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: release-manual.xml:819
+#: release-manual.xml:825
 msgid ""
 "<ulink url='http://www.skolelinux.de/mailman/listinfo/user'>http://www."
 "skolelinux.de/mailman/listinfo/user </ulink> - german speaking support "
@@ -2126,31 +2221,31 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:822
+#: release-manual.xml:828
 msgid ""
 "<ulink url='http://wiki.skolelinux.de'>http://wiki.skolelinux.de </ulink> - "
 "german wiki with lots of <ulink url='/HowTos'>HowTos </ulink> etc."
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:829
+#: release-manual.xml:835
 msgid "in french"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:830
+#: release-manual.xml:836
 msgid ""
 "<ulink url='http://lists.debian.org/debian-edu-french'>http://lists.debian."
 "org/debian-edu-french </ulink> - french speaking support mailinglist"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:836
+#: release-manual.xml:842
 msgid "Professional support"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:837
+#: release-manual.xml:843
 msgid ""
 "Lists of companies providing professional support are available from <ulink "
 "url='http://wiki.debian.org/DebianEdu/Help/ProfessionalHelp'>http://wiki."
@@ -2158,12 +2253,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:841
+#: release-manual.xml:847
 msgid "Copyright and authors"
 msgstr ""
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:842
+#: release-manual.xml:848
 #, fuzzy
 msgid ""
 "This document is written and copyrighted 2007 by Holger Levsen, Petter "
@@ -2174,7 +2269,7 @@ msgstr ""
 "or einer beliebigen spaeteren Version veroeffentlicht. Geniesse es!"
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:843
+#: release-manual.xml:849
 msgid ""
 "If you add content to it, <emphasis role='strong'>please only do so if you "
 "are the author of it and plan to release it under the same conditions </"
@@ -2183,12 +2278,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:846
+#: release-manual.xml:852
 msgid "Translation copyright and authors"
 msgstr ""
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:847
+#: release-manual.xml:853
 #, fuzzy
 msgid ""
 "The spanish translation is copyrighted 2007 by José L. Redrejo Rodríguez and "
@@ -2198,7 +2293,7 @@ msgstr ""
 "or einer beliebigen spaeteren Version veroeffentlicht. Geniesse es!"
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:848
+#: release-manual.xml:854
 #, fuzzy
 msgid ""
 "The norwegian Bokmål translation is copyrighted 2007 by Petter Reinholdtsen "
@@ -2208,7 +2303,7 @@ msgstr ""
 "or einer beliebigen spaeteren Version veroeffentlicht. Geniesse es!"
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:849
+#: release-manual.xml:855
 #, fuzzy
 msgid ""
 "The german translation is copyrighted 2007 by Holger Levsen and Patrick "
@@ -2218,13 +2313,13 @@ msgstr ""
 "or einer beliebigen spaeteren Version veroeffentlicht. Geniesse es!"
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:851
+#: release-manual.xml:857
 #, fuzzy
 msgid "Translations of this document"
 msgstr "Copyright dieses Dokuments"
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:852
+#: release-manual.xml:858
 msgid ""
 "Fully translated versions of this document are not yet available, as the "
 "document itself is very incomplete. Incomplete translations for Norwegian "
@@ -2232,91 +2327,117 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:853
+#: release-manual.xml:859
 msgid "Howto translate this document"
 msgstr "Anleitung zum Übersetzen dieses Dokuments"
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:854
+#: release-manual.xml:860
 msgid "If you want to start/help translating this document, you can!"
-msgstr "Wir freuen uns über jeden, der uns bei der Übersetzung dieses Dokuments hilft!"
+msgstr ""
+"Wir freuen uns über jeden, der uns bei der Übersetzung dieses Dokuments "
+"hilft!"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:855
+#: release-manual.xml:861
 msgid ""
 "Translations of this document are kept in .po files like in many free "
 "software projects, read"
-msgstr "Übersetzungen des englischen Originaldokuments stehen als PO-Datei zur Verfügung, wie sie in vielen freien Softwareprojekten verwendet werden, vgl. "
+msgstr ""
+"Übersetzungen des englischen Originaldokuments stehen als PO-Datei zur "
+"Verfügung, wie sie in vielen freien Softwareprojekten verwendet werden, vgl. "
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:856
-msgid "for more information on this. There are many easy tools for translating."
-msgstr "für weitere Einzelheiten. Zur Übersetzung gibt es mehrere einfache Hilfsprogramme."
+#: release-manual.xml:862
+msgid ""
+"for more information on this. There are many easy tools for translating."
+msgstr ""
+"für weitere Einzelheiten. Zur Übersetzung gibt es mehrere einfache "
+"Hilfsprogramme."
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:857
-msgid "To update the translations you need to be a member of the alioth project"
-msgstr "Um eine Übersetzung zu aktualisieren benötigt man eine (kostenlose) Mitgliedschaft beim Alioth-Projekt"
+#: release-manual.xml:863
+msgid ""
+"To update the translations you need to be a member of the alioth project"
+msgstr ""
+"Um eine Übersetzung zu aktualisieren benötigt man eine (kostenlose) "
+"Mitgliedschaft beim Alioth-Projekt"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:858
+#: release-manual.xml:864
 msgid ""
 ". To work on them you just need to check them out anonymously from svn, "
 "create patches and send those to <ulink url='mailto:debian-edu at l.d.o'>debian-"
 "edu at l.d.o </ulink> or file a bug against the debian-edu-doc package."
 msgstr ""
-". Diese Dateien lassen sich einfach anonym aus dem SVN herunterladen, bearbeiten und anschließend an <ulink url='mailto:debian-edu at l.d.o'>debian-"
-"edu at l.d.o </ulink> senden - oder Sie reichen eine Fehlermeldung gegenüber dem Paket debian-edu-doc ein."
+". Diese Dateien lassen sich einfach anonym aus dem SVN herunterladen, "
+"bearbeiten und anschließend an <ulink url='mailto:debian-edu at l.d.o'>debian-"
+"edu at l.d.o </ulink> senden - oder Sie reichen eine Fehlermeldung gegenüber "
+"dem Paket debian-edu-doc ein."
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:860
+#: release-manual.xml:866
 msgid "Checkout the source package with the following command:"
 msgstr "Das Quellpaket kann mit dem folgenden Befehl 'ausgecheckt' werden:"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:865
+#: release-manual.xml:871
 msgid "Then edit the"
 msgstr "Nun bearbeiten Sie  "
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:866
+#: release-manual.xml:872
 msgid ""
 "and either commit it to svn (if you have the rights to do so) or send the "
 "file to the mailinglist."
-msgstr "und reichen Sie die Änderung entweder ins SVN ein ('commit' bei entsprechenden Rechten im Alioth-Projekt)  oder senden Sie die Datei an die Mailingliste."
+msgstr ""
+"und reichen Sie die Änderung entweder ins SVN ein ('commit' bei "
+"entsprechenden Rechten im Alioth-Projekt)  oder senden Sie die Datei an die "
+"Mailingliste."
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:867
+#: release-manual.xml:873
 msgid ""
 "Read /usr/share/doc/debian-edu-doc/README.release-manual-translations to "
 "find information how to create a new .po file for your language if there is "
 "none yet, and how to update it."
-msgstr "Lesen Sie /usr/share/doc/debian-edu-doc/README.release-manual-translations, um mehr darüber zu erfahren, wie man eine neue PO-Datei für eine weitere Sprache erzeugt bzw. eine bestehende ergänzt."
+msgstr ""
+"Lesen Sie /usr/share/doc/debian-edu-doc/README.release-manual-translations, "
+"um mehr darüber zu erfahren, wie man eine neue PO-Datei für eine weitere "
+"Sprache erzeugt bzw. eine bestehende ergänzt."
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:869
+#: release-manual.xml:875
 msgid "Potential problems for translations"
 msgstr "Mögliche Probleme bei der Übersetzung"
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject>
-#: release-manual.xml:870
+#: release-manual.xml:876
 msgid ""
 "We will need to write sed-scripts (or something like that) to support "
 "different images for different translations. Laters <inlinemediaobject>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:875
+#: release-manual.xml:881
 msgid "Please report any other showstoppers."
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:878
-msgid "Appendix A - The GNU Public Licence"
+#: release-manual.xml:884
+#, fuzzy
+msgid "Appendix A - The GNU Public License"
 msgstr "Anhang A - The GNU Public Licence"
 
+# type: Content of: <article><para><section><para>
+#: release-manual.xml:885
+msgid ""
+"<emphasis role='strong'>Note to translators: </emphasis> there is no need to "
+"translate the GPL license text."
+msgstr ""
+
 # type: CDATA
-#: release-manual.xml:880
+#: release-manual.xml:888
 #, no-wrap
 msgid ""
 "    Release manual for Debian-Edu etch 3.0 Codename \"Terra\"\n"
@@ -2575,3 +2696,15 @@ msgid ""
 "]]"
 msgstr ""
 
+# type: Content of: <article><para><section><para><inlinemediaobject>
+#~ msgid ""
+#~ "package, which can be installed on a webserver. (FIXME: do it "
+#~ "<inlinemediaobject>"
+#~ msgstr ""
+#~ "Pakets, das auf einen Webserver installiert werden kann.  (FIXME: do it "
+#~ "<inlinemediaobject>"
+
+# type: Content of: <article><para><section><para><inlinemediaobject><textobject>
+#, fuzzy
+#~ msgid "<phrase>skolelinux-world </phrase>"
+#~ msgstr "<phrase>:)  </phrase>"
diff --git a/documentation/release-manual/release-manual.es.po b/documentation/release-manual/release-manual.es.po
index 69536a2..602c138 100644
--- a/documentation/release-manual/release-manual.es.po
+++ b/documentation/release-manual/release-manual.es.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: release-manual\n"
-"POT-Creation-Date: 2007-07-24  9:25+0200\n"
+"POT-Creation-Date: 2007-07-27  0:12+0200\n"
 "PO-Revision-Date: 2007-07-22 10:19+0200\n"
 "Last-Translator: \n"
 "Language-Team:  <es at li.org>\n"
@@ -58,20 +58,12 @@ msgstr ""
 # type: Content of: <article><para><section><para>
 #: release-manual.xml:10
 msgid ""
-"package, which can be installed on a webserver. (FIXME: do it "
-"<inlinemediaobject>"
+"package, which can be <ulink url='http://maintainer.skolelinux.no/debian-edu-"
+"doc/'>installed on a webserver </ulink>."
 msgstr ""
-"paquete, que puede instalarse en un servidor web.(POR HACER: hacerlo "
-"<inlinemediaobject>"
-
-# type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:11 release-manual.xml:350 release-manual.xml:516
-#: release-manual.xml:871
-msgid "<phrase>:)  </phrase>"
-msgstr "<phrase>:)  </phrase>"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:15
+#: release-manual.xml:12
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/AboutDebianEdu'>About </ulink> "
 "Debian-Edu and Skolelinux"
@@ -80,7 +72,7 @@ msgstr ""
 "Debian-Edu y Skolelinux"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:18
+#: release-manual.xml:15
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/Architecture'>Architecture </"
 "ulink> - the design principles of Debian-Edu"
@@ -89,7 +81,7 @@ msgstr ""
 "ulink> - Las bases de diseño de Debian-Edu"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:21
+#: release-manual.xml:18
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/Features'>Features </ulink> - new "
 "Features in this release and old ones"
@@ -98,7 +90,7 @@ msgstr ""
 "- nuevas  Funcionalidades de estas versión y las antiguas"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:24
+#: release-manual.xml:21
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/Requirements'>Requirements </"
 "ulink> to run Debian-Edu"
@@ -107,7 +99,7 @@ msgstr ""
 "ulink>para usar Debian-Edu"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:27
+#: release-manual.xml:24
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/Installation'>Installation </"
 "ulink> - how to install"
@@ -116,7 +108,7 @@ msgstr ""
 "- como instalar"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:30
+#: release-manual.xml:27
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/GettingStarted'>Getting started </"
 "ulink> - what needs to be done after Installation"
@@ -125,7 +117,7 @@ msgstr ""
 "ulink> - lo que hay que hacer después de la Instalación"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:33
+#: release-manual.xml:30
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/Maintainance'>Maintainance </"
 "ulink> - Security updates, Backups and monitoring the systems"
@@ -135,16 +127,17 @@ msgstr ""
 "sistemas"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:36
+#: release-manual.xml:33
+#, fuzzy
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/Upgrades'>Upgrades </ulink> from "
-"<ulink url='/DebianEdu'>DebianEdu </ulink> sarge and woody"
+"Debian-Edu sarge and woody"
 msgstr ""
 "<ulink url='/DebianEdu/Documentation/Etch/Upgrades'>Actualizaciones </ulink> "
 "desde <ulink url='/DebianEdu'>DebianEdu </ulink> sarge y woody"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:40
+#: release-manual.xml:36
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/HowTo'>HowTo </ulink> - simple "
 "step by step Howtos"
@@ -153,7 +146,7 @@ msgstr ""
 "Instrucciones simples paso a paso"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:43
+#: release-manual.xml:39
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/Contribute'>Contribute </ulink> to "
 "Debian-Edu"
@@ -162,7 +155,7 @@ msgstr ""
 "Debian-Edu"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:46
+#: release-manual.xml:42
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/Support'>Support </ulink> - how"
 "+where to find help"
@@ -171,7 +164,7 @@ msgstr ""
 "donde encontrar ayuda"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:49
+#: release-manual.xml:45
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/CopyRight'>Copyright </ulink> and "
 "Authors of this document"
@@ -180,7 +173,7 @@ msgstr ""
 "Autores de este documento"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:52
+#: release-manual.xml:48
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/Translations'>Translations </"
 "ulink> of this document"
@@ -189,7 +182,7 @@ msgstr ""
 "ulink> de este documento"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:55
+#: release-manual.xml:51
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/AppendixA'>Appendix A </ulink> - "
 "The GNU Public Licence"
@@ -198,7 +191,7 @@ msgstr ""
 "The GNU Public Licence"
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:59
+#: release-manual.xml:55
 msgid ""
 "Special pages: <ulink url='/DebianEdu/Documentation/Etch'>Index page </"
 "ulink> - <ulink url='/DebianEdu/Documentation/Etch/AllInOne'>All in one page "
@@ -209,19 +202,20 @@ msgstr ""
 "página </ulink>"
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:63
+#: release-manual.xml:59
 msgid "About Debian-Edu and Skolelinux"
 msgstr "Acerca de DebianEdu y Skolelinux"
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:64
+#: release-manual.xml:60
+#, fuzzy
 msgid ""
 "Skolelinux is the Debian-edu project's <ulink url='http://wiki.debian.net/"
 "index.cgi?CustomDebian'>Custom Debian Distribution </ulink> (CDD) in "
 "development. What this means is that Skolelinux is a version of Debian whose "
 "out-of-the box environment gives you a completely configured school-network "
 "In Norway, where Skolelinux was started, the main target group is schools "
-"serving the 6-16 years age bracket)."
+"serving the 6-16 years age bracket."
 msgstr ""
 "Skolelinux es el proyecto Debian-edu <ulink url='http://wiki.debian.net/"
 "index.cgi?CustomDebian'>Custom Debian Distribution </ulink> (CDD) en "
@@ -231,40 +225,42 @@ msgstr ""
 "colegios para alumnos entre 6 y 16 años)."
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:66
+#: release-manual.xml:62
+#, fuzzy
 msgid ""
-"The system is in use in several countries around the world, with most users "
-"in Norway, Germany and France."
+"The system is in use in several countries around the world, with most "
+"installations in Norway, Germany and France."
 msgstr ""
 "El sistema se usa en varios paises por todo el mundo, aunque la mayoría "
 "están en Noruega, Alemania y Francia."
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:68
+#: release-manual.xml:64
 msgid "Architecture"
 msgstr "Arquitectura"
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:69
+#: release-manual.xml:65
+#, fuzzy
 msgid ""
-"This secton of the document describes the network architecture and services "
+"This section of the document describes the network architecture and services "
 "provided by a Skolelinux installation."
 msgstr ""
 "Esta sección del documento describe la arquitectura de red y los servicios "
 "proporcionados por una instalación Skolelinux."
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:70 release-manual.xml:232
+#: release-manual.xml:66 release-manual.xml:231
 msgid "Network"
 msgstr "Red"
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:72
+#: release-manual.xml:68
 msgid "<phrase>attachment:network-arch_en.png </phrase>"
 msgstr "<phrase>attachment:network-arch_en.png </phrase>"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:76
+#: release-manual.xml:72
 msgid ""
 "Network architecture as dia file: <ulink url='/DebianEdu/Documentation/Etch/"
 "Architecture?action=AttachFile&do=get&target=network-arch_en."
@@ -275,14 +271,15 @@ msgstr ""
 "target=network-arch_en.dia'>attachment:network-arch_en.dia </ulink>"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:78
+#: release-manual.xml:74
+#, fuzzy
 msgid ""
 "The figure is a sketch of the assumed network topology. The default setup of "
 "a Skolelinux assumes that there is one (and only one) main-server, while "
 "allowing the inclusion of both normal workstations and thin-client-servers "
 "(with associated thin-clients). The number of workstations can be as large "
 "or small as you want (starting from none to a lot). The same goes for the "
-"thin-client-serves, each of which is on a seperate network so that the "
+"thin-client-serves, each of which is on a separate network so that the "
 "traffic between the thin-clients and the thin-client-server doesn't affect "
 "the rest of the network services."
 msgstr ""
@@ -296,7 +293,7 @@ msgstr ""
 "servidor no afecta al resto de los servicios de red."
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:79
+#: release-manual.xml:75
 msgid ""
 "The reason that there can only be one main-server in each school network is "
 "that the main-server provides DHCP, and there can be only one machine doing "
@@ -313,13 +310,14 @@ msgstr ""
 "alias DNS de ese servicio a la máquina correcta."
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:80
+#: release-manual.xml:76
+#, fuzzy
 msgid ""
 "In order to simplify the standard setup of Skolelinux the Internet "
-"connection runs over a seperate router. It is possible to set up Debian with "
+"connection runs over a separate router. It is possible to set up Debian with "
 "both a modem as an ISDN connection, however no attempt is made to make such "
 "a setup work out-of-the box for Skolelinux (the setup needed to adjust "
-"default situation to this should be documented seperately)."
+"default situation to this should be documented separately)."
 msgstr ""
 "Para simplificar la configuración estándar de Skolelinux, la conexión a "
 "Internet va sobre un router separado. Se puede configurar Debian con un "
@@ -329,19 +327,20 @@ msgstr ""
 "separado)."
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:82
+#: release-manual.xml:78
 msgid "Services"
 msgstr "Servicios"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:83
+#: release-manual.xml:79
+#, fuzzy
 msgid ""
 "With the exception of the control of the thin-clients, all services are "
 "initially set up on one central computer (the main-server). Because of "
-"performance reasons the thin-client-server should be a sepperate machine "
+"performance reasons the thin-client-server should be a separate machine "
 "(though it is possible to install both the main-server and thin-client-"
 "server profiles on the same machine), All services are allocated a dedicated "
-"DNS-name and are offered exclusivly over IPv4. The allocated DNS name makes "
+"DNS-name and are offered exclusively over IPv4. The allocated DNS name makes "
 "it easy to move individual machines from the main-server to a different "
 "machine, by simply stopping the service on the main-server, and changing the "
 "DNS configuration to point to the new location of the service (which should "
@@ -360,7 +359,7 @@ msgstr ""
 "en esa máquina)."
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:84
+#: release-manual.xml:80
 msgid ""
 "To ensure security all connections where passwords are transmitted over the "
 "network are encrypted, so no passwords are send over the network as plain "
@@ -371,10 +370,11 @@ msgstr ""
 "plano."
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:85
+#: release-manual.xml:81
+#, fuzzy
 msgid ""
 "Below is a list of the services that are set up by default in a Skolelinux "
-"networki, with the DNS name of eache service given in square brackets. Where "
+"network, with the DNS name of each service given in square brackets. Where "
 "possible the DNS name correspond to the service name in"
 msgstr ""
 "A continuación hay una lista de los servicios que se configuran por defecto "
@@ -382,12 +382,13 @@ msgstr ""
 "Siempre que sea posible el nombre DNS corresponde al nombre del servicio en"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:86
+#: release-manual.xml:82
+#, fuzzy
 msgid ""
 ", where this is not possible the common name of the service is used as the "
 "DNS name. All configuration files will, if possible, refer to the service by "
 "name (without the domain name) thus making it easy for schools to change "
-"either their domain (if they have an own DNS domain), or their ip-adress."
+"either their domain (if they have an own DNS domain), or their IP address."
 msgstr ""
 ", cuando no es posible se usa el nombre común del servicio como nombre DNS. "
 "Todos los archivos de configuración, si se puede, se referirán al servicio "
@@ -396,10 +397,11 @@ msgstr ""
 "dirección ip."
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:104
+#: release-manual.xml:100
+#, fuzzy
 msgid ""
 "Each user stores his personal files in his home folder which is made "
-"availble by the server. Home folders are accessible from all machines, "
+"available by the server. Home folders are accessible from all machines, "
 "giving users access to the same files regardless of which machine they are "
 "using. The server is operating system agnostic in offering access using NFS "
 "for Unix Clients, SMB for Windows and Macintosh clients."
@@ -411,13 +413,14 @@ msgstr ""
 "Windows y clientes Macintosh."
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:105
+#: release-manual.xml:101
+#, fuzzy
 msgid ""
 "By default e-mail is set up for local delivery (i.e. within the school) "
 "only, though e-mail delivery to the wider Internet may be set up if the "
-"school has a fixed Internet-connection. Mailinglists are set up based on the "
-"user database, giving each class their own mailinglist. Clients are set up "
-"to deliver mail to the server (using \"smarthost\"), and users can access "
+"school has a fixed Internet-connection. Mailing lists are set up based on "
+"the user database, giving each class their own mailing list. Clients are set "
+"up to deliver mail to the server (using 'smarthost'), and users can access "
 "their personal mail through either POP3 or IMAP."
 msgstr ""
 "Por defecto, el correo está configurado para envío local (dentro de la "
@@ -429,16 +432,17 @@ msgstr ""
 "mediante POP3 o IMAP."
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:106
+#: release-manual.xml:102
+#, fuzzy
 msgid ""
-"All services are accesible using the same username and password, thanks to "
+"All services are accessible using the same username and password, thanks to "
 "the central user database for authentication and authorization."
 msgstr ""
 "Todos los servicios usan el mismo nombre de usuario y contraseña, gracias a "
 "la base de datos de usuario centralizada para autenticación y autorización."
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:107
+#: release-manual.xml:103
 msgid ""
 "To increase performance on frequently accessed sites a web proxy that caches "
 "files locally (Squid) is used. In conjunction with blocking web-traffic in "
@@ -451,10 +455,11 @@ msgstr ""
 "acceso a Internet individualmente para cada puesto."
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:108
+#: release-manual.xml:104
+#, fuzzy
 msgid ""
-"Network configuration on the clients is done automatigically using DHCP. "
-"Normal clients are allocated IP adresses in the private subnet 10.0.2.0/23, "
+"Network configuration on the clients is done automagically using DHCP. "
+"Normal clients are allocated IP addresses in the private subnet 10.0.2.0/23, "
 "while thin clients are connected to the corresponding thin-client-server via "
 "the seperate subnet 192.168.0.0/24 (this to ensure that the network traffic "
 "of the thin clients doesn't interfere with the rest of the network services)."
@@ -466,7 +471,7 @@ msgstr ""
 "de los clientes ligeros no interfiere con el resto de los servicios de red)."
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:109
+#: release-manual.xml:105
 msgid ""
 "Centralized logging is set up so that all machines send their syslog "
 "messages to the server. The syslog service is set up so that it only accepts "
@@ -477,7 +482,7 @@ msgstr ""
 "aceptar sólo mensajes entrantes desde la red local."
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:110
+#: release-manual.xml:106
 msgid ""
 "By default the DNS server is set up with a domain for internal use only (*."
 "intern), until a real (\"external\") DNS domain can be set up. The DNS "
@@ -490,12 +495,13 @@ msgstr ""
 "todos los puestos de la red pueden usarlo como su servidor de DNS principal."
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:111
+#: release-manual.xml:107
+#, fuzzy
 msgid ""
-"Pupils and teachers have the possibilty to publish websites. The webserver "
+"Pupils and teachers have the possibility to publish websites. The web server "
 "provides mechanisms for authenticating users, and for limiting access to "
 "individual pages and subdiretories to certain users and groups. Users will "
-"have the possibility to create dynamic webpages, as the webserver will be "
+"have the possibility to create dynamic web pages, as the web server will be "
 "programmable on the server side."
 msgstr ""
 "Los alumnos y los profesores pueden publicar sus propios sitiso web. El "
@@ -505,7 +511,8 @@ msgstr ""
 "el servidor web se puede programar."
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:112
+#: release-manual.xml:108
+#, fuzzy
 msgid ""
 "Information on users and machines can be changed in one central location, "
 "and is made accessible to all computers on the network automatically. To "
@@ -514,7 +521,7 @@ msgid ""
 "avoid user confusion there won't be any difference between file groups, "
 "mailing lists, and network groups. This implies that groups of machines "
 "which have to be network groups, have the same namespace as user groups and "
-"mailinglists."
+"mailing lists."
 msgstr ""
 "La información sobre los puestos y los usuarios se puede cambiar en un lugar "
 "central y es acccesible a todos los ordenadores de la red automáticamente. "
@@ -527,7 +534,7 @@ msgstr ""
 "correo."
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:113
+#: release-manual.xml:109
 msgid ""
 "Administration of services and users will by and large be via web, and "
 "follow established standards, functioning well in the webbrowsers which are "
@@ -540,13 +547,14 @@ msgstr ""
 "individuales o grupos de usuarios mediante los sistemas de administración."
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:114
+#: release-manual.xml:110
+#, fuzzy
 msgid ""
 "In order to avoid certain problems with NFS, and to make it simpler to debug "
 "problems, the clocks of the different machines need to be synchronized. To "
 "achieve this the Skolelinux server is set up as a local Network Time "
 "Protocol (NTP) server, and all workstations and clients are set up to "
-"synchronize their clock with the server. The server itselve should "
+"synchronize their clock with the server. The server itself should "
 "synchronize its clock via NTP against machines on the Internet, thus "
 "ensuring the whole network has the correct time."
 msgstr ""
@@ -559,12 +567,13 @@ msgstr ""
 "la red tiene la hora correcta."
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:115
+#: release-manual.xml:111
+#, fuzzy
 msgid ""
 "Printers are connected where convenient, either directly onto the network, "
 "or connected to a server, workstation or thin-client-server. Access to "
-"printers can be controled for individual users according to the groups they "
-"belong to, this will be achieved by using quota and acces control for "
+"printers can be controlled for individual users according to the groups they "
+"belong to, this will be achieved by using quota and access control for "
 "printers."
 msgstr ""
 "Las impresoras se conectan donde convenga, bien directamente en la red, o "
@@ -574,17 +583,18 @@ msgstr ""
 "las impresoras."
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:116
+#: release-manual.xml:112
 msgid "Thin client services"
 msgstr "Sevicios de clientes ligeros"
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:117
+#: release-manual.xml:113
+#, fuzzy
 msgid ""
 "A thin client setup enables a ordinary PC to function as an (X-)terminal. "
 "This means that that machine boots from a diskette or directly from the "
-"server using network-PROM without using the local client harddrive. The thin "
-"client setup used is that of the Linux Terminal Server Project (LTSP)."
+"server using network-PROM without using the local client hard drive. The "
+"thin client setup used is that of the Linux Terminal Server Project (LTSP)."
 msgstr ""
 "Una configuración de cliente ligero permite a un PC ordinario funcionar como "
 "un terminal (X). Esto significa que la máquina arranca desde un disquete o "
@@ -593,7 +603,7 @@ msgstr ""
 "Project (LTSP)."
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:118
+#: release-manual.xml:114
 msgid ""
 "Thin clients are a good way to make use of older, weaker machines as they "
 "effectively run all programs on the LTSP-Server. This works as follows: The "
@@ -610,7 +620,7 @@ msgstr ""
 "XDMCP, asegurando que todos los programas se ejecutan en el servidor LTSP."
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:119
+#: release-manual.xml:115
 msgid ""
 "The thin client server is set up to receive syslog from the thin clients, "
 "and forward these messages to the central syslog recipient. (Oops, the thin "
@@ -623,12 +633,12 @@ msgstr ""
 "identificar que cliente está haciendo qué cosa en el servidor central?)"
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:122
+#: release-manual.xml:118
 msgid "Administration"
 msgstr "Administración"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:123
+#: release-manual.xml:119
 msgid ""
 "All the linux machines that are installed by means of a Skolelinux CD or DVD "
 "will be administrable from a central computer, most likely the server. It "
@@ -641,7 +651,7 @@ msgstr ""
 "acceso completo a todos los puestos."
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:124
+#: release-manual.xml:120
 msgid ""
 "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 "
@@ -654,7 +664,7 @@ msgstr ""
 "que la automatización distribuya los cambios."
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:125
+#: release-manual.xml:121
 msgid ""
 "All user information is kept in an LDAP directory. Updates of user accounts "
 "are made against this database and is used by the clients for user "
@@ -665,17 +675,17 @@ msgstr ""
 "y es la que usan los clientes para autenticarse."
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:127 release-manual.xml:243
+#: release-manual.xml:123 release-manual.xml:242
 msgid "Installation"
 msgstr "Instalación"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:128
+#: release-manual.xml:124
 msgid "Installation is possible either from a CD or DVD."
 msgstr "Se puede instalar tanto desde un CD como un DVD."
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:129
+#: release-manual.xml:125
 msgid ""
 "The aim is to be able to install a server from CD/DVD, and install clients "
 "over the network by booting all other machines from the network. The DVD "
@@ -686,7 +696,7 @@ msgstr ""
 "instalación del DVD funciona sin acceder a Internet."
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:130
+#: release-manual.xml:126
 msgid ""
 "The installation should not ask any questions, with the exception of desired "
 "language (e.g. Norwegian Bokmal, Nynorsk, Sami) and machine profile (server, "
@@ -702,12 +712,12 @@ msgstr ""
 "después de la instalación."
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:132
+#: release-manual.xml:128
 msgid "File system access configuration"
 msgstr "Configuración del acceso al sistema de archivos"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:133
+#: release-manual.xml:129
 msgid ""
 "Each Skolelinux user account is assigned a section of the file system on the "
 "file server. This section (home directory) contains the user's configuration "
@@ -724,7 +734,7 @@ msgstr ""
 "algunos no deberían ser accesibles por nadie que no fuera el usuario."
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:134
+#: release-manual.xml:130
 msgid ""
 "To ensure that all disks that are used for user directories or shared "
 "directories can be uniquely named across all the computers in the "
@@ -735,12 +745,12 @@ msgstr ""
 "se pueden montar como "
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:135
+#: release-manual.xml:131
 msgid ". Initially, one directory is created on the file server,"
 msgstr ". Inicialmente se crea un directorio en el servidor de ficheros,"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:136
+#: release-manual.xml:132
 msgid ""
 ", in which all the user accounts are created. More directories may then be "
 "created when needed, to accomodate particular user groups or particular "
@@ -751,7 +761,7 @@ msgstr ""
 "particulares."
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:137
+#: release-manual.xml:133
 msgid ""
 "To enable shared file access control using the file groups, each user must "
 "be assigned a primary group with no other members. The name of this private "
@@ -779,12 +789,13 @@ msgstr ""
 "grupo de usuarios X=7)."
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:139
+#: release-manual.xml:135
+#, fuzzy
 msgid ""
 "The initial access settings for newly created files is a matter of policy. "
 "They may either be set to give read access to everybody, which can later be "
 "removed by explicit user action, or they may be initially blocked, "
-"necessiating user action to make them accessible. The first approach "
+"necessitating user action to make them accessible. The first approach "
 "encourages knowledge sharing, and makes the system more transparent, whereas "
 "the second method decreases the risk of unwanted spreading of sensitive "
 "information. The problem with the first solution is that it is not apparent "
@@ -811,7 +822,7 @@ msgstr ""
 "como otros han resuelto los mismos problemas."
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:140
+#: release-manual.xml:136
 msgid ""
 "Suggestion: The files are initially set to be readable by all, but "
 "particular directories are created in which the content is initially "
@@ -824,17 +835,18 @@ msgstr ""
 "legible o no. Concretamente, umask debería valer 002, y"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:141
-msgid "created with priviliges 0775,"
+#: release-manual.xml:137
+#, fuzzy
+msgid "created with privileges 0775,"
 msgstr "creado con privilegios 0775,"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:142
+#: release-manual.xml:138
 msgid "given 0750,and"
 msgstr "con 0750, y"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:143
+#: release-manual.xml:139
 msgid ""
 "given 0775. Files that should not be readable by others should be put in"
 msgstr ""
@@ -842,12 +854,12 @@ msgstr ""
 "ponerse en"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:144
+#: release-manual.xml:140
 msgid ", whereas public files will be put in"
 msgstr ", mientras que los archivos públicos estarán en"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:145
+#: release-manual.xml:141
 msgid ""
 ". Other files will initially be accessible, but may be blocked as needed."
 msgstr ""
@@ -855,7 +867,7 @@ msgstr ""
 "si se necesita."
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:146
+#: release-manual.xml:142
 msgid ""
 "ssh requires that the home directory can only be written to by the owner, "
 "thus the maximum access privilege for"
@@ -864,17 +876,17 @@ msgstr ""
 "así que el privilegio máximo para"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:147
+#: release-manual.xml:143
 msgid "is 755."
 msgstr "es 755."
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:151
+#: release-manual.xml:147
 msgid "random notes"
 msgstr "notas sueltas"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:152
+#: release-manual.xml:148
 msgid ""
 "These are random notes concerning things which should be included in this "
 "document."
@@ -882,35 +894,35 @@ msgstr ""
 "Estas son varias notas de cosas que deberían incluirse en este documento."
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:164
+#: release-manual.xml:160
 msgid "Features"
 msgstr "Características"
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:165
+#: release-manual.xml:161
 #, fuzzy
 msgid "New features in the \"3.0 Terra\" release 2007-07-22"
 msgstr "Características nuevas en la versión \"3.0 Terra\""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:174
+#: release-manual.xml:170
 msgid "OpenOffice.org version 2.0."
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:185
+#: release-manual.xml:181
 msgid "Regression: A new web based user administration tool are included named"
 msgstr ""
 "Regresión: Se ha incluido una nueva herramienta de administración de "
 "usuarios llamada"
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:186
+#: release-manual.xml:182
 msgid ". The old one named wlus required"
 msgstr ". El antiguo nombre wlus necesitaba"
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:187
+#: release-manual.xml:183
 #, fuzzy
 msgid ". Webmin is now removed from Debian because of problems supporting it."
 msgstr ""
@@ -918,24 +930,24 @@ msgstr ""
 "tenía."
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:191
+#: release-manual.xml:187
 #, fuzzy
 msgid "Features in 2.0 release 2006-03-14"
 msgstr "Características de la versión 2.0"
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:196
+#: release-manual.xml:192
 msgid "OpenOffice.org 1.1."
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:201
+#: release-manual.xml:197
 #, fuzzy
 msgid "Features in \"1.0 Venus\" release 2004-06-20"
 msgstr "Características de la versión \"1.0 venus\""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:208
+#: release-manual.xml:204
 msgid ""
 "(Information on the older releases can be found on <ulink url='http://"
 "developer.skolelinux.no/info/cdbygging/news.html'>http://developer."
@@ -943,12 +955,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:212
+#: release-manual.xml:208
 msgid "Requirements"
 msgstr "Requisitos"
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:213
+#: release-manual.xml:209
 msgid ""
 "There are different ways of set up a Skolelinux solution. It can be "
 "installed on just one standalone PC or a regional wide solution at many "
@@ -963,27 +975,29 @@ msgstr ""
 "puestos de cliente."
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:220
+#: release-manual.xml:216
+#, fuzzy
 msgid ""
-"for diskless workstations, which are also know as <ulink url='/"
-"LowFat'>LowFat </ulink> clients, 256 MB RAM and 800 MHz or more is "
-"recommended minimum requirements. Swap is required"
+"for diskless workstations (also known as <ulink url='/LowFat'>LowFat </"
+"ulink> clients) 256 MB RAM and 800 MHz or more is recommended minimum "
+"requirements. Swap is required"
 msgstr ""
 "para puestos sin discos, que también son conocidos como clientes <ulink "
 "url='/LowFat'>LowFat </ulink> los requisitos mínimos son 256 Mb de RAM y 800 "
 "MHz de cpu. Se necesita también swap."
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:225
+#: release-manual.xml:221
 msgid "FIXME: add links to explainations of main-server and thinclient-server"
 msgstr ""
 "POR HACER: añadir enlaces a las explicaciones del servidor principal y "
 "servidor de clientes ligeros"
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:228
+#: release-manual.xml:224
+#, fuzzy
 msgid ""
-"Some municipalities provides a remote desktop in addition what's default "
+"Some municipalities provide a remote desktop in addition to what defaults "
 "with Skolelinux. That way students and teachers can access Skolelinux from "
 "their home computer running Windows, Mac or Linux."
 msgstr ""
@@ -991,8 +1005,29 @@ msgstr ""
 "defecto en Skolelinux. De esa forma los alumnos y profesores pueden acceder "
 "a Skolelinux desde su casa usando Windows, Mac o Linux."
 
+# type: Content of: <article><para><section><para>
+#: release-manual.xml:228
+msgid ""
+"Some schools use control tools like Controlaula or Italc to supervise their "
+"students."
+msgstr ""
+
+# type: Content of: <article><para><section><para>
+#: release-manual.xml:229
+msgid ""
+"Some schools use squidguard or dansguardian to restrict internet access."
+msgstr ""
+
+# type: Content of: <article><para><section><para>
+#: release-manual.xml:230
+msgid ""
+"Some schools use alternative user administration tools like CipUX for "
+"extended features. In France, this is combined with moodle to keep track of "
+"students' facilities and credit points."
+msgstr ""
+
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:233
+#: release-manual.xml:232
 msgid ""
 "Skolelinux network services are made pluggable with several different client "
 "alternatives as <ulink url='/LowFat'>LowFat </ulink> clients (Diskless), "
@@ -1007,7 +1042,7 @@ msgstr ""
 "capacidades de de red de las escuelas."
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:237
+#: release-manual.xml:236
 msgid ""
 "A router/gateway, connected to the internet on the external interface and "
 "running on the IP address 10.0.2.1 on the internal interface."
@@ -1016,14 +1051,14 @@ msgstr ""
 "dirección IP 10.0.2.1 en el interfaz interno."
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:238
+#: release-manual.xml:237
 msgid "FIXME: We suggest coyote (link) or or. link to setup documentation"
 msgstr ""
 "POR HACER: Sugerimos coyote (enlace) o o. enlazar a la documentación de "
 "configuración"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:239
+#: release-manual.xml:238
 msgid ""
 "FIXME: also link to <ulink url='/HowTo'>HowTo </ulink> change IP setup of "
 "Debian-Edu - but recommend against doing so."
@@ -1033,12 +1068,12 @@ msgstr ""
 "haga."
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:244
+#: release-manual.xml:243
 msgid "Where to find more information"
 msgstr "Donde encontrar más información"
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject>
-#: release-manual.xml:245
+#: release-manual.xml:244
 #, fuzzy
 msgid ""
 "We recommend to read or at least take a look at the <ulink url='http://www."
@@ -1054,12 +1089,12 @@ msgstr ""
 "<inlinemediaobject>"
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:247 release-manual.xml:778
+#: release-manual.xml:246 release-manual.xml:784
 msgid "<phrase>:-)  </phrase>"
 msgstr "<phrase>:-)  </phrase>"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:251
+#: release-manual.xml:250
 msgid ""
 "Even more <ulink url='http://www.debian.org/releases/stable/"
 "installmanual'>information about the Debian etch release </ulink> is "
@@ -1070,17 +1105,17 @@ msgstr ""
 "disponible en su manual de instalación."
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:254
+#: release-manual.xml:253
 msgid "Download an installation media for Debian-edu etch 3.0r0"
 msgstr "Descargar un formato de instalación para Debian-edu etch 3.0r0"
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:255
+#: release-manual.xml:254
 msgid "DVDs for i386, amd64 and powerpc"
 msgstr "DVDs para i386, amd64 y powerpc"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:256
+#: release-manual.xml:255
 msgid ""
 "The multiarch dvd ISO image is 4.4 GiB large. To download it, use either of "
 "these methods:"
@@ -1089,22 +1124,22 @@ msgstr ""
 "de estos métodos:"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:265
+#: release-manual.xml:264
 msgid "or for the netinstall cd you can download for i386"
 msgstr "o con el cd netinstall puedes descargarla para i386"
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:274
+#: release-manual.xml:273
 msgid "amd64"
 msgstr "amd64"
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:283
+#: release-manual.xml:282
 msgid "and powerpc"
 msgstr "y powerpc"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:292
+#: release-manual.xml:291
 msgid ""
 "The powerpc port has not been tested as much as the other architectures, "
 "though it should work just fine and has been reported to work. Still, we "
@@ -1117,17 +1152,17 @@ msgstr ""
 "no ser soportada como las demás arquitecturas."
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:293
+#: release-manual.xml:292
 msgid "The source code for this release is available on a DVD image"
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:304
+#: release-manual.xml:303
 msgid "Installation from CD"
 msgstr "Instalación desde CD"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:305
+#: release-manual.xml:304
 msgid ""
 "The netinst installation will fetch some packages from the CD and the rest "
 "from the net.  The amount of packages fetched from the net varies from "
@@ -1137,12 +1172,12 @@ msgstr ""
 "el resto desde la red. La cantidad de paquetes a descargar depende del pefil:"
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:315
+#: release-manual.xml:314
 msgid "Installation options"
 msgstr "Opciones de instalación"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:316
+#: release-manual.xml:315
 msgid ""
 "When you do an Debian-Edu installation you have a few options to choose. But "
 "don't be afraid, there aren't many. We have done a good job hiding the "
@@ -1160,41 +1195,41 @@ msgstr ""
 "ponemos por defecto van estupendamente."
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:318
+#: release-manual.xml:317
 msgid ""
 "Normal graphical installation is the default on i386 and amd64. The powerpc "
 "installer does not support graphical installation. Enter"
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:319
+#: release-manual.xml:318
 msgid "at the boot prompt to do a text-mode install."
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:321
+#: release-manual.xml:320
 msgid "The"
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:322
+#: release-manual.xml:321
 msgid ""
 "option adds the barebone profile to the profile options, and switches to "
 "manual partitioning. Enter"
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:323
+#: release-manual.xml:322
 msgid "or"
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:324
+#: release-manual.xml:323
 msgid "at the syslinux/yaboot prompt to enter expert mode."
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para><inlinemediaobject>
-#: release-manual.xml:348
+#: release-manual.xml:347
 msgid ""
 "please say yes to submit information to <ulink url='http://popcon.skolelinux."
 "org/'>http://popcon.skolelinux.org/ </ulink> - though you dont have to "
@@ -1204,8 +1239,13 @@ msgstr ""
 "skolelinux.org/'>http://popcon.skolelinux.org/ </ulink> - aunque no es "
 "obligatorio <inlinemediaobject>"
 
+# type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
+#: release-manual.xml:349 release-manual.xml:515 release-manual.xml:877
+msgid "<phrase>:)  </phrase>"
+msgstr "<phrase>:)  </phrase>"
+
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:358
+#: release-manual.xml:357
 msgid ""
 "FIXME: this section lacks info how to install half-thick clients, which we "
 "marketing as great feature...! half-thick clients (aka diskless workstation "
@@ -1218,7 +1258,7 @@ msgstr ""
 "configuran después de la instalación, siguiendo el tutorial para ello."
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:360
+#: release-manual.xml:359
 msgid ""
 "Screenshot tour through an i386 main-server + thin-client-server installation"
 msgstr ""
@@ -1226,77 +1266,77 @@ msgstr ""
 "servidor de clientes ligeros"
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:362
+#: release-manual.xml:361
 msgid "<phrase>attachment:debian-edu-bootopt.png </phrase>"
 msgstr "<phrase>attachment:debian-edu-bootopt.png </phrase>"
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:367
+#: release-manual.xml:366
 msgid "<phrase>attachment:debian-edu-lang-en.png </phrase>"
 msgstr "<phrase>attachment:debian-edu-lang-en.png </phrase>"
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:372
+#: release-manual.xml:371
 msgid "<phrase>attachment:debian-edu-region-en.png </phrase>"
 msgstr "<phrase>attachment:debian-edu-region-en.png </phrase>"
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:377
+#: release-manual.xml:376
 msgid "<phrase>attachment:debian-edu-keyboard-en.png </phrase>"
 msgstr "<phrase>attachment:debian-edu-keyboard-en.png </phrase>"
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:382
+#: release-manual.xml:381
 msgid "<phrase>attachment:debian-edu-profile-ms-tcs-en.png </phrase>"
 msgstr "<phrase>attachment:debian-edu-profile-ms-tcs-en.png </phrase>"
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:387
+#: release-manual.xml:386
 msgid "<phrase>attachment:debian-edu-autopartition-en.png </phrase>"
 msgstr "<phrase>attachment:debian-edu-autopartition-en.png </phrase>"
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:392
+#: release-manual.xml:391
 msgid "<phrase>attachment:debian-edu-popcon-en.png </phrase>"
 msgstr "<phrase>attachment:debian-edu-popcon-en.png </phrase>"
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:397
+#: release-manual.xml:396
 msgid "<phrase>attachment:debian-edu-timezone-en.png </phrase>"
 msgstr "<phrase>attachment:debian-edu-timezone-en.png </phrase>"
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:402
+#: release-manual.xml:401
 msgid "<phrase>attachment:debian-edu-rootpw-en.png </phrase>"
 msgstr "<phrase>attachment:debian-edu-rootpw-en.png </phrase>"
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:407
+#: release-manual.xml:406
 msgid "<phrase>attachment:debian-edu-baseinstall-en.png </phrase>"
 msgstr "<phrase>attachment:debian-edu-baseinstall-en.png </phrase>"
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:412
+#: release-manual.xml:411
 msgid "<phrase>attachment:debian-edu-pkginstall-ms-tcs-en.png </phrase>"
 msgstr "<phrase>attachment:debian-edu-pkginstall-ms-tcs-en.png </phrase>"
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:417
+#: release-manual.xml:416
 msgid "<phrase>attachment:debian-edu-finished-en.png </phrase>"
 msgstr "<phrase>attachment:debian-edu-finished-en.png </phrase>"
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:422
+#: release-manual.xml:421
 msgid "<phrase>attachment:debian-edu-grub.png </phrase>"
 msgstr "<phrase>attachment:debian-edu-grub.png </phrase>"
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:427
+#: release-manual.xml:426
 msgid "<phrase>attachment:debian-edu-usplash.png </phrase>"
 msgstr "<phrase>attachment:debian-edu-usplash.png </phrase>"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:431
+#: release-manual.xml:430
 msgid ""
 "The KDM login screen was manually adjusted to reduce the resolution for this "
 "screen shot."
@@ -1305,22 +1345,22 @@ msgstr ""
 "resolución para este pantallazo."
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:433
+#: release-manual.xml:432
 msgid "<phrase>attachment:debian-edu-kdm-small-en.png </phrase>"
 msgstr "<phrase>attachment:debian-edu-kdm-small-en.png </phrase>"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:437
+#: release-manual.xml:436
 msgid "FIXME"
 msgstr "POR CORREGIR"
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:440
+#: release-manual.xml:439
 msgid "Getting started"
 msgstr "Para empezar"
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:441
+#: release-manual.xml:440
 msgid ""
 "FIXME: Describe here, what needs to be done after the installation to use "
 "Debian-Edu for real."
@@ -1329,7 +1369,7 @@ msgstr ""
 "para usar Debian-Edu en la práctica."
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:442
+#: release-manual.xml:441
 msgid ""
 "The <ulink url='/DebianEdu/Documentation/Etch/HowTo'>howto </ulink> chapter "
 "describes more tips and tricks and frequently asked questions, while this is "
@@ -1340,12 +1380,12 @@ msgstr ""
 "las cosas que todo el mundo tiene que hacer."
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:444
+#: release-manual.xml:443
 msgid "Services running on the main server"
 msgstr "Servicios que corren en el servidor principal"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:445
+#: release-manual.xml:444
 msgid ""
 "There are several services running on the main server which can be managed "
 "via a web management interface.  We'll describe each service here."
@@ -1354,12 +1394,12 @@ msgstr ""
 "interfaz web. Los describiremos aquí."
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:446
+#: release-manual.xml:445
 msgid "User Management"
 msgstr "Gestión de Usuarios"
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:447
+#: release-manual.xml:446
 msgid ""
 "Point your webbrowser to <ulink url='https://www/lwat'>https://www/lwat </"
 "ulink> and you'll get an login screen where you can login with your admin "
@@ -1372,13 +1412,13 @@ msgstr ""
 "de la instalación su nombre de usuario es:"
 
 # type: CDATA
-#: release-manual.xml:449
+#: release-manual.xml:448
 #, no-wrap
 msgid "admin]]"
 msgstr "admin]]"
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:450
+#: release-manual.xml:449
 msgid ""
 "and the password is the password you entered during the installation for the "
 "root account. Here you can manage your users and your user groups. For "
@@ -1392,17 +1432,17 @@ msgstr ""
 "proporciona lwat. Esto es una lista de lo que puede hacer con lwat:"
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:456
+#: release-manual.xml:455
 msgid "User Administration"
 msgstr "Administración de Usuarios"
 
 # type: Content of: <article><para><section><section><section><section><para>
-#: release-manual.xml:457
+#: release-manual.xml:456
 msgid "There are 4 kind of possible users:"
 msgstr "Hay 4 posibles tipos de usuarios:"
 
 # type: Content of: <article><para><section><section><section><section><para>
-#: release-manual.xml:463
+#: release-manual.xml:462
 msgid ""
 "If you want to add an user you'll recognise that you can't provide an "
 "password for your users. For Security Reasons we disabled this. The "
@@ -1417,19 +1457,19 @@ msgstr ""
 "cambiarlo sin problema."
 
 # type: Content of: <article><para><section><section><section><section><para>
-#: release-manual.xml:464
+#: release-manual.xml:463
 msgid "FIXME: describe Groups, Machine and Machine Administration here."
 msgstr ""
 "POR CORREGIR: describir Grupos, Máquinas y Administración de las Máquinas "
 "aquí."
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:467
+#: release-manual.xml:466
 msgid "Printer Managment"
 msgstr "Gestión de impresoras"
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:468
+#: release-manual.xml:467
 msgid ""
 "For Printer Management point your webbrowser to <ulink url='https://www/"
 "cups'>https://www/cups </ulink>.  This is the normal cups management site "
@@ -1444,17 +1484,17 @@ msgstr ""
 "debería accederse a este sitio sin usar ssl."
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:470
+#: release-manual.xml:469
 msgid "FIXME: Go further"
 msgstr "POR CORREGIR: Ir más allá"
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:473
+#: release-manual.xml:472
 msgid "Adding debian-edu machines to the LDAP domain"
 msgstr "Añadir máquinas debian-edu al dominio LDAP"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:474
+#: release-manual.xml:473
 msgid ""
 "FIXME: add how, is that the right headline for this? (The [.<ulink url='/"
 "DebianEdu/Documentation/Etch/GettingStarted/HowTo'>/HowTo </ulink>] Chapter "
@@ -1469,12 +1509,12 @@ msgstr ""
 "apropiado en LDAP usando lwat. [pere 2007-07-18]"
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:478
+#: release-manual.xml:477
 msgid "HowTo"
 msgstr "HowTo"
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:479
+#: release-manual.xml:478
 msgid ""
 "The <ulink url='/HowTos'>HowTos </ulink> from <ulink url='http://wiki.debian."
 "org/DebianEdu/HowTo/'>http://wiki.debian.org/DebianEdu/HowTo/ </ulink> are "
@@ -1487,12 +1527,12 @@ msgstr ""
 "mover los de los usuarios <ulink url='/HowTos'>HowTos </ulink>aquí."
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:483
+#: release-manual.xml:482
 msgid "Those are not that many:"
 msgstr "No son demasiados:"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:499
+#: release-manual.xml:498
 msgid ""
 "<ulink url='http://wiki.debian.org/DebianEdu/HowTo/"
 "LtspDisklessWorkstation'>http://wiki.debian.org/DebianEdu/HowTo/"
@@ -1505,7 +1545,7 @@ msgstr ""
 "cambiarse el apunte a $svn/trunk/src/debian-edu-config/sbin/ltsp-make-client "
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:508
+#: release-manual.xml:507
 msgid ""
 "<ulink url='http://wiki.debian.org/DebianEdu/HowTo/TeacherFirstStep'>http://"
 "wiki.debian.org/DebianEdu/HowTo/TeacherFirstStep </ulink> - incomplete but "
@@ -1516,7 +1556,7 @@ msgstr ""
 "interesante"
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:512
+#: release-manual.xml:511
 msgid ""
 "(see the history of those wiki pages and ask the authors if they are fine "
 "with moving the howto and putting it under the GPL)"
@@ -1525,12 +1565,12 @@ msgstr ""
 "les importa moverlas al howto y ponerlas bajo GPL)"
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:513
+#: release-manual.xml:512
 msgid "Other topics"
 msgstr "Otros temas"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:514
+#: release-manual.xml:513
 msgid ""
 "Other topics the documentation should cover, not neccessarily in the <ulink "
 "url='/HowTo'>HowTo </ulink> Chapter though <inlinemediaobject>"
@@ -1539,7 +1579,7 @@ msgstr ""
 "<ulink url='/HowTo'>HowTo </ulink> Capítulo sobre <inlinemediaobject>"
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject>
-#: release-manual.xml:519
+#: release-manual.xml:518
 msgid ""
 "</inlinemediaobject> This <ulink url='/HowTo'>HowTo </ulink> chapter "
 "definitly needs reorganisation - sorry translators <inlinemediaobject>"
@@ -1548,12 +1588,12 @@ msgstr ""
 "reorganizarse - lo siento por los traductores <inlinemediaobject>"
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:521
+#: release-manual.xml:520
 msgid "<phrase>:( </phrase>"
 msgstr "<phrase>:( </phrase>"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:525
+#: release-manual.xml:524
 msgid ""
 "Somewhere we also need to document lwat basics (howto create users, access "
 "home dirs (or rather export them to machines) and (give a pointer to) italc "
@@ -1564,7 +1604,7 @@ msgstr ""
 "máquinas) y dar enlaces a la documentación de italc."
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:527
+#: release-manual.xml:526
 msgid ""
 "Installing single service machines for spreading the load from main-server"
 msgstr ""
@@ -1572,32 +1612,32 @@ msgstr ""
 "principal"
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:535
+#: release-manual.xml:534
 msgid "LDAP Setup"
 msgstr "Configuración de LDAP"
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:537
+#: release-manual.xml:536
 msgid "/etc/ in svk"
 msgstr "/etc/ en svk"
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:539
+#: release-manual.xml:538
 msgid "modify Kiosk mode"
 msgstr "modificar el modo Kiosk"
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:541
+#: release-manual.xml:540
 msgid "Flash"
 msgstr "Flash"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:542
+#: release-manual.xml:541
 msgid "To install the Adobe Flash Player web browser plugin, install the"
 msgstr "Instalar el plugin del reproductor de Adobe Flash, instalar el"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:543
+#: release-manual.xml:542
 msgid ""
 "debian package.  It require a working Internet connection, and will download "
 "the precompiled binary from Adobe and convert it into a Debian package "
@@ -1608,12 +1648,12 @@ msgstr ""
 "binario precompilado de Adobe para convertirlo antes en un paquete Debian."
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:545
+#: release-manual.xml:544
 msgid "<phrase>/!\\ </phrase>"
 msgstr "<phrase>/!\\ </phrase>"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:548
+#: release-manual.xml:547
 msgid ""
 "</inlinemediaobject> Version 9.0.31.0.1 of the package do not work in Etch "
 "[pere 2007-07-12]"
@@ -1622,7 +1662,7 @@ msgstr ""
 "[pere 2007-07-12]"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:549
+#: release-manual.xml:548
 msgid ""
 "An alternative is to install flashplayer-mozilla from debian-multimedia.  It "
 "work with both konqueror and firefox."
@@ -1631,17 +1671,17 @@ msgstr ""
 "Funciona tanto con konqueror como con firefox"
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:551
+#: release-manual.xml:550
 msgid "Java"
 msgstr "Java"
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:555
+#: release-manual.xml:554
 msgid "Sound & Video"
 msgstr "Sonido y Vídeo"
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:556
+#: release-manual.xml:555
 msgid ""
 "- where to find libdvdcss for playing dvds.  Should we promote <ulink "
 "url='http://www.debian-multimedia.org/'>http://www.debian-multimedia.org/ </"
@@ -1652,12 +1692,12 @@ msgstr ""
 "org/ </ulink> o algún otro sitio?"
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:561
+#: release-manual.xml:560
 msgid "Thin Clients vs Diskless workstations"
 msgstr "Clientes ligeros vs Puestos sin disco"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:562
+#: release-manual.xml:561
 msgid ""
 "Instructions on how to enable diskless workstations / stateless "
 "workstations / lowfat clients / half-thick clients are available from <ulink "
@@ -1670,27 +1710,27 @@ msgstr ""
 "HowTo/LtspDisklessWorkstation </ulink>"
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:565
+#: release-manual.xml:564
 msgid "printer managing"
 msgstr "gestión de impresora"
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:567
+#: release-manual.xml:566
 msgid "Firewall setup (coyote linux)"
 msgstr "Configuración del Cortafuegos (coyote linux)"
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:569
+#: release-manual.xml:568
 msgid "LTSP in detail"
 msgstr "LTSP en detalle"
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:571
+#: release-manual.xml:570
 msgid "Connecting windows machines to the network / windows integration"
 msgstr "Conectar máquinas windows a la red / integración con windows"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:572
+#: release-manual.xml:571
 msgid ""
 "For Windows clients the Windows domain \"SKOLELINUX\" is available to be "
 "joined. A special service called Samba, installed on the main-server tjener, "
@@ -1703,7 +1743,7 @@ msgstr ""
 "de autentificar a los usuarios."
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:573
+#: release-manual.xml:572
 msgid ""
 "In order to make Windows clients join the domain some (few) steps are "
 "required:"
@@ -1712,14 +1752,14 @@ msgstr ""
 "(pocos) pasos:"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:574
+#: release-manual.xml:573
 msgid ""
 "1. Create a user with membership in the \"admins\" group (if not already "
 "existing)"
 msgstr "1. Crear un usuario en el grupo \"admins\" (si no existiera ya)"
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:575
+#: release-manual.xml:574
 msgid ""
 "In order to be able to join the \"SKOLELINUX\" domain a member of the admins "
 "group needs to authorize the process. If not yet existing a user with that "
@@ -1734,12 +1774,12 @@ msgstr ""
 "contraseña para root en Samba."
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:579
+#: release-manual.xml:578
 msgid "2. Configure the Windows client as static host"
 msgstr "2. Concigurar el cliente Windows como un puesto estático"
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:580
+#: release-manual.xml:579
 msgid ""
 "When joining a samba domain some special data is stored on the domain "
 "controller (tjener). This data is needed to recognize the Windows client "
@@ -1760,7 +1800,7 @@ msgstr ""
 "unirse al dominio."
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:583
+#: release-manual.xml:582
 msgid ""
 "3. On the Windows client: Make sure the network and system configuration "
 "matches the data stored on tjener (hostname and ip configuration)"
@@ -1770,13 +1810,13 @@ msgstr ""
 "configuración de ip)"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:586
+#: release-manual.xml:585
 msgid "4. Join the domain as usual using the user added in step 1."
 msgstr ""
 "4. Unirse al dominio como de costumbre con el usuario añadido en el paso 1."
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:589
+#: release-manual.xml:588
 msgid ""
 "Windows will sync the profile of domain users on every login and logout. "
 "Depending on how much data stored in the profile this could take some time. "
@@ -1791,33 +1831,50 @@ msgstr ""
 "servidor en su lugar) y guardar los archivos en la unidad H: en lugar de "
 "\"Mis Documentos\"."
 
+# type: Content of: <article><para><section><section><title>
+#: release-manual.xml:590
+msgid "Using volatile.debian.org and backports.org"
+msgstr ""
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:591
+msgid "FIXME: describe howto..."
+msgstr ""
+
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:592
+#: release-manual.xml:594
 msgid "Maintainance"
 msgstr "Mantenimiento"
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:593
+#: release-manual.xml:595
 msgid "Updating the software"
 msgstr "Actualizar el software"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:594
-msgid "document how to use aptitude upgrade / kde-update-notifier"
-msgstr "documentar como usar aptitude upgrade /kde-update-notifier"
+#: release-manual.xml:596
+msgid "This section explains how to use"
+msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:595
-msgid "are cron-apt and apt-listchanges installed and configured?"
+#: release-manual.xml:597
+msgid "and kde-update-notifier"
+msgstr ""
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:598
+#, fuzzy
+msgid ""
+"FIXME: are cron-apt, apt-proxy and apt-listchanges installed and configured?"
 msgstr "¿están cron-apt y apt-listchanges instalados y configurados?"
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:597
+#: release-manual.xml:600
 msgid "Backup Management"
 msgstr "Gestión de las copias de seguridad"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:598
+#: release-manual.xml:601
 msgid ""
 "For the backup management point your browser to <ulink url='https://www/"
 "slbackup-php'>https://www/slbackup-php </ulink>. Please note that you have "
@@ -1830,7 +1887,7 @@ msgstr ""
 "introducir la contraseña de root. Si intenta acceder sin ssl no funcionará."
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:600
+#: release-manual.xml:603
 msgid ""
 "FIXME: I have to have a look on the webpage of slbackup-php to describe this "
 "further"
@@ -1839,27 +1896,27 @@ msgstr ""
 "mejor"
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:602
+#: release-manual.xml:605
 msgid "Server Monitoring"
 msgstr "Monitorización del Servidor"
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:603
+#: release-manual.xml:606
 msgid "Munin"
 msgstr "Munin"
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:605
+#: release-manual.xml:608
 msgid "Nagios"
 msgstr "Nagios"
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:607
+#: release-manual.xml:610
 msgid "Sitesummary"
 msgstr "Sitesummary"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:608
+#: release-manual.xml:611
 msgid ""
 "Some documentation on sitesummary is available from <ulink url='http://wiki."
 "debian.org/DebianEdu/HowTo/SiteSummary'>http://wiki.debian.org/DebianEdu/"
@@ -1870,17 +1927,17 @@ msgstr ""
 "HowTo/SiteSummary </ulink>"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:610
+#: release-manual.xml:613
 msgid "give pointers to munin, sitesummary and nagios doc"
 msgstr "dar apuntes sobre munin, sitesummary y nagios"
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:614
+#: release-manual.xml:617
 msgid "Upgrades"
 msgstr "Actualizaciones"
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:615
+#: release-manual.xml:618
 msgid ""
 "Before explaining how to upgrade, please note, that you do this update on "
 "your productive server on your own risk. <emphasis role='strong'>Debian-Edu/"
@@ -1893,7 +1950,7 @@ msgstr ""
 "más allá de las que indique la ley aplicable.  </emphasis>"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:617
+#: release-manual.xml:620
 msgid ""
 "More <ulink url='http://www.debian.org/releases/stable/"
 "installmanual'>information about the Debian etch release </ulink> is "
@@ -1904,7 +1961,7 @@ msgstr ""
 "disponible en su manual de instalación."
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:619
+#: release-manual.xml:622
 msgid ""
 "If you want to be sure that after the upgrade everything works like before , "
 "you should test the upgrade on a test server, which is configured the same "
@@ -1917,7 +1974,7 @@ msgstr ""
 "ver si todo funciona como debiera."
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:620
+#: release-manual.xml:623
 msgid ""
 "Also it might be wise to wait a bit and keep running sarge for some more "
 "weeks, so that others can test the upgrade, experience problems and document "
@@ -1931,19 +1988,19 @@ msgstr ""
 "durante algún tiempo."
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:621
+#: release-manual.xml:624
 msgid "Upgrades from Debian-Edu sarge"
 msgstr "Actualizar desde Debian-Edu sarge"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:622
+#: release-manual.xml:625
 msgid ""
 "Please read this chapter completly before you start upgrading your systems."
 msgstr ""
 "Lea este capítulo por completo antes de empezar a actualizar sus sitemas."
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:623
+#: release-manual.xml:626
 msgid ""
 "In case of problems you could also read the <ulink url='http://www.debian."
 "org/releases/stable/releasenotes'>releasenotes for Debian etch </ulink>. "
@@ -1962,12 +2019,12 @@ msgstr ""
 "antes de actualizar!)"
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:627
+#: release-manual.xml:630
 msgid "Partioning scheme changed"
 msgstr "Cambiado el esquema de particiones"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:628
+#: release-manual.xml:631
 msgid ""
 "The main problem upgrading from the sarge-based Release to Terra is that the "
 "Partition Scheme changed completly. The sarge-based Release has two volume "
@@ -1978,7 +2035,7 @@ msgstr ""
 "en Sarge tiene dos Grupos de Unidades:"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:632
+#: release-manual.xml:635
 msgid ""
 "But the etch based release has only 1 Volume Group due to internal changes "
 "of the Installer."
@@ -1987,7 +2044,7 @@ msgstr ""
 "cambios internos del instalador."
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:633
+#: release-manual.xml:636
 msgid ""
 "The main problem is here that the System Volumegroup is quit small since the "
 "data in this Partitions is mostly static. When trying the upgrade on an 8GB "
@@ -2004,12 +2061,12 @@ msgstr ""
 "actualización fallará por falta de espacio en el dispositivo."
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:635
+#: release-manual.xml:638
 msgid "Prepare the System"
 msgstr "Preparar el sistema"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:636
+#: release-manual.xml:639
 msgid ""
 "If you have enough space in the vg_system Volumegroup but not in the lv_var- "
 "Partition you have to resize this partition:"
@@ -2018,7 +2075,7 @@ msgstr ""
 "tendrá que redimensionar esta partición:"
 
 # type: CDATA
-#: release-manual.xml:637
+#: release-manual.xml:640
 #, no-wrap
 msgid ""
 "/etc/init.d/squid stop \n"
@@ -2030,25 +2087,25 @@ msgstr ""
 "umount -fl /var ]]"
 
 # type: CDATA
-#: release-manual.xml:642
+#: release-manual.xml:645
 #, no-wrap
 msgid "e2fsck -f /dev/vg_system/lv_data ]]"
 msgstr "e2fsck -f /dev/vg_system/lv_data ]]"
 
 # type: CDATA
-#: release-manual.xml:645
+#: release-manual.xml:648
 #, no-wrap
 msgid "lvextend -L +1GB /dev/vg_system/lv_data ]]"
 msgstr "lvextend -L +1GB /dev/vg_system/lv_data ]]"
 
 # type: CDATA
-#: release-manual.xml:648
+#: release-manual.xml:651
 #, no-wrap
 msgid "resize2fs /dev/vg_system/lv_data]]"
 msgstr "resize2fs /dev/vg_system/lv_data]]"
 
 # type: CDATA
-#: release-manual.xml:651
+#: release-manual.xml:654
 #, no-wrap
 msgid ""
 "mount /var \n"
@@ -2060,12 +2117,12 @@ msgstr ""
 "/etc/init.d/squid start ]]"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:658
+#: release-manual.xml:661
 msgid "Now start the upgrade with:"
 msgstr "Ahora inicie la actualización con:"
 
 # type: CDATA
-#: release-manual.xml:659
+#: release-manual.xml:662
 #, no-wrap
 msgid ""
 "apt-get update \n"
@@ -2075,12 +2132,12 @@ msgstr ""
 "apt-get dist-upgrade ]]"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:663
+#: release-manual.xml:666
 msgid "after you have modified your sources.list:"
 msgstr "después de modificar su sources.list:"
 
 # type: CDATA
-#: release-manual.xml:664
+#: release-manual.xml:667
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian etch main contrib non-free \n"
@@ -2090,12 +2147,12 @@ msgstr ""
 "deb http://ftp.skolelinux.org/skolelinux etch local]]"
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:669
+#: release-manual.xml:672
 msgid "Answers to Debconf Questions raising during upgrade"
 msgstr "Respuestas a las preguntas de Debconf durante la actualización"
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:670
+#: release-manual.xml:673
 msgid ""
 "Okay we'll give yo here some hints, what you should answer when some debconf "
 "Questions comes up. But please note. This upgrade <ulink url='/HowTo'>HowTo "
@@ -2119,12 +2176,12 @@ msgstr ""
 "edu at lists.debian.org </ulink>) o en el IRC (irc.oftc.net): #debian-edu."
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:674
+#: release-manual.xml:677
 msgid "* Configure nagios-common."
 msgstr "* Configurar nagios-common"
 
 # type: Content of: <article><para><section><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:675
+#: release-manual.xml:678
 msgid ""
 "Here you have to enter an passwort for the <emphasis>nagiosadmin </emphasis> "
 "user."
@@ -2133,54 +2190,54 @@ msgstr ""
 "emphasis>."
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:679
+#: release-manual.xml:682
 msgid "* Configure console-data"
 msgstr "* Configurar console-data"
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:682
+#: release-manual.xml:685
 msgid "* Configure openssh-server"
 msgstr "* Configurar openssh-server"
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:685
+#: release-manual.xml:688
 msgid "* Configure systat"
 msgstr "* Configurar systat"
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:688
+#: release-manual.xml:691
 msgid "* Configure popularity-contest"
 msgstr "* Configurar popularity-contest"
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:691
+#: release-manual.xml:694
 msgid "* Configure libnss-ldap"
 msgstr "* Configurar libnss-ldap"
 
 # type: Content of: <article><para><section><section><section><orderedlist><listitem><para>
-#: release-manual.xml:692
+#: release-manual.xml:695
 msgid "Change the prompt to: <emphasis>ldaps://ldap/ </emphasis>"
 msgstr "Cambie la respuesta a: <emphasis>ldaps://ldap/ </emphasis>"
 
 # type: Content of: <article><para><section><section><section><orderedlist><listitem><para>
-#: release-manual.xml:695
+#: release-manual.xml:698
 msgid ""
 "Change the prompt to: <emphasis>dc=skole,dc=skolelinux,dc=no </emphasis>"
 msgstr ""
 "Cambie la respuesta a: <emphasis>dc=skole,dc=skolelinux,dc=no </emphasis>"
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:702
+#: release-manual.xml:705
 msgid "* Upgrade glibc now. Answer Yes here."
 msgstr "* Actualizar ahora glibc. Respuesta: Sí"
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:703
+#: release-manual.xml:706
 msgid "* Restart Services. Answer Yes here."
 msgstr "* Reiniciar servicios. Respuesta Sí."
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:704
+#: release-manual.xml:707
 msgid ""
 "Okay. This should be all if you have no additional packages installed. Now "
 "the upgrade process start to replace the packages."
@@ -2189,7 +2246,7 @@ msgstr ""
 "actualización empieza a reemplazar los paquetes."
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:705
+#: release-manual.xml:708
 msgid ""
 "Please note here: The Installer will ask several times if you want to keep "
 "your old modified Version of an Configfile or if you want to get the latest. "
@@ -2202,12 +2259,12 @@ msgstr ""
 "instalar la más nueva."
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:706
+#: release-manual.xml:709
 msgid "The upgrade will fail with this error message:"
 msgstr "La actualización fallará con este mensaje de error:"
 
 # type: CDATA
-#: release-manual.xml:707
+#: release-manual.xml:710
 #, no-wrap
 msgid ""
 "Errors were encountered while processing: \n"
@@ -2223,7 +2280,7 @@ msgstr ""
 "]]"
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:712
+#: release-manual.xml:715
 msgid ""
 "To fix this you have to edit these two files: <emphasis>/var/lib/dpkg/info/"
 "mozilla-firefox-locale-it.postrm </emphasis> and <emphasis>/var/lib/dpkg/"
@@ -2238,28 +2295,28 @@ msgstr ""
 "reinicie el proceso de actualización con:"
 
 # type: CDATA
-#: release-manual.xml:716
+#: release-manual.xml:719
 #, no-wrap
 msgid "apt-get -f install]]"
 msgstr "apt-get -f install]]"
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:717
+#: release-manual.xml:720
 msgid "Now the upgrade work again:"
 msgstr "Ahora la actualización funciona de nuevo:"
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:718
+#: release-manual.xml:721
 msgid "* Several Modified configuration files (nagios)"
 msgstr "* Algunos archivos de configuración modificados (nagios)"
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:721
+#: release-manual.xml:724
 msgid "Then the installation failed another time:"
 msgstr "Y la instalación vuelve a fallar:"
 
 # type: CDATA
-#: release-manual.xml:722
+#: release-manual.xml:725
 #, no-wrap
 msgid ""
 "Errors were encountered while processing: \n"
@@ -2273,7 +2330,7 @@ msgstr ""
 "]]"
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:726
+#: release-manual.xml:729
 msgid ""
 "In order to fix this rename this directory: <emphasis>/var/backups/dc=skole,"
 "dc=skolelinux,dc=no-2.2.23-8.ldapdb </emphasis> and since ldap now runs not "
@@ -2286,7 +2343,7 @@ msgstr ""
 "cambiar los permisos de los ficheros de configuración:"
 
 # type: CDATA
-#: release-manual.xml:729
+#: release-manual.xml:732
 #, no-wrap
 msgid ""
 "chown -R openldap:openldap /etc/ldap/ \n"
@@ -2296,7 +2353,7 @@ msgstr ""
 "apt-get -f install]]"
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:731
+#: release-manual.xml:734
 msgid ""
 "Then the installation should finish <emphasis role='strong'>without </"
 "emphasis> an error.  Since now many packages are not upgrades please restart "
@@ -2307,18 +2364,18 @@ msgstr ""
 "reinicie el proces de dist-upgrade con:"
 
 # type: CDATA
-#: release-manual.xml:733
+#: release-manual.xml:736
 #, no-wrap
 msgid "apt-get dist-upgrade]]"
 msgstr "apt-get dist-upgrade]]"
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:734
+#: release-manual.xml:737
 msgid "The next error raising up is this one:"
 msgstr "El siguiente error que aparece es este:"
 
 # type: CDATA
-#: release-manual.xml:735
+#: release-manual.xml:738
 #, no-wrap
 msgid ""
 "Errors were encountered while processing: \n"
@@ -2330,24 +2387,24 @@ msgstr ""
 "E: Sub-process /usr/bin/dpkg returned an error code (1)]]"
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:738
+#: release-manual.xml:741
 msgid "Please remove the package: <emphasis>courier-ldap </emphasis> with"
 msgstr "Elimine el paquete: <emphasis>courier-ldap </emphasis>  con"
 
 # type: CDATA
-#: release-manual.xml:740
+#: release-manual.xml:743
 #, no-wrap
 msgid "apt-get remove courier-ldap]]"
 msgstr "apt-get remove courier-ldap]]"
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:741
+#: release-manual.xml:744
 msgid ""
 "and wait until it is finished.Then restart the dist-upgrade process again."
 msgstr "y espere hasta que termine. Después reinicie el dist-upgrade de nuevo."
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:742
+#: release-manual.xml:745
 msgid ""
 "If you have only the default packages installed the upgrade process should "
 "now finish without raising more errors. The only remaining upgrade issue is "
@@ -2356,18 +2413,18 @@ msgid ""
 msgstr ""
 
 # type: CDATA
-#: release-manual.xml:743
+#: release-manual.xml:746
 #, no-wrap
 msgid "chown bind:root -R /etc/bind ]]"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:746
+#: release-manual.xml:749
 msgid "Upgrades from older Debian-Edu / Skolelinux installations"
 msgstr "Actualizar desde instalaciones antiguas de Debian-Edu / Skolelinux"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:747
+#: release-manual.xml:750
 msgid ""
 "Upgrades from the woody based Debian-Edu / Skolelinux installation are not "
 "supported. Upgrade to the sarge based version first, a howto can be found at "
@@ -2382,28 +2439,27 @@ msgstr ""
 "UpgradeFrom1.0 </ulink> Después actualice a Terra (versión basada en etch)"
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:751
+#: release-manual.xml:754
 msgid "Contribute"
 msgstr "Contribuir"
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:752
+#: release-manual.xml:755
 msgid "Let us know you exist"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:754
-#, fuzzy
-msgid "<phrase>skolelinux-world </phrase>"
-msgstr "<phrase>:-)  </phrase>"
+#: release-manual.xml:757
+msgid "<phrase>worldmapphp?lang=en&foo=bar </phrase>"
+msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:758
+#: release-manual.xml:761
 msgid "There are Debian Edu users all over the world."
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:759
+#: release-manual.xml:762
 msgid ""
 "The Debian Edu project provide a database of schools and users of the system "
 "to help the users find each other, and also to have an idea about where the "
@@ -2414,19 +2470,19 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:762
+#: release-manual.xml:765
 msgid "Resources"
 msgstr "Recursos"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:763
+#: release-manual.xml:766
 msgid "<emphasis role='strong'>FIXME </emphasis>, for now some basic pointers:"
 msgstr ""
 "<emphasis role='strong'>POR CORREGIR </emphasis>, por ahora unas "
 "indicaciones básicas:"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:765
+#: release-manual.xml:768
 msgid ""
 "<ulink url='http://wiki.debian.org/DebianEdu'>http://wiki.debian.org/"
 "DebianEdu </ulink> - mostly developer centric wiki"
@@ -2435,7 +2491,7 @@ msgstr ""
 "DebianEdu </ulink> - wiki orientado a desarrolladores"
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:768
+#: release-manual.xml:771
 msgid ""
 "<ulink url='http://lists.debian.org/debian-edu'>http://lists.debian.org/"
 "debian-edu </ulink> - developer centric mailing list"
@@ -2443,21 +2499,26 @@ msgstr ""
 "<ulink url='http://lists.debian.org/debian-edu'>http://lists.debian.org/"
 "debian-edu </ulink> - lista de correo orientada a desarrolladores"
 
+# type: Content of: <article><para><section><section><itemizedlist><listitem><para>
+#: release-manual.xml:775
+msgid ""
+"we are organized in <ulink url='http://wiki.debian.org/DebianEdu/"
+"Teams/'>different teams </ulink> working on different subjects."
+msgstr ""
+
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:773
-msgid "FIXME: add info how developers and testers can contribute."
+#: release-manual.xml:779
+msgid "FIXME: add link to Support chapter"
 msgstr ""
-"POR CORREGIR: añadir información de como desarrolladores y probadores pueden "
-"ayudar"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:775
+#: release-manual.xml:781
 #, fuzzy
 msgid "Documentation writers"
 msgstr "== Escritores de la Documentación =="
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:776
+#: release-manual.xml:782
 msgid ""
 "This document needs your help. You can help at <ulink url='http://wiki."
 "skolelinux.no/DebianEdu/Documentation/Etch/'>http://wiki.skolelinux.no/"
@@ -2468,12 +2529,12 @@ msgstr ""
 "DebianEdu/Documentation/Etch/ </ulink> <inlinemediaobject>"
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:783
+#: release-manual.xml:789
 msgid "Translations wanted"
 msgstr "Se necesitan traducciones"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:784
+#: release-manual.xml:790
 msgid ""
 "Another good way to help is by translating software and documentation. "
 "Information how to translate the documentation can be found in the <ulink "
@@ -2483,12 +2544,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:787
+#: release-manual.xml:793
 msgid "Join a local Debian-Edu team"
 msgstr "Unirse a un equipo local de Debian-Edu"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:788
+#: release-manual.xml:794
 msgid ""
 "<emphasis role='strong'>FIXME </emphasis>: in Norway, Germany, France, Spain "
 "(the region of Extremadura)."
@@ -2497,12 +2558,12 @@ msgstr ""
 "España  (la región de Extremadura con LinEx)."
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:791
+#: release-manual.xml:797
 msgid "Start a new local Debian-Edu team"
 msgstr "Comenzar un nuevo equipo local de debian-edu"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:792
+#: release-manual.xml:798
 msgid ""
 "<emphasis role='strong'>FIXME: </emphasis> \"isolated\" contributors and "
 "users in schools exist in Greece, the Netherlands, Japan and elsewhere. Meet "
@@ -2514,22 +2575,22 @@ msgstr ""
 "edu!"
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:796
+#: release-manual.xml:802
 msgid "Support"
 msgstr "Soporte"
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:797
+#: release-manual.xml:803
 msgid "Volunteer based support"
 msgstr "Soporte basado en voluntarios"
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:798
+#: release-manual.xml:804
 msgid "in english"
 msgstr "en inglés"
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: release-manual.xml:799
+#: release-manual.xml:805
 msgid ""
 "<ulink url='https://init.linpro.no/mailman/skolelinux.no/listinfo/admin-"
 "discuss'>https://init.linpro.no/mailman/skolelinux.no/listinfo/admin-discuss "
@@ -2540,7 +2601,7 @@ msgstr ""
 "</ulink> - lista de correo para soporte en habla inglesa"
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:802
+#: release-manual.xml:808
 msgid ""
 "<ulink url='http://lists.debian.org/debian-edu'>http://lists.debian.org/"
 "debian-edu </ulink> - developer centric mailing list, more useful to report "
@@ -2551,12 +2612,12 @@ msgstr ""
 "útil para informar de problemas que para que te ayuden"
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:808
+#: release-manual.xml:814
 msgid "in norwegian"
 msgstr "en noruego"
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: release-manual.xml:809
+#: release-manual.xml:815
 msgid ""
 "<ulink url='https://init.linpro.no/mailman/skolelinux.no/listinfo/"
 "bruker'>https://init.linpro.no/mailman/skolelinux.no/listinfo/bruker </"
@@ -2567,7 +2628,7 @@ msgstr ""
 "ulink> - lista de correo de soporte para usuarios en habla noruega"
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: release-manual.xml:812
+#: release-manual.xml:818
 msgid ""
 "<ulink url='https://init.linpro.no/mailman/skolelinux.no/listinfo/"
 "linuxiskolen'>https://init.linpro.no/mailman/skolelinux.no/listinfo/"
@@ -2578,12 +2639,12 @@ msgstr ""
 "linuxiskolen </ulink> - POR CORREGIR"
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:818
+#: release-manual.xml:824
 msgid "in german"
 msgstr "en alemán"
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: release-manual.xml:819
+#: release-manual.xml:825
 msgid ""
 "<ulink url='http://www.skolelinux.de/mailman/listinfo/user'>http://www."
 "skolelinux.de/mailman/listinfo/user </ulink> - german speaking support "
@@ -2594,7 +2655,7 @@ msgstr ""
 "para usuarios en habla alemana"
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: release-manual.xml:822
+#: release-manual.xml:828
 msgid ""
 "<ulink url='http://wiki.skolelinux.de'>http://wiki.skolelinux.de </ulink> - "
 "german wiki with lots of <ulink url='/HowTos'>HowTos </ulink> etc."
@@ -2603,12 +2664,12 @@ msgstr ""
 "wiki alemán con muchos <ulink url='/HowTos'>Tutoriales </ulink> etc."
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:829
+#: release-manual.xml:835
 msgid "in french"
 msgstr "en francés"
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:830
+#: release-manual.xml:836
 msgid ""
 "<ulink url='http://lists.debian.org/debian-edu-french'>http://lists.debian."
 "org/debian-edu-french </ulink> - french speaking support mailinglist"
@@ -2617,12 +2678,12 @@ msgstr ""
 "org/debian-edu-french </ulink> lista de correo de soporte en francés"
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:836
+#: release-manual.xml:842
 msgid "Professional support"
 msgstr "Soporte profesional"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:837
+#: release-manual.xml:843
 msgid ""
 "Lists of companies providing professional support are available from <ulink "
 "url='http://wiki.debian.org/DebianEdu/Help/ProfessionalHelp'>http://wiki."
@@ -2633,12 +2694,12 @@ msgstr ""
 "wiki.debian.org/DebianEdu/Help/ProfessionalHelp </ulink>."
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:841
+#: release-manual.xml:847
 msgid "Copyright and authors"
 msgstr "Copyright y authores"
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:842
+#: release-manual.xml:848
 #, fuzzy
 msgid ""
 "This document is written and copyrighted 2007 by Holger Levsen, Petter "
@@ -2650,7 +2711,7 @@ msgstr ""
 "licencia GPL2 o cualquier versión posterior. ¡Disfrútalo!"
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:843
+#: release-manual.xml:849
 msgid ""
 "If you add content to it, <emphasis role='strong'>please only do so if you "
 "are the author of it and plan to release it under the same conditions </"
@@ -2662,12 +2723,12 @@ msgstr ""
 "tu nombre aquí y libéralo bajo la GPL2 o posterior."
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:846
+#: release-manual.xml:852
 msgid "Translation copyright and authors"
 msgstr "Copyright de la traducción y Autores"
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:847
+#: release-manual.xml:853
 msgid ""
 "The spanish translation is copyrighted 2007 by José L. Redrejo Rodríguez and "
 "is released under the GPL2 or any later version."
@@ -2676,7 +2737,7 @@ msgstr ""
 "está bajo la licencia GPL2 o versiones posteriores."
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:848
+#: release-manual.xml:854
 msgid ""
 "The norwegian Bokmål translation is copyrighted 2007 by Petter Reinholdtsen "
 "and is released under the GPL2 or any later version."
@@ -2685,7 +2746,7 @@ msgstr ""
 "la licencia GPL2 o versiones posteriores."
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:849
+#: release-manual.xml:855
 #, fuzzy
 msgid ""
 "The german translation is copyrighted 2007 by Holger Levsen and Patrick "
@@ -2695,12 +2756,12 @@ msgstr ""
 "licencia GPL2 o versiones posteriores."
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:851
+#: release-manual.xml:857
 msgid "Translations of this document"
 msgstr "Traducciones de este documento"
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:852
+#: release-manual.xml:858
 msgid ""
 "Fully translated versions of this document are not yet available, as the "
 "document itself is very incomplete. Incomplete translations for Norwegian "
@@ -2711,18 +2772,18 @@ msgstr ""
 "y español."
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:853
+#: release-manual.xml:859
 msgid "Howto translate this document"
 msgstr "Como traducir este documento"
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:854
+#: release-manual.xml:860
 #, fuzzy
 msgid "If you want to start/help translating this document, you can!"
 msgstr "Como traducir este documento"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:855
+#: release-manual.xml:861
 msgid ""
 "Translations of this document are kept in .po files like in many free "
 "software projects, read"
@@ -2731,7 +2792,7 @@ msgstr ""
 "muchos proyectos de software libre, lea"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:856
+#: release-manual.xml:862
 msgid ""
 "for more information on this. There are many easy tools for translating."
 msgstr ""
@@ -2739,14 +2800,14 @@ msgstr ""
 "para traducir."
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:857
+#: release-manual.xml:863
 msgid ""
 "To update the translations you need to be a member of the alioth project"
 msgstr ""
 "Para actualizar las traducciones debe ser un miembro del proyecto alioth"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:858
+#: release-manual.xml:864
 msgid ""
 ". To work on them you just need to check them out anonymously from svn, "
 "create patches and send those to <ulink url='mailto:debian-edu at l.d.o'>debian-"
@@ -2757,24 +2818,24 @@ msgstr ""
 "edu at l.d.o </ulink> o ponga un bug al paquete debian-edu-doc."
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:860
+#: release-manual.xml:866
 msgid "Checkout the source package with the following command:"
 msgstr "Descargue los fuentes del paquete con este comando:"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:865
+#: release-manual.xml:871
 msgid "Then edit the"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:866
+#: release-manual.xml:872
 msgid ""
 "and either commit it to svn (if you have the rights to do so) or send the "
 "file to the mailinglist."
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:867
+#: release-manual.xml:873
 #, fuzzy
 msgid ""
 "Read /usr/share/doc/debian-edu-doc/README.release-manual-translations to "
@@ -2788,12 +2849,12 @@ msgstr ""
 "mimetype=xml/docbook'>los fuentes </ulink>."
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:869
+#: release-manual.xml:875
 msgid "Potential problems for translations"
 msgstr "Problemas potenciales para los traductores"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:870
+#: release-manual.xml:876
 msgid ""
 "We will need to write sed-scripts (or something like that) to support "
 "different images for different translations. Laters <inlinemediaobject>"
@@ -2802,17 +2863,25 @@ msgstr ""
 "diferentes imágenes con diferentes traducciones <inlinemediaobject>"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:875
+#: release-manual.xml:881
 msgid "Please report any other showstoppers."
 msgstr "Por favor, informa de otros posibles fallos importantes."
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:878
-msgid "Appendix A - The GNU Public Licence"
+#: release-manual.xml:884
+#, fuzzy
+msgid "Appendix A - The GNU Public License"
 msgstr "Apéndice A - La Licencia Pública GNU (GPL)"
 
+# type: Content of: <article><para><section><para>
+#: release-manual.xml:885
+msgid ""
+"<emphasis role='strong'>Note to translators: </emphasis> there is no need to "
+"translate the GPL license text."
+msgstr ""
+
 # type: CDATA
-#: release-manual.xml:880
+#: release-manual.xml:888
 #, no-wrap
 msgid ""
 "    Release manual for Debian-Edu etch 3.0 Codename \"Terra\"\n"
@@ -3325,6 +3394,29 @@ msgstr ""
 "\n"
 "]]"
 
+# type: Content of: <article><para><section><para>
+#~ msgid ""
+#~ "package, which can be installed on a webserver. (FIXME: do it "
+#~ "<inlinemediaobject>"
+#~ msgstr ""
+#~ "paquete, que puede instalarse en un servidor web.(POR HACER: hacerlo "
+#~ "<inlinemediaobject>"
+
+# type: Content of: <article><para><section><section><para>
+#~ msgid "document how to use aptitude upgrade / kde-update-notifier"
+#~ msgstr "documentar como usar aptitude upgrade /kde-update-notifier"
+
+# type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
+#, fuzzy
+#~ msgid "<phrase>skolelinux-world </phrase>"
+#~ msgstr "<phrase>:-)  </phrase>"
+
+# type: Content of: <article><para><section><section><para>
+#~ msgid "FIXME: add info how developers and testers can contribute."
+#~ msgstr ""
+#~ "POR CORREGIR: añadir información de como desarrolladores y probadores "
+#~ "pueden ayudar"
+
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
 #~ msgid ""
 #~ "Local Device Support on <ulink url='/ThinClients'>ThinClients </ulink>"
diff --git a/documentation/release-manual/release-manual.nb.po b/documentation/release-manual/release-manual.nb.po
index c99202e..5bdd631 100644
--- a/documentation/release-manual/release-manual.nb.po
+++ b/documentation/release-manual/release-manual.nb.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: release-manual\n"
-"POT-Creation-Date: 2007-07-24  9:25+0200\n"
+"POT-Creation-Date: 2007-07-27  0:12+0200\n"
 "PO-Revision-Date: 2007-07-14 11:34MET\n"
 "Last-Translator: Petter Reinholdtsen <pere at hungry.com>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
@@ -48,119 +48,113 @@ msgid ""
 "Documentation/Etch/Translations'>Translations </ulink> are part of the"
 msgstr ""
 
-# type: Content of: <article><para><section><para><inlinemediaobject>
+# type: Content of: <article><para><section><para>
 #: release-manual.xml:10
 msgid ""
-"package, which can be installed on a webserver. (FIXME: do it "
-"<inlinemediaobject>"
-msgstr ""
-
-# type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:11 release-manual.xml:350 release-manual.xml:516
-#: release-manual.xml:871
-msgid "<phrase>:)  </phrase>"
+"package, which can be <ulink url='http://maintainer.skolelinux.no/debian-edu-"
+"doc/'>installed on a webserver </ulink>."
 msgstr ""
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:15
+#: release-manual.xml:12
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/AboutDebianEdu'>About </ulink> "
 "Debian-Edu and Skolelinux"
 msgstr ""
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:18
+#: release-manual.xml:15
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/Architecture'>Architecture </"
 "ulink> - the design principles of Debian-Edu"
 msgstr ""
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:21
+#: release-manual.xml:18
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/Features'>Features </ulink> - new "
 "Features in this release and old ones"
 msgstr ""
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:24
+#: release-manual.xml:21
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/Requirements'>Requirements </"
 "ulink> to run Debian-Edu"
 msgstr ""
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:27
+#: release-manual.xml:24
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/Installation'>Installation </"
 "ulink> - how to install"
 msgstr ""
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:30
+#: release-manual.xml:27
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/GettingStarted'>Getting started </"
 "ulink> - what needs to be done after Installation"
 msgstr ""
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:33
+#: release-manual.xml:30
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/Maintainance'>Maintainance </"
 "ulink> - Security updates, Backups and monitoring the systems"
 msgstr ""
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:36
+#: release-manual.xml:33
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/Upgrades'>Upgrades </ulink> from "
-"<ulink url='/DebianEdu'>DebianEdu </ulink> sarge and woody"
+"Debian-Edu sarge and woody"
 msgstr ""
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:40
+#: release-manual.xml:36
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/HowTo'>HowTo </ulink> - simple "
 "step by step Howtos"
 msgstr ""
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:43
+#: release-manual.xml:39
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/Contribute'>Contribute </ulink> to "
 "Debian-Edu"
 msgstr ""
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:46
+#: release-manual.xml:42
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/Support'>Support </ulink> - how"
 "+where to find help"
 msgstr ""
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:49
+#: release-manual.xml:45
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/CopyRight'>Copyright </ulink> and "
 "Authors of this document"
 msgstr ""
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:52
+#: release-manual.xml:48
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/Translations'>Translations </"
 "ulink> of this document"
 msgstr ""
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:55
+#: release-manual.xml:51
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/AppendixA'>Appendix A </ulink> - "
 "The GNU Public Licence"
 msgstr ""
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:59
+#: release-manual.xml:55
 msgid ""
 "Special pages: <ulink url='/DebianEdu/Documentation/Etch'>Index page </"
 "ulink> - <ulink url='/DebianEdu/Documentation/Etch/AllInOne'>All in one page "
@@ -168,52 +162,52 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:63
+#: release-manual.xml:59
 msgid "About Debian-Edu and Skolelinux"
 msgstr ""
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:64
+#: release-manual.xml:60
 msgid ""
 "Skolelinux is the Debian-edu project's <ulink url='http://wiki.debian.net/"
 "index.cgi?CustomDebian'>Custom Debian Distribution </ulink> (CDD) in "
 "development. What this means is that Skolelinux is a version of Debian whose "
 "out-of-the box environment gives you a completely configured school-network "
 "In Norway, where Skolelinux was started, the main target group is schools "
-"serving the 6-16 years age bracket)."
+"serving the 6-16 years age bracket."
 msgstr ""
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:66
+#: release-manual.xml:62
 msgid ""
-"The system is in use in several countries around the world, with most users "
-"in Norway, Germany and France."
+"The system is in use in several countries around the world, with most "
+"installations in Norway, Germany and France."
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:68
+#: release-manual.xml:64
 msgid "Architecture"
 msgstr ""
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:69
+#: release-manual.xml:65
 msgid ""
-"This secton of the document describes the network architecture and services "
+"This section of the document describes the network architecture and services "
 "provided by a Skolelinux installation."
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:70 release-manual.xml:232
+#: release-manual.xml:66 release-manual.xml:231
 msgid "Network"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:72
+#: release-manual.xml:68
 msgid "<phrase>attachment:network-arch_en.png </phrase>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:76
+#: release-manual.xml:72
 msgid ""
 "Network architecture as dia file: <ulink url='/DebianEdu/Documentation/Etch/"
 "Architecture?action=AttachFile&do=get&target=network-arch_en."
@@ -221,20 +215,20 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:78
+#: release-manual.xml:74
 msgid ""
 "The figure is a sketch of the assumed network topology. The default setup of "
 "a Skolelinux assumes that there is one (and only one) main-server, while "
 "allowing the inclusion of both normal workstations and thin-client-servers "
 "(with associated thin-clients). The number of workstations can be as large "
 "or small as you want (starting from none to a lot). The same goes for the "
-"thin-client-serves, each of which is on a seperate network so that the "
+"thin-client-serves, each of which is on a separate network so that the "
 "traffic between the thin-clients and the thin-client-server doesn't affect "
 "the rest of the network services."
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:79
+#: release-manual.xml:75
 msgid ""
 "The reason that there can only be one main-server in each school network is "
 "that the main-server provides DHCP, and there can be only one machine doing "
@@ -245,29 +239,29 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:80
+#: release-manual.xml:76
 msgid ""
 "In order to simplify the standard setup of Skolelinux the Internet "
-"connection runs over a seperate router. It is possible to set up Debian with "
+"connection runs over a separate router. It is possible to set up Debian with "
 "both a modem as an ISDN connection, however no attempt is made to make such "
 "a setup work out-of-the box for Skolelinux (the setup needed to adjust "
-"default situation to this should be documented seperately)."
+"default situation to this should be documented separately)."
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:82
+#: release-manual.xml:78
 msgid "Services"
 msgstr "Tjenester"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:83
+#: release-manual.xml:79
 msgid ""
 "With the exception of the control of the thin-clients, all services are "
 "initially set up on one central computer (the main-server). Because of "
-"performance reasons the thin-client-server should be a sepperate machine "
+"performance reasons the thin-client-server should be a separate machine "
 "(though it is possible to install both the main-server and thin-client-"
 "server profiles on the same machine), All services are allocated a dedicated "
-"DNS-name and are offered exclusivly over IPv4. The allocated DNS name makes "
+"DNS-name and are offered exclusively over IPv4. The allocated DNS name makes "
 "it easy to move individual machines from the main-server to a different "
 "machine, by simply stopping the service on the main-server, and changing the "
 "DNS configuration to point to the new location of the service (which should "
@@ -275,7 +269,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:84
+#: release-manual.xml:80
 msgid ""
 "To ensure security all connections where passwords are transmitted over the "
 "network are encrypted, so no passwords are send over the network as plain "
@@ -283,52 +277,52 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:85
+#: release-manual.xml:81
 msgid ""
 "Below is a list of the services that are set up by default in a Skolelinux "
-"networki, with the DNS name of eache service given in square brackets. Where "
+"network, with the DNS name of each service given in square brackets. Where "
 "possible the DNS name correspond to the service name in"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:86
+#: release-manual.xml:82
 msgid ""
 ", where this is not possible the common name of the service is used as the "
 "DNS name. All configuration files will, if possible, refer to the service by "
 "name (without the domain name) thus making it easy for schools to change "
-"either their domain (if they have an own DNS domain), or their ip-adress."
+"either their domain (if they have an own DNS domain), or their IP address."
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:104
+#: release-manual.xml:100
 msgid ""
 "Each user stores his personal files in his home folder which is made "
-"availble by the server. Home folders are accessible from all machines, "
+"available by the server. Home folders are accessible from all machines, "
 "giving users access to the same files regardless of which machine they are "
 "using. The server is operating system agnostic in offering access using NFS "
 "for Unix Clients, SMB for Windows and Macintosh clients."
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:105
+#: release-manual.xml:101
 msgid ""
 "By default e-mail is set up for local delivery (i.e. within the school) "
 "only, though e-mail delivery to the wider Internet may be set up if the "
-"school has a fixed Internet-connection. Mailinglists are set up based on the "
-"user database, giving each class their own mailinglist. Clients are set up "
-"to deliver mail to the server (using \"smarthost\"), and users can access "
+"school has a fixed Internet-connection. Mailing lists are set up based on "
+"the user database, giving each class their own mailing list. Clients are set "
+"up to deliver mail to the server (using 'smarthost'), and users can access "
 "their personal mail through either POP3 or IMAP."
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:106
+#: release-manual.xml:102
 msgid ""
-"All services are accesible using the same username and password, thanks to "
+"All services are accessible using the same username and password, thanks to "
 "the central user database for authentication and authorization."
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:107
+#: release-manual.xml:103
 msgid ""
 "To increase performance on frequently accessed sites a web proxy that caches "
 "files locally (Squid) is used. In conjunction with blocking web-traffic in "
@@ -337,17 +331,17 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:108
+#: release-manual.xml:104
 msgid ""
-"Network configuration on the clients is done automatigically using DHCP. "
-"Normal clients are allocated IP adresses in the private subnet 10.0.2.0/23, "
+"Network configuration on the clients is done automagically using DHCP. "
+"Normal clients are allocated IP addresses in the private subnet 10.0.2.0/23, "
 "while thin clients are connected to the corresponding thin-client-server via "
 "the seperate subnet 192.168.0.0/24 (this to ensure that the network traffic "
 "of the thin clients doesn't interfere with the rest of the network services)."
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:109
+#: release-manual.xml:105
 msgid ""
 "Centralized logging is set up so that all machines send their syslog "
 "messages to the server. The syslog service is set up so that it only accepts "
@@ -355,7 +349,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:110
+#: release-manual.xml:106
 msgid ""
 "By default the DNS server is set up with a domain for internal use only (*."
 "intern), until a real (\"external\") DNS domain can be set up. The DNS "
@@ -364,17 +358,17 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:111
+#: release-manual.xml:107
 msgid ""
-"Pupils and teachers have the possibilty to publish websites. The webserver "
+"Pupils and teachers have the possibility to publish websites. The web server "
 "provides mechanisms for authenticating users, and for limiting access to "
 "individual pages and subdiretories to certain users and groups. Users will "
-"have the possibility to create dynamic webpages, as the webserver will be "
+"have the possibility to create dynamic web pages, as the web server will be "
 "programmable on the server side."
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:112
+#: release-manual.xml:108
 msgid ""
 "Information on users and machines can be changed in one central location, "
 "and is made accessible to all computers on the network automatically. To "
@@ -383,11 +377,11 @@ msgid ""
 "avoid user confusion there won't be any difference between file groups, "
 "mailing lists, and network groups. This implies that groups of machines "
 "which have to be network groups, have the same namespace as user groups and "
-"mailinglists."
+"mailing lists."
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:113
+#: release-manual.xml:109
 msgid ""
 "Administration of services and users will by and large be via web, and "
 "follow established standards, functioning well in the webbrowsers which are "
@@ -396,43 +390,43 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:114
+#: release-manual.xml:110
 msgid ""
 "In order to avoid certain problems with NFS, and to make it simpler to debug "
 "problems, the clocks of the different machines need to be synchronized. To "
 "achieve this the Skolelinux server is set up as a local Network Time "
 "Protocol (NTP) server, and all workstations and clients are set up to "
-"synchronize their clock with the server. The server itselve should "
+"synchronize their clock with the server. The server itself should "
 "synchronize its clock via NTP against machines on the Internet, thus "
 "ensuring the whole network has the correct time."
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:115
+#: release-manual.xml:111
 msgid ""
 "Printers are connected where convenient, either directly onto the network, "
 "or connected to a server, workstation or thin-client-server. Access to "
-"printers can be controled for individual users according to the groups they "
-"belong to, this will be achieved by using quota and acces control for "
+"printers can be controlled for individual users according to the groups they "
+"belong to, this will be achieved by using quota and access control for "
 "printers."
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:116
+#: release-manual.xml:112
 msgid "Thin client services"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:117
+#: release-manual.xml:113
 msgid ""
 "A thin client setup enables a ordinary PC to function as an (X-)terminal. "
 "This means that that machine boots from a diskette or directly from the "
-"server using network-PROM without using the local client harddrive. The thin "
-"client setup used is that of the Linux Terminal Server Project (LTSP)."
+"server using network-PROM without using the local client hard drive. The "
+"thin client setup used is that of the Linux Terminal Server Project (LTSP)."
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:118
+#: release-manual.xml:114
 msgid ""
 "Thin clients are a good way to make use of older, weaker machines as they "
 "effectively run all programs on the LTSP-Server. This works as follows: The "
@@ -443,7 +437,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:119
+#: release-manual.xml:115
 msgid ""
 "The thin client server is set up to receive syslog from the thin clients, "
 "and forward these messages to the central syslog recipient. (Oops, the thin "
@@ -452,12 +446,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:122
+#: release-manual.xml:118
 msgid "Administration"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:123
+#: release-manual.xml:119
 msgid ""
 "All the linux machines that are installed by means of a Skolelinux CD or DVD "
 "will be administrable from a central computer, most likely the server. It "
@@ -466,7 +460,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:124
+#: release-manual.xml:120
 msgid ""
 "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 "
@@ -475,7 +469,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:125
+#: release-manual.xml:121
 msgid ""
 "All user information is kept in an LDAP directory. Updates of user accounts "
 "are made against this database and is used by the clients for user "
@@ -483,17 +477,17 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:127 release-manual.xml:243
+#: release-manual.xml:123 release-manual.xml:242
 msgid "Installation"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:128
+#: release-manual.xml:124
 msgid "Installation is possible either from a CD or DVD."
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:129
+#: release-manual.xml:125
 msgid ""
 "The aim is to be able to install a server from CD/DVD, and install clients "
 "over the network by booting all other machines from the network. The DVD "
@@ -501,7 +495,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:130
+#: release-manual.xml:126
 msgid ""
 "The installation should not ask any questions, with the exception of desired "
 "language (e.g. Norwegian Bokmal, Nynorsk, Sami) and machine profile (server, "
@@ -511,12 +505,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:132
+#: release-manual.xml:128
 msgid "File system access configuration"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:133
+#: release-manual.xml:129
 msgid ""
 "Each Skolelinux user account is assigned a section of the file system on the "
 "file server. This section (home directory) contains the user's configuration "
@@ -527,7 +521,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:134
+#: release-manual.xml:130
 msgid ""
 "To ensure that all disks that are used for user directories or shared "
 "directories can be uniquely named across all the computers in the "
@@ -535,12 +529,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:135
+#: release-manual.xml:131
 msgid ". Initially, one directory is created on the file server,"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:136
+#: release-manual.xml:132
 msgid ""
 ", in which all the user accounts are created. More directories may then be "
 "created when needed, to accomodate particular user groups or particular "
@@ -548,7 +542,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:137
+#: release-manual.xml:133
 msgid ""
 "To enable shared file access control using the file groups, each user must "
 "be assigned a primary group with no other members. The name of this private "
@@ -564,12 +558,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:139
+#: release-manual.xml:135
 msgid ""
 "The initial access settings for newly created files is a matter of policy. "
 "They may either be set to give read access to everybody, which can later be "
 "removed by explicit user action, or they may be initially blocked, "
-"necessiating user action to make them accessible. The first approach "
+"necessitating user action to make them accessible. The first approach "
 "encourages knowledge sharing, and makes the system more transparent, whereas "
 "the second method decreases the risk of unwanted spreading of sensitive "
 "information. The problem with the first solution is that it is not apparent "
@@ -583,7 +577,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:140
+#: release-manual.xml:136
 msgid ""
 "Suggestion: The files are initially set to be readable by all, but "
 "particular directories are created in which the content is initially "
@@ -592,103 +586,103 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:141
-msgid "created with priviliges 0775,"
+#: release-manual.xml:137
+msgid "created with privileges 0775,"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:142
+#: release-manual.xml:138
 msgid "given 0750,and"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:143
+#: release-manual.xml:139
 msgid ""
 "given 0775. Files that should not be readable by others should be put in"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:144
+#: release-manual.xml:140
 msgid ", whereas public files will be put in"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:145
+#: release-manual.xml:141
 msgid ""
 ". Other files will initially be accessible, but may be blocked as needed."
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:146
+#: release-manual.xml:142
 msgid ""
 "ssh requires that the home directory can only be written to by the owner, "
 "thus the maximum access privilege for"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:147
+#: release-manual.xml:143
 msgid "is 755."
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:151
+#: release-manual.xml:147
 msgid "random notes"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:152
+#: release-manual.xml:148
 msgid ""
 "These are random notes concerning things which should be included in this "
 "document."
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:164
+#: release-manual.xml:160
 msgid "Features"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:165
+#: release-manual.xml:161
 msgid "New features in the \"3.0 Terra\" release 2007-07-22"
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:174
+#: release-manual.xml:170
 msgid "OpenOffice.org version 2.0."
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:185
+#: release-manual.xml:181
 msgid "Regression: A new web based user administration tool are included named"
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:186
+#: release-manual.xml:182
 msgid ". The old one named wlus required"
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:187
+#: release-manual.xml:183
 msgid ". Webmin is now removed from Debian because of problems supporting it."
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:191
+#: release-manual.xml:187
 msgid "Features in 2.0 release 2006-03-14"
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:196
+#: release-manual.xml:192
 msgid "OpenOffice.org 1.1."
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:201
+#: release-manual.xml:197
 msgid "Features in \"1.0 Venus\" release 2004-06-20"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:208
+#: release-manual.xml:204
 msgid ""
 "(Information on the older releases can be found on <ulink url='http://"
 "developer.skolelinux.no/info/cdbygging/news.html'>http://developer."
@@ -696,12 +690,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:212
+#: release-manual.xml:208
 msgid "Requirements"
 msgstr ""
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:213
+#: release-manual.xml:209
 msgid ""
 "There are different ways of set up a Skolelinux solution. It can be "
 "installed on just one standalone PC or a regional wide solution at many "
@@ -711,28 +705,49 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:220
+#: release-manual.xml:216
 msgid ""
-"for diskless workstations, which are also know as <ulink url='/"
-"LowFat'>LowFat </ulink> clients, 256 MB RAM and 800 MHz or more is "
-"recommended minimum requirements. Swap is required"
+"for diskless workstations (also known as <ulink url='/LowFat'>LowFat </"
+"ulink> clients) 256 MB RAM and 800 MHz or more is recommended minimum "
+"requirements. Swap is required"
 msgstr ""
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:225
+#: release-manual.xml:221
 msgid "FIXME: add links to explainations of main-server and thinclient-server"
 msgstr ""
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:228
+#: release-manual.xml:224
 msgid ""
-"Some municipalities provides a remote desktop in addition what's default "
+"Some municipalities provide a remote desktop in addition to what defaults "
 "with Skolelinux. That way students and teachers can access Skolelinux from "
 "their home computer running Windows, Mac or Linux."
 msgstr ""
 
+# type: Content of: <article><para><section><para>
+#: release-manual.xml:228
+msgid ""
+"Some schools use control tools like Controlaula or Italc to supervise their "
+"students."
+msgstr ""
+
+# type: Content of: <article><para><section><para>
+#: release-manual.xml:229
+msgid ""
+"Some schools use squidguard or dansguardian to restrict internet access."
+msgstr ""
+
+# type: Content of: <article><para><section><para>
+#: release-manual.xml:230
+msgid ""
+"Some schools use alternative user administration tools like CipUX for "
+"extended features. In France, this is combined with moodle to keep track of "
+"students' facilities and credit points."
+msgstr ""
+
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:233
+#: release-manual.xml:232
 msgid ""
 "Skolelinux network services are made pluggable with several different client "
 "alternatives as <ulink url='/LowFat'>LowFat </ulink> clients (Diskless), "
@@ -742,31 +757,31 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:237
+#: release-manual.xml:236
 msgid ""
 "A router/gateway, connected to the internet on the external interface and "
 "running on the IP address 10.0.2.1 on the internal interface."
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:238
+#: release-manual.xml:237
 msgid "FIXME: We suggest coyote (link) or or. link to setup documentation"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:239
+#: release-manual.xml:238
 msgid ""
 "FIXME: also link to <ulink url='/HowTo'>HowTo </ulink> change IP setup of "
 "Debian-Edu - but recommend against doing so."
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:244
+#: release-manual.xml:243
 msgid "Where to find more information"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject>
-#: release-manual.xml:245
+#: release-manual.xml:244
 msgid ""
 "We recommend to read or at least take a look at the <ulink url='http://www."
 "debian.org/releases/stable/releasenotes'>release notes for Debian etch </"
@@ -776,12 +791,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:247 release-manual.xml:778
+#: release-manual.xml:246 release-manual.xml:784
 msgid "<phrase>:-)  </phrase>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:251
+#: release-manual.xml:250
 msgid ""
 "Even more <ulink url='http://www.debian.org/releases/stable/"
 "installmanual'>information about the Debian etch release </ulink> is "
@@ -789,39 +804,39 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:254
+#: release-manual.xml:253
 msgid "Download an installation media for Debian-edu etch 3.0r0"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:255
+#: release-manual.xml:254
 msgid "DVDs for i386, amd64 and powerpc"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:256
+#: release-manual.xml:255
 msgid ""
 "The multiarch dvd ISO image is 4.4 GiB large. To download it, use either of "
 "these methods:"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:265
+#: release-manual.xml:264
 msgid "or for the netinstall cd you can download for i386"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:274
+#: release-manual.xml:273
 msgid "amd64"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:283
+#: release-manual.xml:282
 msgid "and powerpc"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:292
+#: release-manual.xml:291
 msgid ""
 "The powerpc port has not been tested as much as the other architectures, "
 "though it should work just fine and has been reported to work. Still, we "
@@ -830,17 +845,17 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:293
+#: release-manual.xml:292
 msgid "The source code for this release is available on a DVD image"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:304
+#: release-manual.xml:303
 msgid "Installation from CD"
 msgstr "Installasjon fra CD"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:305
+#: release-manual.xml:304
 msgid ""
 "The netinst installation will fetch some packages from the CD and the rest "
 "from the net.  The amount of packages fetched from the net varies from "
@@ -848,12 +863,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:315
+#: release-manual.xml:314
 msgid "Installation options"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:316
+#: release-manual.xml:315
 msgid ""
 "When you do an Debian-Edu installation you have a few options to choose. But "
 "don't be afraid, there aren't many. We have done a good job hiding the "
@@ -864,49 +879,54 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:318
+#: release-manual.xml:317
 msgid ""
 "Normal graphical installation is the default on i386 and amd64. The powerpc "
 "installer does not support graphical installation. Enter"
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:319
+#: release-manual.xml:318
 msgid "at the boot prompt to do a text-mode install."
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:321
+#: release-manual.xml:320
 msgid "The"
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:322
+#: release-manual.xml:321
 msgid ""
 "option adds the barebone profile to the profile options, and switches to "
 "manual partitioning. Enter"
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:323
+#: release-manual.xml:322
 msgid "or"
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:324
+#: release-manual.xml:323
 msgid "at the syslinux/yaboot prompt to enter expert mode."
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para><inlinemediaobject>
-#: release-manual.xml:348
+#: release-manual.xml:347
 msgid ""
 "please say yes to submit information to <ulink url='http://popcon.skolelinux."
 "org/'>http://popcon.skolelinux.org/ </ulink> - though you dont have to "
 "<inlinemediaobject>"
 msgstr ""
 
+# type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
+#: release-manual.xml:349 release-manual.xml:515 release-manual.xml:877
+msgid "<phrase>:)  </phrase>"
+msgstr ""
+
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:358
+#: release-manual.xml:357
 msgid ""
 "FIXME: this section lacks info how to install half-thick clients, which we "
 "marketing as great feature...! half-thick clients (aka diskless workstation "
@@ -915,112 +935,112 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:360
+#: release-manual.xml:359
 msgid ""
 "Screenshot tour through an i386 main-server + thin-client-server installation"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:362
+#: release-manual.xml:361
 msgid "<phrase>attachment:debian-edu-bootopt.png </phrase>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:367
+#: release-manual.xml:366
 msgid "<phrase>attachment:debian-edu-lang-en.png </phrase>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:372
+#: release-manual.xml:371
 msgid "<phrase>attachment:debian-edu-region-en.png </phrase>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:377
+#: release-manual.xml:376
 msgid "<phrase>attachment:debian-edu-keyboard-en.png </phrase>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:382
+#: release-manual.xml:381
 msgid "<phrase>attachment:debian-edu-profile-ms-tcs-en.png </phrase>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:387
+#: release-manual.xml:386
 msgid "<phrase>attachment:debian-edu-autopartition-en.png </phrase>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:392
+#: release-manual.xml:391
 msgid "<phrase>attachment:debian-edu-popcon-en.png </phrase>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:397
+#: release-manual.xml:396
 msgid "<phrase>attachment:debian-edu-timezone-en.png </phrase>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:402
+#: release-manual.xml:401
 msgid "<phrase>attachment:debian-edu-rootpw-en.png </phrase>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:407
+#: release-manual.xml:406
 msgid "<phrase>attachment:debian-edu-baseinstall-en.png </phrase>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:412
+#: release-manual.xml:411
 msgid "<phrase>attachment:debian-edu-pkginstall-ms-tcs-en.png </phrase>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:417
+#: release-manual.xml:416
 msgid "<phrase>attachment:debian-edu-finished-en.png </phrase>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:422
+#: release-manual.xml:421
 msgid "<phrase>attachment:debian-edu-grub.png </phrase>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:427
+#: release-manual.xml:426
 msgid "<phrase>attachment:debian-edu-usplash.png </phrase>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:431
+#: release-manual.xml:430
 msgid ""
 "The KDM login screen was manually adjusted to reduce the resolution for this "
 "screen shot."
 msgstr ""
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:433
+#: release-manual.xml:432
 msgid "<phrase>attachment:debian-edu-kdm-small-en.png </phrase>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:437
+#: release-manual.xml:436
 msgid "FIXME"
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:440
+#: release-manual.xml:439
 msgid "Getting started"
 msgstr ""
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:441
+#: release-manual.xml:440
 msgid ""
 "FIXME: Describe here, what needs to be done after the installation to use "
 "Debian-Edu for real."
 msgstr ""
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:442
+#: release-manual.xml:441
 msgid ""
 "The <ulink url='/DebianEdu/Documentation/Etch/HowTo'>howto </ulink> chapter "
 "describes more tips and tricks and frequently asked questions, while this is "
@@ -1028,24 +1048,24 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:444
+#: release-manual.xml:443
 msgid "Services running on the main server"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:445
+#: release-manual.xml:444
 msgid ""
 "There are several services running on the main server which can be managed "
 "via a web management interface.  We'll describe each service here."
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:446
+#: release-manual.xml:445
 msgid "User Management"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:447
+#: release-manual.xml:446
 msgid ""
 "Point your webbrowser to <ulink url='https://www/lwat'>https://www/lwat </"
 "ulink> and you'll get an login screen where you can login with your admin "
@@ -1054,13 +1074,13 @@ msgid ""
 msgstr ""
 
 # type: CDATA
-#: release-manual.xml:449
+#: release-manual.xml:448
 #, no-wrap
 msgid "admin]]"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:450
+#: release-manual.xml:449
 msgid ""
 "and the password is the password you entered during the installation for the "
 "root account. Here you can manage your users and your user groups. For "
@@ -1070,17 +1090,17 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><section><title>
-#: release-manual.xml:456
+#: release-manual.xml:455
 msgid "User Administration"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><section><para>
-#: release-manual.xml:457
+#: release-manual.xml:456
 msgid "There are 4 kind of possible users:"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><section><para>
-#: release-manual.xml:463
+#: release-manual.xml:462
 msgid ""
 "If you want to add an user you'll recognise that you can't provide an "
 "password for your users. For Security Reasons we disabled this. The "
@@ -1090,17 +1110,17 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><section><para>
-#: release-manual.xml:464
+#: release-manual.xml:463
 msgid "FIXME: describe Groups, Machine and Machine Administration here."
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:467
+#: release-manual.xml:466
 msgid "Printer Managment"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:468
+#: release-manual.xml:467
 msgid ""
 "For Printer Management point your webbrowser to <ulink url='https://www/"
 "cups'>https://www/cups </ulink>.  This is the normal cups management site "
@@ -1110,17 +1130,17 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:470
+#: release-manual.xml:469
 msgid "FIXME: Go further"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:473
+#: release-manual.xml:472
 msgid "Adding debian-edu machines to the LDAP domain"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:474
+#: release-manual.xml:473
 msgid ""
 "FIXME: add how, is that the right headline for this? (The [.<ulink url='/"
 "DebianEdu/Documentation/Etch/GettingStarted/HowTo'>/HowTo </ulink>] Chapter "
@@ -1130,12 +1150,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:478
+#: release-manual.xml:477
 msgid "HowTo"
 msgstr ""
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:479
+#: release-manual.xml:478
 msgid ""
 "The <ulink url='/HowTos'>HowTos </ulink> from <ulink url='http://wiki.debian."
 "org/DebianEdu/HowTo/'>http://wiki.debian.org/DebianEdu/HowTo/ </ulink> are "
@@ -1144,12 +1164,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:483
+#: release-manual.xml:482
 msgid "Those are not that many:"
 msgstr ""
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:499
+#: release-manual.xml:498
 msgid ""
 "<ulink url='http://wiki.debian.org/DebianEdu/HowTo/"
 "LtspDisklessWorkstation'>http://wiki.debian.org/DebianEdu/HowTo/"
@@ -1158,7 +1178,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:508
+#: release-manual.xml:507
 msgid ""
 "<ulink url='http://wiki.debian.org/DebianEdu/HowTo/TeacherFirstStep'>http://"
 "wiki.debian.org/DebianEdu/HowTo/TeacherFirstStep </ulink> - incomplete but "
@@ -1166,38 +1186,38 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:512
+#: release-manual.xml:511
 msgid ""
 "(see the history of those wiki pages and ask the authors if they are fine "
 "with moving the howto and putting it under the GPL)"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:513
+#: release-manual.xml:512
 msgid "Other topics"
 msgstr "Andre tema"
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject>
-#: release-manual.xml:514
+#: release-manual.xml:513
 msgid ""
 "Other topics the documentation should cover, not neccessarily in the <ulink "
 "url='/HowTo'>HowTo </ulink> Chapter though <inlinemediaobject>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject>
-#: release-manual.xml:519
+#: release-manual.xml:518
 msgid ""
 "</inlinemediaobject> This <ulink url='/HowTo'>HowTo </ulink> chapter "
 "definitly needs reorganisation - sorry translators <inlinemediaobject>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:521
+#: release-manual.xml:520
 msgid "<phrase>:( </phrase>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:525
+#: release-manual.xml:524
 msgid ""
 "Somewhere we also need to document lwat basics (howto create users, access "
 "home dirs (or rather export them to machines) and (give a pointer to) italc "
@@ -1205,38 +1225,38 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:527
+#: release-manual.xml:526
 msgid ""
 "Installing single service machines for spreading the load from main-server"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:535
+#: release-manual.xml:534
 msgid "LDAP Setup"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:537
+#: release-manual.xml:536
 msgid "/etc/ in svk"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:539
+#: release-manual.xml:538
 msgid "modify Kiosk mode"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:541
+#: release-manual.xml:540
 msgid "Flash"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:542
+#: release-manual.xml:541
 msgid "To install the Adobe Flash Player web browser plugin, install the"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:543
+#: release-manual.xml:542
 msgid ""
 "debian package.  It require a working Internet connection, and will download "
 "the precompiled binary from Adobe and convert it into a Debian package "
@@ -1245,36 +1265,36 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:545
+#: release-manual.xml:544
 msgid "<phrase>/!\\ </phrase>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:548
+#: release-manual.xml:547
 msgid ""
 "</inlinemediaobject> Version 9.0.31.0.1 of the package do not work in Etch "
 "[pere 2007-07-12]"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:549
+#: release-manual.xml:548
 msgid ""
 "An alternative is to install flashplayer-mozilla from debian-multimedia.  It "
 "work with both konqueror and firefox."
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:551
+#: release-manual.xml:550
 msgid "Java"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:555
+#: release-manual.xml:554
 msgid "Sound & Video"
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:556
+#: release-manual.xml:555
 msgid ""
 "- where to find libdvdcss for playing dvds.  Should we promote <ulink "
 "url='http://www.debian-multimedia.org/'>http://www.debian-multimedia.org/ </"
@@ -1282,12 +1302,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:561
+#: release-manual.xml:560
 msgid "Thin Clients vs Diskless workstations"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:562
+#: release-manual.xml:561
 msgid ""
 "Instructions on how to enable diskless workstations / stateless "
 "workstations / lowfat clients / half-thick clients are available from <ulink "
@@ -1296,27 +1316,27 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:565
+#: release-manual.xml:564
 msgid "printer managing"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:567
+#: release-manual.xml:566
 msgid "Firewall setup (coyote linux)"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:569
+#: release-manual.xml:568
 msgid "LTSP in detail"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:571
+#: release-manual.xml:570
 msgid "Connecting windows machines to the network / windows integration"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:572
+#: release-manual.xml:571
 msgid ""
 "For Windows clients the Windows domain \"SKOLELINUX\" is available to be "
 "joined. A special service called Samba, installed on the main-server tjener, "
@@ -1325,21 +1345,21 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:573
+#: release-manual.xml:572
 msgid ""
 "In order to make Windows clients join the domain some (few) steps are "
 "required:"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:574
+#: release-manual.xml:573
 msgid ""
 "1. Create a user with membership in the \"admins\" group (if not already "
 "existing)"
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:575
+#: release-manual.xml:574
 msgid ""
 "In order to be able to join the \"SKOLELINUX\" domain a member of the admins "
 "group needs to authorize the process. If not yet existing a user with that "
@@ -1349,12 +1369,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:579
+#: release-manual.xml:578
 msgid "2. Configure the Windows client as static host"
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:580
+#: release-manual.xml:579
 msgid ""
 "When joining a samba domain some special data is stored on the domain "
 "controller (tjener). This data is needed to recognize the Windows client "
@@ -1367,19 +1387,19 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:583
+#: release-manual.xml:582
 msgid ""
 "3. On the Windows client: Make sure the network and system configuration "
 "matches the data stored on tjener (hostname and ip configuration)"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:586
+#: release-manual.xml:585
 msgid "4. Join the domain as usual using the user added in step 1."
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:589
+#: release-manual.xml:588
 msgid ""
 "Windows will sync the profile of domain users on every login and logout. "
 "Depending on how much data stored in the profile this could take some time. "
@@ -1388,33 +1408,49 @@ msgid ""
 "and save file into the H: volume instead of \"Own files\"."
 msgstr ""
 
+# type: Content of: <article><para><section><section><title>
+#: release-manual.xml:590
+msgid "Using volatile.debian.org and backports.org"
+msgstr ""
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:591
+msgid "FIXME: describe howto..."
+msgstr ""
+
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:592
+#: release-manual.xml:594
 msgid "Maintainance"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:593
+#: release-manual.xml:595
 msgid "Updating the software"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:594
-msgid "document how to use aptitude upgrade / kde-update-notifier"
+#: release-manual.xml:596
+msgid "This section explains how to use"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:595
-msgid "are cron-apt and apt-listchanges installed and configured?"
+#: release-manual.xml:597
+msgid "and kde-update-notifier"
+msgstr ""
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:598
+msgid ""
+"FIXME: are cron-apt, apt-proxy and apt-listchanges installed and configured?"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:597
+#: release-manual.xml:600
 msgid "Backup Management"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:598
+#: release-manual.xml:601
 msgid ""
 "For the backup management point your browser to <ulink url='https://www/"
 "slbackup-php'>https://www/slbackup-php </ulink>. Please note that you have "
@@ -1423,34 +1459,34 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:600
+#: release-manual.xml:603
 msgid ""
 "FIXME: I have to have a look on the webpage of slbackup-php to describe this "
 "further"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:602
+#: release-manual.xml:605
 msgid "Server Monitoring"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:603
+#: release-manual.xml:606
 msgid "Munin"
 msgstr "Munin"
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:605
+#: release-manual.xml:608
 msgid "Nagios"
 msgstr "Nagios"
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:607
+#: release-manual.xml:610
 msgid "Sitesummary"
 msgstr "Sitesummary"
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:608
+#: release-manual.xml:611
 msgid ""
 "Some documentation on sitesummary is available from <ulink url='http://wiki."
 "debian.org/DebianEdu/HowTo/SiteSummary'>http://wiki.debian.org/DebianEdu/"
@@ -1458,17 +1494,17 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:610
+#: release-manual.xml:613
 msgid "give pointers to munin, sitesummary and nagios doc"
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:614
+#: release-manual.xml:617
 msgid "Upgrades"
 msgstr ""
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:615
+#: release-manual.xml:618
 msgid ""
 "Before explaining how to upgrade, please note, that you do this update on "
 "your productive server on your own risk. <emphasis role='strong'>Debian-Edu/"
@@ -1477,7 +1513,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:617
+#: release-manual.xml:620
 msgid ""
 "More <ulink url='http://www.debian.org/releases/stable/"
 "installmanual'>information about the Debian etch release </ulink> is "
@@ -1485,7 +1521,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:619
+#: release-manual.xml:622
 msgid ""
 "If you want to be sure that after the upgrade everything works like before , "
 "you should test the upgrade on a test server, which is configured the same "
@@ -1494,7 +1530,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:620
+#: release-manual.xml:623
 msgid ""
 "Also it might be wise to wait a bit and keep running sarge for some more "
 "weeks, so that others can test the upgrade, experience problems and document "
@@ -1504,18 +1540,18 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:621
+#: release-manual.xml:624
 msgid "Upgrades from Debian-Edu sarge"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:622
+#: release-manual.xml:625
 msgid ""
 "Please read this chapter completly before you start upgrading your systems."
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:623
+#: release-manual.xml:626
 msgid ""
 "In case of problems you could also read the <ulink url='http://www.debian."
 "org/releases/stable/releasenotes'>releasenotes for Debian etch </ulink>. "
@@ -1527,12 +1563,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:627
+#: release-manual.xml:630
 msgid "Partioning scheme changed"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:628
+#: release-manual.xml:631
 msgid ""
 "The main problem upgrading from the sarge-based Release to Terra is that the "
 "Partition Scheme changed completly. The sarge-based Release has two volume "
@@ -1540,14 +1576,14 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:632
+#: release-manual.xml:635
 msgid ""
 "But the etch based release has only 1 Volume Group due to internal changes "
 "of the Installer."
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:633
+#: release-manual.xml:636
 msgid ""
 "The main problem is here that the System Volumegroup is quit small since the "
 "data in this Partitions is mostly static. When trying the upgrade on an 8GB "
@@ -1558,19 +1594,19 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:635
+#: release-manual.xml:638
 msgid "Prepare the System"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:636
+#: release-manual.xml:639
 msgid ""
 "If you have enough space in the vg_system Volumegroup but not in the lv_var- "
 "Partition you have to resize this partition:"
 msgstr ""
 
 # type: CDATA
-#: release-manual.xml:637
+#: release-manual.xml:640
 #, no-wrap
 msgid ""
 "/etc/init.d/squid stop \n"
@@ -1579,25 +1615,25 @@ msgid ""
 msgstr ""
 
 # type: CDATA
-#: release-manual.xml:642
+#: release-manual.xml:645
 #, no-wrap
 msgid "e2fsck -f /dev/vg_system/lv_data ]]"
 msgstr ""
 
 # type: CDATA
-#: release-manual.xml:645
+#: release-manual.xml:648
 #, no-wrap
 msgid "lvextend -L +1GB /dev/vg_system/lv_data ]]"
 msgstr ""
 
 # type: CDATA
-#: release-manual.xml:648
+#: release-manual.xml:651
 #, no-wrap
 msgid "resize2fs /dev/vg_system/lv_data]]"
 msgstr ""
 
 # type: CDATA
-#: release-manual.xml:651
+#: release-manual.xml:654
 #, no-wrap
 msgid ""
 "mount /var \n"
@@ -1606,12 +1642,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:658
+#: release-manual.xml:661
 msgid "Now start the upgrade with:"
 msgstr ""
 
 # type: CDATA
-#: release-manual.xml:659
+#: release-manual.xml:662
 #, no-wrap
 msgid ""
 "apt-get update \n"
@@ -1619,12 +1655,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:663
+#: release-manual.xml:666
 msgid "after you have modified your sources.list:"
 msgstr ""
 
 # type: CDATA
-#: release-manual.xml:664
+#: release-manual.xml:667
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian etch main contrib non-free \n"
@@ -1632,12 +1668,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:669
+#: release-manual.xml:672
 msgid "Answers to Debconf Questions raising during upgrade"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:670
+#: release-manual.xml:673
 msgid ""
 "Okay we'll give yo here some hints, what you should answer when some debconf "
 "Questions comes up. But please note. This upgrade <ulink url='/HowTo'>HowTo "
@@ -1652,72 +1688,72 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:674
+#: release-manual.xml:677
 msgid "* Configure nagios-common."
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:675
+#: release-manual.xml:678
 msgid ""
 "Here you have to enter an passwort for the <emphasis>nagiosadmin </emphasis> "
 "user."
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:679
+#: release-manual.xml:682
 msgid "* Configure console-data"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:682
+#: release-manual.xml:685
 msgid "* Configure openssh-server"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:685
+#: release-manual.xml:688
 msgid "* Configure systat"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:688
+#: release-manual.xml:691
 msgid "* Configure popularity-contest"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:691
+#: release-manual.xml:694
 msgid "* Configure libnss-ldap"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><orderedlist><listitem><para>
-#: release-manual.xml:692
+#: release-manual.xml:695
 msgid "Change the prompt to: <emphasis>ldaps://ldap/ </emphasis>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><orderedlist><listitem><para>
-#: release-manual.xml:695
+#: release-manual.xml:698
 msgid ""
 "Change the prompt to: <emphasis>dc=skole,dc=skolelinux,dc=no </emphasis>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:702
+#: release-manual.xml:705
 msgid "* Upgrade glibc now. Answer Yes here."
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:703
+#: release-manual.xml:706
 msgid "* Restart Services. Answer Yes here."
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:704
+#: release-manual.xml:707
 msgid ""
 "Okay. This should be all if you have no additional packages installed. Now "
 "the upgrade process start to replace the packages."
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:705
+#: release-manual.xml:708
 msgid ""
 "Please note here: The Installer will ask several times if you want to keep "
 "your old modified Version of an Configfile or if you want to get the latest. "
@@ -1726,12 +1762,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:706
+#: release-manual.xml:709
 msgid "The upgrade will fail with this error message:"
 msgstr ""
 
 # type: CDATA
-#: release-manual.xml:707
+#: release-manual.xml:710
 #, no-wrap
 msgid ""
 "Errors were encountered while processing: \n"
@@ -1742,7 +1778,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:712
+#: release-manual.xml:715
 msgid ""
 "To fix this you have to edit these two files: <emphasis>/var/lib/dpkg/info/"
 "mozilla-firefox-locale-it.postrm </emphasis> and <emphasis>/var/lib/dpkg/"
@@ -1752,28 +1788,28 @@ msgid ""
 msgstr ""
 
 # type: CDATA
-#: release-manual.xml:716
+#: release-manual.xml:719
 #, no-wrap
 msgid "apt-get -f install]]"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:717
+#: release-manual.xml:720
 msgid "Now the upgrade work again:"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:718
+#: release-manual.xml:721
 msgid "* Several Modified configuration files (nagios)"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:721
+#: release-manual.xml:724
 msgid "Then the installation failed another time:"
 msgstr ""
 
 # type: CDATA
-#: release-manual.xml:722
+#: release-manual.xml:725
 #, no-wrap
 msgid ""
 "Errors were encountered while processing: \n"
@@ -1783,7 +1819,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:726
+#: release-manual.xml:729
 msgid ""
 "In order to fix this rename this directory: <emphasis>/var/backups/dc=skole,"
 "dc=skolelinux,dc=no-2.2.23-8.ldapdb </emphasis> and since ldap now runs not "
@@ -1792,7 +1828,7 @@ msgid ""
 msgstr ""
 
 # type: CDATA
-#: release-manual.xml:729
+#: release-manual.xml:732
 #, no-wrap
 msgid ""
 "chown -R openldap:openldap /etc/ldap/ \n"
@@ -1800,7 +1836,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:731
+#: release-manual.xml:734
 msgid ""
 "Then the installation should finish <emphasis role='strong'>without </"
 "emphasis> an error.  Since now many packages are not upgrades please restart "
@@ -1808,18 +1844,18 @@ msgid ""
 msgstr ""
 
 # type: CDATA
-#: release-manual.xml:733
+#: release-manual.xml:736
 #, no-wrap
 msgid "apt-get dist-upgrade]]"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:734
+#: release-manual.xml:737
 msgid "The next error raising up is this one:"
 msgstr ""
 
 # type: CDATA
-#: release-manual.xml:735
+#: release-manual.xml:738
 #, no-wrap
 msgid ""
 "Errors were encountered while processing: \n"
@@ -1828,24 +1864,24 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:738
+#: release-manual.xml:741
 msgid "Please remove the package: <emphasis>courier-ldap </emphasis> with"
 msgstr ""
 
 # type: CDATA
-#: release-manual.xml:740
+#: release-manual.xml:743
 #, no-wrap
 msgid "apt-get remove courier-ldap]]"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:741
+#: release-manual.xml:744
 msgid ""
 "and wait until it is finished.Then restart the dist-upgrade process again."
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:742
+#: release-manual.xml:745
 msgid ""
 "If you have only the default packages installed the upgrade process should "
 "now finish without raising more errors. The only remaining upgrade issue is "
@@ -1854,18 +1890,18 @@ msgid ""
 msgstr ""
 
 # type: CDATA
-#: release-manual.xml:743
+#: release-manual.xml:746
 #, no-wrap
 msgid "chown bind:root -R /etc/bind ]]"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:746
+#: release-manual.xml:749
 msgid "Upgrades from older Debian-Edu / Skolelinux installations"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:747
+#: release-manual.xml:750
 msgid ""
 "Upgrades from the woody based Debian-Edu / Skolelinux installation are not "
 "supported. Upgrade to the sarge based version first, a howto can be found at "
@@ -1875,27 +1911,27 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:751
+#: release-manual.xml:754
 msgid "Contribute"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:752
+#: release-manual.xml:755
 msgid "Let us know you exist"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:754
-msgid "<phrase>skolelinux-world </phrase>"
+#: release-manual.xml:757
+msgid "<phrase>worldmapphp?lang=en&foo=bar </phrase>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:758
+#: release-manual.xml:761
 msgid "There are Debian Edu users all over the world."
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:759
+#: release-manual.xml:762
 msgid ""
 "The Debian Edu project provide a database of schools and users of the system "
 "to help the users find each other, and also to have an idea about where the "
@@ -1906,41 +1942,48 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:762
+#: release-manual.xml:765
 msgid "Resources"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:763
+#: release-manual.xml:766
 msgid "<emphasis role='strong'>FIXME </emphasis>, for now some basic pointers:"
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:765
+#: release-manual.xml:768
 msgid ""
 "<ulink url='http://wiki.debian.org/DebianEdu'>http://wiki.debian.org/"
 "DebianEdu </ulink> - mostly developer centric wiki"
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:768
+#: release-manual.xml:771
 msgid ""
 "<ulink url='http://lists.debian.org/debian-edu'>http://lists.debian.org/"
 "debian-edu </ulink> - developer centric mailing list"
 msgstr ""
 
+# type: Content of: <article><para><section><section><itemizedlist><listitem><para>
+#: release-manual.xml:775
+msgid ""
+"we are organized in <ulink url='http://wiki.debian.org/DebianEdu/"
+"Teams/'>different teams </ulink> working on different subjects."
+msgstr ""
+
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:773
-msgid "FIXME: add info how developers and testers can contribute."
+#: release-manual.xml:779
+msgid "FIXME: add link to Support chapter"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:775
+#: release-manual.xml:781
 msgid "Documentation writers"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject>
-#: release-manual.xml:776
+#: release-manual.xml:782
 msgid ""
 "This document needs your help. You can help at <ulink url='http://wiki."
 "skolelinux.no/DebianEdu/Documentation/Etch/'>http://wiki.skolelinux.no/"
@@ -1948,12 +1991,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:783
+#: release-manual.xml:789
 msgid "Translations wanted"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:784
+#: release-manual.xml:790
 msgid ""
 "Another good way to help is by translating software and documentation. "
 "Information how to translate the documentation can be found in the <ulink "
@@ -1963,24 +2006,24 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:787
+#: release-manual.xml:793
 msgid "Join a local Debian-Edu team"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:788
+#: release-manual.xml:794
 msgid ""
 "<emphasis role='strong'>FIXME </emphasis>: in Norway, Germany, France, Spain "
 "(the region of Extremadura)."
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:791
+#: release-manual.xml:797
 msgid "Start a new local Debian-Edu team"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:792
+#: release-manual.xml:798
 msgid ""
 "<emphasis role='strong'>FIXME: </emphasis> \"isolated\" contributors and "
 "users in schools exist in Greece, the Netherlands, Japan and elsewhere. Meet "
@@ -1988,22 +2031,22 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:796
+#: release-manual.xml:802
 msgid "Support"
 msgstr "Støtte"
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:797
+#: release-manual.xml:803
 msgid "Volunteer based support"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:798
+#: release-manual.xml:804
 msgid "in english"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:799
+#: release-manual.xml:805
 msgid ""
 "<ulink url='https://init.linpro.no/mailman/skolelinux.no/listinfo/admin-"
 "discuss'>https://init.linpro.no/mailman/skolelinux.no/listinfo/admin-discuss "
@@ -2011,7 +2054,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: release-manual.xml:802
+#: release-manual.xml:808
 msgid ""
 "<ulink url='http://lists.debian.org/debian-edu'>http://lists.debian.org/"
 "debian-edu </ulink> - developer centric mailing list, more useful to report "
@@ -2019,12 +2062,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:808
+#: release-manual.xml:814
 msgid "in norwegian"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:809
+#: release-manual.xml:815
 msgid ""
 "<ulink url='https://init.linpro.no/mailman/skolelinux.no/listinfo/"
 "bruker'>https://init.linpro.no/mailman/skolelinux.no/listinfo/bruker </"
@@ -2032,7 +2075,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:812
+#: release-manual.xml:818
 msgid ""
 "<ulink url='https://init.linpro.no/mailman/skolelinux.no/listinfo/"
 "linuxiskolen'>https://init.linpro.no/mailman/skolelinux.no/listinfo/"
@@ -2040,12 +2083,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:818
+#: release-manual.xml:824
 msgid "in german"
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: release-manual.xml:819
+#: release-manual.xml:825
 msgid ""
 "<ulink url='http://www.skolelinux.de/mailman/listinfo/user'>http://www."
 "skolelinux.de/mailman/listinfo/user </ulink> - german speaking support "
@@ -2053,31 +2096,31 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:822
+#: release-manual.xml:828
 msgid ""
 "<ulink url='http://wiki.skolelinux.de'>http://wiki.skolelinux.de </ulink> - "
 "german wiki with lots of <ulink url='/HowTos'>HowTos </ulink> etc."
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:829
+#: release-manual.xml:835
 msgid "in french"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:830
+#: release-manual.xml:836
 msgid ""
 "<ulink url='http://lists.debian.org/debian-edu-french'>http://lists.debian."
 "org/debian-edu-french </ulink> - french speaking support mailinglist"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:836
+#: release-manual.xml:842
 msgid "Professional support"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:837
+#: release-manual.xml:843
 msgid ""
 "Lists of companies providing professional support are available from <ulink "
 "url='http://wiki.debian.org/DebianEdu/Help/ProfessionalHelp'>http://wiki."
@@ -2085,13 +2128,13 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:841
+#: release-manual.xml:847
 #, fuzzy
 msgid "Copyright and authors"
 msgstr "Opphavsrett og forfattere"
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:842
+#: release-manual.xml:848
 msgid ""
 "This document is written and copyrighted 2007 by Holger Levsen, Petter "
 "Reinholdtsen, Daniel Heß, Patrick Winnertz and Knut Yrvin is released under "
@@ -2099,7 +2142,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:843
+#: release-manual.xml:849
 msgid ""
 "If you add content to it, <emphasis role='strong'>please only do so if you "
 "are the author of it and plan to release it under the same conditions </"
@@ -2108,39 +2151,39 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:846
+#: release-manual.xml:852
 #, fuzzy
 msgid "Translation copyright and authors"
 msgstr "Opphavsrett og forfattere"
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:847
+#: release-manual.xml:853
 msgid ""
 "The spanish translation is copyrighted 2007 by José L. Redrejo Rodríguez and "
 "is released under the GPL2 or any later version."
 msgstr ""
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:848
+#: release-manual.xml:854
 msgid ""
 "The norwegian Bokmål translation is copyrighted 2007 by Petter Reinholdtsen "
 "and is released under the GPL2 or any later version."
 msgstr ""
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:849
+#: release-manual.xml:855
 msgid ""
 "The german translation is copyrighted 2007 by Holger Levsen and Patrick "
 "Winnertz and is released under the GPL2 or any later version."
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:851
+#: release-manual.xml:857
 msgid "Translations of this document"
 msgstr "Oversettelser av dette dokumentet"
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:852
+#: release-manual.xml:858
 msgid ""
 "Fully translated versions of this document are not yet available, as the "
 "document itself is very incomplete. Incomplete translations for Norwegian "
@@ -2148,36 +2191,36 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:853
+#: release-manual.xml:859
 msgid "Howto translate this document"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:854
+#: release-manual.xml:860
 msgid "If you want to start/help translating this document, you can!"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:855
+#: release-manual.xml:861
 msgid ""
 "Translations of this document are kept in .po files like in many free "
 "software projects, read"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:856
+#: release-manual.xml:862
 msgid ""
 "for more information on this. There are many easy tools for translating."
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:857
+#: release-manual.xml:863
 msgid ""
 "To update the translations you need to be a member of the alioth project"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:858
+#: release-manual.xml:864
 msgid ""
 ". To work on them you just need to check them out anonymously from svn, "
 "create patches and send those to <ulink url='mailto:debian-edu at l.d.o'>debian-"
@@ -2185,24 +2228,24 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:860
+#: release-manual.xml:866
 msgid "Checkout the source package with the following command:"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:865
+#: release-manual.xml:871
 msgid "Then edit the"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:866
+#: release-manual.xml:872
 msgid ""
 "and either commit it to svn (if you have the rights to do so) or send the "
 "file to the mailinglist."
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:867
+#: release-manual.xml:873
 msgid ""
 "Read /usr/share/doc/debian-edu-doc/README.release-manual-translations to "
 "find information how to create a new .po file for your language if there is "
@@ -2210,29 +2253,37 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:869
+#: release-manual.xml:875
 msgid "Potential problems for translations"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject>
-#: release-manual.xml:870
+#: release-manual.xml:876
 msgid ""
 "We will need to write sed-scripts (or something like that) to support "
 "different images for different translations. Laters <inlinemediaobject>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:875
+#: release-manual.xml:881
 msgid "Please report any other showstoppers."
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:878
-msgid "Appendix A - The GNU Public Licence"
+#: release-manual.xml:884
+#, fuzzy
+msgid "Appendix A - The GNU Public License"
 msgstr "Vedlegg A - GNU Generell Offentlig Lisens"
 
+# type: Content of: <article><para><section><para>
+#: release-manual.xml:885
+msgid ""
+"<emphasis role='strong'>Note to translators: </emphasis> there is no need to "
+"translate the GPL license text."
+msgstr ""
+
 # type: CDATA
-#: release-manual.xml:880
+#: release-manual.xml:888
 #, no-wrap
 msgid ""
 "    Release manual for Debian-Edu etch 3.0 Codename \"Terra\"\n"
diff --git a/documentation/release-manual/release-manual.xml b/documentation/release-manual/release-manual.xml
index a082786..ea2826c 100644
--- a/documentation/release-manual/release-manual.xml
+++ b/documentation/release-manual/release-manual.xml
@@ -4,14 +4,11 @@
 </title><para>This is the (<emphasis>still incomplete
 </emphasis>) release manual for the Debian-Edu etch 3.0 release.  
 </para><para>This document was put into the <code>debian-edu-doc
-</code> package on <code>2007-07-24 07:25 UTC</code>. (The version at <ulink url='http://wiki.skolelinux.no/DebianEdu/Documentation/Etch'>http://wiki.skolelinux.no/DebianEdu/Documentation/Etch
+</code> package on <code>2007-07-26 22:13 UTC</code>. (The version at <ulink url='http://wiki.skolelinux.no/DebianEdu/Documentation/Etch'>http://wiki.skolelinux.no/DebianEdu/Documentation/Etch
 </ulink> is a wiki and updated frequently.) <ulink url='/DebianEdu/Documentation/Etch/Translations'>Translations
 </ulink> are part of the <code>debian-edu-doc
-</code> package, which can be installed on a webserver. (FIXME: do it <inlinemediaobject><imageobject><imagedata width='15' fileref='/wiki/rightsidebar/img/smile.png' depth='15'/>
-</imageobject><textobject><phrase>:)
-</phrase>
-</textobject>
-</inlinemediaobject> 
+</code> package, which can be <ulink url='http://maintainer.skolelinux.no/debian-edu-doc/'>installed on a webserver
+</ulink>. 
 </para><itemizedlist><listitem><para><ulink url='/DebianEdu/Documentation/Etch/AboutDebianEdu'>About
 </ulink> Debian-Edu and Skolelinux 
 </para>
@@ -34,8 +31,7 @@
 </ulink> - Security updates, Backups and monitoring the systems 
 </para>
 </listitem><listitem><para><ulink url='/DebianEdu/Documentation/Etch/Upgrades'>Upgrades
-</ulink> from <ulink url='/DebianEdu'>DebianEdu
-</ulink> sarge and woody 
+</ulink> from Debian-Edu sarge and woody 
 </para>
 </listitem><listitem><para><ulink url='/DebianEdu/Documentation/Etch/HowTo'>HowTo
 </ulink> - simple step by step Howtos 
@@ -62,11 +58,11 @@
 </para>
 </section> <para/><section><title>About Debian-Edu and Skolelinux
 </title><para>Skolelinux is the Debian-edu project's <ulink url='http://wiki.debian.net/index.cgi?CustomDebian'>Custom Debian Distribution
-</ulink> (CDD) in development. What this means is that Skolelinux is a version of Debian whose out-of-the box environment gives you a completely configured school-network  In Norway, where Skolelinux was started, the main target group is schools serving the 6-16 years age bracket). 
-</para><para>The system is in use in several countries around the world, with most users in Norway, Germany and France. 
+</ulink> (CDD) in development. What this means is that Skolelinux is a version of Debian whose out-of-the box environment gives you a completely configured school-network  In Norway, where Skolelinux was started, the main target group is schools serving the 6-16 years age bracket. 
+</para><para>The system is in use in several countries around the world, with most installations in Norway, Germany and France. 
 </para>
 </section> <para/><section><title>Architecture
-</title><para>This secton of the document describes the network architecture and services provided by a Skolelinux installation. 
+</title><para>This section of the document describes the network architecture and services provided by a Skolelinux installation. 
 </para><para/><section><title>Network
 </title><para><inlinemediaobject><imageobject><imagedata fileref='/DebianEdu/Documentation/Etch/Architecture?action=AttachFile&do=get&target=network-arch_en.png'/>
 </imageobject><textobject><phrase>attachment:network-arch_en.png
@@ -75,46 +71,46 @@
 </inlinemediaobject> 
 </para><para>Network architecture as dia file: <ulink url='/DebianEdu/Documentation/Etch/Architecture?action=AttachFile&do=get&target=network-arch_en.dia'>attachment:network-arch_en.dia
 </ulink> 
-</para><para>The figure is a sketch of the assumed network topology. The default setup of a Skolelinux assumes that there is one (and only one) main-server, while allowing the inclusion of both normal workstations and thin-client-servers (with associated thin-clients). The number of workstations can be as large or small as you want (starting from none to a lot). The same goes for the thin-client-serves, each of which is on a seperate network so that the traffic between the thin-clients and the thin-client-server doesn't affect the rest of the network services.  
+</para><para>The figure is a sketch of the assumed network topology. The default setup of a Skolelinux assumes that there is one (and only one) main-server, while allowing the inclusion of both normal workstations and thin-client-servers (with associated thin-clients). The number of workstations can be as large or small as you want (starting from none to a lot). The same goes for the thin-client-serves, each of which is on a separate network so that the traffic between the thin-clients and the thin-client-server doesn't affect the rest of the network services.  
 </para><para>The reason that there can only be one main-server in each school network is that the main-server provides DHCP, and there can be only one machine doing so in each network. It is possible to move the services of the main-server to other machines by setting up the service on another machine, and subsequently updating the DNS-configuration pointing the DNS alias for that service to the right computer.  
-</para><para>In order to simplify the standard setup of Skolelinux the Internet connection runs over a seperate router. It is possible to set up Debian with both a modem as an ISDN connection, however no attempt is made to make such a setup work out-of-the box for Skolelinux (the setup needed to adjust default situation to this should be documented seperately). 
+</para><para>In order to simplify the standard setup of Skolelinux the Internet connection runs over a separate router. It is possible to set up Debian with both a modem as an ISDN connection, however no attempt is made to make such a setup work out-of-the box for Skolelinux (the setup needed to adjust default situation to this should be documented separately). 
 </para><para/>
 </section><section><title>Services
-</title><para>With the exception of the control of the thin-clients, all services are initially set up on one central computer (the main-server). Because of performance reasons the thin-client-server should be a sepperate machine (though it is possible to install both the main-server and thin-client-server profiles on the same machine), All services are allocated a dedicated DNS-name and are offered exclusivly over IPv4. The allocated DNS name makes it easy to move individual machines from the main-server to a different machine, by simply stopping the service on the main-server, and changing the DNS configuration to point to the new location of the service (which should be setup on that machine first off course).  
+</title><para>With the exception of the control of the thin-clients, all services are initially set up on one central computer (the main-server). Because of performance reasons the thin-client-server should be a separate machine (though it is possible to install both the main-server and thin-client-server profiles on the same machine), All services are allocated a dedicated DNS-name and are offered exclusively over IPv4. The allocated DNS name makes it easy to move individual machines from the main-server to a different machine, by simply stopping the service on the main-server, and changing the DNS configuration to point to the new location of the service (which should be setup on that machine first off course).  
 </para><para>To ensure security all connections where passwords are transmitted over the network are encrypted, so no passwords are send over the network as plain text.  
-</para><para>Below is a list of the services that are set up by default in a Skolelinux networki, with the DNS name of eache service given in square brackets. Where possible the DNS name correspond to the service name in <code>/etc/services
-</code>, where this is not possible the common name of the service is used as the DNS name. All configuration files will, if possible, refer to the service by name (without the domain name) thus making it easy for schools to change either their domain (if they have an own DNS domain), or their ip-adress. 
-</para><itemizedlist><listitem>Centralized logging [syslog]  
-</listitem><listitem>DNS(Bind)[domain]  
-</listitem><listitem>Automatic networkconfiguration of machines(DHCP)[bootps]  
-</listitem><listitem>Clocksynchronization (NTP)[ntp]  
-</listitem><listitem>Home directories via network file system (SMB/NFS)[homes]  
-</listitem><listitem>Elektronic postoffice [postoffice]  
-</listitem><listitem>Directoryservice(OpenLDAP)[ldap]  
-</listitem><listitem>User administration(lwat) 
-</listitem><listitem>Webserver (Apache/PHP)[www]  
-</listitem><listitem>Central backup (sl-backup, slbackup-php) [backup]  
-</listitem><listitem>Web-cache / proxy (Squid)[webcache]  
-</listitem><listitem>Printing(CUPS) [ipp]  
-</listitem><listitem>Remote login (OpenSSH) [ssh]  
+</para><para>Below is a list of the services that are set up by default in a Skolelinux network, with the DNS name of each service given in square brackets. Where possible the DNS name correspond to the service name in <code>/etc/services
+</code>, where this is not possible the common name of the service is used as the DNS name. All configuration files will, if possible, refer to the service by name (without the domain name) thus making it easy for schools to change either their domain (if they have an own DNS domain), or their IP address. 
+</para><itemizedlist><listitem>Centralized Logging [syslog]  
+</listitem><listitem>DNS (Bind) [domain]  
+</listitem><listitem>Automatic Network Configuration of Machines (DHCP) [bootps]  
+</listitem><listitem>Clock Synchronization (NTP) [ntp]  
+</listitem><listitem>Home Directories via Network File System (SMB/NFS) [homes]  
+</listitem><listitem>Elektronic Post Office [postoffice]  
+</listitem><listitem>Directoryservice(OpenLDAP) [ldap]  
+</listitem><listitem>User Administration (lwat) 
+</listitem><listitem>Web Server (Apache/PHP) [www]  
+</listitem><listitem>Central Backup (sl-backup, slbackup-php) [backup]  
+</listitem><listitem>Web Cache / Proxy (Squid) [webcache]  
+</listitem><listitem>Printing (CUPS) [ipp]  
+</listitem><listitem>Remote Login (OpenSSH) [ssh]  
 </listitem><listitem>Automatic configuring [cfengine]  
-</listitem><listitem>Thin client servers (LTSP) [ltsp-server-\#]  
-</listitem><listitem>Machine- and service surveillance with error reporting, + status and history on the web. Error reporting by mail. (munin and site-summary]) 
+</listitem><listitem>Thin Client Server/s (LTSP) [ltspserver\#]  
+</listitem><listitem>Machine and Service Surveillance with Error Reporting, plus Status and History on the Web. Error Reporting by Email (munin and site-summary) 
 </listitem>
-</itemizedlist><para>Each user stores his personal files in his home folder which is made availble by the server. Home folders are accessible from all machines, giving users access to the same files regardless of which machine they are using. The server is operating system agnostic in offering access using NFS for Unix Clients, SMB for Windows and Macintosh clients.  
-</para><para>By default e-mail is set up for local delivery (i.e. within the school) only, though e-mail delivery to the wider Internet may be set up if the school has a fixed Internet-connection. Mailinglists are set up based on the user database, giving each class their own mailinglist. Clients are set up to deliver mail to the server (using "smarthost"), and users can access their personal mail through either POP3 or IMAP.  
-</para><para>All services are accesible using the same username and password, thanks to the central user database for authentication and authorization.  
+</itemizedlist><para>Each user stores his personal files in his home folder which is made available by the server. Home folders are accessible from all machines, giving users access to the same files regardless of which machine they are using. The server is operating system agnostic in offering access using NFS for Unix Clients, SMB for Windows and Macintosh clients.  
+</para><para>By default e-mail is set up for local delivery (i.e. within the school) only, though e-mail delivery to the wider Internet may be set up if the school has a fixed Internet-connection. Mailing lists are set up based on the user database, giving each class their own mailing list. Clients are set up to deliver mail to the server (using 'smarthost'), and users can access their personal mail through either POP3 or IMAP.  
+</para><para>All services are accessible using the same username and password, thanks to the central user database for authentication and authorization.  
 </para><para>To increase performance on frequently accessed sites a web proxy that caches files locally (Squid) is used. In conjunction with blocking web-traffic in the router this also enables control of Internet access on individual machines.  
-</para><para>Network configuration on the clients is done automatigically using DHCP. Normal clients are allocated IP adresses in the private subnet 10.0.2.0/23, while thin clients are connected to the corresponding thin-client-server via the seperate subnet 192.168.0.0/24 (this to ensure that the network traffic of the thin clients doesn't interfere with the rest of the network services).  
+</para><para>Network configuration on the clients is done automagically using DHCP. Normal clients are allocated IP addresses in the private subnet 10.0.2.0/23, while thin clients are connected to the corresponding thin-client-server via the seperate subnet 192.168.0.0/24 (this to ensure that the network traffic of the thin clients doesn't interfere with the rest of the network services).  
 </para><para>Centralized logging is set up so that all machines send their syslog messages to the server. The syslog service is set up so that it only accepts incoming messages from the local network.  
 </para><para>By default the DNS server is set up with a domain for internal use only (*.intern), until a real ("external") DNS domain can be set up. The DNS server is set up as caching DNS server so that all machines on the network can use it as the main DNS Server.  
-</para><para>Pupils and teachers have the possibilty to publish websites. The webserver provides mechanisms for authenticating users, and for limiting access to individual pages and subdiretories to certain users and groups. Users will have the possibility to create dynamic webpages, as the webserver will be programmable on the server side.  
-</para><para>Information on users and machines can be changed in one central location, and is made accessible to all computers on the network automatically. To achieve this a centralized directory server is set up. The directory will have information on users, user groups, machines, and groups of machines. To avoid user confusion there won't be any difference between file groups, mailing lists, and network groups. This implies that groups of machines which have to be network groups, have the same namespace as user groups and mailinglists.  
+</para><para>Pupils and teachers have the possibility to publish websites. The web server provides mechanisms for authenticating users, and for limiting access to individual pages and subdiretories to certain users and groups. Users will have the possibility to create dynamic web pages, as the web server will be programmable on the server side.  
+</para><para>Information on users and machines can be changed in one central location, and is made accessible to all computers on the network automatically. To achieve this a centralized directory server is set up. The directory will have information on users, user groups, machines, and groups of machines. To avoid user confusion there won't be any difference between file groups, mailing lists, and network groups. This implies that groups of machines which have to be network groups, have the same namespace as user groups and mailing lists.  
 </para><para>Administration of services and users will by and large be via web, and follow established standards, functioning well in the webbrowsers which are part of Skolelinux. The delegation of certain tasks to individual users or user groups will be made possible by the administration systems.  
-</para><para>In order to avoid certain problems with NFS, and to make it simpler to debug problems, the clocks of the different machines need to be synchronized. To achieve this the Skolelinux server is set up as a local Network Time Protocol (NTP) server, and all workstations and clients are set up to synchronize their clock with the server. The server itselve should synchronize its clock via NTP against machines on the Internet, thus ensuring the whole network has the correct time.  
-</para><para>Printers are connected where convenient, either directly onto the network, or connected to a server, workstation or thin-client-server. Access to printers can be controled for individual users according to the groups they belong to, this will be achieved by using quota and acces control for printers. 
+</para><para>In order to avoid certain problems with NFS, and to make it simpler to debug problems, the clocks of the different machines need to be synchronized. To achieve this the Skolelinux server is set up as a local Network Time Protocol (NTP) server, and all workstations and clients are set up to synchronize their clock with the server. The server itself should synchronize its clock via NTP against machines on the Internet, thus ensuring the whole network has the correct time.  
+</para><para>Printers are connected where convenient, either directly onto the network, or connected to a server, workstation or thin-client-server. Access to printers can be controlled for individual users according to the groups they belong to, this will be achieved by using quota and access control for printers. 
 </para><para/><section><title>Thin client services
-</title><para>A thin client setup enables a ordinary PC to function as an (X-)terminal. This means that that machine boots from a diskette or directly from the server using network-PROM without using the local client harddrive. The thin client setup used is that of the Linux Terminal Server Project (LTSP).  
+</title><para>A thin client setup enables a ordinary PC to function as an (X-)terminal. This means that that machine boots from a diskette or directly from the server using network-PROM without using the local client hard drive. The thin client setup used is that of the Linux Terminal Server Project (LTSP).  
 </para><para>Thin clients are a good way to make use of older, weaker machines as they effectively run all programs on the LTSP-Server. This works as follows: The service uses DHCP and TFTP to connect to the network and boot from the network. Next, the file system is mounted via NFS from the LTSP-server, and finally X11 is started and connected to the same LTSP-server by XDMCP, thus ensuring that all programs are run on the LTSP-server.  
 </para><para>The thin client server is set up to receive syslog from the thin clients, and forward these messages to the central syslog recipient. (Oops, the thin clients don't have uniqe names across LTSP servers. How can we identify which client is logged onto what on the central server?) 
 </para><para/>
@@ -136,9 +132,9 @@
 </code>, in which all the user accounts are created. More directories may then be created when needed, to accomodate particular user groups or particular patterns of usage.  
 </para><para>To enable shared file access control using the file groups, each user must be assigned a primary group with no other members. The name of this private group should be identical to the username. (<ulink url='http://www.redhat.com/docs/manuals/linux/RHL-9-Manual/ref-guide/s1-users-groups-private-groups.html'>More info on private groups
 </ulink> is available from Redhat.) This allows for all new files created by the user to be set with full access for the file's group. Together with set-gid bit on directories and inheritance of rights, this enables controlled file sharing between the members of a file group. Therefore, the users' umask should be 00X. (If all users initially should be able to read newly created files, then X=2. If only the relevant group should be given initial read access then X=7.) 
-</para><para>The initial access settings for newly created files is a matter of policy. They may either be set to give read access to everybody, which can later be removed by explicit user action, or they may be initially blocked, necessiating user action to make them accessible. The first approach encourages knowledge sharing, and makes the system more transparent, whereas the second method decreases the risk of unwanted spreading of sensitive information. The problem with the first solution is that it is not apparent to the users that the material they create will be accessible to all other users. This is detectable only upon inspection of other users' directories, where one can see that the files are readable. The problem with the second solution is that few people are likely to make their files accessible, even if they do not contain sensitive information and the content would be helpful to inquisitive users who want to learn how others have solved particular problems (typically configuration issues).  
+</para><para>The initial access settings for newly created files is a matter of policy. They may either be set to give read access to everybody, which can later be removed by explicit user action, or they may be initially blocked, necessitating user action to make them accessible. The first approach encourages knowledge sharing, and makes the system more transparent, whereas the second method decreases the risk of unwanted spreading of sensitive information. The problem with the first solution is that it is not apparent to the users that the material they create will be accessible to all other users. This is detectable only upon inspection of other users' directories, where one can see that the files are readable. The problem with the second solution is that few people are likely to make their files accessible, even if they do not contain sensitive information and the content would be helpful to inquisitive users who want to learn how others have solved particular problems (typically configuration issues).  
 </para><para>Suggestion: The files are initially set to be readable by all, but particular directories are created in which the content is initially blocked. This will simplify deciding whether the file should be made readable or not. Concretely, umask should be set to 002, and <code>~/
-</code> created with priviliges 0775, <code>~/priv/
+</code> created with privileges 0775, <code>~/priv/
 </code> given 0750,and <code>~/pub/
 </code> given 0775. Files that should not be readable by others should be put in <code>~/priv/
 </code>, whereas public files will be put in <code>~/pub/
@@ -151,7 +147,7 @@
 </section><section><title>random notes
 </title><para>These are random notes concerning things which should be included in this document.  
 </para><itemizedlist><listitem>Centralized user database with grouping and the ability to control which groups have access to which machines.  
-</listitem><listitem>Grouping of machines and ability to control access to network services for these groups (acces blocking to Internet via squid)  
+</listitem><listitem>Grouping of machines and ability to control access to network services for these groups (access blocking to Internet via squid)  
 </listitem><listitem>Should consider using a DNS name from RFC 2606.  
 </listitem>
 </itemizedlist><para/><para> 
@@ -212,24 +208,27 @@
 </section> <para/><section><title>Requirements
 </title><para>There are different ways of set up a Skolelinux solution. It can be installed on just one standalone PC or a regional wide solution at many schools operated centrally. This variety of configurations makes a huge difference on how things are set up regarding network components, servers and client machines.  
 </para><itemizedlist><listitem>one single computer or server(s) with many clients  
-</listitem><listitem>harddrive space requirements varies between profiles, but any disk with more than 8 GiB will be sufficient.  As always, more disk space is an advantage. 
-</listitem><listitem>for main-servers: a router/gateway is reachable on 10.0.2.1 that provides access to the internet for the main server (10.0.2.2)    
-</listitem><listitem>thinclient-servers need to have two network cards installed. Eth0 connected to the main network (10.0.2.0/23) and eth1 (192.168.0.0/24) where the clients get conneced. 
-</listitem><listitem>for thin clients 32 MB RAM and 133 MHz or more is recommended as minimum. Swap is required 
-</listitem><listitem>for workstations or standalone PC's 256 MB RAM and 450 MHz or more is recommended minimum requirements 
-</listitem><listitem><para>for diskless workstations, which are also know as <ulink url='/LowFat'>LowFat
-</ulink> clients, 256 MB RAM and 800 MHz or more is recommended minimum requirements. Swap is required 
+</listitem><listitem>disk space requirements depend on profiles used, but any disk from 8 GiB will be sufficient.  As usual, the bigger the better 
+</listitem><listitem>for the main-server (Tjener): a router/gateway (IP 10.0.2.1) providing access to the internet for the main server (10.0.2.2)    
+</listitem><listitem>thinclient-servers (LTSP) need to have two network cards installed: eth0 connected to the main network (10.0.2.0/23) and eth1 (192.168.0.0/24) serving the thin-clients 
+</listitem><listitem>for thin-clients 32 MiB RAM and 133 MHz is recommended as minimum. Swap is required 
+</listitem><listitem>for workstations or standalone PCs 450 MHz, 256 MiB RAM and 8 GiB disc space are recommended minimum requirements 
+</listitem><listitem><para>for diskless workstations (also known as <ulink url='/LowFat'>LowFat
+</ulink> clients) 256 MB RAM and 800 MHz or more is recommended minimum requirements. Swap is required 
 </para>
 </listitem><listitem>for Laptops 256 MB RAM and 450 MHz are minimum requirements 
 </listitem>
 </itemizedlist><para>FIXME: add links to explainations of main-server and thinclient-server 
 </para><para><emphasis role='strong'>Additional solutions
 </emphasis> 
-</para><para>Some municipalities provides a remote desktop in addition what's default with Skolelinux. That way students and teachers can access Skolelinux from their home computer running Windows, Mac or Linux.  
-</para><itemizedlist><listitem>NX graphcal client gives students and teachers access to Skolelinux remotely on Windows, Mac or Linux PC. One municipality in Norway has provided NX support to all their students since 2005. They report that the solution is stable.  
+</para><para>Some municipalities provide a remote desktop in addition to what defaults with Skolelinux. That way students and teachers can access Skolelinux from their home computer running Windows, Mac or Linux.  
+</para><itemizedlist><listitem>NX graphical client gives students and teachers access to Skolelinux remotely on Windows, Mac or Linux PC. One municipality in Norway has provided NX support to all their students since 2005. They report that the solution is stable.  
 </listitem><listitem>VNC client (Virtual Network Computer) gives access to Skolelinux remotely.  
 </listitem>
-</itemizedlist><para/><section><title>Network
+</itemizedlist><para>Some schools use control tools like Controlaula or Italc to supervise their students. 
+</para><para>Some schools use squidguard or dansguardian to restrict internet access. 
+</para><para>Some schools use alternative user administration tools like CipUX for extended features. In France, this is combined with moodle to keep track of students' facilities and credit points. 
+</para><para/><section><title>Network
 </title><para>Skolelinux network services are made pluggable with several different client alternatives as <ulink url='/LowFat'>LowFat
 </ulink> clients (Diskless), Laptops and thin clients. This makes Skolelinux really adaptable and usable in small and large installations, taking the schools network capabilities into account.  
 </para><para><emphasis role='strong'>Internet-Router
@@ -587,12 +586,16 @@
 </para><itemizedlist><listitem>Depending on the version and language of you Windows installation, you should find the configuration about the domain or workgroup of your system somewhere in the system properties. A freshly installed Windows system should belong to a default workgroup. You can join the domain by selecting "Domain" instead of "Workgroup" and entering SKOLELINUX as new domain. Pressing enter will then open a new window, where the login data of the user created in step 1. can be entered. After some time the Windows client opens a popup window with a welcome message. After the obligatory reboot the loginscreen offers a option to login into the domain. 
 </listitem>
 </itemizedlist><para>Windows will sync the profile of domain users on every login and logout. Depending on how much data stored in the profile this could take some time. To minimize the time needed, one should deactivate things like local cache in browsers (you could use the squid proxycache installed on tjener instead) and save file into the H: volume instead of "Own files". 
+</para><para/>
+</section><section><title>Using volatile.debian.org and backports.org
+</title><para>FIXME: describe howto... 
 </para>
 </section>
 </section> <para/><section><title>Maintainance
 </title><para/><section><title>Updating the software
-</title><para>document how to use aptitude upgrade / kde-update-notifier 
-</para><para>are cron-apt and apt-listchanges installed and configured? 
+</title><para>This section explains how to use <code>aptitude upgrade
+</code> and kde-update-notifier 
+</para><para>FIXME: are cron-apt, apt-proxy and apt-listchanges installed and configured? 
 </para><para/>
 </section><section><title>Backup Management
 </title><para>For the backup management point your browser to <ulink url='https://www/slbackup-php'>https://www/slbackup-php
@@ -750,8 +753,8 @@ E: Sub-process /usr/bin/dpkg returned an error code (1)]]>
 </section>
 </section> <para/><section><title>Contribute
 </title><para/><section><title>Let us know you exist
-</title><para><inlinemediaobject><imageobject><imagedata fileref='http://www.skolelinux.no/testskoler/map/skolelinux-world.jpg'/>
-</imageobject><textobject><phrase>skolelinux-world
+</title><para><inlinemediaobject><imageobject><imagedata fileref='http://www.skolelinux.no/slschools/worldmap.php?lang=en&foo=bar.jpeg'/>
+</imageobject><textobject><phrase>worldmapphp?lang=en&foo=bar
 </phrase>
 </textobject>
 </inlinemediaobject> 
@@ -769,8 +772,11 @@ E: Sub-process /usr/bin/dpkg returned an error code (1)]]>
 </ulink> - developer centric mailing list 
 </para>
 </listitem><listitem>#debian-edu on irc.debian.org 
+</listitem><listitem><para>we are organized in <ulink url='http://wiki.debian.org/DebianEdu/Teams/'>different teams
+</ulink> working on different subjects. 
+</para>
 </listitem>
-</itemizedlist><para>FIXME: add info how developers and testers can contribute. 
+</itemizedlist><para>FIXME: add link to Support chapter 
 </para><para/>
 </section><section><title>Documentation writers
 </title><para>This document needs your help. You can help at <ulink url='http://wiki.skolelinux.no/DebianEdu/Documentation/Etch/'>http://wiki.skolelinux.no/DebianEdu/Documentation/Etch/
@@ -875,8 +881,10 @@ E: Sub-process /usr/bin/dpkg returned an error code (1)]]>
 </para><para>Please report any other showstoppers. 
 </para>
 </section>
-</section> <para/><section><title>Appendix A - The GNU Public Licence
-</title><para>
+</section> <para/><section><title>Appendix A - The GNU Public License
+</title><para><emphasis role='strong'>Note to translators:
+</emphasis> there is no need to translate the GPL license text. 
+</para><para>
 </para><screen><![CDATA[
     Release manual for Debian-Edu etch 3.0 Codename "Terra"
     Copyright (C) 2007 Holger Levsen <holger at layer-acht.org> and others, see


hooks/post-receive
-- 
debian-edu-doc.git (Debian package debian-edu-doc)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "debian-edu-doc.git" (Debian package debian-edu-doc).




More information about the debian-edu-commits mailing list