[debian-edu-commits] debian-edu/debian-edu-doc.git (#1549) - master (branch) updated: 1.5_20130714_7.1-17-g5bd433e

Sat Jul 27 07:59:36 UTC 2013

The branch, master has been updated
       via  5bd433ee377720e47e8a7dd46ab6c8aaa657ed4b (commit)
      from  da1bd202715e8db10861eaac6841e1750e325170 (commit)

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

- Log -----------------------------------------------------------------
commit 5bd433ee377720e47e8a7dd46ab6c8aaa657ed4b
Author: David Prévot <taffit at debian.org>
Date:   Sat Jul 27 09:15:57 2013 +0200

    Update manual and images from the wiki

-----------------------------------------------------------------------

Summary of changes:
 .../debian-edu-wheezy/debian-edu-wheezy-manual.pot |   25 ++++++++++----------
 .../debian-edu-wheezy/debian-edu-wheezy-manual.xml |   14 +++++------
 .../debian-edu-wheezy/images/de/worldmap.png       |  Bin 386904 -> 386834 bytes
 .../debian-edu-wheezy/images/es/worldmap.png       |  Bin 387021 -> 386933 bytes
 .../debian-edu-wheezy/images/fr/worldmap.png       |  Bin 386939 -> 386873 bytes
 .../debian-edu-wheezy/images/worldmap.png          |  Bin 386940 -> 386868 bytes
 6 files changed, 20 insertions(+), 19 deletions(-)

The diff of changes is:

diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
index e44c895..7b68c5d 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-07-20 17:47-0400\n"
+"POT-Creation-Date: 2013-07-27 09:04+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -75,7 +75,7 @@ msgid ""
 "flash drive all other machines can be installed via the network, this "
 "includes \"roaming workstations\" (ones that can be taken away from the "
 "school network, usually laptops or netbooks) as well as PXE booting for "
-"diskless machines like tradional thin-clients."
+"diskless machines like traditional thin-clients."
 msgstr ""
 
 #. type: Content of: <article><section><para>
@@ -1544,16 +1544,16 @@ msgstr ""
 msgid ""
 "After giving the root password, you will be asked to create a normal user "
 "account \"for non-administrative tasks\". For Debian Edu this account is "
-"very important: It is the account you will use to manage the Skolelinux "
+"very important: it is the account you will use to manage the Skolelinux "
 "network."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The choosen password for this user <emphasis role=\"strong\">must</emphasis> "
-"have a length of <emphasis role=\"strong\">at least 5 characters</emphasis> "
-"- otherwise login will not be possible. (And that's even though a shorter "
-"password will be accepted by the installer.)"
+"The password for this user <emphasis role=\"strong\">must</emphasis> have a "
+"length of <emphasis role=\"strong\">at least 5 characters</emphasis> - "
+"otherwise login will not be possible (even though a shorter password will be "
+"accepted by the installer)."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -1615,7 +1615,7 @@ msgid ""
 "of packages fetched from the net varies from profile to profile but stays "
 "below a gigabyte (unless you choose to install all possible desktops). Once "
 "you have installed the main-server (whether a pure main-server or combi-"
-"server does not matter), further installation will use it's proxy to avoid "
+"server does not matter), further installation will use its proxy to avoid "
 "downloading the same package several times from the net."
 msgstr ""
 
@@ -2625,8 +2625,9 @@ msgstr ""
 #. type: Content of: <article><section><section><para>
 msgid ""
 "Diskless workstations and thin-clients work out-of-the-box when connected to "
-"the main network. Only workstations with disks *have* to be added with "
-"GOsa², but all *can*."
+"the main network. Only workstations with disks <emphasis role=\"strong"
+"\">have</emphasis> to be added with GOsa², but all <emphasis role=\"strong"
+"\">can</emphasis>."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -2646,7 +2647,7 @@ msgid ""
 "alternatively you might click the <computeroutput>Propose ip</"
 "computeroutput> button which will show the first free fixed address in "
 "10.0.0.0/8, most probably something like 10.0.0.2 if you add the first "
-"machine this way. It may be better to first think about your network: For "
+"machine this way. It may be better to first think about your network: for "
 "example you could use 10.0.0.x with x>10 and x<50 for servers, and "
 "x>100 for workstations. Don't forget to activate the just added system. "
 "With the exception of the main server all systems will then have a matching "
@@ -2662,7 +2663,7 @@ msgid ""
 "h</computeroutput> shows usage information. Please note, that the IP "
 "addresses shown after usage of <computeroutput>sitesummary2ldapdhcp</"
 "computeroutput> belong to the dynamic IP range. These systems can then be "
-"modified though to suite your network: Rename each new system, activate DHCP "
+"modified though to suit your network: rename each new system, activate DHCP "
 "and DNS, add it to netgroups, if needed; reboot the system afterwards.  The "
 "following screenshots show how this looks in practice:"
 msgstr ""
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
index fac2bfb..a1a40fa 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
@@ -19,7 +19,7 @@
 </title>
 <para>Debian Edu aka Skolelinux is a Linux distribution based on Debian providing an out-of-the box environment of a completely configured school network.   
 </para>
-<para>Immediatly after installation a school server running all services needed for a school network is set up (see the next chapter <link linkend="Architecture">details of the architecture of this setup</link>), just waiting for users and machines being added via GOsa², a comfortable Web-UI, or any other LDAP editor. A netbooting environment is prepared using PXE, so after initial installation of the main server from CD, Blue-ray disc or USB flash drive all other machines can be installed via the network, this includes "roaming workstations" (ones that can be taken away from the school network, usually laptops or netbooks) as well as PXE booting for diskless machines like tradional thin-clients. 
+<para>Immediatly after installation a school server running all services needed for a school network is set up (see the next chapter <link linkend="Architecture">details of the architecture of this setup</link>), just waiting for users and machines being added via GOsa², a comfortable Web-UI, or any other LDAP editor. A netbooting environment is prepared using PXE, so after initial installation of the main server from CD, Blue-ray disc or USB flash drive all other machines can be installed via the network, this includes "roaming workstations" (ones that can be taken away from the school network, usually laptops or netbooks) as well as PXE booting for diskless machines like traditional thin-clients. 
 </para>
 <para>Several educational applications like celestia, drgeo, gcompris, kalzium, kgeography, solfege and scratch are included in the default desktop setup, which can be extended easily and almost endlessly via the Debian universe. 
 </para>
@@ -649,9 +649,9 @@ FIXME: the source DVD download URL currently doesn't work
 <para>Wait. If the selected profiles include Thin-client-server then the installer will spend quite some time at the end, "Finishing the installation - Running debian-edu-profile-udeb..." 
 </para></listitem>
 <listitem>
-<para>After giving the root password, you will be asked to create a normal user account "for non-administrative tasks". For Debian Edu this account is very important: It is the account you will use to manage the Skolelinux network.  
+<para>After giving the root password, you will be asked to create a normal user account "for non-administrative tasks". For Debian Edu this account is very important: it is the account you will use to manage the Skolelinux network.  
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/alert.png"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> The choosen password for this user <emphasis role="strong">must</emphasis> have a length of <emphasis role="strong">at least 5 characters</emphasis> - otherwise login will not be possible. (And that's even though a shorter password will be accepted by the installer.) 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/alert.png"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> The password for this user <emphasis role="strong">must</emphasis> have a length of <emphasis role="strong">at least 5 characters</emphasis> - otherwise login will not be possible (even though a shorter password will be accepted by the installer). 
 </para></listitem>
 <listitem>
 <para>Be happy 
@@ -683,7 +683,7 @@ deb http://ftp.skolelinux.org/skolelinux wheezy local]]></screen>
 <section id="Installation--A_note_on_CD_installs">
 <title>A note on CD installs
 </title>
-<para>A netinst installation (which is the type of installation our CD provides) will fetch some packages from the CD and the rest from the net. The amount of packages fetched from the net varies from profile to profile but stays below a gigabyte (unless you choose to install all possible desktops). Once you have installed the main-server (whether a pure main-server or combi-server does not matter), further installation will use it's proxy to avoid downloading the same package several times from the net. 
+<para>A netinst installation (which is the type of installation our CD provides) will fetch some packages from the CD and the rest from the net. The amount of packages fetched from the net varies from profile to profile but stays below a gigabyte (unless you choose to install all possible desktops). Once you have installed the main-server (whether a pure main-server or combi-server does not matter), further installation will use its proxy to avoid downloading the same package several times from the net. 
 </para>
 </section>
 
@@ -1078,13 +1078,13 @@ net groupmap add unixgroup=NEW_GROUP type=domain ntgroup="NEW_GROUP"\
 </title>
 <para>Machine management basically allows you to manage all networked devices in your Debian Edu network. Every machine added to the LDAP directory using GOsa² has a hostname, an IP address, a MAC address and a domain name (which is usually "intern"). For a fuller description of the Debian Edu architecture see the <link linkend="Architecture">architecture</link> chapter of this manual. 
 </para>
-<para>Diskless workstations and thin-clients work out-of-the-box when connected to the main network. Only workstations with disks *have* to be added with GOsa², but all *can*. 
+<para>Diskless workstations and thin-clients work out-of-the-box when connected to the main network. Only workstations with disks <emphasis role="strong">have</emphasis> to be added with GOsa², but all <emphasis role="strong">can</emphasis>. 
 </para>
 <para>To add a machine, use the GOsa² main menu, systems, add. You can use an IP address/hostname from the preconfigured address space 10.0.0.0/8. Currently there are only two predefined fixed addresses: 10.0.2.2 (tjener) and 10.0.0.1 (gateway). The addresses from 10.0.16.20 to 10.0.31.254 (roughly 10.0.16.0/20 or 4000 hosts) are reserved for DHCP and are assigned dynamically. 
 </para>
-<para>To assign a host with the MAC address 52:54:00:12:34:10 a static IP address in GOsa² you have to enter the MAC address, the hostname and the IP; alternatively you might click the <computeroutput>Propose ip</computeroutput> button which will show the first free fixed address in 10.0.0.0/8, most probably something like 10.0.0.2 if you add the first machine this way. It may be better to first think about your network: For example you could use 10.0.0.x with x>10 and x<50 for servers, and x>100 for workstations. Don't forget to activate the just added system. With the exception of the main server all systems will then have a matching icon.  
+<para>To assign a host with the MAC address 52:54:00:12:34:10 a static IP address in GOsa² you have to enter the MAC address, the hostname and the IP; alternatively you might click the <computeroutput>Propose ip</computeroutput> button which will show the first free fixed address in 10.0.0.0/8, most probably something like 10.0.0.2 if you add the first machine this way. It may be better to first think about your network: for example you could use 10.0.0.x with x>10 and x<50 for servers, and x>100 for workstations. Don't forget to activate the just added system. With the exception of the main server all systems will then have a matching icon.  
 </para>
-<para>If the machines have booted as thin clients/diskless workstations or have been installed using any of the networked profiles, the <computeroutput>sitesummary2ldapdhcp</computeroutput> script can be used to automatically add machines to GOsa², <computeroutput>sitesummary2ldapdhcp -h</computeroutput> shows usage information. Please note, that the IP addresses shown after usage of <computeroutput>sitesummary2ldapdhcp</computeroutput> belong to the dynamic IP range. These systems can then be modified though to suite your network: Rename each new system, activate DHCP and DNS, add it to netgroups, if needed; reboot the system afterwards.   The following screenshots show how this looks in practice: 
+<para>If the machines have booted as thin clients/diskless workstations or have been installed using any of the networked profiles, the <computeroutput>sitesummary2ldapdhcp</computeroutput> script can be used to automatically add machines to GOsa², <computeroutput>sitesummary2ldapdhcp -h</computeroutput> shows usage information. Please note, that the IP addresses shown after usage of <computeroutput>sitesummary2ldapdhcp</computeroutput> belong to the dynamic IP range. These systems can then be modified though to suit your network: rename each new system, activate DHCP and DNS, add it to netgroups, if needed; reboot the system afterwards.   The following screenshots show how this looks in practice: 
 </para><screen><![CDATA[root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t workstations
 info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] id ether-00:04:76:d3:28:b7.
 
diff --git a/documentation/debian-edu-wheezy/images/de/worldmap.png b/documentation/debian-edu-wheezy/images/de/worldmap.png
index b93dd95..c2c62ff 100644
Binary files a/documentation/debian-edu-wheezy/images/de/worldmap.png and b/documentation/debian-edu-wheezy/images/de/worldmap.png differ
diff --git a/documentation/debian-edu-wheezy/images/es/worldmap.png b/documentation/debian-edu-wheezy/images/es/worldmap.png
index 988b845..fc7ae14 100644
Binary files a/documentation/debian-edu-wheezy/images/es/worldmap.png and b/documentation/debian-edu-wheezy/images/es/worldmap.png differ
diff --git a/documentation/debian-edu-wheezy/images/fr/worldmap.png b/documentation/debian-edu-wheezy/images/fr/worldmap.png
index 16ea548..2b12f4e 100644
Binary files a/documentation/debian-edu-wheezy/images/fr/worldmap.png and b/documentation/debian-edu-wheezy/images/fr/worldmap.png differ
diff --git a/documentation/debian-edu-wheezy/images/worldmap.png b/documentation/debian-edu-wheezy/images/worldmap.png
index 272cdbb..29c45f2 100644
Binary files a/documentation/debian-edu-wheezy/images/worldmap.png and b/documentation/debian-edu-wheezy/images/worldmap.png differ


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

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


