[debian-edu-commits] debian-edu/debian-edu-doc.git (#1628) - master (branch) updated: 1.5_20131001_7.1-8-g2cb9b64

Tue Oct 1 23:23:29 UTC 2013

The branch, master has been updated
       via  2cb9b64e9833b7685c02c157cb31efe3495b33eb (commit)
      from  2e3ede1beaa6affa7d73cd1a6e750a44873d4407 (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 2cb9b64e9833b7685c02c157cb31efe3495b33eb
Author: David Prévot <taffit at debian.org>
Date:   Tue Oct 1 19:21:53 2013 -0400

    Update manual from the wiki

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

Summary of changes:
 .../debian-edu-wheezy/debian-edu-wheezy-manual.pot     |   16 ++++++++--------
 .../debian-edu-wheezy/debian-edu-wheezy-manual.xml     |    6 +++---
 2 files changed, 11 insertions(+), 11 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 da83d5f..34c5bc0 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-10-01 17:27-0400\n"
+"POT-Creation-Date: 2013-10-01 19:19-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -829,7 +829,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"For running Iceweasel/Firefox and OpenOffice.org, 128 MiB RAM is a minimum "
+"For running Iceweasel/Firefox and LibreOffice, 128 MiB RAM is a minimum "
 "requirement."
 msgstr ""
 
@@ -856,11 +856,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"On workstations with little RAM the spell checker can cause OpenOffice.org "
-"to hang if the swap space is too small. Then the system administrator has to "
-"disable the spell checker on OpenOffice.org or students have to kill "
-"OpenOffice.org, resulting in loss of work. Enabling at least 512 MiB swap on "
-"a 320 MiB RAM workstation solves this, and the spell checker runs smoothly."
+"On workstations with little RAM the spell checker can cause LibreOffice to "
+"hang if the swap space is too small. Then the system administrator has to "
+"disable the spell checker on LibreOffice or students have to kill "
+"LibreOffice, resulting in loss of work. Enabling at least 512 MiB swap on a "
+"320 MiB RAM workstation solves this, and the spell checker runs smoothly."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -5170,7 +5170,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Note: Since such ten-year-old thin clients may also have trouble running "
-"never versions of OpenOffice.org and Firefox/Iceweasel due to pixmap caching "
+"never versions of LibreOffice and Firefox/Iceweasel due to pixmap caching "
 "issues, you may consider running thin clients with at least 128 MB RAM, or "
 "upgrade the hardware, which will also give you the benefit of being able to "
 "use them as diskless workstations."
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
index fe0c562..014cf0c 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
@@ -328,7 +328,7 @@
 </para>
 <itemizedlist>
 <listitem>
-<para>For running Iceweasel/Firefox and OpenOffice.org, 128 MiB RAM is a minimum requirement.  
+<para>For running Iceweasel/Firefox and LibreOffice, 128 MiB RAM is a minimum requirement.  
 </para></listitem></itemizedlist></listitem>
 <listitem>
 <para>For workstations, diskless workstations and standalone PCs, 800 MHz, 320 MiB RAM are minimum requirements, though 512 or 1024 MiB RAM will perform considerably better. Just a faster CPU will speed things up.  
@@ -342,7 +342,7 @@
 <para>If your diskless workstations have hard drives, it is recommended to use them for swap as it is a lot faster than network swapping.  
 </para></listitem></itemizedlist></listitem>
 <listitem>
-<para>On workstations with little RAM the spell checker can cause OpenOffice.org to hang if the swap space is too small. Then the system administrator has to disable the spell checker on OpenOffice.org or students have to kill OpenOffice.org, resulting in loss of work. Enabling at least 512 MiB swap on a 320 MiB RAM workstation solves this, and the spell checker runs smoothly.  
+<para>On workstations with little RAM the spell checker can cause LibreOffice to hang if the swap space is too small. Then the system administrator has to disable the spell checker on LibreOffice or students have to kill LibreOffice, resulting in loss of work. Enabling at least 512 MiB swap on a 320 MiB RAM workstation solves this, and the spell checker runs smoothly.  
 </para></listitem></itemizedlist></listitem>
 <listitem>
 <para>Laptops have the same requirements as for workstations since they are just movable workstations. 
@@ -2197,7 +2197,7 @@ exit]]></screen>
 </para><screen><![CDATA[LDM_DIRECTX=True]]></screen>
 <para><inlinemediaobject><imageobject><imagedata fileref="./images/alert.png"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> <emphasis role="strong">Warning</emphasis>: The above protects initial login, but all activities after that use unencrypted networked X. Passwords (except the initial one) will travel in cleartext over the network, as well as anything else. 
 </para>
-<para>Note: Since such ten-year-old thin clients may also have trouble running never versions of OpenOffice.org and Firefox/Iceweasel due to pixmap caching issues, you may consider running thin clients with at least 128 MB RAM, or upgrade the hardware, which will also give you the benefit of being able to use them as diskless workstations. 
+<para>Note: Since such ten-year-old thin clients may also have trouble running never versions of LibreOffice and Firefox/Iceweasel due to pixmap caching issues, you may consider running thin clients with at least 128 MB RAM, or upgrade the hardware, which will also give you the benefit of being able to use them as diskless workstations. 
 </para>
 </section>
 </section>


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).


