[debian-edu-commits] debian-edu/ 01/01: Updated from the wiki.

[Petter Reinholdtsen]

This is an automated email from the git hooks/post-receive script.

pere pushed a commit to branch master
in repository debian-edu-itil-doc-nb.

commit b657943b0cd54d201d879fb416caf6a3708f1a29
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Sun Apr 5 10:24:53 2015 +0200

    Updated from the wiki.
---
 documentation/itil/itil.pot | 8 +++-----
 documentation/itil/itil.xml | 6 ++----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/documentation/itil/itil.pot b/documentation/itil/itil.pot
index f7bdca4..1bd4a3e 100644
--- a/documentation/itil/itil.pot
+++ b/documentation/itil/itil.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-04-05 10:00+0300\n"
+"POT-Creation-Date: 2015-04-05 10:23+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"
@@ -8728,8 +8728,7 @@ msgstr ""
 msgid ""
 "#deb file:///cdrom/ sarge main local\n"
 "\n"
-"deb cdrom:[Debian GNU/Linux edu _Sarge_ - Unofficial i386 Binary-1 (20050808)]/ unstable contrib loc\n"
-"al main non-free\n"
+"deb cdrom:[Debian GNU/Linux edu _Sarge_ - Unofficial i386 Binary-1 (20050808)]/ unstable contrib local main non-free\n"
 "\n"
 "# deb http://security.debian.org/ stable/updates main contrib non-free\n"
 "#deb http://security.debian.org/ sarge/updates main contrib non-free\n"
@@ -8762,8 +8761,7 @@ msgstr ""
 msgid ""
 "#deb file:///cdrom/ sarge main local\n"
 "\n"
-"#deb cdrom:[Debian GNU/Linux edu _Sarge_ - Unofficial i386 Binary-1 (20050808)]/ unstable contrib lo\n"
-"cal main non-free\n"
+"#deb cdrom:[Debian GNU/Linux edu _Sarge_ - Unofficial i386 Binary-1 (20050808)]/ unstable contrib local main non-free\n"
 "\n"
 "#deb http://security.debian.org/ stable/updates main contrib non-free\n"
 "deb http://security.debian.org/ sarge/updates main contrib non-free\n"
diff --git a/documentation/itil/itil.xml b/documentation/itil/itil.xml
index c460b2a..17ab6d1 100644
--- a/documentation/itil/itil.xml
+++ b/documentation/itil/itil.xml
@@ -4762,8 +4762,7 @@ model name      : Intel(R) Xeon(TM) CPU 2.66GHz]]></screen>
 <para>Dette er innholdet av en fil med referanser til pakkearkiv på Internett eller fra en CD-rom:  
 </para><screen><![CDATA[#deb file:///cdrom/ sarge main local
 
-deb cdrom:[Debian GNU/Linux edu _Sarge_ - Unofficial i386 Binary-1 (20050808)]/ unstable contrib loc
-al main non-free
+deb cdrom:[Debian GNU/Linux edu _Sarge_ - Unofficial i386 Binary-1 (20050808)]/ unstable contrib local main non-free
 
 # deb http://security.debian.org/ stable/updates main contrib non-free
 #deb http://security.debian.org/ sarge/updates main contrib non-free
@@ -4781,8 +4780,7 @@ al main non-free
 <para>Som en start bør det se ut som dette:  
 </para><screen><![CDATA[#deb file:///cdrom/ sarge main local
 
-#deb cdrom:[Debian GNU/Linux edu _Sarge_ - Unofficial i386 Binary-1 (20050808)]/ unstable contrib lo
-cal main non-free
+#deb cdrom:[Debian GNU/Linux edu _Sarge_ - Unofficial i386 Binary-1 (20050808)]/ unstable contrib local main non-free
 
 #deb http://security.debian.org/ stable/updates main contrib non-free
 deb http://security.debian.org/ sarge/updates main contrib non-free

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/upstream/debian-edu-itil-doc-nb.git