[debian-edu-commits] debian-edu/debian-edu-doc.git (#117) - wheezy (branch) updated: 0.5.20070720-9-g3da63ef

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


The branch, wheezy has been updated
       via  3da63efbe6c5b79073d56638c84f90809c4c5d47 (commit)
      from  7573289be7c3f251563497e17edf4bbdfa4d9b30 (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 | 1190 +++++++++++-------
 documentation/release-manual/release-manual.es.po | 1327 +++++++++++++--------
 documentation/release-manual/release-manual.nb.po | 1203 ++++++++++++-------
 documentation/release-manual/release-manual.xml   |  368 +++---
 4 files changed, 2556 insertions(+), 1532 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 e341f79..d7a0d24 100644
--- a/documentation/release-manual/release-manual.de.po
+++ b/documentation/release-manual/release-manual.de.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: release-manual\n"
-"POT-Creation-Date: 2007-07-21  2:10+0200\n"
+"POT-Creation-Date: 2007-07-21 15:04+0200\n"
 "PO-Revision-Date: 2007-07-06 12:55+0200\n"
 "Last-Translator: Holger Levsen <holger at layer-acht.org>\n"
 "Language-Team: german team <users at skolelinux.de>\n"
@@ -58,17 +58,16 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:11 release-manual.xml:83 release-manual.xml:292
-#: release-manual.xml:382
+#: release-manual.xml:11 release-manual.xml:291 release-manual.xml:381
+#: release-manual.xml:696
 msgid "<phrase>:)  </phrase>"
 msgstr ""
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
 #: release-manual.xml:15
-#, fuzzy
 msgid ""
-"<ulink url='/DebianEdu/Documentation/Etch/CopyRight'>Copyright </ulink> and "
-"Authors"
+"<ulink url='/DebianEdu/Documentation/Etch/AboutDebianEdu'>About </ulink> "
+"Debian-Edu and Skolelinux"
 msgstr ""
 "<ulink url='/DebianEdu/Documentation/Etch/CopyRight'>Copyright </ulink> und "
 "andere Grundlagen"
@@ -77,23 +76,14 @@ msgstr ""
 #: release-manual.xml:18
 #, fuzzy
 msgid ""
-"<ulink url='/DebianEdu/Documentation/Etch/Translations'>Translations </"
-"ulink> of this document"
+"<ulink url='/DebianEdu/Documentation/Etch/Architecture'>Architecture </"
+"ulink> - the design principles of Debian-Edu"
 msgstr ""
 "<ulink url='/DebianEdu/Documentation/Etch/CopyRight'>Copyright </ulink> und "
 "andere Grundlagen"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
 #: release-manual.xml:21
-msgid ""
-"<ulink url='/DebianEdu/Documentation/Etch/AboutDebianEdu'>About </ulink> "
-"Debian-Edu and Skolelinux"
-msgstr ""
-"<ulink url='/DebianEdu/Documentation/Etch/CopyRight'>Copyright </ulink> und "
-"andere Grundlagen"
-
-# type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:24
 #, fuzzy
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/Features'>Features </ulink> - new "
@@ -103,17 +93,7 @@ msgstr ""
 "andere Grundlagen"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:27
-#, fuzzy
-msgid ""
-"<ulink url='/DebianEdu/Documentation/Etch/Architecture'>Architecture </"
-"ulink> - the design principles of Debian-Edu"
-msgstr ""
-"<ulink url='/DebianEdu/Documentation/Etch/CopyRight'>Copyright </ulink> und "
-"andere Grundlagen"
-
-# type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:30
+#: release-manual.xml:24
 #, fuzzy
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/Requirements'>Requirements </"
@@ -123,7 +103,7 @@ msgstr ""
 "andere Grundlagen"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:33
+#: release-manual.xml:27
 #, fuzzy
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/Installation'>Installation </"
@@ -133,7 +113,7 @@ msgstr ""
 "andere Grundlagen"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:36
+#: release-manual.xml:30
 #, fuzzy
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/GettingStarted'>Getting started </"
@@ -143,7 +123,7 @@ msgstr ""
 "andere Grundlagen"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:39
+#: release-manual.xml:33
 #, fuzzy
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/Maintainance'>Maintainance </"
@@ -153,7 +133,7 @@ msgstr ""
 "andere Grundlagen"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:42
+#: release-manual.xml:36
 #, fuzzy
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/Upgrades'>Upgrades </ulink> from "
@@ -163,7 +143,7 @@ msgstr ""
 "andere Grundlagen"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:46
+#: release-manual.xml:40
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/HowTo'>HowTo </ulink> - simple "
 "step by step Howtos"
@@ -172,7 +152,7 @@ msgstr ""
 "Schritt-fuer-Schritt Anleitungen"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:49
+#: release-manual.xml:43
 #, fuzzy
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/Contribute'>Contribute </ulink> to "
@@ -182,7 +162,7 @@ msgstr ""
 "andere Grundlagen"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:52
+#: release-manual.xml:46
 #, fuzzy
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/Support'>Support </ulink> - how"
@@ -192,6 +172,26 @@ msgstr ""
 "andere Grundlagen"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
+#: release-manual.xml:49
+#, fuzzy
+msgid ""
+"<ulink url='/DebianEdu/Documentation/Etch/CopyRight'>Copyright </ulink> and "
+"Authors of this document"
+msgstr ""
+"<ulink url='/DebianEdu/Documentation/Etch/CopyRight'>Copyright </ulink> und "
+"andere Grundlagen"
+
+# type: Content of: <article><para><section><itemizedlist><listitem><para>
+#: release-manual.xml:52
+#, fuzzy
+msgid ""
+"<ulink url='/DebianEdu/Documentation/Etch/Translations'>Translations </"
+"ulink> of this document"
+msgstr ""
+"<ulink url='/DebianEdu/Documentation/Etch/CopyRight'>Copyright </ulink> und "
+"andere Grundlagen"
+
+# type: Content of: <article><para><section><itemizedlist><listitem><para>
 #: release-manual.xml:55
 #, fuzzy
 msgid ""
@@ -211,183 +211,52 @@ msgstr ""
 
 # type: Content of: <article><para><section><title>
 #: release-manual.xml:63
-msgid "Copyright and authors"
-msgstr ""
+#, fuzzy
+msgid "About Debian-Edu and Skolelinux"
+msgstr "AboutDebianEdu"
 
 # type: Content of: <article><para><section><para>
 #: release-manual.xml:64
-#, fuzzy
 msgid ""
-"This document is written and copyrighted 2007 by Holger Levsen, Petter "
-"Reinholdtsen, Daniel Heß and Patrick Winnertz and is released under the GPL2 "
-"or any later version. Enjoy!"
+"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)."
 msgstr ""
-"Das gesamte Dokument is Copyright 2007 Holger Levsen und wird unter derGPL2 "
-"or einer beliebigen spaeteren Version veroeffentlicht. Geniesse es!"
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:65
+#: release-manual.xml:66
 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 </"
-"emphasis>! Then add your name here and release it under the GPL2 or later "
-"version."
+"The system is in use in several countries around the world, with most users "
+"in Norway, Germany and France."
 msgstr ""
 
 # type: Content of: <article><para><section><title>
 #: release-manual.xml:68
-msgid "Translation copyright and authors"
-msgstr ""
-
-# type: Content of: <article><para><section><para>
-#: release-manual.xml:69
-#, fuzzy
-msgid ""
-"The spanish translation is copyrighted 2007 by José L. Redrejo Rodríguez and "
-"is released under the GPL2 or any later version."
-msgstr ""
-"Das gesamte Dokument is Copyright 2007 Holger Levsen und wird unter derGPL2 "
-"or einer beliebigen spaeteren Version veroeffentlicht. Geniesse es!"
-
-# type: Content of: <article><para><section><para>
-#: release-manual.xml:70
-#, fuzzy
-msgid ""
-"The norwegian Bokmål translation is copyrighted 2007 by Petter Reinholdtsen "
-"and is released under the GPL2 or any later version."
-msgstr ""
-"Das gesamte Dokument is Copyright 2007 Holger Levsen und wird unter derGPL2 "
-"or einer beliebigen spaeteren Version veroeffentlicht. Geniesse es!"
-
-# type: Content of: <article><para><section><para>
-#: release-manual.xml:71
-#, fuzzy
-msgid ""
-"The german translation is copyrighted 2007 by Holger Levsen and is released "
-"under the GPL2 or any later version."
-msgstr ""
-"Das gesamte Dokument is Copyright 2007 Holger Levsen und wird unter derGPL2 "
-"or einer beliebigen spaeteren Version veroeffentlicht. Geniesse es!"
-
-# type: Content of: <article><para><section><title>
-#: release-manual.xml:73
-#, fuzzy
-msgid "Translations of this document"
-msgstr "Copyright dieses Dokuments"
-
-# type: Content of: <article><para><section><para>
-#: release-manual.xml:74
-msgid ""
-"Fully translated versions of this document are not yet available, as the "
-"document itself is very incomplete. Incomplete translations for Norwegian "
-"Bokmål and Spanish exist."
-msgstr ""
-
-# type: Content of: <article><para><section><title>
-#: release-manual.xml:75
-#, fuzzy
-msgid "Howto translate this document"
-msgstr "Copyright dieses Dokuments"
-
-# type: Content of: <article><para><section><section><para>
-#: release-manual.xml:76
-msgid ""
-"If you want to start translating, you can! Read /usr/share/doc/debian-edu-"
-"doc/README.release-manual-translations to find information how to create a ."
-"po file for your language, and how to update it against <ulink url='http://"
-"wiki.skolelinux.no/DebianEdu/Documentation/Etch/AllInOne?action=format&"
-"mimetype=xml/docbook'>the source </ulink>."
-msgstr ""
-
-# type: Content of: <article><para><section><section><para>
-#: release-manual.xml:78
-msgid ""
-"<emphasis role='strong'>FIXME: </emphasis> describe how to work in svn and "
-"give a step by step howto."
-msgstr ""
-
-# type: Content of: <article><para><section><section><title>
-#: release-manual.xml:81
-msgid "Potential problems for translations"
-msgstr ""
-
-# type: Content of: <article><para><section><section><para><inlinemediaobject>
-#: release-manual.xml:82
-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:87
-msgid "Please report any other showstoppers."
-msgstr ""
-
-# type: Content of: <article><para><section><title>
-#: release-manual.xml:90
-msgid "AboutDebianEdu"
-msgstr "AboutDebianEdu"
-
-# type: Content of: <article><para><section><para>
-#: release-manual.xml:91
-msgid "Welcome to <ulink url='/DebianEdu'>DebianEdu </ulink> / Skolelinux!"
-msgstr ""
-"Willkommen bei <ulink url='/DebianEdu'>DebianEdu </ulink> / Skolelinux!"
-
-# type: Content of: <article><para><section><title>
-#: release-manual.xml:94
-msgid "Features"
-msgstr ""
-
-# type: Content of: <article><para><section><section><title>
-#: release-manual.xml:95
-msgid "New features in the \"3.0 Terra\" release"
-msgstr ""
-
-# type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:102
-msgid "Local Device Support on <ulink url='/ThinClients'>ThinClients </ulink>"
-msgstr ""
-
-# type: Content of: <article><para><section><section><title>
-#: release-manual.xml:108
-msgid "Features in 2.0 release"
-msgstr ""
-
-# type: Content of: <article><para><section><section><title>
-#: release-manual.xml:112
-msgid "Features in \"1.0 venus\" release"
-msgstr ""
-
-# type: Content of: <article><para><section><title>
-#: release-manual.xml:117
 msgid "Architecture"
 msgstr "Architektur"
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:122
+#: release-manual.xml:69
 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). This document describes the network "
-"architecture and services provided by a Skolelinux installation."
+"This secton 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:124
+#: release-manual.xml:70
 msgid "Network"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:126
+#: release-manual.xml:72
 msgid "<phrase>attachment:network-arch_en.png </phrase>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:130
+#: release-manual.xml:76
 msgid ""
 "Network architecture as dia file: <ulink url='/DebianEdu/Documentation/Etch/"
 "Architecture?action=AttachFile&do=get&target=network-arch_en."
@@ -395,7 +264,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:132
+#: release-manual.xml:78
 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 "
@@ -408,7 +277,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:133
+#: release-manual.xml:79
 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 "
@@ -419,7 +288,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:134
+#: release-manual.xml:80
 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 "
@@ -429,12 +298,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:136
+#: release-manual.xml:82
 msgid "Services"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:137
+#: release-manual.xml:83
 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 "
@@ -449,7 +318,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:138
+#: release-manual.xml:84
 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 "
@@ -457,19 +326,24 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:139
+#: release-manual.xml:85
 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 "
-"possible the DNS name correspond to the service name in {{/etc/services}}, "
-"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 "
+"possible the DNS name correspond to the service name in"
+msgstr ""
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:86
+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 ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:157
+#: release-manual.xml:104
 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, "
@@ -479,7 +353,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:158
+#: release-manual.xml:105
 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 "
@@ -490,14 +364,14 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:159
+#: release-manual.xml:106
 msgid ""
 "All services are accesible 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:160
+#: release-manual.xml:107
 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 "
@@ -506,7 +380,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:161
+#: release-manual.xml:108
 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, "
@@ -516,7 +390,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:162
+#: release-manual.xml:109
 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 "
@@ -524,7 +398,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:163
+#: release-manual.xml:110
 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 "
@@ -533,7 +407,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:164
+#: release-manual.xml:111
 msgid ""
 "Pupils and teachers have the possibilty to publish websites. The webserver "
 "provides mechanisms for authenticating users, and for limiting access to "
@@ -543,7 +417,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:165
+#: release-manual.xml:112
 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 "
@@ -556,7 +430,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:166
+#: release-manual.xml:113
 msgid ""
 "Administration of services and users will by and large be via web, and "
 "follow established standards, functioning well in the webbrowsers which are "
@@ -565,7 +439,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:167
+#: release-manual.xml:114
 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 "
@@ -577,7 +451,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:168
+#: release-manual.xml:115
 msgid ""
 "Printers are connected where convenient, either directly onto the network, "
 "or connected to a server, workstation or thin-client-server. Access to "
@@ -587,12 +461,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:169
+#: release-manual.xml:116
 msgid "Thin client services"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:170
+#: release-manual.xml:117
 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 "
@@ -601,7 +475,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:171
+#: release-manual.xml:118
 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 "
@@ -612,7 +486,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:172
+#: release-manual.xml:119
 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 "
@@ -621,22 +495,22 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:175
+#: release-manual.xml:122
 #, fuzzy
 msgid "Administration"
 msgstr "Installation"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:176
+#: release-manual.xml:123
 msgid ""
-"All the linux machines that are installed by means of the Skolelinux CD will "
-"be administrable from a central computer, most likely the server. It will be "
-"possible to login to all machines by ssh, and thereby have full access to "
-"the machines"
+"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 "
+"will be possible to login to all machines by ssh, and thereby have full "
+"access to the machines"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:177
+#: release-manual.xml:124
 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 "
@@ -645,33 +519,33 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:178
+#: release-manual.xml:125
 msgid ""
-"All user information is kept in an SQL database. Updates of user accounts "
-"are made against this database. The information is exported to an LDAP "
-"directory which is used by the clients for user authentication."
+"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 "
+"authentication."
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:180 release-manual.xml:218
+#: release-manual.xml:127 release-manual.xml:207
 msgid "Installation"
 msgstr "Installation"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:181
-msgid "Installation is possible either from a CD or by a diskette from server."
+#: release-manual.xml:128
+msgid "Installation is possible either from a CD or DVD."
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:182
+#: release-manual.xml:129
 msgid ""
-"The aim is to be able to install a server from CD, and install clients over "
-"the network by booting all other machines from the network. The installation "
-"has to work without access to the Internet."
+"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 "
+"installation works without access to the Internet."
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:183
+#: release-manual.xml:130
 msgid ""
 "The installation should not ask any questions, with the exception of desired "
 "language (e.g. Norwegian Bokmal, Nynorsk, Sami) and machine profile (server, "
@@ -681,12 +555,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:185
+#: release-manual.xml:132
 msgid "File system access configuration"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:186
+#: release-manual.xml:133
 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 "
@@ -697,19 +571,28 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:187
+#: release-manual.xml:134
 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 "
-"installation, they can be mounted as {{/skole/host/directory/}}. Initially, "
-"one directory is created on the file server, {{/skole/tjener/home0/}}, in "
-"which all the user accounts are created. More directories may then be "
+"installation, they can be mounted as"
+msgstr ""
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:135
+msgid ". Initially, one directory is created on the file server,"
+msgstr ""
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:136
+msgid ""
+", 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."
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:188
+#: release-manual.xml:137
 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 "
@@ -725,7 +608,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:190
+#: release-manual.xml:139
 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 "
@@ -744,105 +627,198 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:191
+#: release-manual.xml:140
 msgid ""
 "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 {{~/}} created "
-"with priviliges 0775, {{~/priv/}} given 0750,and {{~/pub/}} given 0775. "
-"Files that should not be readable by others should be put in {{~/priv/}}, "
-"whereas public files will be put in {{~/pub/}}. Other files will initially "
-"be accessible, but may be blocked as needed."
+"readable or not. Concretely, umask should be set to 002, and"
+msgstr ""
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:141
+msgid "created with priviliges 0775,"
+msgstr ""
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:142
+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"
+msgstr ""
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:144
+msgid ", whereas public files will be put in"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:192
+#: release-manual.xml:145
+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
 msgid ""
 "ssh requires that the home directory can only be written to by the owner, "
-"thus the maximum access privilege for {{~/}} is 755."
+"thus the maximum access privilege for"
+msgstr ""
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:147
+msgid "is 755."
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:196
+#: release-manual.xml:151
 msgid "random notes"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:197
+#: release-manual.xml:152
 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:204
+#: release-manual.xml:164
+msgid "Features"
+msgstr ""
+
+# type: Content of: <article><para><section><section><title>
+#: release-manual.xml:165
+msgid "New features in the \"3.0 Terra\" release"
+msgstr ""
+
+# type: Content of: <article><para><section><section><itemizedlist><listitem><para>
+#: release-manual.xml:172
+msgid "Local Device Support on <ulink url='/ThinClients'>ThinClients </ulink>"
+msgstr ""
+
+# type: Content of: <article><para><section><section><itemizedlist><listitem><para>
+#: release-manual.xml:178
+msgid "Regression: the webbrowser based system administration tool"
+msgstr ""
+
+# type: Content of: <article><para><section><section><itemizedlist><listitem><para>
+#: release-manual.xml:179
+msgid ""
+"was removed from Debian, as it has several problems and is not supported "
+"anymore. User administration is done with a new webbrowser based tool called"
+msgstr ""
+
+# type: Content of: <article><para><section><section><title>
+#: release-manual.xml:184
+msgid "Features in 2.0 release"
+msgstr ""
+
+# type: Content of: <article><para><section><section><title>
+#: release-manual.xml:188
+msgid "Features in \"1.0 venus\" release"
+msgstr ""
+
+# type: Content of: <article><para><section><title>
+#: release-manual.xml:193
 msgid "Requirements"
 msgstr "Vorraussetzungen"
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:210
+#: release-manual.xml:199
 msgid "FIXME: add links to explainations of main-server and thinclient-server"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:211
+#: release-manual.xml:200
 msgid "Internet-Router"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:212
+#: release-manual.xml:201
 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:213
+#: release-manual.xml:202
 msgid "FIXME: We suggest coyote (link) or or. link to setup documentation"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:214
+#: release-manual.xml:203
 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:219
-msgid "Download an installation media for Debian-edu etch rc5"
+#: release-manual.xml:208
+msgid "Where to find more information"
+msgstr ""
+
+# type: Content of: <article><para><section><section><para><inlinemediaobject>
+#: release-manual.xml:209
+msgid ""
+"We recommend to read or at least take a look the <ulink url='http://www."
+"debian.org/releases/stable/releasenotes'>releasenotes for Debian etch </"
+"ulink> before you start installing a system for production use. If you just "
+"want to give Debian-Edu/Skolelinux a try, you don't have to though, it "
+"should just work <inlinemediaobject>"
+msgstr ""
+
+# type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
+#: release-manual.xml:211 release-manual.xml:605
+msgid "<phrase>:-)  </phrase>"
+msgstr ""
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:215
+msgid ""
+"Even more <ulink url='http://www.debian.org/releases/stable/"
+"installmanual'>information about the Debian etch release </ulink> is "
+"available in its installation manual."
+msgstr ""
+
+# type: Content of: <article><para><section><section><title>
+#: release-manual.xml:218
+msgid "Download an installation media for Debian-edu etch 3.0r0"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:220
+#: release-manual.xml:219
 msgid "DVDs for i386, amd64 and powerpc"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:221
+#: release-manual.xml:220
 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:228
+#: release-manual.xml:227
 msgid "or for the netinstall cd you can download for i386"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:235
+#: release-manual.xml:234
 msgid "amd64"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:242
+#: release-manual.xml:241
 msgid "and powerpc"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:249
+#: release-manual.xml:248
 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 "
@@ -851,13 +827,13 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:252
+#: release-manual.xml:251
 #, fuzzy
 msgid "Installation from CD"
 msgstr "Installation"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:253
+#: release-manual.xml:252
 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 "
@@ -865,13 +841,13 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:263
+#: release-manual.xml:262
 #, fuzzy
 msgid "Installation options"
 msgstr "Installation"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:264
+#: release-manual.xml:263
 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 "
@@ -882,7 +858,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para><inlinemediaobject>
-#: release-manual.xml:290
+#: release-manual.xml:289
 msgid ""
 "please say yes to submit information to <ulink url='http://popcon.skolelinux."
 "org/'>http://popcon.skolelinux.org/ </ulink> - though you dont have to "
@@ -890,77 +866,78 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:300
+#: release-manual.xml:299
 msgid ""
 "FIXME: this section lacks info how to install half-thick clients, which we "
-"marketing as great feature...! half-thick clients (aka diskless "
-"workstations) are set up after the installation, following the howto for it."
+"marketing as great feature...! half-thick clients (aka diskless workstation "
+"aka lowfat clients s) are set up after the installation, following the howto "
+"for it."
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:302
+#: release-manual.xml:301
 msgid "Screenshot tour through an i386 main-server installation"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:303
+#: release-manual.xml:302
 msgid "FIXME"
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:306
+#: release-manual.xml:305
 msgid "Getting started"
 msgstr ""
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:307
+#: release-manual.xml:306
 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:308
+#: release-manual.xml:307
 msgid ""
-"The [.<ulink url='/DebianEdu/Documentation/Etch/GettingStarted/HowTo'>/HowTo "
-"</ulink>] chapter describes more tips and tricks and frequently asked "
-"questions, while this is for the stuff everybody needs to do."
+"The <ulink url='/DebianEdu/Documentation/Etch/HowTo'>howto </ulink> chapter "
+"describes more tips and tricks and frequently asked questions, while this is "
+"for the stuff everybody needs to do."
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:310
-msgid "Services running on tjener"
+#: release-manual.xml:309
+msgid "Services running on the main server"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:311
+#: release-manual.xml:310
 msgid ""
-"There are several services running on the tjener which can be managed via a "
-"web management interface.  We'll describe each service here."
+"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:312
+#: release-manual.xml:311
 msgid "User Management"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:313
+#: release-manual.xml:312
 msgid ""
-"Point your webbrowser to <ulink url='https://tjener.intern/lwat'>https://"
-"tjener.intern/lwat </ulink> and you'll get an login screen where you can "
-"login with your admin account.  If you visit this site the first time after "
-"installation the loginname there is:"
+"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 "
+"account.  If you visit this site the first time after installation the "
+"loginname there is:"
 msgstr ""
 
 # type: CDATA
-#: release-manual.xml:315
+#: release-manual.xml:314
 #, no-wrap
 msgid "admin]]"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:316
+#: release-manual.xml:315
 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 "
@@ -970,18 +947,18 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:322
+#: release-manual.xml:321
 #, fuzzy
 msgid "User Administration"
 msgstr "Installation"
 
 # type: Content of: <article><para><section><section><section><section><para>
-#: release-manual.xml:323
+#: release-manual.xml:322
 msgid "There are 4 kind of possible users:"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><section><para>
-#: release-manual.xml:329
+#: release-manual.xml:328
 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 "
@@ -991,37 +968,37 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><section><para>
-#: release-manual.xml:330
+#: release-manual.xml:329
 msgid "FIXME: describe Groups, Machine and Machine Administration here."
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:333
+#: release-manual.xml:332
 msgid "Printer Managment"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:334
+#: release-manual.xml:333
 msgid ""
-"For Printer Management point your webbrowser to <ulink url='https://tjener."
-"intern/cups'>https://tjener.intern/cups </ulink>.  This is the normal cups "
-"management site where you can add/delete/modfiy your printers and can clean "
-"up the printing queue.  For changes you'll have to login as root with your "
-"root password. So you should access this site never without using ssl."
+"For Printer Management point your webbrowser to <ulink url='https://www/"
+"cups'>https://www/cups </ulink>.  This is the normal cups management site "
+"where you can add/delete/modfiy your printers and can clean up the printing "
+"queue.  For changes you'll have to login as root with your root password. So "
+"you should access this site never without using ssl."
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:336
+#: release-manual.xml:335
 msgid "FIXME: Go further"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:339
+#: release-manual.xml:338
 msgid "Adding debian-edu machines to the LDAP domain"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:340
+#: release-manual.xml:339
 msgid ""
 "FIXME: add how, is that the right headline for this? (The [.<ulink url='/"
 "DebianEdu/Documentation/Etch/GettingStarted/HowTo'>/HowTo </ulink>] Chapter "
@@ -1031,12 +1008,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:344
+#: release-manual.xml:343
 msgid "HowTo"
 msgstr "Anleitung"
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:345
+#: release-manual.xml:344
 msgid ""
 "The <ulink url='/HowTos'>HowTos </ulink> from <ulink url='http://wiki.debian."
 "org/DebianEdu/HowTo/'>http://wiki.debian.org/DebianEdu/HowTo/ </ulink> are "
@@ -1049,12 +1026,12 @@ msgstr ""
 "Anwenderspezifischen <ulink url='/HowTos'>HowTos </ulink> hierhin schieben!"
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:349
+#: release-manual.xml:348
 msgid "Those are not that many:"
 msgstr ""
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:365
+#: release-manual.xml:364
 msgid ""
 "<ulink url='http://wiki.debian.org/DebianEdu/HowTo/"
 "LtspDisklessWorkstation'>http://wiki.debian.org/DebianEdu/HowTo/"
@@ -1063,7 +1040,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:374
+#: release-manual.xml:373
 msgid ""
 "<ulink url='http://wiki.debian.org/DebianEdu/HowTo/TeacherFirstStep'>http://"
 "wiki.debian.org/DebianEdu/HowTo/TeacherFirstStep </ulink> - incomplete but "
@@ -1071,38 +1048,38 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:378
+#: release-manual.xml:377
 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:379
+#: release-manual.xml:378
 msgid "Other topics"
 msgstr ""
 
 # type: Content of: <article><para><section><para><inlinemediaobject>
-#: release-manual.xml:380
+#: release-manual.xml:379
 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:385
+#: release-manual.xml:384
 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:387
+#: release-manual.xml:386
 msgid "<phrase>:( </phrase>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:391
+#: release-manual.xml:390
 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 "
@@ -1110,38 +1087,38 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:393
+#: release-manual.xml:392
 msgid ""
 "Installing single service machines for spreading the load from main-server"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:401
+#: release-manual.xml:400
 msgid "LDAP Setup"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:403
+#: release-manual.xml:402
 msgid "/etc/ in svk"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:405
+#: release-manual.xml:404
 msgid "modify Kiosk mode"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:407
+#: release-manual.xml:406
 msgid "Flash"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:408
+#: release-manual.xml:407
 msgid "To install the Adobe Flash Player web browser plugin, install the"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:409
+#: release-manual.xml:408
 msgid ""
 "debian package.  It require a working Internet connection, and will download "
 "the precompiled binary from Adobe and convert it into a Debian package "
@@ -1150,36 +1127,36 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:411
+#: release-manual.xml:410
 msgid "<phrase>/!\\ </phrase>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:414
+#: release-manual.xml:413
 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:415
+#: release-manual.xml:414
 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:417
+#: release-manual.xml:416
 msgid "Java"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:421
+#: release-manual.xml:420
 msgid "Sound & Video"
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:422
+#: release-manual.xml:421
 msgid ""
 "- where to find libdvdcss for playing dvds.  Should we promote <ulink "
 "url='http://www.debian-multimedia.org/'>http://www.debian-multimedia.org/ </"
@@ -1187,32 +1164,32 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:427
+#: release-manual.xml:426
 msgid "Thin Clients vs Half-Thick Clients"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:429
+#: release-manual.xml:428
 msgid "printer managing"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:431
+#: release-manual.xml:430
 msgid "Firewall setup (coyote linux)"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:433
+#: release-manual.xml:432
 msgid "LTSP in detail"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:435
+#: release-manual.xml:434
 msgid "Connecting windows machines to the network / windows integration"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:436
+#: release-manual.xml:435
 msgid ""
 "For Windows clients the Windows domain \"SKOLELINUX\" is available to be "
 "joined. A special service called Samba, installed on the main-server tjener, "
@@ -1221,21 +1198,21 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:437
+#: release-manual.xml:436
 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:438
+#: release-manual.xml:437
 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:439
+#: release-manual.xml:438
 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 "
@@ -1245,12 +1222,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:443
+#: release-manual.xml:442
 msgid "2. Configure the Windows client as static host"
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:444
+#: release-manual.xml:443
 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 "
@@ -1263,19 +1240,19 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:447
+#: release-manual.xml:446
 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:450
+#: release-manual.xml:449
 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:453
+#: release-manual.xml:452
 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. "
@@ -1285,89 +1262,142 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:456
+#: release-manual.xml:455
 msgid "Maintainance"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:457
+#: release-manual.xml:456
 msgid "Updating the software"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:458
+#: release-manual.xml:457
 msgid "document how to use aptitude upgrade / kde-update-notifier"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:459
+#: release-manual.xml:458
 msgid "are cron-apt and apt-listchanges installed and configured?"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:461
+#: release-manual.xml:460
 msgid "Backup Management"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:462
+#: release-manual.xml:461
 msgid ""
-"For the backup management point your browser to <ulink url='https://tjener."
-"intern/slbackup-php'>https://tjener.intern/slbackup-php </ulink>. Please "
-"note that you have to access this site via ssl, since you have to enter the "
-"root password there. If you try to access this site without using ssl it "
-"will fail."
+"For the backup management point your browser to <ulink url='https://www/"
+"slbackup-php'>https://www/slbackup-php </ulink>. Please note that you have "
+"to access this site via ssl, since you have to enter the root password "
+"there. If you try to access this site without using ssl it will fail."
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:464
+#: release-manual.xml:463
 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:466
+#: release-manual.xml:465
 msgid "Server Monitoring"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:467
+#: release-manual.xml:466
 msgid "Munin"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:469
+#: release-manual.xml:468
 msgid "Nagios"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:471
+#: release-manual.xml:470
 msgid "Sitesummary"
 msgstr ""
 
+# type: Content of: <article><para><section><section><section><para>
+#: release-manual.xml:471
+msgid ""
+"Some documentation on sitesummary is available from <ulink url='http://wiki."
+"debian.org/DebianEdu/HowTo/SiteSummary'>http://wiki.debian.org/DebianEdu/"
+"HowTo/SiteSummary </ulink>"
+msgstr ""
+
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:472
+#: release-manual.xml:473
 msgid "give pointers to munin, sitesummary and nagios doc"
 msgstr ""
 
-# type: Content of: <article><para><section><title>
-#: release-manual.xml:476
-msgid "Upgrades"
+# type: Content of: <article><para><section><title>
+#: release-manual.xml:477
+msgid "Upgrades"
+msgstr ""
+
+# type: Content of: <article><para><section><para>
+#: release-manual.xml:478
+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/"
+"Skolelinux comes with ABSOLUTELY NO WARRANTY, to the extent permitted by "
+"applicable law.  </emphasis>"
+msgstr ""
+
+# type: Content of: <article><para><section><para>
+#: release-manual.xml:480
+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 "
+"way as your production server. There you can test the upgrade without risk "
+"and see if everything works as it should."
+msgstr ""
+
+# type: Content of: <article><para><section><para>
+#: release-manual.xml:481
+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 "
+"them here. Debian-Edu sarge will receive continued support for some time in "
+"the future. FIXME: decide and document how long we will be able to support "
+"sarge."
+msgstr ""
+
+# type: Content of: <article><para><section><section><title>
+#: release-manual.xml:482
+msgid "Upgrades from Debian-Edu sarge"
+msgstr ""
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:483
+msgid ""
+"Please read this chapter completly before you start upgrading your systems."
 msgstr ""
 
-# type: Content of: <article><para><section><para>
-#: release-manual.xml:477
-msgid "FIXME: add link to debian release notes, here or in [./Installation] ?"
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:484
+msgid ""
+"In case of problems you could also read the <ulink url='http://www.debian."
+"org/releases/stable/releasenotes'>releasenotes for Debian etch </ulink>. "
+"(Debian-Edu/Skolelinux \"2.0 Terra\" installed a 2.6 kernel as default, but "
+"if you are running a 2.4 kernel, you <emphasis>should </emphasis> read the "
+"<ulink url='http://www.debian.org/releases/stable/i386/release-notes/ch-"
+"information.en.html#s-upgrade-to-2.6'>notes on upgrading from kernel 2.4 to "
+"2.6 </ulink> before you upgrade!)"
 msgstr ""
 
-# type: Content of: <article><para><section><section><title>
-#: release-manual.xml:478
-msgid "Upgrades from Debian-Edu sarge"
+# type: Content of: <article><para><section><section><section><title>
+#: release-manual.xml:488
+msgid "Partioning scheme changed"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:479
+#: release-manual.xml:489
 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 "
@@ -1375,14 +1405,14 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:483
+#: release-manual.xml:493
 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:484
+#: release-manual.xml:494
 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 "
@@ -1393,19 +1423,19 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:485
+#: release-manual.xml:496
 msgid "Prepare the System"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:486
+#: release-manual.xml:497
 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:487
+#: release-manual.xml:498
 #, no-wrap
 msgid ""
 "/etc/init.d/squid stop \n"
@@ -1414,25 +1444,25 @@ msgid ""
 msgstr ""
 
 # type: CDATA
-#: release-manual.xml:492
+#: release-manual.xml:503
 #, no-wrap
 msgid "e2fsck -f /dev/vg_system/lv_data ]]"
 msgstr ""
 
 # type: CDATA
-#: release-manual.xml:495
+#: release-manual.xml:506
 #, no-wrap
 msgid "lvextend -L +1GB /dev/vg_system/lv_data ]]"
 msgstr ""
 
 # type: CDATA
-#: release-manual.xml:498
+#: release-manual.xml:509
 #, no-wrap
 msgid "resize2fs /dev/vg_system/lv_data]]"
 msgstr ""
 
 # type: CDATA
-#: release-manual.xml:501
+#: release-manual.xml:512
 #, no-wrap
 msgid ""
 "mount /var \n"
@@ -1441,12 +1471,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:508
+#: release-manual.xml:519
 msgid "Now start the upgrade with:"
 msgstr ""
 
 # type: CDATA
-#: release-manual.xml:509
+#: release-manual.xml:520
 #, no-wrap
 msgid ""
 "apt-get update \n"
@@ -1454,12 +1484,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:513
+#: release-manual.xml:524
 msgid "after you have modified your sources.list:"
 msgstr ""
 
 # type: CDATA
-#: release-manual.xml:514
+#: release-manual.xml:525
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian etch main contrib non-free \n"
@@ -1467,12 +1497,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:519
+#: release-manual.xml:530
 msgid "Answers to Debconf Questions raising during upgrade"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:520
+#: release-manual.xml:531
 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 "
@@ -1487,17 +1517,124 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:524
-msgid "FIXME: Which questions raises up here (I'll fix this tomorrow ;-))"
+#: release-manual.xml:535
+msgid "* Configure nagios-common."
+msgstr ""
+
+# type: Content of: <article><para><section><section><section><itemizedlist><listitem><para>
+#: release-manual.xml:536
+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:540
+msgid "* Configure console-data"
+msgstr ""
+
+# type: Content of: <article><para><section><section><section><para>
+#: release-manual.xml:543
+msgid "* Configure openssh-server"
+msgstr ""
+
+# type: Content of: <article><para><section><section><section><para>
+#: release-manual.xml:546
+msgid "* Configure systat"
+msgstr ""
+
+# type: Content of: <article><para><section><section><section><para>
+#: release-manual.xml:549
+msgid "* Configure popularity-contest"
+msgstr ""
+
+# type: Content of: <article><para><section><section><section><para>
+#: release-manual.xml:552
+msgid "* Configure libnss-ldap"
+msgstr ""
+
+# type: Content of: <article><para><section><section><section><orderedlist><listitem><para>
+#: release-manual.xml:553
+msgid "Change the prompt to: <emphasis>ldaps://ldap/ </emphasis>"
+msgstr ""
+
+# type: Content of: <article><para><section><section><section><orderedlist><listitem><para>
+#: release-manual.xml:556
+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:563
+msgid "* Upgrade glibc now. Answer Yes here."
+msgstr ""
+
+# type: Content of: <article><para><section><section><section><para>
+#: release-manual.xml:564
+msgid "* Restart Services. Answer Yes here."
+msgstr ""
+
+# type: Content of: <article><para><section><section><section><para>
+#: release-manual.xml:565
+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:566
+msgid "The upgrade will fail with this error message:"
+msgstr ""
+
+# type: CDATA
+#: release-manual.xml:567
+#, no-wrap
+msgid ""
+"Errors were encountered while processing: \n"
+" mozilla-firefox-locale-it\n"
+" mozilla-firefox-locale-el\n"
+"E: Sub-process /usr/bin/dpkg returned an error code (1)\n"
+"]]"
+msgstr ""
+
+# type: Content of: <article><para><section><section><section><para>
+#: release-manual.xml:572
+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/"
+"info/mozilla-firefox-local-el.postrm </emphasis> and comment out in both the "
+"line containing: <emphasis>update-mozilla-firefox-chrome </emphasis>. Then "
+"restart the upgrade process with:"
+msgstr ""
+
+# type: CDATA
+#: release-manual.xml:576
+#, no-wrap
+msgid "apt-get -f install]]"
+msgstr ""
+
+# type: Content of: <article><para><section><section><section><para>
+#: release-manual.xml:577
+msgid "Now the upgrade work again:"
+msgstr ""
+
+# type: Content of: <article><para><section><section><section><para>
+#: release-manual.xml:578
+msgid "* Several Modified configuration files (nagios)"
+msgstr ""
+
+# type: Content of: <article><para><section><section><section><para>
+#: release-manual.xml:581
+msgid "*"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:527
+#: release-manual.xml:584
 msgid "Upgrades from older Debian-Edu / Skolelinux installations"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:528
+#: release-manual.xml:585
 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 "
@@ -1507,68 +1644,108 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:532
+#: release-manual.xml:589
 msgid "Contribute"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:533
+#: release-manual.xml:590
 msgid "Resources"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:534
+#: release-manual.xml:591
 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:593
+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:596
+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><para>
+#: release-manual.xml:601
+msgid "FIXME: add info how developers and testers can contribute."
+msgstr ""
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:602
+msgid "== Documentation writers =="
+msgstr ""
+
+# type: Content of: <article><para><section><section><para><inlinemediaobject>
+#: release-manual.xml:603
+msgid ""
+"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/ </ulink> <inlinemediaobject>"
+msgstr ""
+
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:545
+#: release-manual.xml:610
 msgid "Translations wanted"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:546
+#: release-manual.xml:611
 msgid ""
 "Translations of this document are kept in .po files like in many free "
-"software projects, read {{usr/share/doc/debian-edu-doc/README.release-manual-"
-"translations}} for more information on this. There are many easy tools for "
-"translating."
+"software projects, read"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:547
+#: release-manual.xml:612
 msgid ""
-"To update the translations you need to be a member of the alioth project "
-"{{debian}}. 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."
+"for more information on this. There are many easy tools for translating."
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:549
+#: release-manual.xml:613
+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:614
+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 ""
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:616
 msgid "Checkout the source package with the following command:"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:553
-msgid "Join a local debian-edu team"
+#: release-manual.xml:622
+msgid "Join a local Debian-Edu team"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:554
+#: release-manual.xml:623
 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:557
-msgid "start a new local debian-edu team"
+#: release-manual.xml:626
+msgid "Start a new local Debian-Edu team"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:558
+#: release-manual.xml:627
 msgid ""
 "<emphasis role='strong'>FIXME: </emphasis> \"isolated\" contributors and "
 "users in schools exist in Greece, the Netherlands, Japan and elsewhere. Meet "
@@ -1576,95 +1753,223 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:562
+#: release-manual.xml:631
 msgid "Support"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:563
-msgid "volunteer based support"
+#: release-manual.xml:632
+msgid "Volunteer based support"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:564
+#: release-manual.xml:633
 msgid "in english"
 msgstr ""
 
-# type: Content of: <article><para><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: release-manual.xml:565
-msgid ""
-"<ulink url='http://lists.debian.org/debian-edu'>http://lists.debian.org/"
-"debian-edu </ulink> - developer centric mailing list, more useful to report "
-"problems than to get real support"
-msgstr ""
-
 # type: Content of: <article><para><section><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:568
+#: release-manual.xml:634
 msgid ""
 "<ulink url='https://init.linpro.no/mailman/skolelinux.no/listinfo/admin-"
 "discuss'>https://init.linpro.no/mailman/skolelinux.no/listinfo/admin-discuss "
 "</ulink> - english speaking support mailing list"
 msgstr ""
 
+# type: Content of: <article><para><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: release-manual.xml:637
+msgid ""
+"<ulink url='http://lists.debian.org/debian-edu'>http://lists.debian.org/"
+"debian-edu </ulink> - developer centric mailing list, more useful to report "
+"problems than to get real support"
+msgstr ""
+
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:574
+#: release-manual.xml:643
 msgid "in norwegian"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:578
+#: release-manual.xml:644
 msgid ""
 "<ulink url='https://init.linpro.no/mailman/skolelinux.no/listinfo/"
 "bruker'>https://init.linpro.no/mailman/skolelinux.no/listinfo/bruker </"
 "ulink> - norwegian speaking support mailing list"
 msgstr ""
 
-# type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:583
-msgid "FIXME: briefly describe the diffs between those lists..."
+# type: Content of: <article><para><section><section><section><itemizedlist><listitem><para>
+#: release-manual.xml:647
+msgid ""
+"<ulink url='https://init.linpro.no/mailman/skolelinux.no/listinfo/"
+"linuxiskolen'>https://init.linpro.no/mailman/skolelinux.no/listinfo/"
+"linuxiskolen </ulink> - FIXME: what is this"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:585
+#: release-manual.xml:653
 msgid "in german"
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: release-manual.xml:586
+#: release-manual.xml:654
 msgid ""
 "<ulink url='http://www.skolelinux.de/mailman/listinfo/user'>http://www."
 "skolelinux.de/mailman/listinfo/user </ulink> - german speaking support "
 "mailinglist"
 msgstr ""
 
+# type: Content of: <article><para><section><section><section><itemizedlist><listitem><para>
+#: release-manual.xml:657
+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:592
+#: release-manual.xml:664
 msgid "in french"
 msgstr ""
 
+# type: Content of: <article><para><section><section><section><itemizedlist><listitem><para>
+#: release-manual.xml:665
+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:599
-msgid "professional support"
+#: release-manual.xml:671
+msgid "Professional support"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:600
+#: release-manual.xml:672
 msgid ""
-"Lists of companies providing professional support is available from <ulink "
-"url='http://wiki.skolelinux.no/Hjelp/ProfesjonellHjelp'>http://wiki."
-"skolelinux.no/Hjelp/ProfesjonellHjelp </ulink> for Norway and <ulink "
+"Lists of companies providing professional support are available from <ulink "
 "url='http://wiki.debian.org/DebianEdu/Help/ProfessionalHelp'>http://wiki."
-"debian.org/DebianEdu/Help/ProfessionalHelp </ulink> for the rest of the "
-"world."
+"debian.org/DebianEdu/Help/ProfessionalHelp </ulink>."
+msgstr ""
+
+# type: Content of: <article><para><section><title>
+#: release-manual.xml:676
+msgid "Copyright and authors"
+msgstr ""
+
+# type: Content of: <article><para><section><para>
+#: release-manual.xml:677
+#, fuzzy
+msgid ""
+"This document is written and copyrighted 2007 by Holger Levsen, Petter "
+"Reinholdtsen, Daniel Heß and Patrick Winnertz and is released under the GPL2 "
+"or any later version. Enjoy!"
+msgstr ""
+"Das gesamte Dokument is Copyright 2007 Holger Levsen und wird unter derGPL2 "
+"or einer beliebigen spaeteren Version veroeffentlicht. Geniesse es!"
+
+# type: Content of: <article><para><section><para>
+#: release-manual.xml:678
+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 </"
+"emphasis>! Then add your name here and release it under the GPL2 or later "
+"version."
+msgstr ""
+
+# type: Content of: <article><para><section><title>
+#: release-manual.xml:681
+msgid "Translation copyright and authors"
+msgstr ""
+
+# type: Content of: <article><para><section><para>
+#: release-manual.xml:682
+#, fuzzy
+msgid ""
+"The spanish translation is copyrighted 2007 by José L. Redrejo Rodríguez and "
+"is released under the GPL2 or any later version."
+msgstr ""
+"Das gesamte Dokument is Copyright 2007 Holger Levsen und wird unter derGPL2 "
+"or einer beliebigen spaeteren Version veroeffentlicht. Geniesse es!"
+
+# type: Content of: <article><para><section><para>
+#: release-manual.xml:683
+#, fuzzy
+msgid ""
+"The norwegian Bokmål translation is copyrighted 2007 by Petter Reinholdtsen "
+"and is released under the GPL2 or any later version."
+msgstr ""
+"Das gesamte Dokument is Copyright 2007 Holger Levsen und wird unter derGPL2 "
+"or einer beliebigen spaeteren Version veroeffentlicht. Geniesse es!"
+
+# type: Content of: <article><para><section><para>
+#: release-manual.xml:684
+#, fuzzy
+msgid ""
+"The german translation is copyrighted 2007 by Holger Levsen and is released "
+"under the GPL2 or any later version."
+msgstr ""
+"Das gesamte Dokument is Copyright 2007 Holger Levsen und wird unter derGPL2 "
+"or einer beliebigen spaeteren Version veroeffentlicht. Geniesse es!"
+
+# type: Content of: <article><para><section><title>
+#: release-manual.xml:686
+#, fuzzy
+msgid "Translations of this document"
+msgstr "Copyright dieses Dokuments"
+
+# type: Content of: <article><para><section><para>
+#: release-manual.xml:687
+msgid ""
+"Fully translated versions of this document are not yet available, as the "
+"document itself is very incomplete. Incomplete translations for Norwegian "
+"Bokmål and Spanish exist."
+msgstr ""
+
+# type: Content of: <article><para><section><title>
+#: release-manual.xml:688
+#, fuzzy
+msgid "Howto translate this document"
+msgstr "Copyright dieses Dokuments"
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:689
+msgid ""
+"If you want to start translating, you can! Read /usr/share/doc/debian-edu-"
+"doc/README.release-manual-translations to find information how to create a ."
+"po file for your language, and how to update it against <ulink url='http://"
+"wiki.skolelinux.no/DebianEdu/Documentation/Etch/AllInOne?action=format&"
+"mimetype=xml/docbook'>the source </ulink>."
+msgstr ""
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:691
+msgid ""
+"<emphasis role='strong'>FIXME: </emphasis> describe how to work in svn and "
+"give a step by step howto."
+msgstr ""
+
+# type: Content of: <article><para><section><section><title>
+#: release-manual.xml:694
+msgid "Potential problems for translations"
+msgstr ""
+
+# type: Content of: <article><para><section><section><para><inlinemediaobject>
+#: release-manual.xml:695
+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:700
+msgid "Please report any other showstoppers."
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:605
+#: release-manual.xml:703
 msgid "Appendix A - The GNU Public Licence"
 msgstr ""
 
 # type: CDATA
-#: release-manual.xml:607
+#: release-manual.xml:705
 #, no-wrap
 msgid ""
 "    Release manual for Debian-Edu etch 3.0 Codename \"Terra\"\n"
@@ -1924,6 +2229,11 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><para>
+#~ msgid "Welcome to <ulink url='/DebianEdu'>DebianEdu </ulink> / Skolelinux!"
+#~ msgstr ""
+#~ "Willkommen bei <ulink url='/DebianEdu'>DebianEdu </ulink> / Skolelinux!"
+
+# type: Content of: <article><para><section><para>
 #~ msgid "This will become the etch documentation."
 #~ msgstr "Dies wird die Etch doku werden"
 
diff --git a/documentation/release-manual/release-manual.es.po b/documentation/release-manual/release-manual.es.po
index fa6c36f..a72293a 100644
--- a/documentation/release-manual/release-manual.es.po
+++ b/documentation/release-manual/release-manual.es.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: release-manual\n"
-"POT-Creation-Date: 2007-07-21  2:10+0200\n"
+"POT-Creation-Date: 2007-07-21 15:04+0200\n"
 "PO-Revision-Date: 2007-07-15 09:52+0200\n"
 "Last-Translator: José L. Redrejo Rodríguez <jredrejo at edu.juntaextremadura."
 "net>\n"
@@ -66,33 +66,14 @@ msgid ""
 msgstr "paquete, que puede instalarse en un servidor web."
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:11 release-manual.xml:83 release-manual.xml:292
-#: release-manual.xml:382
+#: release-manual.xml:11 release-manual.xml:291 release-manual.xml:381
+#: release-manual.xml:696
 msgid "<phrase>:)  </phrase>"
 msgstr ""
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
 #: release-manual.xml:15
 msgid ""
-"<ulink url='/DebianEdu/Documentation/Etch/CopyRight'>Copyright </ulink> and "
-"Authors"
-msgstr ""
-"<ulink url='/DebianEdu/Documentation/Etch/CopyRight'>Copyright </ulink> y "
-"Autores"
-
-# type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:18
-#, fuzzy
-msgid ""
-"<ulink url='/DebianEdu/Documentation/Etch/Translations'>Translations </"
-"ulink> of this document"
-msgstr ""
-"<ulink url='/DebianEdu/Documentation/Etch/Translations'>Traducciones de este "
-"documento</ulink>"
-
-# type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:21
-msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/AboutDebianEdu'>About </ulink> "
 "Debian-Edu and Skolelinux"
 msgstr ""
@@ -100,25 +81,25 @@ msgstr ""
 "Debian-Edu y Skolelinux"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:24
+#: release-manual.xml:18
 #, fuzzy
 msgid ""
-"<ulink url='/DebianEdu/Documentation/Etch/Features'>Features </ulink> - new "
-"Features in this release and old ones"
+"<ulink url='/DebianEdu/Documentation/Etch/Architecture'>Architecture </"
+"ulink> - the design principles of Debian-Edu"
 msgstr ""
 "<ulink url='/DebianEdu/Documentation/Etch/Architecture'>Arquitectura </ulink>"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:27
+#: release-manual.xml:21
 #, fuzzy
 msgid ""
-"<ulink url='/DebianEdu/Documentation/Etch/Architecture'>Architecture </"
-"ulink> - the design principles of Debian-Edu"
+"<ulink url='/DebianEdu/Documentation/Etch/Features'>Features </ulink> - new "
+"Features in this release and old ones"
 msgstr ""
 "<ulink url='/DebianEdu/Documentation/Etch/Architecture'>Arquitectura </ulink>"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:30
+#: release-manual.xml:24
 #, fuzzy
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/Requirements'>Requirements </"
@@ -127,7 +108,7 @@ msgstr ""
 "<ulink url='/DebianEdu/Documentation/Etch/Requirements'>Requisitos </ulink>"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:33
+#: release-manual.xml:27
 #, fuzzy
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/Installation'>Installation </"
@@ -136,7 +117,7 @@ msgstr ""
 "<ulink url='/DebianEdu/Documentation/Etch/Installation'>Instalación </ulink>"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:36
+#: release-manual.xml:30
 #, fuzzy
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/GettingStarted'>Getting started </"
@@ -146,7 +127,7 @@ msgstr ""
 "donde encontrar ayuda"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:39
+#: release-manual.xml:33
 #, fuzzy
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/Maintainance'>Maintainance </"
@@ -156,7 +137,7 @@ msgstr ""
 "ulink>"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:42
+#: release-manual.xml:36
 #, fuzzy
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/Upgrades'>Upgrades </ulink> from "
@@ -165,7 +146,7 @@ msgstr ""
 "<ulink url='/DebianEdu/Documentation/Etch/Upgrades'>Actualizaciones </ulink>"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:46
+#: release-manual.xml:40
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/HowTo'>HowTo </ulink> - simple "
 "step by step Howtos"
@@ -174,7 +155,7 @@ msgstr ""
 "Instrucciones simples paso a paso"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:49
+#: release-manual.xml:43
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/Contribute'>Contribute </ulink> to "
 "Debian-Edu"
@@ -183,7 +164,7 @@ msgstr ""
 "Debian-Edu"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:52
+#: release-manual.xml:46
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/Support'>Support </ulink> - how"
 "+where to find help"
@@ -192,6 +173,26 @@ msgstr ""
 "donde encontrar ayuda"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
+#: release-manual.xml:49
+#, fuzzy
+msgid ""
+"<ulink url='/DebianEdu/Documentation/Etch/CopyRight'>Copyright </ulink> and "
+"Authors of this document"
+msgstr ""
+"<ulink url='/DebianEdu/Documentation/Etch/CopyRight'>Copyright </ulink> y "
+"Autores"
+
+# type: Content of: <article><para><section><itemizedlist><listitem><para>
+#: release-manual.xml:52
+#, fuzzy
+msgid ""
+"<ulink url='/DebianEdu/Documentation/Etch/Translations'>Translations </"
+"ulink> of this document"
+msgstr ""
+"<ulink url='/DebianEdu/Documentation/Etch/Translations'>Traducciones de este "
+"documento</ulink>"
+
+# type: Content of: <article><para><section><itemizedlist><listitem><para>
 #: release-manual.xml:55
 #, fuzzy
 msgid ""
@@ -215,199 +216,51 @@ msgstr ""
 # type: Content of: <article><para><section><title>
 #: release-manual.xml:63
 #, fuzzy
-msgid "Copyright and authors"
-msgstr "Copyright y Authores"
+msgid "About Debian-Edu and Skolelinux"
+msgstr "Acerca de DebianEdu"
 
 # type: Content of: <article><para><section><para>
 #: release-manual.xml:64
-#, fuzzy
 msgid ""
-"This document is written and copyrighted 2007 by Holger Levsen, Petter "
-"Reinholdtsen, Daniel Heß and Patrick Winnertz and is released under the GPL2 "
-"or any later version. Enjoy!"
+"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)."
 msgstr ""
-"Esto documento ha sido escrito con copyright de Holger Levsen 2007 y "
-"distribuidobajo la licencia GPL2 o cualquier versión posterior. ¡Disfrútalo!"
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:65
+#: release-manual.xml:66
 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 </"
-"emphasis>! Then add your name here and release it under the GPL2 or later "
-"version."
+"The system is in use in several countries around the world, with most users "
+"in Norway, Germany and France."
 msgstr ""
-"¡Si le añades contenido <emphasis role='strong'> hazlo sólo si eres su autor "
-"y planeas liberarlo bajo las mismas condiciones !</emphasis>. Después añade "
-"tu nombre aquí y libéralo bajo la GPL2 o posterior."
 
 # type: Content of: <article><para><section><title>
 #: release-manual.xml:68
-#, fuzzy
-msgid "Translation copyright and authors"
-msgstr "Copyright y Authores"
-
-# type: Content of: <article><para><section><para>
-#: release-manual.xml:69
-#, fuzzy
-msgid ""
-"The spanish translation is copyrighted 2007 by José L. Redrejo Rodríguez and "
-"is released under the GPL2 or any later version."
-msgstr ""
-"Esto documento ha sido escrito con copyright de Holger Levsen 2007 y "
-"distribuidobajo la licencia GPL2 o cualquier versión posterior. ¡Disfrútalo!"
-
-# type: Content of: <article><para><section><para>
-#: release-manual.xml:70
-#, fuzzy
-msgid ""
-"The norwegian Bokmål translation is copyrighted 2007 by Petter Reinholdtsen "
-"and is released under the GPL2 or any later version."
-msgstr ""
-"Esto documento ha sido escrito con copyright de Holger Levsen 2007 y "
-"distribuidobajo la licencia GPL2 o cualquier versión posterior. ¡Disfrútalo!"
-
-# type: Content of: <article><para><section><para>
-#: release-manual.xml:71
-#, fuzzy
-msgid ""
-"The german translation is copyrighted 2007 by Holger Levsen and is released "
-"under the GPL2 or any later version."
-msgstr ""
-"Esto documento ha sido escrito con copyright de Holger Levsen 2007 y "
-"distribuidobajo la licencia GPL2 o cualquier versión posterior. ¡Disfrútalo!"
-
-# type: Content of: <article><para><section><title>
-#: release-manual.xml:73
-msgid "Translations of this document"
-msgstr "Traducciones de este documento"
-
-# type: Content of: <article><para><section><para>
-#: release-manual.xml:74
-#, fuzzy
-msgid ""
-"Fully translated versions of this document are not yet available, as the "
-"document itself is very incomplete. Incomplete translations for Norwegian "
-"Bokmål and Spanish exist."
-msgstr ""
-"Todavía no están disponibles traducciones de este documento, puesto que el "
-"propio documento está incompleto, incluso su esqueleto está inacabado."
-
-# type: Content of: <article><para><section><section><title>
-#: release-manual.xml:75
-msgid "Howto translate this document"
-msgstr "Como traducir este documento"
-
-# type: Content of: <article><para><section><section><para>
-#: release-manual.xml:76
-#, fuzzy
-msgid ""
-"If you want to start translating, you can! Read /usr/share/doc/debian-edu-"
-"doc/README.release-manual-translations to find information how to create a ."
-"po file for your language, and how to update it against <ulink url='http://"
-"wiki.skolelinux.no/DebianEdu/Documentation/Etch/AllInOne?action=format&"
-"mimetype=xml/docbook'>the source </ulink>."
-msgstr ""
-"y en  debian-edu-doc-$version/documentation/release-manual/README "
-"encontrarásinformación para crear un archivo .po para tu idioma y como "
-"actualizarlo en <ulink url='http://wiki.skolelinux.no/DebianEdu/"
-"Documentation/Etch/AllInOne?action=format&mimetype=xml/docbook'>los "
-"fuentes </ulink>."
-
-# type: Content of: <article><para><section><section><para>
-#: release-manual.xml:78
-msgid ""
-"<emphasis role='strong'>FIXME: </emphasis> describe how to work in svn and "
-"give a step by step howto."
-msgstr ""
-"<emphasis role='strong'>POR CORREGIR: </emphasis> describen como trabajar "
-"con svn y muestran un tutorial paso a paso."
-
-# type: Content of: <article><para><section><section><title>
-#: release-manual.xml:81
-#, fuzzy
-msgid "Potential problems for translations"
-msgstr "Problemas potenciales para los traductores"
-
-# type: Content of: <article><para><section><section><para>
-#: release-manual.xml:82
-#, fuzzy
-msgid ""
-"We will need to write sed-scripts (or something like that) to support "
-"different images for different translations. Laters <inlinemediaobject>"
-msgstr ""
-"También necesitamso escribir scripts de sed (o algo parecido) para soportar "
-"diferentes imágenes con diferentes traducciones <inlinemediaobject>"
-
-# type: Content of: <article><para><section><section><para>
-#: release-manual.xml:87
-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:90
-msgid "AboutDebianEdu"
-msgstr "Acerca de DebianEdu"
-
-# type: Content of: <article><para><section><para>
-#: release-manual.xml:91
-msgid "Welcome to <ulink url='/DebianEdu'>DebianEdu </ulink> / Skolelinux!"
-msgstr "Bienvenido a  <ulink url='/DebianEdu'>DebianEdu </ulink> / Skolelinux!"
-
-# type: Content of: <article><para><section><title>
-#: release-manual.xml:94
-msgid "Features"
-msgstr ""
-
-# type: Content of: <article><para><section><section><title>
-#: release-manual.xml:95
-msgid "New features in the \"3.0 Terra\" release"
-msgstr ""
-
-# type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:102
-msgid "Local Device Support on <ulink url='/ThinClients'>ThinClients </ulink>"
-msgstr ""
-
-# type: Content of: <article><para><section><section><title>
-#: release-manual.xml:108
-msgid "Features in 2.0 release"
-msgstr ""
-
-# type: Content of: <article><para><section><section><title>
-#: release-manual.xml:112
-msgid "Features in \"1.0 venus\" release"
-msgstr ""
-
-# type: Content of: <article><para><section><title>
-#: release-manual.xml:117
 msgid "Architecture"
 msgstr "Arquitectura"
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:122
+#: release-manual.xml:69
 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). This document describes the network "
-"architecture and services provided by a Skolelinux installation."
+"This secton 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:124
+#: release-manual.xml:70
 msgid "Network"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:126
+#: release-manual.xml:72
 msgid "<phrase>attachment:network-arch_en.png </phrase>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:130
+#: release-manual.xml:76
 msgid ""
 "Network architecture as dia file: <ulink url='/DebianEdu/Documentation/Etch/"
 "Architecture?action=AttachFile&do=get&target=network-arch_en."
@@ -415,7 +268,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:132
+#: release-manual.xml:78
 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 "
@@ -428,7 +281,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:133
+#: release-manual.xml:79
 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 "
@@ -439,7 +292,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:134
+#: release-manual.xml:80
 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 "
@@ -449,12 +302,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:136
+#: release-manual.xml:82
 msgid "Services"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:137
+#: release-manual.xml:83
 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 "
@@ -469,7 +322,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:138
+#: release-manual.xml:84
 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 "
@@ -477,19 +330,24 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:139
+#: release-manual.xml:85
 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 "
-"possible the DNS name correspond to the service name in {{/etc/services}}, "
-"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 "
+"possible the DNS name correspond to the service name in"
+msgstr ""
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:86
+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 ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:157
+#: release-manual.xml:104
 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, "
@@ -499,7 +357,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:158
+#: release-manual.xml:105
 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 "
@@ -510,14 +368,14 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:159
+#: release-manual.xml:106
 msgid ""
 "All services are accesible 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:160
+#: release-manual.xml:107
 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 "
@@ -526,7 +384,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:161
+#: release-manual.xml:108
 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, "
@@ -536,7 +394,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:162
+#: release-manual.xml:109
 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 "
@@ -544,7 +402,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:163
+#: release-manual.xml:110
 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 "
@@ -553,7 +411,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:164
+#: release-manual.xml:111
 msgid ""
 "Pupils and teachers have the possibilty to publish websites. The webserver "
 "provides mechanisms for authenticating users, and for limiting access to "
@@ -563,7 +421,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:165
+#: release-manual.xml:112
 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 "
@@ -576,7 +434,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:166
+#: release-manual.xml:113
 msgid ""
 "Administration of services and users will by and large be via web, and "
 "follow established standards, functioning well in the webbrowsers which are "
@@ -585,7 +443,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:167
+#: release-manual.xml:114
 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 "
@@ -597,7 +455,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:168
+#: release-manual.xml:115
 msgid ""
 "Printers are connected where convenient, either directly onto the network, "
 "or connected to a server, workstation or thin-client-server. Access to "
@@ -607,12 +465,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:169
+#: release-manual.xml:116
 msgid "Thin client services"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:170
+#: release-manual.xml:117
 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 "
@@ -621,7 +479,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:171
+#: release-manual.xml:118
 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 "
@@ -632,7 +490,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:172
+#: release-manual.xml:119
 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 "
@@ -641,22 +499,22 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:175
+#: release-manual.xml:122
 #, fuzzy
 msgid "Administration"
 msgstr "Instalación"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:176
+#: release-manual.xml:123
 msgid ""
-"All the linux machines that are installed by means of the Skolelinux CD will "
-"be administrable from a central computer, most likely the server. It will be "
-"possible to login to all machines by ssh, and thereby have full access to "
-"the machines"
+"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 "
+"will be possible to login to all machines by ssh, and thereby have full "
+"access to the machines"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:177
+#: release-manual.xml:124
 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 "
@@ -665,33 +523,33 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:178
+#: release-manual.xml:125
 msgid ""
-"All user information is kept in an SQL database. Updates of user accounts "
-"are made against this database. The information is exported to an LDAP "
-"directory which is used by the clients for user authentication."
+"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 "
+"authentication."
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:180 release-manual.xml:218
+#: release-manual.xml:127 release-manual.xml:207
 msgid "Installation"
 msgstr "Instalación"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:181
-msgid "Installation is possible either from a CD or by a diskette from server."
+#: release-manual.xml:128
+msgid "Installation is possible either from a CD or DVD."
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:182
+#: release-manual.xml:129
 msgid ""
-"The aim is to be able to install a server from CD, and install clients over "
-"the network by booting all other machines from the network. The installation "
-"has to work without access to the Internet."
+"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 "
+"installation works without access to the Internet."
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:183
+#: release-manual.xml:130
 msgid ""
 "The installation should not ask any questions, with the exception of desired "
 "language (e.g. Norwegian Bokmal, Nynorsk, Sami) and machine profile (server, "
@@ -701,12 +559,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:185
+#: release-manual.xml:132
 msgid "File system access configuration"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:186
+#: release-manual.xml:133
 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 "
@@ -717,19 +575,28 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:187
+#: release-manual.xml:134
 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 "
-"installation, they can be mounted as {{/skole/host/directory/}}. Initially, "
-"one directory is created on the file server, {{/skole/tjener/home0/}}, in "
-"which all the user accounts are created. More directories may then be "
+"installation, they can be mounted as"
+msgstr ""
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:135
+msgid ". Initially, one directory is created on the file server,"
+msgstr ""
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:136
+msgid ""
+", 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."
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:188
+#: release-manual.xml:137
 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 "
@@ -745,7 +612,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:190
+#: release-manual.xml:139
 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 "
@@ -764,84 +631,177 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:191
+#: release-manual.xml:140
 msgid ""
 "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 {{~/}} created "
-"with priviliges 0775, {{~/priv/}} given 0750,and {{~/pub/}} given 0775. "
-"Files that should not be readable by others should be put in {{~/priv/}}, "
-"whereas public files will be put in {{~/pub/}}. Other files will initially "
-"be accessible, but may be blocked as needed."
+"readable or not. Concretely, umask should be set to 002, and"
+msgstr ""
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:141
+msgid "created with priviliges 0775,"
+msgstr ""
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:142
+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"
+msgstr ""
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:144
+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."
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:192
+#: release-manual.xml:146
 msgid ""
 "ssh requires that the home directory can only be written to by the owner, "
-"thus the maximum access privilege for {{~/}} is 755."
+"thus the maximum access privilege for"
+msgstr ""
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:147
+msgid "is 755."
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:196
+#: release-manual.xml:151
 msgid "random notes"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:197
+#: release-manual.xml:152
 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:204
+#: release-manual.xml:164
+msgid "Features"
+msgstr ""
+
+# type: Content of: <article><para><section><section><title>
+#: release-manual.xml:165
+msgid "New features in the \"3.0 Terra\" release"
+msgstr ""
+
+# type: Content of: <article><para><section><section><itemizedlist><listitem><para>
+#: release-manual.xml:172
+msgid "Local Device Support on <ulink url='/ThinClients'>ThinClients </ulink>"
+msgstr ""
+
+# type: Content of: <article><para><section><section><itemizedlist><listitem><para>
+#: release-manual.xml:178
+msgid "Regression: the webbrowser based system administration tool"
+msgstr ""
+
+# type: Content of: <article><para><section><section><itemizedlist><listitem><para>
+#: release-manual.xml:179
+msgid ""
+"was removed from Debian, as it has several problems and is not supported "
+"anymore. User administration is done with a new webbrowser based tool called"
+msgstr ""
+
+# type: Content of: <article><para><section><section><title>
+#: release-manual.xml:184
+msgid "Features in 2.0 release"
+msgstr ""
+
+# type: Content of: <article><para><section><section><title>
+#: release-manual.xml:188
+msgid "Features in \"1.0 venus\" release"
+msgstr ""
+
+# type: Content of: <article><para><section><title>
+#: release-manual.xml:193
 msgid "Requirements"
 msgstr "Requisitos"
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:210
+#: release-manual.xml:199
 msgid "FIXME: add links to explainations of main-server and thinclient-server"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:211
+#: release-manual.xml:200
 msgid "Internet-Router"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:212
+#: release-manual.xml:201
 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:213
+#: release-manual.xml:202
 msgid "FIXME: We suggest coyote (link) or or. link to setup documentation"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:214
+#: release-manual.xml:203
 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:219
+#: release-manual.xml:208
+msgid "Where to find more information"
+msgstr ""
+
+# type: Content of: <article><para><section><section><para><inlinemediaobject>
+#: release-manual.xml:209
+msgid ""
+"We recommend to read or at least take a look the <ulink url='http://www."
+"debian.org/releases/stable/releasenotes'>releasenotes for Debian etch </"
+"ulink> before you start installing a system for production use. If you just "
+"want to give Debian-Edu/Skolelinux a try, you don't have to though, it "
+"should just work <inlinemediaobject>"
+msgstr ""
+
+# type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
+#: release-manual.xml:211 release-manual.xml:605
+msgid "<phrase>:-)  </phrase>"
+msgstr ""
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:215
+msgid ""
+"Even more <ulink url='http://www.debian.org/releases/stable/"
+"installmanual'>information about the Debian etch release </ulink> is "
+"available in its installation manual."
+msgstr ""
+
+# type: Content of: <article><para><section><section><title>
+#: release-manual.xml:218
 #, fuzzy
-msgid "Download an installation media for Debian-edu etch rc5"
+msgid "Download an installation media for Debian-edu etch 3.0r0"
 msgstr "Descargar un formato de instalación para Debian-edu etch rc4"
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:220
+#: release-manual.xml:219
 msgid "DVDs for i386, amd64 and powerpc"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:221
+#: release-manual.xml:220
 msgid ""
 "The multiarch dvd ISO image is 4.4 GiB large. To download it, use either of "
 "these methods:"
@@ -850,22 +810,22 @@ msgstr ""
 "de estos métodos:"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:228
+#: release-manual.xml:227
 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:235
+#: release-manual.xml:234
 msgid "amd64"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:242
+#: release-manual.xml:241
 msgid "and powerpc"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:249
+#: release-manual.xml:248
 #, fuzzy
 msgid ""
 "The powerpc port has not been tested as much as the other architectures, "
@@ -880,13 +840,13 @@ msgstr ""
 "etch-test-powerpc/debian-edu-powerpc-CD-1.iso </ulink>."
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:252
+#: release-manual.xml:251
 #, fuzzy
 msgid "Installation from CD"
 msgstr "Instalación"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:253
+#: release-manual.xml:252
 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 "
@@ -896,12 +856,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:263
+#: release-manual.xml:262
 msgid "Installation options"
 msgstr "Opciones de instalación"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:264
+#: release-manual.xml:263
 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 "
@@ -919,7 +879,7 @@ msgstr ""
 "ponemos por defecto van estupendamente."
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para><inlinemediaobject>
-#: release-manual.xml:290
+#: release-manual.xml:289
 msgid ""
 "please say yes to submit information to <ulink url='http://popcon.skolelinux."
 "org/'>http://popcon.skolelinux.org/ </ulink> - though you dont have to "
@@ -927,80 +887,81 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:300
+#: release-manual.xml:299
 #, fuzzy
 msgid ""
 "FIXME: this section lacks info how to install half-thick clients, which we "
-"marketing as great feature...! half-thick clients (aka diskless "
-"workstations) are set up after the installation, following the howto for it."
+"marketing as great feature...! half-thick clients (aka diskless workstation "
+"aka lowfat clients s) are set up after the installation, following the howto "
+"for it."
 msgstr ""
 "POR CORREGIR: esta sección necesita información sobre como instalar clientes "
 "semiligeros, que estamos anunciando como una gran mejora...!"
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:302
+#: release-manual.xml:301
 msgid "Screenshot tour through an i386 main-server installation"
 msgstr "Varios pantallazos de la instalación de un Servidor principal i386"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:303
+#: release-manual.xml:302
 msgid "FIXME"
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:306
+#: release-manual.xml:305
 msgid "Getting started"
 msgstr ""
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:307
+#: release-manual.xml:306
 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:308
+#: release-manual.xml:307
 msgid ""
-"The [.<ulink url='/DebianEdu/Documentation/Etch/GettingStarted/HowTo'>/HowTo "
-"</ulink>] chapter describes more tips and tricks and frequently asked "
-"questions, while this is for the stuff everybody needs to do."
+"The <ulink url='/DebianEdu/Documentation/Etch/HowTo'>howto </ulink> chapter "
+"describes more tips and tricks and frequently asked questions, while this is "
+"for the stuff everybody needs to do."
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:310
-msgid "Services running on tjener"
+#: release-manual.xml:309
+msgid "Services running on the main server"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:311
+#: release-manual.xml:310
 msgid ""
-"There are several services running on the tjener which can be managed via a "
-"web management interface.  We'll describe each service here."
+"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:312
+#: release-manual.xml:311
 msgid "User Management"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:313
+#: release-manual.xml:312
 msgid ""
-"Point your webbrowser to <ulink url='https://tjener.intern/lwat'>https://"
-"tjener.intern/lwat </ulink> and you'll get an login screen where you can "
-"login with your admin account.  If you visit this site the first time after "
-"installation the loginname there is:"
+"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 "
+"account.  If you visit this site the first time after installation the "
+"loginname there is:"
 msgstr ""
 
 # type: CDATA
-#: release-manual.xml:315
+#: release-manual.xml:314
 #, no-wrap
 msgid "admin]]"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:316
+#: release-manual.xml:315
 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 "
@@ -1010,18 +971,18 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:322
+#: release-manual.xml:321
 #, fuzzy
 msgid "User Administration"
 msgstr "Instalación"
 
 # type: Content of: <article><para><section><section><section><section><para>
-#: release-manual.xml:323
+#: release-manual.xml:322
 msgid "There are 4 kind of possible users:"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><section><para>
-#: release-manual.xml:329
+#: release-manual.xml:328
 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 "
@@ -1031,38 +992,38 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><section><para>
-#: release-manual.xml:330
+#: release-manual.xml:329
 msgid "FIXME: describe Groups, Machine and Machine Administration here."
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:333
+#: release-manual.xml:332
 #, fuzzy
 msgid "Printer Managment"
 msgstr "gestión de impresora"
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:334
+#: release-manual.xml:333
 msgid ""
-"For Printer Management point your webbrowser to <ulink url='https://tjener."
-"intern/cups'>https://tjener.intern/cups </ulink>.  This is the normal cups "
-"management site where you can add/delete/modfiy your printers and can clean "
-"up the printing queue.  For changes you'll have to login as root with your "
-"root password. So you should access this site never without using ssl."
+"For Printer Management point your webbrowser to <ulink url='https://www/"
+"cups'>https://www/cups </ulink>.  This is the normal cups management site "
+"where you can add/delete/modfiy your printers and can clean up the printing "
+"queue.  For changes you'll have to login as root with your root password. So "
+"you should access this site never without using ssl."
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:336
+#: release-manual.xml:335
 msgid "FIXME: Go further"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:339
+#: release-manual.xml:338
 msgid "Adding debian-edu machines to the LDAP domain"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:340
+#: release-manual.xml:339
 msgid ""
 "FIXME: add how, is that the right headline for this? (The [.<ulink url='/"
 "DebianEdu/Documentation/Etch/GettingStarted/HowTo'>/HowTo </ulink>] Chapter "
@@ -1072,12 +1033,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:344
+#: release-manual.xml:343
 msgid "HowTo"
 msgstr "HowTo"
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:345
+#: release-manual.xml:344
 msgid ""
 "The <ulink url='/HowTos'>HowTos </ulink> from <ulink url='http://wiki.debian."
 "org/DebianEdu/HowTo/'>http://wiki.debian.org/DebianEdu/HowTo/ </ulink> are "
@@ -1090,12 +1051,12 @@ msgstr ""
 "mover los de los usuarios <ulink url='/HowTos'>HowTos </ulink>aquí."
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:349
+#: release-manual.xml:348
 msgid "Those are not that many:"
 msgstr "No son demasiados:"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:365
+#: release-manual.xml:364
 #, fuzzy
 msgid ""
 "<ulink url='http://wiki.debian.org/DebianEdu/HowTo/"
@@ -1108,7 +1069,7 @@ msgstr ""
 "LtspDisklessWorkstation </ulink>"
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:374
+#: release-manual.xml:373
 msgid ""
 "<ulink url='http://wiki.debian.org/DebianEdu/HowTo/TeacherFirstStep'>http://"
 "wiki.debian.org/DebianEdu/HowTo/TeacherFirstStep </ulink> - incomplete but "
@@ -1119,7 +1080,7 @@ msgstr ""
 "interesante"
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:378
+#: release-manual.xml:377
 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)"
@@ -1128,12 +1089,12 @@ msgstr ""
 "les importa moverlas al howto y ponerlas bajo GPL)"
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:379
+#: release-manual.xml:378
 msgid "Other topics"
 msgstr "Otros temas"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:380
+#: release-manual.xml:379
 msgid ""
 "Other topics the documentation should cover, not neccessarily in the <ulink "
 "url='/HowTo'>HowTo </ulink> Chapter though <inlinemediaobject>"
@@ -1142,7 +1103,7 @@ msgstr ""
 "<ulink url='/HowTo'>HowTo </ulink> Capítulo sobre <inlinemediaobject>"
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject>
-#: release-manual.xml:385
+#: release-manual.xml:384
 msgid ""
 "</inlinemediaobject> This <ulink url='/HowTo'>HowTo </ulink> chapter "
 "definitly needs reorganisation - sorry translators <inlinemediaobject>"
@@ -1151,12 +1112,12 @@ msgstr ""
 "reorganizarse - lo siento por los traductores <inlinemediaobject>"
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:387
+#: release-manual.xml:386
 msgid "<phrase>:( </phrase>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:391
+#: release-manual.xml:390
 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 "
@@ -1167,7 +1128,7 @@ msgstr ""
 "máquinas) y dar enlaces a la documentación de italc."
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:393
+#: release-manual.xml:392
 msgid ""
 "Installing single service machines for spreading the load from main-server"
 msgstr ""
@@ -1175,32 +1136,32 @@ msgstr ""
 "principal"
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:401
+#: release-manual.xml:400
 msgid "LDAP Setup"
 msgstr "Configuración de LDAP"
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:403
+#: release-manual.xml:402
 msgid "/etc/ in svk"
 msgstr "/etc/ en svk"
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:405
+#: release-manual.xml:404
 msgid "modify Kiosk mode"
 msgstr "modificar el modo Kiosk"
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:407
+#: release-manual.xml:406
 msgid "Flash"
 msgstr "Flash"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:408
+#: release-manual.xml:407
 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:409
+#: release-manual.xml:408
 msgid ""
 "debian package.  It require a working Internet connection, and will download "
 "the precompiled binary from Adobe and convert it into a Debian package "
@@ -1211,12 +1172,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:411
+#: release-manual.xml:410
 msgid "<phrase>/!\\ </phrase>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:414
+#: release-manual.xml:413
 msgid ""
 "</inlinemediaobject> Version 9.0.31.0.1 of the package do not work in Etch "
 "[pere 2007-07-12]"
@@ -1225,7 +1186,7 @@ msgstr ""
 "[pere 2007-07-12]"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:415
+#: release-manual.xml:414
 msgid ""
 "An alternative is to install flashplayer-mozilla from debian-multimedia.  It "
 "work with both konqueror and firefox."
@@ -1234,17 +1195,17 @@ msgstr ""
 "Funciona tanto con konqueror como con firefox"
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:417
+#: release-manual.xml:416
 msgid "Java"
 msgstr "Java"
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:421
+#: release-manual.xml:420
 msgid "Sound & Video"
 msgstr "Sonido y Vídeo"
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:422
+#: release-manual.xml:421
 msgid ""
 "- where to find libdvdcss for playing dvds.  Should we promote <ulink "
 "url='http://www.debian-multimedia.org/'>http://www.debian-multimedia.org/ </"
@@ -1255,32 +1216,32 @@ msgstr ""
 "org/ </ulink> o algún otro sitio?"
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:427
+#: release-manual.xml:426
 msgid "Thin Clients vs Half-Thick Clients"
 msgstr "Clientes ligeros / Clientes semi-ligeros"
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:429
+#: release-manual.xml:428
 msgid "printer managing"
 msgstr "gestión de impresora"
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:431
+#: release-manual.xml:430
 msgid "Firewall setup (coyote linux)"
 msgstr "Configuración del Cortafuegos (coyote linux)"
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:433
+#: release-manual.xml:432
 msgid "LTSP in detail"
 msgstr "LTSP en detalle"
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:435
+#: release-manual.xml:434
 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:436
+#: release-manual.xml:435
 msgid ""
 "For Windows clients the Windows domain \"SKOLELINUX\" is available to be "
 "joined. A special service called Samba, installed on the main-server tjener, "
@@ -1289,21 +1250,21 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:437
+#: release-manual.xml:436
 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:438
+#: release-manual.xml:437
 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:439
+#: release-manual.xml:438
 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 "
@@ -1313,12 +1274,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:443
+#: release-manual.xml:442
 msgid "2. Configure the Windows client as static host"
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:444
+#: release-manual.xml:443
 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 "
@@ -1331,19 +1292,19 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:447
+#: release-manual.xml:446
 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:450
+#: release-manual.xml:449
 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:453
+#: release-manual.xml:452
 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. "
@@ -1353,90 +1314,146 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:456
+#: release-manual.xml:455
 msgid "Maintainance"
 msgstr "Mantenimiento"
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:457
+#: release-manual.xml:456
 msgid "Updating the software"
 msgstr "Actualizar el software"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:458
+#: release-manual.xml:457
 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>
-#: release-manual.xml:459
+#: release-manual.xml:458
 msgid "are cron-apt 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:461
+#: release-manual.xml:460
 msgid "Backup Management"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:462
+#: release-manual.xml:461
 msgid ""
-"For the backup management point your browser to <ulink url='https://tjener."
-"intern/slbackup-php'>https://tjener.intern/slbackup-php </ulink>. Please "
-"note that you have to access this site via ssl, since you have to enter the "
-"root password there. If you try to access this site without using ssl it "
-"will fail."
+"For the backup management point your browser to <ulink url='https://www/"
+"slbackup-php'>https://www/slbackup-php </ulink>. Please note that you have "
+"to access this site via ssl, since you have to enter the root password "
+"there. If you try to access this site without using ssl it will fail."
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:464
+#: release-manual.xml:463
 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:466
+#: release-manual.xml:465
 #, fuzzy
 msgid "Server Monitoring"
 msgstr "Monitorización"
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:467
+#: release-manual.xml:466
 msgid "Munin"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:469
+#: release-manual.xml:468
 msgid "Nagios"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:471
+#: release-manual.xml:470
 msgid "Sitesummary"
 msgstr ""
 
+# type: Content of: <article><para><section><itemizedlist><listitem><para>
+#: release-manual.xml:471
+#, fuzzy
+msgid ""
+"Some documentation on sitesummary is available from <ulink url='http://wiki."
+"debian.org/DebianEdu/HowTo/SiteSummary'>http://wiki.debian.org/DebianEdu/"
+"HowTo/SiteSummary </ulink>"
+msgstr ""
+"<ulink url='http://wiki.debian.org/DebianEdu/HowTo/SiteSummary'>http://wiki."
+"debian.org/DebianEdu/HowTo/SiteSummary </ulink>"
+
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:472
+#: release-manual.xml:473
 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:476
+#: release-manual.xml:477
 msgid "Upgrades"
 msgstr "Actualizaciones"
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:477
-msgid "FIXME: add link to debian release notes, here or in [./Installation] ?"
+#: release-manual.xml:478
+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/"
+"Skolelinux comes with ABSOLUTELY NO WARRANTY, to the extent permitted by "
+"applicable law.  </emphasis>"
+msgstr ""
+
+# type: Content of: <article><para><section><para>
+#: release-manual.xml:480
+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 "
+"way as your production server. There you can test the upgrade without risk "
+"and see if everything works as it should."
+msgstr ""
+
+# type: Content of: <article><para><section><para>
+#: release-manual.xml:481
+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 "
+"them here. Debian-Edu sarge will receive continued support for some time in "
+"the future. FIXME: decide and document how long we will be able to support "
+"sarge."
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:478
+#: release-manual.xml:482
 msgid "Upgrades from Debian-Edu sarge"
 msgstr "Actualizar desde Debian-Edu sarge"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:479
+#: release-manual.xml:483
+msgid ""
+"Please read this chapter completly before you start upgrading your systems."
+msgstr ""
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:484
+msgid ""
+"In case of problems you could also read the <ulink url='http://www.debian."
+"org/releases/stable/releasenotes'>releasenotes for Debian etch </ulink>. "
+"(Debian-Edu/Skolelinux \"2.0 Terra\" installed a 2.6 kernel as default, but "
+"if you are running a 2.4 kernel, you <emphasis>should </emphasis> read the "
+"<ulink url='http://www.debian.org/releases/stable/i386/release-notes/ch-"
+"information.en.html#s-upgrade-to-2.6'>notes on upgrading from kernel 2.4 to "
+"2.6 </ulink> before you upgrade!)"
+msgstr ""
+
+# type: Content of: <article><para><section><section><section><title>
+#: release-manual.xml:488
+msgid "Partioning scheme changed"
+msgstr ""
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:489
 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 "
@@ -1444,14 +1461,14 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:483
+#: release-manual.xml:493
 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:484
+#: release-manual.xml:494
 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 "
@@ -1462,19 +1479,19 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:485
+#: release-manual.xml:496
 msgid "Prepare the System"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:486
+#: release-manual.xml:497
 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:487
+#: release-manual.xml:498
 #, no-wrap
 msgid ""
 "/etc/init.d/squid stop \n"
@@ -1483,25 +1500,25 @@ msgid ""
 msgstr ""
 
 # type: CDATA
-#: release-manual.xml:492
+#: release-manual.xml:503
 #, no-wrap
 msgid "e2fsck -f /dev/vg_system/lv_data ]]"
 msgstr ""
 
 # type: CDATA
-#: release-manual.xml:495
+#: release-manual.xml:506
 #, no-wrap
 msgid "lvextend -L +1GB /dev/vg_system/lv_data ]]"
 msgstr ""
 
 # type: CDATA
-#: release-manual.xml:498
+#: release-manual.xml:509
 #, no-wrap
 msgid "resize2fs /dev/vg_system/lv_data]]"
 msgstr ""
 
 # type: CDATA
-#: release-manual.xml:501
+#: release-manual.xml:512
 #, no-wrap
 msgid ""
 "mount /var \n"
@@ -1510,63 +1527,170 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:508
+#: release-manual.xml:519
 msgid "Now start the upgrade with:"
 msgstr ""
 
 # type: CDATA
-#: release-manual.xml:509
+#: release-manual.xml:520
+#, no-wrap
+msgid ""
+"apt-get update \n"
+"apt-get dist-upgrade ]]"
+msgstr ""
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:524
+msgid "after you have modified your sources.list:"
+msgstr ""
+
+# type: CDATA
+#: release-manual.xml:525
+#, no-wrap
+msgid ""
+"deb http://ftp.debian.org/debian etch main contrib non-free \n"
+"deb http://ftp.skolelinux.org/skolelinux etch local]]"
+msgstr ""
+
+# type: Content of: <article><para><section><section><section><title>
+#: release-manual.xml:530
+msgid "Answers to Debconf Questions raising during upgrade"
+msgstr ""
+
+# type: Content of: <article><para><section><section><section><para>
+#: release-manual.xml:531
+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 "
+"</ulink> is based on a very plain fresh installation of an mainserver + "
+"terminalserver. So which questions raises up in addition to that depends on "
+"what is additionally installed on your system (which isn't included per "
+"default in the sarge based <ulink url='/DebianEdu'>DebianEdu </ulink> "
+"Release).  So if there are any questions where you don't know what to "
+"answer, don't hesitate to ask us at the Mailinglist (<ulink url='mailto:"
+"debian-edu at lists.debian.org'>debian-edu at lists.debian.org </ulink>) or at IRC "
+"(irc.oftc.net): #debian-edu."
+msgstr ""
+
+# type: Content of: <article><para><section><section><section><para>
+#: release-manual.xml:535
+msgid "* Configure nagios-common."
+msgstr ""
+
+# type: Content of: <article><para><section><section><section><itemizedlist><listitem><para>
+#: release-manual.xml:536
+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:540
+msgid "* Configure console-data"
+msgstr ""
+
+# type: Content of: <article><para><section><section><section><para>
+#: release-manual.xml:543
+msgid "* Configure openssh-server"
+msgstr ""
+
+# type: Content of: <article><para><section><section><section><para>
+#: release-manual.xml:546
+msgid "* Configure systat"
+msgstr ""
+
+# type: Content of: <article><para><section><section><section><para>
+#: release-manual.xml:549
+msgid "* Configure popularity-contest"
+msgstr ""
+
+# type: Content of: <article><para><section><section><section><para>
+#: release-manual.xml:552
+msgid "* Configure libnss-ldap"
+msgstr ""
+
+# type: Content of: <article><para><section><section><section><orderedlist><listitem><para>
+#: release-manual.xml:553
+msgid "Change the prompt to: <emphasis>ldaps://ldap/ </emphasis>"
+msgstr ""
+
+# type: Content of: <article><para><section><section><section><orderedlist><listitem><para>
+#: release-manual.xml:556
+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:563
+msgid "* Upgrade glibc now. Answer Yes here."
+msgstr ""
+
+# type: Content of: <article><para><section><section><section><para>
+#: release-manual.xml:564
+msgid "* Restart Services. Answer Yes here."
+msgstr ""
+
+# type: Content of: <article><para><section><section><section><para>
+#: release-manual.xml:565
+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:566
+msgid "The upgrade will fail with this error message:"
+msgstr ""
+
+# type: CDATA
+#: release-manual.xml:567
 #, no-wrap
 msgid ""
-"apt-get update \n"
-"apt-get dist-upgrade ]]"
+"Errors were encountered while processing: \n"
+" mozilla-firefox-locale-it\n"
+" mozilla-firefox-locale-el\n"
+"E: Sub-process /usr/bin/dpkg returned an error code (1)\n"
+"]]"
 msgstr ""
 
-# type: Content of: <article><para><section><section><para>
-#: release-manual.xml:513
-msgid "after you have modified your sources.list:"
+# type: Content of: <article><para><section><section><section><para>
+#: release-manual.xml:572
+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/"
+"info/mozilla-firefox-local-el.postrm </emphasis> and comment out in both the "
+"line containing: <emphasis>update-mozilla-firefox-chrome </emphasis>. Then "
+"restart the upgrade process with:"
 msgstr ""
 
 # type: CDATA
-#: release-manual.xml:514
+#: release-manual.xml:576
 #, no-wrap
-msgid ""
-"deb http://ftp.debian.org/debian etch main contrib non-free \n"
-"deb http://ftp.skolelinux.org/skolelinux etch local]]"
+msgid "apt-get -f install]]"
 msgstr ""
 
-# type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:519
-msgid "Answers to Debconf Questions raising during upgrade"
+# type: Content of: <article><para><section><section><section><para>
+#: release-manual.xml:577
+msgid "Now the upgrade work again:"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:520
-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 "
-"</ulink> is based on a very plain fresh installation of an mainserver + "
-"terminalserver. So which questions raises up in addition to that depends on "
-"what is additionally installed on your system (which isn't included per "
-"default in the sarge based <ulink url='/DebianEdu'>DebianEdu </ulink> "
-"Release).  So if there are any questions where you don't know what to "
-"answer, don't hesitate to ask us at the Mailinglist (<ulink url='mailto:"
-"debian-edu at lists.debian.org'>debian-edu at lists.debian.org </ulink>) or at IRC "
-"(irc.oftc.net): #debian-edu."
+#: release-manual.xml:578
+msgid "* Several Modified configuration files (nagios)"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:524
-msgid "FIXME: Which questions raises up here (I'll fix this tomorrow ;-))"
+#: release-manual.xml:581
+msgid "*"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:527
+#: release-manual.xml:584
 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:528
+#: release-manual.xml:585
 #, fuzzy
 msgid ""
 "Upgrades from the woody based Debian-Edu / Skolelinux installation are not "
@@ -1582,58 +1706,111 @@ msgstr ""
 "UpgradeFrom1.0 </ulink>"
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:532
+#: release-manual.xml:589
 msgid "Contribute"
 msgstr "Contribuir"
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:533
+#: release-manual.xml:590
 msgid "Resources"
 msgstr "Recursos"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:534
+#: release-manual.xml:591
 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:593
+#, fuzzy
+msgid ""
+"<ulink url='http://wiki.debian.org/DebianEdu'>http://wiki.debian.org/"
+"DebianEdu </ulink> - mostly developer centric wiki"
+msgstr ""
+"<ulink url='http://wiki.debian.org/DebianEdu'>http://wiki.debian.org/"
+"DebianEdu </ulink>"
+
+# type: Content of: <article><para><section><section><itemizedlist><listitem><para>
+#: release-manual.xml:596
+#, fuzzy
+msgid ""
+"<ulink url='http://lists.debian.org/debian-edu'>http://lists.debian.org/"
+"debian-edu </ulink> - developer centric mailing list"
+msgstr ""
+"<ulink url='http://lists.debian.org/debian-edu'>http://lists.debian.org/"
+"debian-edu </ulink>"
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:601
+msgid "FIXME: add info how developers and testers can contribute."
+msgstr ""
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:602
+msgid "== Documentation writers =="
+msgstr ""
+
+# type: Content of: <article><para><section><para>
+#: release-manual.xml:603
+#, fuzzy
+msgid ""
+"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/ </ulink> <inlinemediaobject>"
+msgstr ""
+"paquete $DEBIAN_EDU_DOC_BUILDDATE. (la versión en <ulink url='http://wiki."
+"skolelinux.no/DebianEdu/Documentation/Etch'>http://wiki.skolelinux.no/"
+"DebianEdu/Documentation/Etch </ulink> es un wiki actualizado a menudo.) "
+"<ulink url='/DebianEdu/Documentation/Etch/Translations'>Las traducciones </"
+"ulink> serán parte del"
+
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:545
+#: release-manual.xml:610
 msgid "Translations wanted"
 msgstr "Se necesitan traducciones"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:546
+#: release-manual.xml:611
 msgid ""
 "Translations of this document are kept in .po files like in many free "
-"software projects, read {{usr/share/doc/debian-edu-doc/README.release-manual-"
-"translations}} for more information on this. There are many easy tools for "
-"translating."
+"software projects, read"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:547
+#: release-manual.xml:612
 msgid ""
-"To update the translations you need to be a member of the alioth project "
-"{{debian}}. 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."
+"for more information on this. There are many easy tools for translating."
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:549
+#: release-manual.xml:613
+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:614
+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 ""
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:616
 msgid "Checkout the source package with the following command:"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:553
-msgid "Join a local debian-edu team"
+#: release-manual.xml:622
+#, fuzzy
+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:554
+#: release-manual.xml:623
 msgid ""
 "<emphasis role='strong'>FIXME </emphasis>: in Norway, Germany, France, Spain "
 "(the region of Extremadura)."
@@ -1642,12 +1819,13 @@ msgstr ""
 "España  (la región de Extremadura con LinEx)."
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:557
-msgid "start a new local debian-edu team"
+#: release-manual.xml:626
+#, fuzzy
+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:558
+#: release-manual.xml:627
 msgid ""
 "<emphasis role='strong'>FIXME: </emphasis> \"isolated\" contributors and "
 "users in schools exist in Greece, the Netherlands, Japan and elsewhere. Meet "
@@ -1659,33 +1837,23 @@ msgstr ""
 "edu!"
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:562
+#: release-manual.xml:631
 msgid "Support"
 msgstr "Soporte"
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:563
-msgid "volunteer based support"
+#: release-manual.xml:632
+#, fuzzy
+msgid "Volunteer based support"
 msgstr "soporte basado en voluntarios"
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:564
+#: release-manual.xml:633
 msgid "in english"
 msgstr ""
 
-# type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:565
-msgid ""
-"<ulink url='http://lists.debian.org/debian-edu'>http://lists.debian.org/"
-"debian-edu </ulink> - developer centric mailing list, more useful to report "
-"problems than to get real support"
-msgstr ""
-"<ulink url='http://lists.debian.org/debian-edu'>http://lists.debian.org/"
-"debian-edu </ulink> - lista de correo orientada a desarrolladores, es más "
-"útil para informar de problemas que para que te ayuden"
-
 # type: Content of: <article><para><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: release-manual.xml:568
+#: release-manual.xml:634
 #, fuzzy
 msgid ""
 "<ulink url='https://init.linpro.no/mailman/skolelinux.no/listinfo/admin-"
@@ -1695,13 +1863,24 @@ msgstr ""
 "<ulink url='mailto:user at skolelinux.de'>user at skolelinux.de </ulink> - lista "
 "de correo de soporte para usuarios en habla alemana"
 
+# type: Content of: <article><para><section><section><itemizedlist><listitem><para>
+#: release-manual.xml:637
+msgid ""
+"<ulink url='http://lists.debian.org/debian-edu'>http://lists.debian.org/"
+"debian-edu </ulink> - developer centric mailing list, more useful to report "
+"problems than to get real support"
+msgstr ""
+"<ulink url='http://lists.debian.org/debian-edu'>http://lists.debian.org/"
+"debian-edu </ulink> - lista de correo orientada a desarrolladores, es más "
+"útil para informar de problemas que para que te ayuden"
+
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:574
+#: release-manual.xml:643
 msgid "in norwegian"
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: release-manual.xml:578
+#: release-manual.xml:644
 #, fuzzy
 msgid ""
 "<ulink url='https://init.linpro.no/mailman/skolelinux.no/listinfo/"
@@ -1711,18 +1890,24 @@ msgstr ""
 "<ulink url='mailto:user at skolelinux.de'>user at skolelinux.de </ulink> - lista "
 "de correo de soporte para usuarios en habla alemana"
 
-# type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:583
-msgid "FIXME: briefly describe the diffs between those lists..."
+# type: Content of: <article><para><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: release-manual.xml:647
+#, fuzzy
+msgid ""
+"<ulink url='https://init.linpro.no/mailman/skolelinux.no/listinfo/"
+"linuxiskolen'>https://init.linpro.no/mailman/skolelinux.no/listinfo/"
+"linuxiskolen </ulink> - FIXME: what is this"
 msgstr ""
+"<ulink url='mailto:user at skolelinux.de'>user at skolelinux.de </ulink> - lista "
+"de correo de soporte para usuarios en habla alemana"
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:585
+#: release-manual.xml:653
 msgid "in german"
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: release-manual.xml:586
+#: release-manual.xml:654
 #, fuzzy
 msgid ""
 "<ulink url='http://www.skolelinux.de/mailman/listinfo/user'>http://www."
@@ -1732,34 +1917,187 @@ msgstr ""
 "<ulink url='mailto:user at skolelinux.de'>user at skolelinux.de </ulink> - lista "
 "de correo de soporte para usuarios en habla alemana"
 
+# type: Content of: <article><para><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: release-manual.xml:657
+#, fuzzy
+msgid ""
+"<ulink url='http://wiki.skolelinux.de'>http://wiki.skolelinux.de </ulink> - "
+"german wiki with lots of <ulink url='/HowTos'>HowTos </ulink> etc."
+msgstr ""
+"<ulink url='mailto:user at skolelinux.de'>user at skolelinux.de </ulink> - lista "
+"de correo de soporte para usuarios en habla alemana"
+
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:592
+#: release-manual.xml:664
 msgid "in french"
 msgstr ""
 
+# type: Content of: <article><para><section><section><itemizedlist><listitem><para>
+#: release-manual.xml:665
+#, fuzzy
+msgid ""
+"<ulink url='http://lists.debian.org/debian-edu-french'>http://lists.debian."
+"org/debian-edu-french </ulink> - french speaking support mailinglist"
+msgstr ""
+"<ulink url='http://lists.debian.org/debian-edu'>http://lists.debian.org/"
+"debian-edu </ulink>"
+
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:599
-msgid "professional support"
+#: release-manual.xml:671
+#, fuzzy
+msgid "Professional support"
 msgstr "soporte profesional"
 
-# type: Content of: <article><para><section><section><para>
-#: release-manual.xml:600
+# type: Content of: <article><para><section><itemizedlist><listitem><para>
+#: release-manual.xml:672
+#, fuzzy
 msgid ""
-"Lists of companies providing professional support is available from <ulink "
-"url='http://wiki.skolelinux.no/Hjelp/ProfesjonellHjelp'>http://wiki."
-"skolelinux.no/Hjelp/ProfesjonellHjelp </ulink> for Norway and <ulink "
+"Lists of companies providing professional support are available from <ulink "
 "url='http://wiki.debian.org/DebianEdu/Help/ProfessionalHelp'>http://wiki."
-"debian.org/DebianEdu/Help/ProfessionalHelp </ulink> for the rest of the "
-"world."
+"debian.org/DebianEdu/Help/ProfessionalHelp </ulink>."
+msgstr ""
+"<ulink url='http://wiki.debian.org/DebianEdu/HowTo/BackupPC'>http://wiki."
+"debian.org/DebianEdu/HowTo/BackupPC </ulink>"
+
+# type: Content of: <article><para><section><title>
+#: release-manual.xml:676
+#, fuzzy
+msgid "Copyright and authors"
+msgstr "Copyright y Authores"
+
+# type: Content of: <article><para><section><para>
+#: release-manual.xml:677
+#, fuzzy
+msgid ""
+"This document is written and copyrighted 2007 by Holger Levsen, Petter "
+"Reinholdtsen, Daniel Heß and Patrick Winnertz and is released under the GPL2 "
+"or any later version. Enjoy!"
+msgstr ""
+"Esto documento ha sido escrito con copyright de Holger Levsen 2007 y "
+"distribuidobajo la licencia GPL2 o cualquier versión posterior. ¡Disfrútalo!"
+
+# type: Content of: <article><para><section><para>
+#: release-manual.xml:678
+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 </"
+"emphasis>! Then add your name here and release it under the GPL2 or later "
+"version."
+msgstr ""
+"¡Si le añades contenido <emphasis role='strong'> hazlo sólo si eres su autor "
+"y planeas liberarlo bajo las mismas condiciones !</emphasis>. Después añade "
+"tu nombre aquí y libéralo bajo la GPL2 o posterior."
+
+# type: Content of: <article><para><section><title>
+#: release-manual.xml:681
+#, fuzzy
+msgid "Translation copyright and authors"
+msgstr "Copyright y Authores"
+
+# type: Content of: <article><para><section><para>
+#: release-manual.xml:682
+#, fuzzy
+msgid ""
+"The spanish translation is copyrighted 2007 by José L. Redrejo Rodríguez and "
+"is released under the GPL2 or any later version."
+msgstr ""
+"Esto documento ha sido escrito con copyright de Holger Levsen 2007 y "
+"distribuidobajo la licencia GPL2 o cualquier versión posterior. ¡Disfrútalo!"
+
+# type: Content of: <article><para><section><para>
+#: release-manual.xml:683
+#, fuzzy
+msgid ""
+"The norwegian Bokmål translation is copyrighted 2007 by Petter Reinholdtsen "
+"and is released under the GPL2 or any later version."
+msgstr ""
+"Esto documento ha sido escrito con copyright de Holger Levsen 2007 y "
+"distribuidobajo la licencia GPL2 o cualquier versión posterior. ¡Disfrútalo!"
+
+# type: Content of: <article><para><section><para>
+#: release-manual.xml:684
+#, fuzzy
+msgid ""
+"The german translation is copyrighted 2007 by Holger Levsen and is released "
+"under the GPL2 or any later version."
+msgstr ""
+"Esto documento ha sido escrito con copyright de Holger Levsen 2007 y "
+"distribuidobajo la licencia GPL2 o cualquier versión posterior. ¡Disfrútalo!"
+
+# type: Content of: <article><para><section><title>
+#: release-manual.xml:686
+msgid "Translations of this document"
+msgstr "Traducciones de este documento"
+
+# type: Content of: <article><para><section><para>
+#: release-manual.xml:687
+#, fuzzy
+msgid ""
+"Fully translated versions of this document are not yet available, as the "
+"document itself is very incomplete. Incomplete translations for Norwegian "
+"Bokmål and Spanish exist."
+msgstr ""
+"Todavía no están disponibles traducciones de este documento, puesto que el "
+"propio documento está incompleto, incluso su esqueleto está inacabado."
+
+# type: Content of: <article><para><section><section><title>
+#: release-manual.xml:688
+msgid "Howto translate this document"
+msgstr "Como traducir este documento"
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:689
+#, fuzzy
+msgid ""
+"If you want to start translating, you can! Read /usr/share/doc/debian-edu-"
+"doc/README.release-manual-translations to find information how to create a ."
+"po file for your language, and how to update it against <ulink url='http://"
+"wiki.skolelinux.no/DebianEdu/Documentation/Etch/AllInOne?action=format&"
+"mimetype=xml/docbook'>the source </ulink>."
+msgstr ""
+"y en  debian-edu-doc-$version/documentation/release-manual/README "
+"encontrarásinformación para crear un archivo .po para tu idioma y como "
+"actualizarlo en <ulink url='http://wiki.skolelinux.no/DebianEdu/"
+"Documentation/Etch/AllInOne?action=format&mimetype=xml/docbook'>los "
+"fuentes </ulink>."
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:691
+msgid ""
+"<emphasis role='strong'>FIXME: </emphasis> describe how to work in svn and "
+"give a step by step howto."
+msgstr ""
+"<emphasis role='strong'>POR CORREGIR: </emphasis> describen como trabajar "
+"con svn y muestran un tutorial paso a paso."
+
+# type: Content of: <article><para><section><section><title>
+#: release-manual.xml:694
+#, fuzzy
+msgid "Potential problems for translations"
+msgstr "Problemas potenciales para los traductores"
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:695
+#, fuzzy
+msgid ""
+"We will need to write sed-scripts (or something like that) to support "
+"different images for different translations. Laters <inlinemediaobject>"
 msgstr ""
+"También necesitamso escribir scripts de sed (o algo parecido) para soportar "
+"diferentes imágenes con diferentes traducciones <inlinemediaobject>"
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:700
+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:605
+#: release-manual.xml:703
 msgid "Appendix A - The GNU Public Licence"
 msgstr ""
 
 # type: CDATA
-#: release-manual.xml:607
+#: release-manual.xml:705
 #, no-wrap
 msgid ""
 "    Release manual for Debian-Edu etch 3.0 Codename \"Terra\"\n"
@@ -2018,6 +2356,11 @@ msgid ""
 "]]"
 msgstr ""
 
+# type: Content of: <article><para><section><para>
+#~ msgid "Welcome to <ulink url='/DebianEdu'>DebianEdu </ulink> / Skolelinux!"
+#~ msgstr ""
+#~ "Bienvenido a  <ulink url='/DebianEdu'>DebianEdu </ulink> / Skolelinux!"
+
 # type: Content of: <article><para><section><section><title>
 #~ msgid "Backups"
 #~ msgstr "Copias de Seguridad"
@@ -2168,14 +2511,6 @@ msgstr ""
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
 #~ msgid ""
-#~ "<ulink url='http://wiki.debian.org/DebianEdu/HowTo/BackupPC'>http://wiki."
-#~ "debian.org/DebianEdu/HowTo/BackupPC </ulink>"
-#~ msgstr ""
-#~ "<ulink url='http://wiki.debian.org/DebianEdu/HowTo/BackupPC'>http://wiki."
-#~ "debian.org/DebianEdu/HowTo/BackupPC </ulink>"
-
-# type: Content of: <article><para><section><itemizedlist><listitem><para>
-#~ msgid ""
 #~ "<ulink url='http://wiki.debian.org/DebianEdu/HowTo/ChangeIpSubnet'>http://"
 #~ "wiki.debian.org/DebianEdu/HowTo/ChangeIpSubnet </ulink>"
 #~ msgstr ""
@@ -2202,14 +2537,6 @@ msgstr ""
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
 #~ msgid ""
-#~ "<ulink url='http://wiki.debian.org/DebianEdu/HowTo/SiteSummary'>http://"
-#~ "wiki.debian.org/DebianEdu/HowTo/SiteSummary </ulink>"
-#~ msgstr ""
-#~ "<ulink url='http://wiki.debian.org/DebianEdu/HowTo/SiteSummary'>http://"
-#~ "wiki.debian.org/DebianEdu/HowTo/SiteSummary </ulink>"
-
-# type: Content of: <article><para><section><itemizedlist><listitem><para>
-#~ msgid ""
 #~ "<ulink url='http://wiki.debian.org/DebianEdu/HowTo/"
 #~ "Squid_LDAP_Authentication'>http://wiki.debian.org/DebianEdu/HowTo/"
 #~ "Squid_LDAP_Authentication </ulink>"
@@ -2222,22 +2549,6 @@ msgstr ""
 #~ msgid "<inlinemediaobject>"
 #~ msgstr "<inlinemediaobject>"
 
-# type: Content of: <article><para><section><itemizedlist><listitem><para>
-#~ msgid ""
-#~ "<ulink url='http://wiki.debian.org/DebianEdu'>http://wiki.debian.org/"
-#~ "DebianEdu </ulink>"
-#~ msgstr ""
-#~ "<ulink url='http://wiki.debian.org/DebianEdu'>http://wiki.debian.org/"
-#~ "DebianEdu </ulink>"
-
-# type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#~ msgid ""
-#~ "<ulink url='http://lists.debian.org/debian-edu'>http://lists.debian.org/"
-#~ "debian-edu </ulink>"
-#~ msgstr ""
-#~ "<ulink url='http://lists.debian.org/debian-edu'>http://lists.debian.org/"
-#~ "debian-edu </ulink>"
-
 # type: Content of: <article><para><section><section><para>
 #~ msgid "<emphasis role='strong'>FIXME </emphasis>"
 #~ msgstr "<emphasis role='strong'>POR CORREGIR </emphasis>"
diff --git a/documentation/release-manual/release-manual.nb.po b/documentation/release-manual/release-manual.nb.po
index 57174ac..9c93587 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-21  2:10+0200\n"
+"POT-Creation-Date: 2007-07-21 15:04+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"
@@ -56,103 +56,103 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:11 release-manual.xml:83 release-manual.xml:292
-#: release-manual.xml:382
+#: release-manual.xml:11 release-manual.xml:291 release-manual.xml:381
+#: release-manual.xml:696
 msgid "<phrase>:)  </phrase>"
 msgstr ""
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
 #: release-manual.xml:15
 msgid ""
-"<ulink url='/DebianEdu/Documentation/Etch/CopyRight'>Copyright </ulink> and "
-"Authors"
+"<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
 msgid ""
-"<ulink url='/DebianEdu/Documentation/Etch/Translations'>Translations </"
-"ulink> of this document"
+"<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
 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:24
-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:27
-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:30
+#: release-manual.xml:24
 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:33
+#: release-manual.xml:27
 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:36
+#: release-manual.xml:30
 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:39
+#: release-manual.xml:33
 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:42
+#: release-manual.xml:36
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/Upgrades'>Upgrades </ulink> from "
 "<ulink url='/DebianEdu'>DebianEdu </ulink> sarge and woody"
 msgstr ""
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:46
+#: release-manual.xml:40
 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:49
+#: release-manual.xml:43
 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:52
+#: release-manual.xml:46
 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
+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
+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
 msgid ""
 "<ulink url='/DebianEdu/Documentation/Etch/AppendixA'>Appendix A </ulink> - "
@@ -169,170 +169,51 @@ msgstr ""
 
 # type: Content of: <article><para><section><title>
 #: release-manual.xml:63
-#, fuzzy
-msgid "Copyright and authors"
-msgstr "Opphavsrett og forfattere"
+msgid "About Debian-Edu and Skolelinux"
+msgstr ""
 
 # type: Content of: <article><para><section><para>
 #: release-manual.xml:64
 msgid ""
-"This document is written and copyrighted 2007 by Holger Levsen, Petter "
-"Reinholdtsen, Daniel Heß and Patrick Winnertz and is released under the GPL2 "
-"or any later version. Enjoy!"
+"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)."
 msgstr ""
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:65
+#: release-manual.xml:66
 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 </"
-"emphasis>! Then add your name here and release it under the GPL2 or later "
-"version."
+"The system is in use in several countries around the world, with most users "
+"in Norway, Germany and France."
 msgstr ""
 
 # type: Content of: <article><para><section><title>
 #: release-manual.xml:68
-#, fuzzy
-msgid "Translation copyright and authors"
-msgstr "Opphavsrett og forfattere"
-
-# type: Content of: <article><para><section><para>
-#: release-manual.xml:69
-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:70
-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:71
-msgid ""
-"The german translation is copyrighted 2007 by Holger Levsen and is released "
-"under the GPL2 or any later version."
-msgstr ""
-
-# type: Content of: <article><para><section><title>
-#: release-manual.xml:73
-msgid "Translations of this document"
-msgstr "Oversettelser av dette dokumentet"
-
-# type: Content of: <article><para><section><para>
-#: release-manual.xml:74
-msgid ""
-"Fully translated versions of this document are not yet available, as the "
-"document itself is very incomplete. Incomplete translations for Norwegian "
-"Bokmål and Spanish exist."
-msgstr ""
-
-# type: Content of: <article><para><section><section><title>
-#: release-manual.xml:75
-msgid "Howto translate this document"
-msgstr ""
-
-# type: Content of: <article><para><section><section><para>
-#: release-manual.xml:76
-msgid ""
-"If you want to start translating, you can! Read /usr/share/doc/debian-edu-"
-"doc/README.release-manual-translations to find information how to create a ."
-"po file for your language, and how to update it against <ulink url='http://"
-"wiki.skolelinux.no/DebianEdu/Documentation/Etch/AllInOne?action=format&"
-"mimetype=xml/docbook'>the source </ulink>."
-msgstr ""
-
-# type: Content of: <article><para><section><section><para>
-#: release-manual.xml:78
-msgid ""
-"<emphasis role='strong'>FIXME: </emphasis> describe how to work in svn and "
-"give a step by step howto."
-msgstr ""
-
-# type: Content of: <article><para><section><section><title>
-#: release-manual.xml:81
-msgid "Potential problems for translations"
-msgstr ""
-
-# type: Content of: <article><para><section><section><para><inlinemediaobject>
-#: release-manual.xml:82
-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:87
-msgid "Please report any other showstoppers."
-msgstr ""
-
-# type: Content of: <article><para><section><title>
-#: release-manual.xml:90
-msgid "AboutDebianEdu"
-msgstr ""
-
-# type: Content of: <article><para><section><para>
-#: release-manual.xml:91
-msgid "Welcome to <ulink url='/DebianEdu'>DebianEdu </ulink> / Skolelinux!"
-msgstr ""
-
-# type: Content of: <article><para><section><title>
-#: release-manual.xml:94
-msgid "Features"
-msgstr ""
-
-# type: Content of: <article><para><section><section><title>
-#: release-manual.xml:95
-msgid "New features in the \"3.0 Terra\" release"
-msgstr ""
-
-# type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:102
-msgid "Local Device Support on <ulink url='/ThinClients'>ThinClients </ulink>"
-msgstr ""
-
-# type: Content of: <article><para><section><section><title>
-#: release-manual.xml:108
-msgid "Features in 2.0 release"
-msgstr ""
-
-# type: Content of: <article><para><section><section><title>
-#: release-manual.xml:112
-msgid "Features in \"1.0 venus\" release"
-msgstr ""
-
-# type: Content of: <article><para><section><title>
-#: release-manual.xml:117
 msgid "Architecture"
 msgstr ""
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:122
+#: release-manual.xml:69
 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). This document describes the network "
-"architecture and services provided by a Skolelinux installation."
+"This secton 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:124
+#: release-manual.xml:70
 msgid "Network"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:126
+#: release-manual.xml:72
 msgid "<phrase>attachment:network-arch_en.png </phrase>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:130
+#: release-manual.xml:76
 msgid ""
 "Network architecture as dia file: <ulink url='/DebianEdu/Documentation/Etch/"
 "Architecture?action=AttachFile&do=get&target=network-arch_en."
@@ -340,7 +221,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:132
+#: release-manual.xml:78
 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 "
@@ -353,7 +234,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:133
+#: release-manual.xml:79
 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 "
@@ -364,7 +245,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:134
+#: release-manual.xml:80
 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 "
@@ -374,12 +255,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:136
+#: release-manual.xml:82
 msgid "Services"
 msgstr "Tjenester"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:137
+#: release-manual.xml:83
 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 "
@@ -394,7 +275,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:138
+#: release-manual.xml:84
 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 "
@@ -402,19 +283,24 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:139
+#: release-manual.xml:85
 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 "
-"possible the DNS name correspond to the service name in {{/etc/services}}, "
-"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 "
+"possible the DNS name correspond to the service name in"
+msgstr ""
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:86
+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 ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:157
+#: release-manual.xml:104
 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, "
@@ -424,7 +310,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:158
+#: release-manual.xml:105
 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 "
@@ -435,14 +321,14 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:159
+#: release-manual.xml:106
 msgid ""
 "All services are accesible 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:160
+#: release-manual.xml:107
 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,7 +337,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:161
+#: release-manual.xml:108
 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, "
@@ -461,7 +347,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:162
+#: release-manual.xml:109
 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 "
@@ -469,7 +355,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:163
+#: release-manual.xml:110
 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 "
@@ -478,7 +364,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:164
+#: release-manual.xml:111
 msgid ""
 "Pupils and teachers have the possibilty to publish websites. The webserver "
 "provides mechanisms for authenticating users, and for limiting access to "
@@ -488,7 +374,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:165
+#: release-manual.xml:112
 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 "
@@ -501,7 +387,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:166
+#: release-manual.xml:113
 msgid ""
 "Administration of services and users will by and large be via web, and "
 "follow established standards, functioning well in the webbrowsers which are "
@@ -510,7 +396,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:167
+#: release-manual.xml:114
 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 "
@@ -522,7 +408,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:168
+#: release-manual.xml:115
 msgid ""
 "Printers are connected where convenient, either directly onto the network, "
 "or connected to a server, workstation or thin-client-server. Access to "
@@ -532,12 +418,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:169
+#: release-manual.xml:116
 msgid "Thin client services"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:170
+#: release-manual.xml:117
 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 "
@@ -546,7 +432,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:171
+#: release-manual.xml:118
 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 "
@@ -557,7 +443,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:172
+#: release-manual.xml:119
 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 "
@@ -566,21 +452,21 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:175
+#: release-manual.xml:122
 msgid "Administration"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:176
+#: release-manual.xml:123
 msgid ""
-"All the linux machines that are installed by means of the Skolelinux CD will "
-"be administrable from a central computer, most likely the server. It will be "
-"possible to login to all machines by ssh, and thereby have full access to "
-"the machines"
+"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 "
+"will be possible to login to all machines by ssh, and thereby have full "
+"access to the machines"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:177
+#: release-manual.xml:124
 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 "
@@ -589,33 +475,33 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:178
+#: release-manual.xml:125
 msgid ""
-"All user information is kept in an SQL database. Updates of user accounts "
-"are made against this database. The information is exported to an LDAP "
-"directory which is used by the clients for user authentication."
+"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 "
+"authentication."
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:180 release-manual.xml:218
+#: release-manual.xml:127 release-manual.xml:207
 msgid "Installation"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:181
-msgid "Installation is possible either from a CD or by a diskette from server."
+#: release-manual.xml:128
+msgid "Installation is possible either from a CD or DVD."
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:182
+#: release-manual.xml:129
 msgid ""
-"The aim is to be able to install a server from CD, and install clients over "
-"the network by booting all other machines from the network. The installation "
-"has to work without access to the Internet."
+"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 "
+"installation works without access to the Internet."
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:183
+#: release-manual.xml:130
 msgid ""
 "The installation should not ask any questions, with the exception of desired "
 "language (e.g. Norwegian Bokmal, Nynorsk, Sami) and machine profile (server, "
@@ -625,12 +511,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:185
+#: release-manual.xml:132
 msgid "File system access configuration"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:186
+#: release-manual.xml:133
 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 "
@@ -641,19 +527,28 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:187
+#: release-manual.xml:134
 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 "
-"installation, they can be mounted as {{/skole/host/directory/}}. Initially, "
-"one directory is created on the file server, {{/skole/tjener/home0/}}, in "
-"which all the user accounts are created. More directories may then be "
+"installation, they can be mounted as"
+msgstr ""
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:135
+msgid ". Initially, one directory is created on the file server,"
+msgstr ""
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:136
+msgid ""
+", 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."
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:188
+#: release-manual.xml:137
 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 "
@@ -669,7 +564,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:190
+#: release-manual.xml:139
 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 "
@@ -688,105 +583,198 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:191
+#: release-manual.xml:140
 msgid ""
 "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 {{~/}} created "
-"with priviliges 0775, {{~/priv/}} given 0750,and {{~/pub/}} given 0775. "
-"Files that should not be readable by others should be put in {{~/priv/}}, "
-"whereas public files will be put in {{~/pub/}}. Other files will initially "
-"be accessible, but may be blocked as needed."
+"readable or not. Concretely, umask should be set to 002, and"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:192
-msgid ""
-"ssh requires that the home directory can only be written to by the owner, "
-"thus the maximum access privilege for {{~/}} is 755."
+#: release-manual.xml:141
+msgid "created with priviliges 0775,"
 msgstr ""
 
-# type: Content of: <article><para><section><section><title>
-#: release-manual.xml:196
-msgid "random notes"
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:142
+msgid "given 0750,and"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:197
+#: release-manual.xml:143
 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:204
-msgid "Requirements"
-msgstr ""
-
-# type: Content of: <article><para><section><para>
-#: release-manual.xml:210
-msgid "FIXME: add links to explainations of main-server and thinclient-server"
+"given 0775. Files that should not be readable by others should be put in"
 msgstr ""
 
-# type: Content of: <article><para><section><section><title>
-#: release-manual.xml:211
-msgid "Internet-Router"
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:144
+msgid ", whereas public files will be put in"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:212
+#: release-manual.xml:145
 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."
+". Other files will initially be accessible, but may be blocked as needed."
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:213
-msgid "FIXME: We suggest coyote (link) or or. link to setup documentation"
+#: release-manual.xml:146
+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:214
-msgid ""
-"FIXME: also link to <ulink url='/HowTo'>HowTo </ulink> change IP setup of "
-"Debian-Edu - but recommend against doing so."
+#: release-manual.xml:147
+msgid "is 755."
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:219
-msgid "Download an installation media for Debian-edu etch rc5"
-msgstr ""
-
-# type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:220
-msgid "DVDs for i386, amd64 and powerpc"
+#: release-manual.xml:151
+msgid "random notes"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:221
+#: release-manual.xml:152
 msgid ""
-"The multiarch dvd ISO image is 4.4 GiB large. To download it, use either of "
-"these methods:"
+"These are random notes concerning things which should be included in this "
+"document."
 msgstr ""
 
-# type: Content of: <article><para><section><section><para>
-#: release-manual.xml:228
-msgid "or for the netinstall cd you can download for i386"
+# type: Content of: <article><para><section><title>
+#: release-manual.xml:164
+msgid "Features"
 msgstr ""
 
-# type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:235
-msgid "amd64"
+# type: Content of: <article><para><section><section><title>
+#: release-manual.xml:165
+msgid "New features in the \"3.0 Terra\" release"
 msgstr ""
 
-# type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:242
+# type: Content of: <article><para><section><section><itemizedlist><listitem><para>
+#: release-manual.xml:172
+msgid "Local Device Support on <ulink url='/ThinClients'>ThinClients </ulink>"
+msgstr ""
+
+# type: Content of: <article><para><section><section><itemizedlist><listitem><para>
+#: release-manual.xml:178
+msgid "Regression: the webbrowser based system administration tool"
+msgstr ""
+
+# type: Content of: <article><para><section><section><itemizedlist><listitem><para>
+#: release-manual.xml:179
+msgid ""
+"was removed from Debian, as it has several problems and is not supported "
+"anymore. User administration is done with a new webbrowser based tool called"
+msgstr ""
+
+# type: Content of: <article><para><section><section><title>
+#: release-manual.xml:184
+msgid "Features in 2.0 release"
+msgstr ""
+
+# type: Content of: <article><para><section><section><title>
+#: release-manual.xml:188
+msgid "Features in \"1.0 venus\" release"
+msgstr ""
+
+# type: Content of: <article><para><section><title>
+#: release-manual.xml:193
+msgid "Requirements"
+msgstr ""
+
+# type: Content of: <article><para><section><para>
+#: release-manual.xml:199
+msgid "FIXME: add links to explainations of main-server and thinclient-server"
+msgstr ""
+
+# type: Content of: <article><para><section><section><title>
+#: release-manual.xml:200
+msgid "Internet-Router"
+msgstr ""
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:201
+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:202
+msgid "FIXME: We suggest coyote (link) or or. link to setup documentation"
+msgstr ""
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:203
+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:208
+msgid "Where to find more information"
+msgstr ""
+
+# type: Content of: <article><para><section><section><para><inlinemediaobject>
+#: release-manual.xml:209
+msgid ""
+"We recommend to read or at least take a look the <ulink url='http://www."
+"debian.org/releases/stable/releasenotes'>releasenotes for Debian etch </"
+"ulink> before you start installing a system for production use. If you just "
+"want to give Debian-Edu/Skolelinux a try, you don't have to though, it "
+"should just work <inlinemediaobject>"
+msgstr ""
+
+# type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
+#: release-manual.xml:211 release-manual.xml:605
+msgid "<phrase>:-)  </phrase>"
+msgstr ""
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:215
+msgid ""
+"Even more <ulink url='http://www.debian.org/releases/stable/"
+"installmanual'>information about the Debian etch release </ulink> is "
+"available in its installation manual."
+msgstr ""
+
+# type: Content of: <article><para><section><section><title>
+#: release-manual.xml:218
+msgid "Download an installation media for Debian-edu etch 3.0r0"
+msgstr ""
+
+# type: Content of: <article><para><section><section><section><title>
+#: release-manual.xml:219
+msgid "DVDs for i386, amd64 and powerpc"
+msgstr ""
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:220
+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:227
+msgid "or for the netinstall cd you can download for i386"
+msgstr ""
+
+# type: Content of: <article><para><section><section><section><para>
+#: release-manual.xml:234
+msgid "amd64"
+msgstr ""
+
+# type: Content of: <article><para><section><section><section><para>
+#: release-manual.xml:241
 msgid "and powerpc"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:249
+#: release-manual.xml:248
 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 "
@@ -795,12 +783,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:252
+#: release-manual.xml:251
 msgid "Installation from CD"
 msgstr "Installasjon fra CD"
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:253
+#: release-manual.xml:252
 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 "
@@ -808,12 +796,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:263
+#: release-manual.xml:262
 msgid "Installation options"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:264
+#: release-manual.xml:263
 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 "
@@ -824,7 +812,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para><inlinemediaobject>
-#: release-manual.xml:290
+#: release-manual.xml:289
 msgid ""
 "please say yes to submit information to <ulink url='http://popcon.skolelinux."
 "org/'>http://popcon.skolelinux.org/ </ulink> - though you dont have to "
@@ -832,77 +820,78 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:300
+#: release-manual.xml:299
 msgid ""
 "FIXME: this section lacks info how to install half-thick clients, which we "
-"marketing as great feature...! half-thick clients (aka diskless "
-"workstations) are set up after the installation, following the howto for it."
+"marketing as great feature...! half-thick clients (aka diskless workstation "
+"aka lowfat clients s) are set up after the installation, following the howto "
+"for it."
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:302
+#: release-manual.xml:301
 msgid "Screenshot tour through an i386 main-server installation"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:303
+#: release-manual.xml:302
 msgid "FIXME"
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:306
+#: release-manual.xml:305
 msgid "Getting started"
 msgstr ""
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:307
+#: release-manual.xml:306
 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:308
+#: release-manual.xml:307
 msgid ""
-"The [.<ulink url='/DebianEdu/Documentation/Etch/GettingStarted/HowTo'>/HowTo "
-"</ulink>] chapter describes more tips and tricks and frequently asked "
-"questions, while this is for the stuff everybody needs to do."
+"The <ulink url='/DebianEdu/Documentation/Etch/HowTo'>howto </ulink> chapter "
+"describes more tips and tricks and frequently asked questions, while this is "
+"for the stuff everybody needs to do."
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:310
-msgid "Services running on tjener"
+#: release-manual.xml:309
+msgid "Services running on the main server"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:311
+#: release-manual.xml:310
 msgid ""
-"There are several services running on the tjener which can be managed via a "
-"web management interface.  We'll describe each service here."
+"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:312
+#: release-manual.xml:311
 msgid "User Management"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:313
+#: release-manual.xml:312
 msgid ""
-"Point your webbrowser to <ulink url='https://tjener.intern/lwat'>https://"
-"tjener.intern/lwat </ulink> and you'll get an login screen where you can "
-"login with your admin account.  If you visit this site the first time after "
-"installation the loginname there is:"
+"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 "
+"account.  If you visit this site the first time after installation the "
+"loginname there is:"
 msgstr ""
 
 # type: CDATA
-#: release-manual.xml:315
+#: release-manual.xml:314
 #, no-wrap
 msgid "admin]]"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:316
+#: release-manual.xml:315
 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 "
@@ -912,17 +901,17 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><section><title>
-#: release-manual.xml:322
+#: release-manual.xml:321
 msgid "User Administration"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><section><para>
-#: release-manual.xml:323
+#: release-manual.xml:322
 msgid "There are 4 kind of possible users:"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><section><para>
-#: release-manual.xml:329
+#: release-manual.xml:328
 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 "
@@ -932,37 +921,37 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><section><para>
-#: release-manual.xml:330
+#: release-manual.xml:329
 msgid "FIXME: describe Groups, Machine and Machine Administration here."
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:333
+#: release-manual.xml:332
 msgid "Printer Managment"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:334
+#: release-manual.xml:333
 msgid ""
-"For Printer Management point your webbrowser to <ulink url='https://tjener."
-"intern/cups'>https://tjener.intern/cups </ulink>.  This is the normal cups "
-"management site where you can add/delete/modfiy your printers and can clean "
-"up the printing queue.  For changes you'll have to login as root with your "
-"root password. So you should access this site never without using ssl."
+"For Printer Management point your webbrowser to <ulink url='https://www/"
+"cups'>https://www/cups </ulink>.  This is the normal cups management site "
+"where you can add/delete/modfiy your printers and can clean up the printing "
+"queue.  For changes you'll have to login as root with your root password. So "
+"you should access this site never without using ssl."
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:336
+#: release-manual.xml:335
 msgid "FIXME: Go further"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:339
+#: release-manual.xml:338
 msgid "Adding debian-edu machines to the LDAP domain"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:340
+#: release-manual.xml:339
 msgid ""
 "FIXME: add how, is that the right headline for this? (The [.<ulink url='/"
 "DebianEdu/Documentation/Etch/GettingStarted/HowTo'>/HowTo </ulink>] Chapter "
@@ -972,12 +961,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:344
+#: release-manual.xml:343
 msgid "HowTo"
 msgstr ""
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:345
+#: release-manual.xml:344
 msgid ""
 "The <ulink url='/HowTos'>HowTos </ulink> from <ulink url='http://wiki.debian."
 "org/DebianEdu/HowTo/'>http://wiki.debian.org/DebianEdu/HowTo/ </ulink> are "
@@ -986,12 +975,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:349
+#: release-manual.xml:348
 msgid "Those are not that many:"
 msgstr ""
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:365
+#: release-manual.xml:364
 msgid ""
 "<ulink url='http://wiki.debian.org/DebianEdu/HowTo/"
 "LtspDisklessWorkstation'>http://wiki.debian.org/DebianEdu/HowTo/"
@@ -1000,7 +989,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><itemizedlist><listitem><para>
-#: release-manual.xml:374
+#: release-manual.xml:373
 msgid ""
 "<ulink url='http://wiki.debian.org/DebianEdu/HowTo/TeacherFirstStep'>http://"
 "wiki.debian.org/DebianEdu/HowTo/TeacherFirstStep </ulink> - incomplete but "
@@ -1008,38 +997,38 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:378
+#: release-manual.xml:377
 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:379
+#: release-manual.xml:378
 msgid "Other topics"
 msgstr "Andre tema"
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject>
-#: release-manual.xml:380
+#: release-manual.xml:379
 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:385
+#: release-manual.xml:384
 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:387
+#: release-manual.xml:386
 msgid "<phrase>:( </phrase>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:391
+#: release-manual.xml:390
 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 "
@@ -1047,38 +1036,38 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:393
+#: release-manual.xml:392
 msgid ""
 "Installing single service machines for spreading the load from main-server"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:401
+#: release-manual.xml:400
 msgid "LDAP Setup"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:403
+#: release-manual.xml:402
 msgid "/etc/ in svk"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:405
+#: release-manual.xml:404
 msgid "modify Kiosk mode"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:407
+#: release-manual.xml:406
 msgid "Flash"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:408
+#: release-manual.xml:407
 msgid "To install the Adobe Flash Player web browser plugin, install the"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:409
+#: release-manual.xml:408
 msgid ""
 "debian package.  It require a working Internet connection, and will download "
 "the precompiled binary from Adobe and convert it into a Debian package "
@@ -1087,36 +1076,36 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:411
+#: release-manual.xml:410
 msgid "<phrase>/!\\ </phrase>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:414
+#: release-manual.xml:413
 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:415
+#: release-manual.xml:414
 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:417
+#: release-manual.xml:416
 msgid "Java"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:421
+#: release-manual.xml:420
 msgid "Sound & Video"
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:422
+#: release-manual.xml:421
 msgid ""
 "- where to find libdvdcss for playing dvds.  Should we promote <ulink "
 "url='http://www.debian-multimedia.org/'>http://www.debian-multimedia.org/ </"
@@ -1124,32 +1113,32 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:427
+#: release-manual.xml:426
 msgid "Thin Clients vs Half-Thick Clients"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:429
+#: release-manual.xml:428
 msgid "printer managing"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:431
+#: release-manual.xml:430
 msgid "Firewall setup (coyote linux)"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:433
+#: release-manual.xml:432
 msgid "LTSP in detail"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:435
+#: release-manual.xml:434
 msgid "Connecting windows machines to the network / windows integration"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:436
+#: release-manual.xml:435
 msgid ""
 "For Windows clients the Windows domain \"SKOLELINUX\" is available to be "
 "joined. A special service called Samba, installed on the main-server tjener, "
@@ -1158,21 +1147,21 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:437
+#: release-manual.xml:436
 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:438
+#: release-manual.xml:437
 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:439
+#: release-manual.xml:438
 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 "
@@ -1182,12 +1171,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:443
+#: release-manual.xml:442
 msgid "2. Configure the Windows client as static host"
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:444
+#: release-manual.xml:443
 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 "
@@ -1200,19 +1189,19 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:447
+#: release-manual.xml:446
 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:450
+#: release-manual.xml:449
 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:453
+#: release-manual.xml:452
 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. "
@@ -1222,89 +1211,142 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:456
+#: release-manual.xml:455
 msgid "Maintainance"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:457
+#: release-manual.xml:456
 msgid "Updating the software"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:458
+#: release-manual.xml:457
 msgid "document how to use aptitude upgrade / kde-update-notifier"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:459
+#: release-manual.xml:458
 msgid "are cron-apt and apt-listchanges installed and configured?"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:461
+#: release-manual.xml:460
 msgid "Backup Management"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:462
+#: release-manual.xml:461
 msgid ""
-"For the backup management point your browser to <ulink url='https://tjener."
-"intern/slbackup-php'>https://tjener.intern/slbackup-php </ulink>. Please "
-"note that you have to access this site via ssl, since you have to enter the "
-"root password there. If you try to access this site without using ssl it "
-"will fail."
+"For the backup management point your browser to <ulink url='https://www/"
+"slbackup-php'>https://www/slbackup-php </ulink>. Please note that you have "
+"to access this site via ssl, since you have to enter the root password "
+"there. If you try to access this site without using ssl it will fail."
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:464
+#: release-manual.xml:463
 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:466
+#: release-manual.xml:465
 msgid "Server Monitoring"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:467
+#: release-manual.xml:466
 msgid "Munin"
 msgstr "Munin"
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:469
+#: release-manual.xml:468
 msgid "Nagios"
 msgstr "Nagios"
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:471
+#: release-manual.xml:470
 msgid "Sitesummary"
 msgstr "Sitesummary"
 
+# type: Content of: <article><para><section><section><section><para>
+#: release-manual.xml:471
+msgid ""
+"Some documentation on sitesummary is available from <ulink url='http://wiki."
+"debian.org/DebianEdu/HowTo/SiteSummary'>http://wiki.debian.org/DebianEdu/"
+"HowTo/SiteSummary </ulink>"
+msgstr ""
+
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:472
+#: release-manual.xml:473
 msgid "give pointers to munin, sitesummary and nagios doc"
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:476
+#: release-manual.xml:477
 msgid "Upgrades"
 msgstr ""
 
 # type: Content of: <article><para><section><para>
-#: release-manual.xml:477
-msgid "FIXME: add link to debian release notes, here or in [./Installation] ?"
+#: release-manual.xml:478
+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/"
+"Skolelinux comes with ABSOLUTELY NO WARRANTY, to the extent permitted by "
+"applicable law.  </emphasis>"
+msgstr ""
+
+# type: Content of: <article><para><section><para>
+#: release-manual.xml:480
+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 "
+"way as your production server. There you can test the upgrade without risk "
+"and see if everything works as it should."
+msgstr ""
+
+# type: Content of: <article><para><section><para>
+#: release-manual.xml:481
+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 "
+"them here. Debian-Edu sarge will receive continued support for some time in "
+"the future. FIXME: decide and document how long we will be able to support "
+"sarge."
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:478
+#: release-manual.xml:482
 msgid "Upgrades from Debian-Edu sarge"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:479
+#: release-manual.xml:483
+msgid ""
+"Please read this chapter completly before you start upgrading your systems."
+msgstr ""
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:484
+msgid ""
+"In case of problems you could also read the <ulink url='http://www.debian."
+"org/releases/stable/releasenotes'>releasenotes for Debian etch </ulink>. "
+"(Debian-Edu/Skolelinux \"2.0 Terra\" installed a 2.6 kernel as default, but "
+"if you are running a 2.4 kernel, you <emphasis>should </emphasis> read the "
+"<ulink url='http://www.debian.org/releases/stable/i386/release-notes/ch-"
+"information.en.html#s-upgrade-to-2.6'>notes on upgrading from kernel 2.4 to "
+"2.6 </ulink> before you upgrade!)"
+msgstr ""
+
+# type: Content of: <article><para><section><section><section><title>
+#: release-manual.xml:488
+msgid "Partioning scheme changed"
+msgstr ""
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:489
 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 "
@@ -1312,14 +1354,14 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:483
+#: release-manual.xml:493
 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:484
+#: release-manual.xml:494
 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 "
@@ -1330,19 +1372,19 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:485
+#: release-manual.xml:496
 msgid "Prepare the System"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:486
+#: release-manual.xml:497
 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:487
+#: release-manual.xml:498
 #, no-wrap
 msgid ""
 "/etc/init.d/squid stop \n"
@@ -1351,25 +1393,25 @@ msgid ""
 msgstr ""
 
 # type: CDATA
-#: release-manual.xml:492
+#: release-manual.xml:503
 #, no-wrap
 msgid "e2fsck -f /dev/vg_system/lv_data ]]"
 msgstr ""
 
 # type: CDATA
-#: release-manual.xml:495
+#: release-manual.xml:506
 #, no-wrap
 msgid "lvextend -L +1GB /dev/vg_system/lv_data ]]"
 msgstr ""
 
 # type: CDATA
-#: release-manual.xml:498
+#: release-manual.xml:509
 #, no-wrap
 msgid "resize2fs /dev/vg_system/lv_data]]"
 msgstr ""
 
 # type: CDATA
-#: release-manual.xml:501
+#: release-manual.xml:512
 #, no-wrap
 msgid ""
 "mount /var \n"
@@ -1378,12 +1420,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:508
+#: release-manual.xml:519
 msgid "Now start the upgrade with:"
 msgstr ""
 
 # type: CDATA
-#: release-manual.xml:509
+#: release-manual.xml:520
 #, no-wrap
 msgid ""
 "apt-get update \n"
@@ -1391,12 +1433,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:513
+#: release-manual.xml:524
 msgid "after you have modified your sources.list:"
 msgstr ""
 
 # type: CDATA
-#: release-manual.xml:514
+#: release-manual.xml:525
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian etch main contrib non-free \n"
@@ -1404,12 +1446,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:519
+#: release-manual.xml:530
 msgid "Answers to Debconf Questions raising during upgrade"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:520
+#: release-manual.xml:531
 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 "
@@ -1424,17 +1466,124 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:524
-msgid "FIXME: Which questions raises up here (I'll fix this tomorrow ;-))"
+#: release-manual.xml:535
+msgid "* Configure nagios-common."
+msgstr ""
+
+# type: Content of: <article><para><section><section><section><itemizedlist><listitem><para>
+#: release-manual.xml:536
+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:540
+msgid "* Configure console-data"
+msgstr ""
+
+# type: Content of: <article><para><section><section><section><para>
+#: release-manual.xml:543
+msgid "* Configure openssh-server"
+msgstr ""
+
+# type: Content of: <article><para><section><section><section><para>
+#: release-manual.xml:546
+msgid "* Configure systat"
+msgstr ""
+
+# type: Content of: <article><para><section><section><section><para>
+#: release-manual.xml:549
+msgid "* Configure popularity-contest"
+msgstr ""
+
+# type: Content of: <article><para><section><section><section><para>
+#: release-manual.xml:552
+msgid "* Configure libnss-ldap"
+msgstr ""
+
+# type: Content of: <article><para><section><section><section><orderedlist><listitem><para>
+#: release-manual.xml:553
+msgid "Change the prompt to: <emphasis>ldaps://ldap/ </emphasis>"
+msgstr ""
+
+# type: Content of: <article><para><section><section><section><orderedlist><listitem><para>
+#: release-manual.xml:556
+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:563
+msgid "* Upgrade glibc now. Answer Yes here."
+msgstr ""
+
+# type: Content of: <article><para><section><section><section><para>
+#: release-manual.xml:564
+msgid "* Restart Services. Answer Yes here."
+msgstr ""
+
+# type: Content of: <article><para><section><section><section><para>
+#: release-manual.xml:565
+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:566
+msgid "The upgrade will fail with this error message:"
+msgstr ""
+
+# type: CDATA
+#: release-manual.xml:567
+#, no-wrap
+msgid ""
+"Errors were encountered while processing: \n"
+" mozilla-firefox-locale-it\n"
+" mozilla-firefox-locale-el\n"
+"E: Sub-process /usr/bin/dpkg returned an error code (1)\n"
+"]]"
+msgstr ""
+
+# type: Content of: <article><para><section><section><section><para>
+#: release-manual.xml:572
+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/"
+"info/mozilla-firefox-local-el.postrm </emphasis> and comment out in both the "
+"line containing: <emphasis>update-mozilla-firefox-chrome </emphasis>. Then "
+"restart the upgrade process with:"
+msgstr ""
+
+# type: CDATA
+#: release-manual.xml:576
+#, no-wrap
+msgid "apt-get -f install]]"
+msgstr ""
+
+# type: Content of: <article><para><section><section><section><para>
+#: release-manual.xml:577
+msgid "Now the upgrade work again:"
+msgstr ""
+
+# type: Content of: <article><para><section><section><section><para>
+#: release-manual.xml:578
+msgid "* Several Modified configuration files (nagios)"
+msgstr ""
+
+# type: Content of: <article><para><section><section><section><para>
+#: release-manual.xml:581
+msgid "*"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:527
+#: release-manual.xml:584
 msgid "Upgrades from older Debian-Edu / Skolelinux installations"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:528
+#: release-manual.xml:585
 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 "
@@ -1444,68 +1593,108 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:532
+#: release-manual.xml:589
 msgid "Contribute"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:533
+#: release-manual.xml:590
 msgid "Resources"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:534
+#: release-manual.xml:591
 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:593
+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:596
+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><para>
+#: release-manual.xml:601
+msgid "FIXME: add info how developers and testers can contribute."
+msgstr ""
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:602
+msgid "== Documentation writers =="
+msgstr ""
+
+# type: Content of: <article><para><section><section><para><inlinemediaobject>
+#: release-manual.xml:603
+msgid ""
+"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/ </ulink> <inlinemediaobject>"
+msgstr ""
+
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:545
+#: release-manual.xml:610
 msgid "Translations wanted"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:546
+#: release-manual.xml:611
 msgid ""
 "Translations of this document are kept in .po files like in many free "
-"software projects, read {{usr/share/doc/debian-edu-doc/README.release-manual-"
-"translations}} for more information on this. There are many easy tools for "
-"translating."
+"software projects, read"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:547
+#: release-manual.xml:612
 msgid ""
-"To update the translations you need to be a member of the alioth project "
-"{{debian}}. 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."
+"for more information on this. There are many easy tools for translating."
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:549
+#: release-manual.xml:613
+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:614
+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 ""
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:616
 msgid "Checkout the source package with the following command:"
 msgstr ""
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:553
-msgid "Join a local debian-edu team"
+#: release-manual.xml:622
+msgid "Join a local Debian-Edu team"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:554
+#: release-manual.xml:623
 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:557
-msgid "start a new local debian-edu team"
+#: release-manual.xml:626
+msgid "Start a new local Debian-Edu team"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:558
+#: release-manual.xml:627
 msgid ""
 "<emphasis role='strong'>FIXME: </emphasis> \"isolated\" contributors and "
 "users in schools exist in Greece, the Netherlands, Japan and elsewhere. Meet "
@@ -1513,95 +1702,211 @@ msgid ""
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:562
+#: release-manual.xml:631
 msgid "Support"
 msgstr "Støtte"
 
 # type: Content of: <article><para><section><section><title>
-#: release-manual.xml:563
-msgid "volunteer based support"
+#: release-manual.xml:632
+msgid "Volunteer based support"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:564
+#: release-manual.xml:633
 msgid "in english"
 msgstr ""
 
-# type: Content of: <article><para><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: release-manual.xml:565
-msgid ""
-"<ulink url='http://lists.debian.org/debian-edu'>http://lists.debian.org/"
-"debian-edu </ulink> - developer centric mailing list, more useful to report "
-"problems than to get real support"
-msgstr ""
-
 # type: Content of: <article><para><section><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:568
+#: release-manual.xml:634
 msgid ""
 "<ulink url='https://init.linpro.no/mailman/skolelinux.no/listinfo/admin-"
 "discuss'>https://init.linpro.no/mailman/skolelinux.no/listinfo/admin-discuss "
 "</ulink> - english speaking support mailing list"
 msgstr ""
 
+# type: Content of: <article><para><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: release-manual.xml:637
+msgid ""
+"<ulink url='http://lists.debian.org/debian-edu'>http://lists.debian.org/"
+"debian-edu </ulink> - developer centric mailing list, more useful to report "
+"problems than to get real support"
+msgstr ""
+
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:574
+#: release-manual.xml:643
 msgid "in norwegian"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><itemizedlist><listitem><para>
-#: release-manual.xml:578
+#: release-manual.xml:644
 msgid ""
 "<ulink url='https://init.linpro.no/mailman/skolelinux.no/listinfo/"
 "bruker'>https://init.linpro.no/mailman/skolelinux.no/listinfo/bruker </"
 "ulink> - norwegian speaking support mailing list"
 msgstr ""
 
-# type: Content of: <article><para><section><section><section><para>
-#: release-manual.xml:583
-msgid "FIXME: briefly describe the diffs between those lists..."
+# type: Content of: <article><para><section><section><section><itemizedlist><listitem><para>
+#: release-manual.xml:647
+msgid ""
+"<ulink url='https://init.linpro.no/mailman/skolelinux.no/listinfo/"
+"linuxiskolen'>https://init.linpro.no/mailman/skolelinux.no/listinfo/"
+"linuxiskolen </ulink> - FIXME: what is this"
 msgstr ""
 
 # type: Content of: <article><para><section><section><section><title>
-#: release-manual.xml:585
+#: release-manual.xml:653
 msgid "in german"
 msgstr ""
 
 # type: Content of: <article><para><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: release-manual.xml:586
+#: release-manual.xml:654
 msgid ""
 "<ulink url='http://www.skolelinux.de/mailman/listinfo/user'>http://www."
 "skolelinux.de/mailman/listinfo/user </ulink> - german speaking support "
 "mailinglist"
 msgstr ""
 
+# type: Content of: <article><para><section><section><section><itemizedlist><listitem><para>
+#: release-manual.xml:657
+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:592
+#: release-manual.xml:664
 msgid "in french"
 msgstr ""
 
+# type: Content of: <article><para><section><section><section><itemizedlist><listitem><para>
+#: release-manual.xml:665
+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:599
-msgid "professional support"
+#: release-manual.xml:671
+msgid "Professional support"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para>
-#: release-manual.xml:600
+#: release-manual.xml:672
 msgid ""
-"Lists of companies providing professional support is available from <ulink "
-"url='http://wiki.skolelinux.no/Hjelp/ProfesjonellHjelp'>http://wiki."
-"skolelinux.no/Hjelp/ProfesjonellHjelp </ulink> for Norway and <ulink "
+"Lists of companies providing professional support are available from <ulink "
 "url='http://wiki.debian.org/DebianEdu/Help/ProfessionalHelp'>http://wiki."
-"debian.org/DebianEdu/Help/ProfessionalHelp </ulink> for the rest of the "
-"world."
+"debian.org/DebianEdu/Help/ProfessionalHelp </ulink>."
+msgstr ""
+
+# type: Content of: <article><para><section><title>
+#: release-manual.xml:676
+#, fuzzy
+msgid "Copyright and authors"
+msgstr "Opphavsrett og forfattere"
+
+# type: Content of: <article><para><section><para>
+#: release-manual.xml:677
+msgid ""
+"This document is written and copyrighted 2007 by Holger Levsen, Petter "
+"Reinholdtsen, Daniel Heß and Patrick Winnertz and is released under the GPL2 "
+"or any later version. Enjoy!"
+msgstr ""
+
+# type: Content of: <article><para><section><para>
+#: release-manual.xml:678
+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 </"
+"emphasis>! Then add your name here and release it under the GPL2 or later "
+"version."
+msgstr ""
+
+# type: Content of: <article><para><section><title>
+#: release-manual.xml:681
+#, fuzzy
+msgid "Translation copyright and authors"
+msgstr "Opphavsrett og forfattere"
+
+# type: Content of: <article><para><section><para>
+#: release-manual.xml:682
+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:683
+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:684
+msgid ""
+"The german translation is copyrighted 2007 by Holger Levsen and is released "
+"under the GPL2 or any later version."
+msgstr ""
+
+# type: Content of: <article><para><section><title>
+#: release-manual.xml:686
+msgid "Translations of this document"
+msgstr "Oversettelser av dette dokumentet"
+
+# type: Content of: <article><para><section><para>
+#: release-manual.xml:687
+msgid ""
+"Fully translated versions of this document are not yet available, as the "
+"document itself is very incomplete. Incomplete translations for Norwegian "
+"Bokmål and Spanish exist."
+msgstr ""
+
+# type: Content of: <article><para><section><section><title>
+#: release-manual.xml:688
+msgid "Howto translate this document"
+msgstr ""
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:689
+msgid ""
+"If you want to start translating, you can! Read /usr/share/doc/debian-edu-"
+"doc/README.release-manual-translations to find information how to create a ."
+"po file for your language, and how to update it against <ulink url='http://"
+"wiki.skolelinux.no/DebianEdu/Documentation/Etch/AllInOne?action=format&"
+"mimetype=xml/docbook'>the source </ulink>."
+msgstr ""
+
+# type: Content of: <article><para><section><section><para>
+#: release-manual.xml:691
+msgid ""
+"<emphasis role='strong'>FIXME: </emphasis> describe how to work in svn and "
+"give a step by step howto."
+msgstr ""
+
+# type: Content of: <article><para><section><section><title>
+#: release-manual.xml:694
+msgid "Potential problems for translations"
+msgstr ""
+
+# type: Content of: <article><para><section><section><para><inlinemediaobject>
+#: release-manual.xml:695
+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:700
+msgid "Please report any other showstoppers."
 msgstr ""
 
 # type: Content of: <article><para><section><title>
-#: release-manual.xml:605
+#: release-manual.xml:703
 msgid "Appendix A - The GNU Public Licence"
 msgstr "Vedlegg A - GNU Generell Offentlig Lisens"
 
 # type: CDATA
-#: release-manual.xml:607
+#: release-manual.xml:705
 #, 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 4432a2f..51c6c89 100644
--- a/documentation/release-manual/release-manual.xml
+++ b/documentation/release-manual/release-manual.xml
@@ -4,7 +4,7 @@
 </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-21 00:10 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-21 13:04 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'/>
@@ -12,21 +12,15 @@
 </phrase>
 </textobject>
 </inlinemediaobject> 
-</para><itemizedlist><listitem><para><ulink url='/DebianEdu/Documentation/Etch/CopyRight'>Copyright
-</ulink> and Authors 
-</para>
-</listitem><listitem><para><ulink url='/DebianEdu/Documentation/Etch/Translations'>Translations
-</ulink> of this document 
-</para>
-</listitem><listitem><para><ulink url='/DebianEdu/Documentation/Etch/AboutDebianEdu'>About
+</para><itemizedlist><listitem><para><ulink url='/DebianEdu/Documentation/Etch/AboutDebianEdu'>About
 </ulink> Debian-Edu and Skolelinux 
 </para>
-</listitem><listitem><para><ulink url='/DebianEdu/Documentation/Etch/Features'>Features
-</ulink> - new Features in this release and old ones 
-</para>
 </listitem><listitem><para><ulink url='/DebianEdu/Documentation/Etch/Architecture'>Architecture
 </ulink> - the design principles of Debian-Edu 
 </para>
+</listitem><listitem><para><ulink url='/DebianEdu/Documentation/Etch/Features'>Features
+</ulink> - new Features in this release and old ones 
+</para>
 </listitem><listitem><para><ulink url='/DebianEdu/Documentation/Etch/Requirements'>Requirements
 </ulink> to run Debian-Edu 
 </para>
@@ -52,6 +46,12 @@
 </listitem><listitem><para><ulink url='/DebianEdu/Documentation/Etch/Support'>Support
 </ulink> - how+where to find help 
 </para>
+</listitem><listitem><para><ulink url='/DebianEdu/Documentation/Etch/CopyRight'>Copyright
+</ulink> and Authors of this document 
+</para>
+</listitem><listitem><para><ulink url='/DebianEdu/Documentation/Etch/Translations'>Translations
+</ulink> of this document 
+</para>
 </listitem><listitem><para><ulink url='/DebianEdu/Documentation/Etch/AppendixA'>Appendix A
 </ulink> - The GNU Public Licence 
 </para>
@@ -60,67 +60,13 @@
 </ulink> - <ulink url='/DebianEdu/Documentation/Etch/AllInOne'>All in one page
 </ulink>  
 </para>
-</section> <para/><section><title>Copyright and authors
-</title><para>This document is written and copyrighted 2007 by Holger Levsen, Petter Reinholdtsen, Daniel Heß and  Patrick Winnertz and is released under the GPL2 or any later version. Enjoy! 
-</para><para>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
-</emphasis>! Then add your name here and release it under the GPL2 or later version. 
-</para><para/>
-</section><section><title>Translation copyright and authors
-</title><para>The spanish translation is copyrighted 2007 by José L. Redrejo Rodríguez and is released under the GPL2 or any later version. 
-</para><para>The norwegian Bokmål translation is copyrighted 2007 by Petter Reinholdtsen and is released under the GPL2 or any later version. 
-</para><para>The german translation is copyrighted 2007 by Holger Levsen and is released under the GPL2 or any later version. 
-</para>
-</section> <para/><section><title>Translations of this document
-</title><para>Fully translated versions of this document are not yet available, as the document itself is very incomplete. Incomplete translations for Norwegian Bokmål and Spanish exist. 
-</para><para/><section><title>Howto translate this document
-</title><para>If you want to start translating, you can! Read /usr/share/doc/debian-edu-doc/README.release-manual-translations to find information how to create a .po file for your language, and how to update it against <ulink url='http://wiki.skolelinux.no/DebianEdu/Documentation/Etch/AllInOne?action=format&mimetype=xml/docbook'>the source
-</ulink>.  
-</para><para><emphasis role='strong'>FIXME:
-</emphasis> describe how to work in svn and give a step by step howto. 
-</para><para/>
-</section><section><title>Potential problems for translations
-</title><para>We will need to write sed-scripts (or something like that) to support different images for different translations. Laters <inlinemediaobject><imageobject><imagedata width='15' fileref='/wiki/rightsidebar/img/smile.png' depth='15'/>
-</imageobject><textobject><phrase>:)
-</phrase>
-</textobject>
-</inlinemediaobject> 
-</para><para>Please report any other showstoppers. 
+</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. 
 </para>
-</section>
-</section> <para/><section><title>AboutDebianEdu
-</title><para>Welcome to <ulink url='/DebianEdu'>DebianEdu
-</ulink> / Skolelinux! 
-</para>
-</section> <para/><section><title>Features
-</title><para/><section><title>New features in the "3.0 Terra" release
-</title><itemizedlist><listitem>Based on Debian 4.0 etch 
-</listitem><listitem>Graphical installer with mouse support 
-</listitem><listitem>LSB 3.1 compatible 
-</listitem><listitem>Linux kernel version 2.6.18 
-</listitem><listitem>KDE desktop environment version 3.5.5 
-</listitem><listitem>Automatic tracking of installed machines 
-</listitem><listitem><para>Local Device Support on <ulink url='/ThinClients'>ThinClients
-</ulink> 
-</para>
-</listitem><listitem>FIXME 
-</listitem>
-</itemizedlist><para/>
-</section><section><title>Features in 2.0 release
-</title><itemizedlist><listitem>FIXME 
-</listitem>
-</itemizedlist><para/>
-</section><section><title>Features in "1.0 venus" release
-</title><itemizedlist><listitem>FIXME 
-</listitem>
-</itemizedlist>
-</section>
 </section> <para/><section><title>Architecture
-</title><para><emphasis role='strong'>copied and pasted from <ulink url='http://developer.skolelinux.no/arkitektur/arkitektur.html.en'>http://developer.skolelinux.no/arkitektur/arkitektur.html.en
-</ulink> ( at that time it was Copyright © 2001, 2002, 2003, 2004 Petter Reinholdtsen <<ulink url='mailto:pere at hungry.com'>pere at hungry.com
-</ulink>>, released under the GPL) - note to translators: there are translations for this document already, which you can also copy and paste. But keep those copyright notes as well.
-</emphasis> 
-</para><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). This document describes the network architecture and services provided by a Skolelinux installation. 
+</title><para>This secton 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
@@ -136,23 +82,24 @@
 </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).  
 </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 {{/etc/services}}, 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><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(Limacute) [postoffice]  
+</listitem><listitem>Elektronic postoffice [postoffice]  
 </listitem><listitem>Directoryservice(OpenLDAP)[ldap]  
-</listitem><listitem>Webserver (Apache/PHP/eZ)[www]  
-</listitem><listitem>SQL server (PostgreSQL)[database]  
-</listitem><listitem>Central backup (?) [backup]  
+</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]  
 </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. 
+</listitem><listitem>Machine- and service surveillance with error reporting, + status and history on the web. Error reporting by mail. (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.  
@@ -173,23 +120,31 @@
 </para><para/>
 </section>
 </section><section><title>Administration
-</title><para>All the linux machines that are installed by means of the Skolelinux CD will be administrable from a central computer, most likely the server. It will be possible to login to all machines by ssh, and thereby have full access to the machines  
+</title><para>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 will be possible to login to all machines by ssh, and thereby have full access to the machines  
 </para><para>We use cfengine to edit configuration files. These files are updated from the server to the clients. In order to change the client configuration, it suffices to edit the server configuration and let the automatation distribute the changes.  
-</para><para>All user information is kept in an SQL database. Updates of user accounts are made against this database. The information is exported to an LDAP directory which is used by the clients for user authentication. 
+</para><para>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 authentication. 
 </para><para/>
 </section><section><title>Installation
-</title><para>Installation is possible either from a CD or by a diskette from server.  
-</para><para>The aim is to be able to install a server from CD, and install clients over the network by booting all other machines from the network. The installation has to work without access to the Internet.  
+</title><para>Installation is possible either from a CD or DVD. 
+</para><para>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 installation works without access to the Internet.  
 </para><para>The installation should not ask any questions, with the exception of desired language (e.g. Norwegian Bokmal, Nynorsk, Sami) and machine profile (server, workstation, thin client server). All other configuration will be set up automatically with reasonable values, to be changed from a centrally location by the system administrator subsequent to the installation. 
 </para><para/>
 </section><section><title>File system access configuration
 </title><para>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 files, documents, email and web pages. Some of the files should be set to have read access for other users on the system, some should be readable by everyone on the internet, and some should not be accessible for reading by anyone but the user.  
-</para><para>To ensure that all disks that are used for user directories or shared directories can be uniquely named across all the computers in the installation, they can be mounted as {{/skole/host/directory/}}. Initially, one directory is created on the file server, {{/skole/tjener/home0/}}, 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 ensure that all disks that are used for user directories or shared directories can be uniquely named across all the computers in the installation, they can be mounted as <code>/skole/host/directory/
+</code>. Initially, one directory is created on the file server, <code>/skole/tjener/home0/
+</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>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 {{~/}} created with priviliges 0775, {{~/priv/}} given 0750,and {{~/pub/}} given 0775. Files that should not be readable by others should be put in {{~/priv/}}, whereas public files will be put in {{~/pub/}}. Other files will initially be accessible, but may be blocked as needed.  
-</para><para>ssh requires that the home directory can only be written to by the owner, thus the maximum access privilege for {{~/}} is 755.  
+</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> 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/
+</code>. Other files will initially be accessible, but may be blocked as needed.  
+</para><para>ssh requires that the home directory can only be written to by the owner, thus the maximum access privilege for <code>~/
+</code> is 755.  
 </para><itemizedlist><listitem>- access to home directories (*~/.)? - home directories - shared directories? 
 </listitem>
 </itemizedlist><para/>
@@ -199,6 +154,40 @@
 </listitem><listitem>Grouping of machines and ability to control access to network services for these groups (acces blocking to Internet via squid)  
 </listitem><listitem>Should consider using a DNS name from RFC 2606.  
 </listitem>
+</itemizedlist><para/><para> 
+</para><para><emphasis role='strong'>This chapter was copied and pasted from <ulink url='http://developer.skolelinux.no/arkitektur/arkitektur.html.en'>http://developer.skolelinux.no/arkitektur/arkitektur.html.en
+</ulink> ( at that time it was Copyright © 2001, 2002, 2003, 2004 Petter Reinholdtsen <<ulink url='mailto:pere at hungry.com'>pere at hungry.com
+</ulink>>, released under the GPL) - note to translators: there are translations for this document already, which you can also copy and paste. But keep those copyright notes as well.
+</emphasis> 
+</para>
+</section>
+</section> <para/><section><title>Features
+</title><para/><section><title>New features in the "3.0 Terra" release
+</title><itemizedlist><listitem>Based on Debian 4.0 etch 
+</listitem><listitem>Graphical installer with mouse support 
+</listitem><listitem>LSB 3.1 compatible 
+</listitem><listitem>Linux kernel version 2.6.18 
+</listitem><listitem>KDE desktop environment version 3.5.5 
+</listitem><listitem>Automatic tracking of installed machines 
+</listitem><listitem><para>Local Device Support on <ulink url='/ThinClients'>ThinClients
+</ulink> 
+</para>
+</listitem><listitem>New processor architectures: amd64 (fully supported) and powerpc (experimental support) 
+</listitem><listitem>Multi-architecture DVD for i386, amd64 and powerpc 
+</listitem><listitem>Regression: it is not possible anymore to install the complete system from a single CD, though we still provide installation CDs, but those requiere internet access during installation 
+</listitem><listitem><para>Regression: the webbrowser based system administration tool <code>webmin
+</code> was removed from Debian, as it has several problems and is not supported anymore. User administration is done with a new webbrowser based tool called <code>lawt
+</code> 
+</para>
+</listitem>
+</itemizedlist><para/>
+</section><section><title>Features in 2.0 release
+</title><itemizedlist><listitem>FIXME 
+</listitem>
+</itemizedlist><para/>
+</section><section><title>Features in "1.0 venus" release
+</title><itemizedlist><listitem>FIXME 
+</listitem>
 </itemizedlist>
 </section>
 </section> <para/><section><title>Requirements
@@ -216,35 +205,45 @@
 </para>
 </section>
 </section> <para/><section><title>Installation
-</title><para/><section><title>Download an installation media for Debian-edu etch rc5
+</title><para/><section><title>Where to find more information
+</title><para>We recommend to read or at least take a look the <ulink url='http://www.debian.org/releases/stable/releasenotes'>releasenotes for Debian etch
+</ulink> before you start installing a system for production use. If you just want to give Debian-Edu/Skolelinux a try, you don't have to though, it should just work <inlinemediaobject><imageobject><imagedata width='15' fileref='/wiki/rightsidebar/img/smile.png' depth='15'/>
+</imageobject><textobject><phrase>:-)
+</phrase>
+</textobject>
+</inlinemediaobject> 
+</para><para>Even more <ulink url='http://www.debian.org/releases/stable/installmanual'>information about the Debian etch release
+</ulink> is available in its installation manual. 
+</para><para/>
+</section><section><title>Download an installation media for Debian-edu etch 3.0r0
 </title><para/><section><title>DVDs for i386, amd64 and powerpc
 </title><para>The multiarch dvd ISO image is 4.4 GiB large. To download it, use either of these methods:  
-</para><itemizedlist><listitem><para><ulink url='ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-amd64-i386-powerpc-DVD-rc5.iso'>ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-amd64-i386-powerpc-DVD-rc5.iso
+</para><itemizedlist><listitem><para><ulink url='ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-amd64-i386-powerpc-DVD-3.0r0.iso'>ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-amd64-i386-powerpc-DVD-3.0r0.iso
 </ulink> 
-</para><para><ulink url='http://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-amd64-i386-powerpc-DVD-rc5.iso'>http://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-amd64-i386-powerpc-DVD-rc5.iso
+</para><para><ulink url='http://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-amd64-i386-powerpc-DVD-3.0r0.iso'>http://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-amd64-i386-powerpc-DVD-3.0r0.iso
 </ulink> 
-</para>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-etch-amd64-i386-powerpc-DVD-rc5.iso 
+</para>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-etch-amd64-i386-powerpc-DVD-3.0r0.iso 
 </listitem>
 </itemizedlist><para>or for the netinstall cd you can download for i386 
-</para><itemizedlist><listitem><para><ulink url='ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-i386-netinst-rc5.iso'>ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-i386-netinst-rc5.iso
+</para><itemizedlist><listitem><para><ulink url='ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-i386-netinst-3.0r0.iso'>ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-i386-netinst-3.0r0.iso
 </ulink>  
-</para><para><ulink url='http://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-i386-netinst-rc5.iso'>http://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-i386-netinst-rc5.iso
+</para><para><ulink url='http://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-i386-netinst-3.0r0.iso'>http://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-i386-netinst-3.0r0.iso
 </ulink> 
-</para>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-etch-i386-netinst-rc5.iso  
+</para>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-etch-i386-netinst-3.0r0.iso  
 </listitem>
 </itemizedlist><para>amd64 
-</para><itemizedlist><listitem><para><ulink url='ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-amd64-netinst-rc5.iso'>ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-amd64-netinst-rc5.iso
+</para><itemizedlist><listitem><para><ulink url='ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-amd64-netinst-3.0r0.iso'>ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-amd64-netinst-3.0r0.iso
 </ulink>  
-</para><para><ulink url='http://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-amd64-netinst-rc5.iso'>http://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-amd64-netinst-rc5.iso
+</para><para><ulink url='http://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-amd64-netinst-3.0r0.iso'>http://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-amd64-netinst-3.0r0.iso
 </ulink> 
-</para>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-etch-amd64-netinst-rc5.iso  
+</para>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-etch-amd64-netinst-3.0r0.iso  
 </listitem>
 </itemizedlist><para>and powerpc 
-</para><itemizedlist><listitem><para><ulink url='ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-powerpc-netinst-rc5.iso'>ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-powerpc-netinst-rc5.iso
+</para><itemizedlist><listitem><para><ulink url='ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-powerpc-netinst-3.0r0.iso'>ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-powerpc-netinst-3.0r0.iso
 </ulink>  
-</para><para><ulink url='http://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-powerpc-netinst-rc5.iso'>http://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-powerpc-netinst-rc5.iso
+</para><para><ulink url='http://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-powerpc-netinst-3.0r0.iso'>http://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-powerpc-netinst-3.0r0.iso
 </ulink> 
-</para>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-etch-powerpc-netinst-rc5.iso  
+</para>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-etch-powerpc-netinst-3.0r0.iso  
 </listitem>
 </itemizedlist><para>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 consider the port an experimental release of Debian-Edu, which we might not be able to support as the other archs. 
 </para><para/>
@@ -297,7 +296,7 @@
 </listitem><listitem>wait 
 </listitem><listitem>be happy 
 </listitem>
-</itemizedlist><para>FIXME: this section lacks info how to install half-thick clients, which we marketing as great feature...!  half-thick clients (aka diskless workstations) are set up after the installation, following the howto for it. 
+</itemizedlist><para>FIXME: this section lacks info how to install half-thick clients, which we marketing as great feature...! half-thick clients (aka diskless workstation aka lowfat clients s) are set up after the installation, following the howto for it. 
 </para><para/>
 </section><section><title>Screenshot tour through an i386 main-server installation
 </title><para>FIXME 
@@ -305,12 +304,12 @@
 </section>
 </section> <para/><section><title>Getting started
 </title><para>FIXME: Describe here, what needs to be done after the installation to use Debian-Edu for real. 
-</para><para>The [.<ulink url='/DebianEdu/Documentation/Etch/GettingStarted/HowTo'>/HowTo
-</ulink>] chapter describes more tips and tricks and frequently asked questions, while this is for the stuff everybody needs to do. 
-</para><para/><section><title>Services running on tjener
-</title><para>There are several services running on the tjener which can be managed via a web management interface.  We'll describe each service here. 
+</para><para>The <ulink url='/DebianEdu/Documentation/Etch/HowTo'>howto
+</ulink> chapter describes more tips and tricks and frequently asked questions, while this is for the stuff everybody needs to do. 
+</para><para/><section><title>Services running on the main server
+</title><para>There are several services running on the main server which can be managed via a web management interface.  We'll describe each service here. 
 </para><para/><section><title>User Management
-</title><para>Point your webbrowser to <ulink url='https://tjener.intern/lwat'>https://tjener.intern/lwat
+</title><para>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 account.  If you visit this site the first time after installation the loginname there is: 
 </para><screen><![CDATA[admin]]>
 </screen><para>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 detailed Information about lwat please have a look on the help-pages provided from lwat(They are linked in lwat). Here a list what is possible with lwat: 
@@ -331,7 +330,7 @@
 </para><para/>
 </section>
 </section><section><title>Printer Managment
-</title><para>For Printer Management point your webbrowser to <ulink url='https://tjener.intern/cups'>https://tjener.intern/cups
+</title><para>For Printer Management point your webbrowser to <ulink url='https://www/cups'>https://www/cups
 </ulink>.  This is the normal cups management site where you can add/delete/modfiy your printers and can clean up the printing queue.  For changes you'll have to login as root with your root password. So you should access this site never without using ssl.  
 </para><para>FIXME: Go further  
 </para><para/>
@@ -459,7 +458,7 @@
 </para><para>are cron-apt 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://tjener.intern/slbackup-php'>https://tjener.intern/slbackup-php
+</title><para>For the backup management point your browser to <ulink url='https://www/slbackup-php'>https://www/slbackup-php
 </ulink>. Please note that you have to access this site via ssl, since you have to enter the root password there. If you try to access this site without using ssl it will fail. 
 </para><para>FIXME: I have to have a look on the webpage of slbackup-php to describe this further 
 </para><para/>
@@ -469,20 +468,32 @@
 </section><section><title>Nagios
 </title><para/>
 </section><section><title>Sitesummary
-</title><para>give pointers to munin, sitesummary and nagios doc  
+</title><para>Some documentation on sitesummary is available from <ulink url='http://wiki.debian.org/DebianEdu/HowTo/SiteSummary'>http://wiki.debian.org/DebianEdu/HowTo/SiteSummary
+</ulink> 
+</para><para>give pointers to munin, sitesummary and nagios doc  
 </para>
 </section>
 </section>
 </section> <para/><section><title>Upgrades
-</title><para>FIXME: add link to debian release notes, here or in [./Installation] ? 
+</title><para>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/Skolelinux comes with ABSOLUTELY NO WARRANTY, to the extent permitted by applicable law.
+</emphasis> 
+</para><para>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 way as your production server. There you can test the upgrade without risk and see if everything works as it should. 
+</para><para>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 them here. Debian-Edu sarge will receive continued support for some time in the future. FIXME: decide and document how long we will be able to support sarge. 
 </para><para/><section><title>Upgrades from Debian-Edu sarge
+</title><para>Please read this chapter completly before you start upgrading your systems. 
+</para><para>In case of problems you could also read the <ulink url='http://www.debian.org/releases/stable/releasenotes'>releasenotes for Debian etch
+</ulink>. (Debian-Edu/Skolelinux "2.0 Terra" installed a 2.6 kernel as default, but if you are running a 2.4 kernel, you <emphasis>should
+</emphasis> read the  <ulink url='http://www.debian.org/releases/stable/i386/release-notes/ch-information.en.html#s-upgrade-to-2.6'>notes on upgrading from kernel 2.4 to 2.6
+</ulink> before you upgrade!) 
+</para><para/><section><title>Partioning scheme changed
 </title><para>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 Groups: 
 </para><itemizedlist><listitem>vg_data which holds the Data Partition as /skole/tjener/home0, ... 
 </listitem><listitem>vg_system contains System Partitions as /var, /usr /var/spool/squid 
 </listitem>
 </itemizedlist><para>But the etch based release has only 1 Volume Group due to internal changes of the Installer.  
 </para><para>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 large Virtual Pc, the upgrade failed since it was not possible to free more space on the vg_sytem.  Please note that you should have about 1,5GB free space on /var and about 600MB free space on /usr.  If this is not fullfilled the upgrade will fail because of too less space on the device.  
-</para><para/><section><title>Prepare the System
+</para><para/>
+</section><section><title>Prepare the System
 </title><para>If you have enough space in the vg_system Volumegroup but not in the lv_var- Partition you have to resize this partition: 
 </para><itemizedlist><listitem>1.) Umount the partition (don't forget that you'll have to umount for this /var/spool/squid, too): <itemizedlist><listitem><screen><![CDATA[/etc/init.d/squid stop 
 umount /var/spool/squid
@@ -521,7 +532,53 @@ deb http://ftp.skolelinux.org/skolelinux etch local]]>
 </ulink> is based on a very plain fresh installation of an mainserver + terminalserver. So which questions raises up in addition to that depends on what is additionally installed on your system (which isn't included per default in the sarge based <ulink url='/DebianEdu'>DebianEdu
 </ulink> Release).  So if there are any questions where you don't know what to answer, don't hesitate to ask us at the Mailinglist (<ulink url='mailto:debian-edu at lists.debian.org'>debian-edu at lists.debian.org
 </ulink>) or at IRC (irc.oftc.net): #debian-edu. 
-</para><para>FIXME: Which questions raises up here (I'll fix this tomorrow ;-)) 
+</para><para>* Configure nagios-common. 
+</para><itemizedlist><listitem><para>Here you have to enter an passwort for the <emphasis>nagiosadmin
+</emphasis> user. 
+</para>
+</listitem>
+</itemizedlist><para>* Configure console-data 
+</para><itemizedlist><listitem>Choose here "Don't change keyboard layout" 
+</listitem>
+</itemizedlist><para>* Configure openssh-server 
+</para><itemizedlist><listitem>Don't deaktivate here the challenge-response Auth.  
+</listitem>
+</itemizedlist><para>* Configure systat 
+</para><itemizedlist><listitem>Choose the default (yes) here. 
+</listitem>
+</itemizedlist><para>* Configure popularity-contest 
+</para><itemizedlist><listitem>You should choose yes here, this would help us to improve debian-edu. (We'll get an weekly report which programs are how often used). Of course anonymously. 
+</listitem>
+</itemizedlist><para>* Configure libnss-ldap 
+</para><orderedlist numeration='arabic'><listitem><para>Change the prompt to: <emphasis>ldaps://ldap/
+</emphasis> 
+</para>
+</listitem><listitem><para>Change the prompt to: <emphasis>dc=skole,dc=skolelinux,dc=no
+</emphasis> 
+</para>
+</listitem><listitem>Use ldapversion 3 here 
+</listitem><listitem>Which Account should root use for ldap lookups FIXME 
+</listitem><listitem>Which password should root use here FIXME 
+</listitem>
+</orderedlist><para>* Upgrade glibc now. Answer Yes here. 
+</para><para>* Restart Services. Answer Yes here. 
+</para><para>Okay. This should be all if you have no additional packages installed. Now the upgrade process start to replace the packages. 
+</para><para>The upgrade will fail with this error message:  
+</para><screen><![CDATA[Errors were encountered while processing: 
+ mozilla-firefox-locale-it
+ mozilla-firefox-locale-el
+E: Sub-process /usr/bin/dpkg returned an error code (1)
+]]>
+</screen><para>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/info/mozilla-firefox-local-el.postrm
+</emphasis> and comment out in both the line containing: <emphasis>update-mozilla-firefox-chrome
+</emphasis>. Then restart the upgrade process with:  
+</para><screen><![CDATA[apt-get -f install]]>
+</screen><para>Now the upgrade work again: 
+</para><para>* Several Modified configuration files (nagios) 
+</para><itemizedlist><listitem>You should always keep your installed one (default) and hit enter 
+</listitem>
+</itemizedlist><para>*  
 </para><para/>
 </section>
 </section><section><title>Upgrades from older Debian-Edu / Skolelinux installations
@@ -534,72 +591,113 @@ deb http://ftp.skolelinux.org/skolelinux etch local]]>
 </title><para><emphasis role='strong'>FIXME
 </emphasis>, for now some basic pointers: 
 </para><itemizedlist><listitem><para><ulink url='http://wiki.debian.org/DebianEdu'>http://wiki.debian.org/DebianEdu
-</ulink> 
+</ulink> - mostly developer centric wiki 
 </para>
 </listitem><listitem><para><ulink url='http://lists.debian.org/debian-edu'>http://lists.debian.org/debian-edu
-</ulink> 
+</ulink> - developer centric mailing list 
 </para>
 </listitem><listitem>#debian-edu on irc.debian.org 
 </listitem>
-</itemizedlist><para/>
+</itemizedlist><para>FIXME: add info how developers and testers can contribute. 
+</para><para>== Documentation writers ==  
+</para><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/
+</ulink> <inlinemediaobject><imageobject><imagedata width='15' fileref='/wiki/rightsidebar/img/smile.png' depth='15'/>
+</imageobject><textobject><phrase>:-)
+</phrase>
+</textobject>
+</inlinemediaobject> 
+</para><para/>
 </section><section><title>Translations wanted
-</title><para>Translations of this document are kept in .po files like in many free software projects, read {{usr/share/doc/debian-edu-doc/README.release-manual-translations}} for more information on this. There are many easy tools for translating. 
-</para><para>To update the translations you need to be a member of the alioth project {{debian}}. 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
+</title><para>Translations of this document are kept in .po files like in many free software projects, read <code>usr/share/doc/debian-edu-doc/README.release-manual-translations
+</code> for more information on this. There are many easy tools for translating. 
+</para><para>To update the translations you need to be a member of the alioth project <code>debian
+</code>. 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. 
 </para><para>Checkout the source package with the following command: 
-</para><itemizedlist><listitem>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/debian-edu-doc 
+</para><itemizedlist><listitem><para><code>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/debian-edu-doc
+</code> 
+</para>
 </listitem>
 </itemizedlist><para/>
-</section><section><title>Join a local debian-edu team
+</section><section><title>Join a local Debian-Edu team
 </title><para><emphasis role='strong'>FIXME
 </emphasis>: in Norway, Germany, France, Spain (the region of Extremadura).  
 </para><para/>
-</section><section><title>start a new local debian-edu team
+</section><section><title>Start a new local Debian-Edu team
 </title><para><emphasis role='strong'>FIXME:
 </emphasis> "isolated" contributors and users in schools exist in Greece, the Netherlands, Japan and elsewhere. Meet up for beer or coffee and form a new Debian Edu local team! 
 </para>
 </section>
 </section> <para/><section><title>Support
-</title><para/><section><title>volunteer based support
+</title><para/><section><title>Volunteer based support
 </title><para/><section><title>in english
-</title><itemizedlist><listitem><para><ulink url='http://lists.debian.org/debian-edu'>http://lists.debian.org/debian-edu
-</ulink> - developer centric mailing list, more useful to report problems than to get real support 
-</para>
-</listitem><listitem><para><ulink url='https://init.linpro.no/mailman/skolelinux.no/listinfo/admin-discuss'>https://init.linpro.no/mailman/skolelinux.no/listinfo/admin-discuss
+</title><itemizedlist><listitem><para><ulink url='https://init.linpro.no/mailman/skolelinux.no/listinfo/admin-discuss'>https://init.linpro.no/mailman/skolelinux.no/listinfo/admin-discuss
 </ulink> - english speaking support mailing list 
 </para>
-</listitem><listitem>#debian-edu on irc.debian.org 
+</listitem><listitem><para><ulink url='http://lists.debian.org/debian-edu'>http://lists.debian.org/debian-edu
+</ulink> - developer centric mailing list, more useful to report problems than to get real support 
+</para>
+</listitem><listitem>#debian-edu on irc.debian.org - developer centric IRC channel 
 </listitem>
 </itemizedlist><para/>
 </section><section><title>in norwegian
-</title><itemizedlist><listitem><para><ulink url='https://init.linpro.no/mailman/skolelinux.no/listinfo/linuxiskolen'>https://init.linpro.no/mailman/skolelinux.no/listinfo/linuxiskolen
-</ulink> 
-</para>
-</listitem><listitem><para><ulink url='https://init.linpro.no/mailman/skolelinux.no/listinfo/bruker'>https://init.linpro.no/mailman/skolelinux.no/listinfo/bruker
+</title><itemizedlist><listitem><para><ulink url='https://init.linpro.no/mailman/skolelinux.no/listinfo/bruker'>https://init.linpro.no/mailman/skolelinux.no/listinfo/bruker
 </ulink> - norwegian speaking support mailing list 
 </para>
-</listitem><listitem>#skolelinux on irc.debian.org 
+</listitem><listitem><para><ulink url='https://init.linpro.no/mailman/skolelinux.no/listinfo/linuxiskolen'>https://init.linpro.no/mailman/skolelinux.no/listinfo/linuxiskolen
+</ulink> - FIXME: what is this 
+</para>
+</listitem><listitem>#skolelinux on irc.debian.org - FIXME: what is this 
 </listitem>
-</itemizedlist><para>FIXME: briefly describe the diffs between those lists... 
-</para><para/>
+</itemizedlist><para/>
 </section><section><title>in german
 </title><itemizedlist><listitem><para><ulink url='http://www.skolelinux.de/mailman/listinfo/user'>http://www.skolelinux.de/mailman/listinfo/user
 </ulink> - german speaking support mailinglist 
 </para>
-</listitem><listitem>#skolelinux.de on irc.debian.org 
+</listitem><listitem><para><ulink url='http://wiki.skolelinux.de'>http://wiki.skolelinux.de
+</ulink> - german wiki with lots of <ulink url='/HowTos'>HowTos
+</ulink> etc. 
+</para>
+</listitem><listitem>#skolelinux.de on irc.debian.org - german speaking support IRC channel 
 </listitem>
 </itemizedlist><para/>
 </section><section><title>in french
 </title><itemizedlist><listitem><para><ulink url='http://lists.debian.org/debian-edu-french'>http://lists.debian.org/debian-edu-french
-</ulink> 
+</ulink> - french speaking support mailinglist 
 </para>
 </listitem>
 </itemizedlist><para/>
 </section>
-</section><section><title>professional support
-</title><para>Lists of companies providing professional support is available from <ulink url='http://wiki.skolelinux.no/Hjelp/ProfesjonellHjelp'>http://wiki.skolelinux.no/Hjelp/ProfesjonellHjelp
-</ulink> for Norway and <ulink url='http://wiki.debian.org/DebianEdu/Help/ProfessionalHelp'>http://wiki.debian.org/DebianEdu/Help/ProfessionalHelp
-</ulink> for the rest of the world. 
+</section><section><title>Professional support
+</title><para>Lists of companies providing professional support are available from <ulink url='http://wiki.debian.org/DebianEdu/Help/ProfessionalHelp'>http://wiki.debian.org/DebianEdu/Help/ProfessionalHelp
+</ulink>. 
+</para>
+</section>
+</section> <para/><section><title>Copyright and authors
+</title><para>This document is written and copyrighted 2007 by Holger Levsen, Petter Reinholdtsen, Daniel Heß and  Patrick Winnertz and is released under the GPL2 or any later version. Enjoy! 
+</para><para>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
+</emphasis>! Then add your name here and release it under the GPL2 or later version. 
+</para><para/>
+</section><section><title>Translation copyright and authors
+</title><para>The spanish translation is copyrighted 2007 by José L. Redrejo Rodríguez and is released under the GPL2 or any later version. 
+</para><para>The norwegian Bokmål translation is copyrighted 2007 by Petter Reinholdtsen and is released under the GPL2 or any later version. 
+</para><para>The german translation is copyrighted 2007 by Holger Levsen and is released under the GPL2 or any later version. 
+</para>
+</section> <para/><section><title>Translations of this document
+</title><para>Fully translated versions of this document are not yet available, as the document itself is very incomplete. Incomplete translations for Norwegian Bokmål and Spanish exist. 
+</para><para/><section><title>Howto translate this document
+</title><para>If you want to start translating, you can! Read /usr/share/doc/debian-edu-doc/README.release-manual-translations to find information how to create a .po file for your language, and how to update it against <ulink url='http://wiki.skolelinux.no/DebianEdu/Documentation/Etch/AllInOne?action=format&mimetype=xml/docbook'>the source
+</ulink>.  
+</para><para><emphasis role='strong'>FIXME:
+</emphasis> describe how to work in svn and give a step by step howto. 
+</para><para/>
+</section><section><title>Potential problems for translations
+</title><para>We will need to write sed-scripts (or something like that) to support different images for different translations. Laters <inlinemediaobject><imageobject><imagedata width='15' fileref='/wiki/rightsidebar/img/smile.png' depth='15'/>
+</imageobject><textobject><phrase>:)
+</phrase>
+</textobject>
+</inlinemediaobject> 
+</para><para>Please report any other showstoppers. 
 </para>
 </section>
 </section> <para/><section><title>Appendix A - The GNU Public Licence


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