[l10n-russian CVS] release-notes Makefile,1.1,1.2 release-notes.en.sgml,1.7,1.8 release-notes.ru.po,1.19,1.20 release-notes.ru.sgml,1.5,1.6

Nikolai Prokoschenko debian-l10n-russian@lists.debian.org
Sat, 28 May 2005 08:57:21 +0000


Update of /cvsroot/l10n-russian/release-notes
In directory haydn:/tmp/cvs-serv22037

Modified Files:
	Makefile release-notes.en.sgml release-notes.ru.po 
	release-notes.ru.sgml 
Log Message:
sync with current revision

Index: Makefile
===================================================================
RCS file: /cvsroot/l10n-russian/release-notes/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile	24 May 2005 23:04:27 -0000	1.1
+++ Makefile	28 May 2005 08:57:19 -0000	1.2
@@ -16,7 +16,7 @@
 
 update-po:
 	debiandoc2pot $(SGML_ORIG) > $(POT)
-	msgmerge -U $(PO) $(POT)
+	msgmerge --no-wrap -U $(PO) $(POT)
 
 stats:
 	msgfmt -v -o /dev/null $(PO)

Index: release-notes.ru.po
===================================================================
RCS file: /cvsroot/l10n-russian/release-notes/release-notes.ru.po,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- release-notes.ru.po	27 May 2005 07:37:37 -0000	1.19
+++ release-notes.ru.po	28 May 2005 08:57:19 -0000	1.20
@@ -861,13 +861,13 @@
 "deal with file conflicts if they should occur."
 msgstr ""
 
-#. <heading> 480--480
-#: release-notes.en.sgml:480
+#. <heading> 481--481
+#: release-notes.en.sgml:481
 msgid "Checking kernel support"
 msgstr "Проверка поддержки ядра"
 
-#. <p> 483--484
-#: release-notes.en.sgml:483
+#. <p> 484--485
+#: release-notes.en.sgml:484
 msgid ""
 "All machines with a 64bit SPARC CPU (sun4u) should be upgradable without any "
 "special considerations about kernel support."
@@ -875,8 +875,8 @@
 "Все системы с 64-битными процессорами SPARC (sun4u) должны обновиться не "
 "требуя никакой специальной поддержки ядра."
 
-#. <p> 486--488
-#: release-notes.en.sgml:486
+#. <p> 487--489
+#: release-notes.en.sgml:487
 #, fuzzy
 msgid ""
 "sun4c CPUs are <em>no longer supported</em> in &releasename;. The support "
@@ -887,8 +887,8 @@
 "почти ничего неизвестно, так как они очень редки. Вполне возможно, что "
 "процессоры sun4d с MMU будут работать."
 
-#. <p> 490--494
-#: release-notes.en.sgml:490
+#. <p> 491--495
+#: release-notes.en.sgml:491
 #, fuzzy
 msgid ""
 "sun4m CPUs are still supported but you need to install a newer kernel "
@@ -902,8 +902,8 @@
 "содержат команды процессора, которые на некоторых машинах недоступны. Новое "
 "ядро будет эмулировать недостающие команды."
 
-#. <p> 496--499
-#: release-notes.en.sgml:496
+#. <p> 497--500
+#: release-notes.en.sgml:497
 msgid ""
 "Technically only <em>some</em> sun4m chips are affected, but as glibc can't "
 "reliably detect whether a system is affected it will refuse to be upgraded "
@@ -914,8 +914,8 @@
 "процессором, то он просто откажется устанавливаться на любую 32-битную "
 "систему на базе SPARC без исправленного ядра."
 
-#. <p> 501--506
-#: release-notes.en.sgml:501
+#. <p> 502--507
+#: release-notes.en.sgml:502
 msgid ""
 "For those interested in the gory details: some of the sun4m chips, produced "
 "by Cypress/ROSS, don't implement the <tt>umul</tt> instruction (RT601/"
@@ -930,8 +930,8 @@
 "6xxMP. Более поздние модели использовали чипы производства TI. Пока нам "
 "неизвестно, распространяется ли на них этот недостаток."
 
-#. <p> 511--515
-#: release-notes.en.sgml:511
+#. <p> 512--516
+#: release-notes.en.sgml:512
 #, fuzzy
 msgid ""
 "On 64bit HPPA machines you will need to upgrade to a newer kernel version "
@@ -944,8 +944,8 @@
 "некоторых машинах недоступны. Новое ядро будет эмулировать недостающие "
 "команды."
 
-#. <p> 519--521
-#: release-notes.en.sgml:519
+#. <p> 520--522
+#: release-notes.en.sgml:520
 #, fuzzy
 msgid ""
 "True \"80386\" CPUs are <em>no longer supported</em> by &releasename;. This "
@@ -954,30 +954,17 @@
 "\"Настоящие\" 386 (процессоры Intel 80386) <em>теперь не поддерживаются</em> "
 "sarge. Это, конечно, не касается процессоров \"80486\" и более новых."
 
-#. <p> 525--529
-#: release-notes.en.sgml:525
-#, fuzzy
-msgid ""
-"On &arch-title; machines you will need to upgrade to a newer kernel version "
-"first before upgrading the system. This is necessary because of a "
-"inconsistent definition of the inter process communication of the new libc "
-"and the kernel, so you need an updated kernel that provides the correct "
-"definition first."
-msgstr ""
-"На 64-битных HPPA перед обновлением системы надо будет обновить ядро. Это "
-"вызвано тем, что новые версии glibc содержат команды процессора, которые на "
-"некоторых машинах недоступны. Новое ядро будет эмулировать недостающие "
-"команды."
-
-#. <heading> 533--533
-#. <heading> 1429--1429
-#: release-notes.en.sgml:533 release-notes.en.sgml:1429
+#. <heading> 526--526
+#. <heading> 750--750
+#. <heading> 1437--1437
+#: release-notes.en.sgml:526 release-notes.en.sgml:750
+#: release-notes.en.sgml:1437
 #, fuzzy
 msgid "Upgrading the kernel"
 msgstr "Обновление ядра"
 
-#. <p> 535--537
-#: release-notes.en.sgml:535
+#. <p> 528--530
+#: release-notes.en.sgml:528
 msgid ""
 "If (and only if) the previous section indicates that you should upgrade your "
 "kernel <em>before</em> the upgrade of the system, you should do so now."
@@ -985,27 +972,26 @@
 "Если в предыдущем разделе было сказано, что вам надо обновить версию ядра "
 "<em>перед</em> обновлением системы, сделайте это."
 
-#. <p> 539--545
-#: release-notes.en.sgml:539
+#. <p> 532--536
+#: release-notes.en.sgml:532
 #, fuzzy
 msgid ""
-"<![ %not-mips-mipsel [ Backports are available of all tools needed to "
-"install the current kernel from &releasename;. ]]> Detailed instructions on "
-"how to install the new kernel can be found in <ref id=\"kernel-upgrade-howto"
-"\">."
+"Backports are available of all tools needed to install the current kernel "
+"from &releasename;. Detailed instructions on how to install the new kernel "
+"can be found in <ref id=\"kernel-upgrade-howto\">."
 msgstr ""
 "Все инструменты, необходимые для установки ядра sarge, доступны в виде "
 "бэкпортов. Подробные инструкции по установке нового ядра можно получить тут: "
 "<ref id=\"kernel-upgrade-howto\">."
 
-#. <heading> 552--552
-#: release-notes.en.sgml:552
+#. <heading> 544--544
+#: release-notes.en.sgml:544
 #, fuzzy
 msgid "Preparing sources for APT"
 msgstr "Подготовка источников APT"
 
-#. <p> 554--556
-#: release-notes.en.sgml:554
+#. <p> 546--548
+#: release-notes.en.sgml:546
 msgid ""
 "Before starting the upgrade you must set up <package>apt</package>'s "
 "configuration file for package lists, <file>/etc/apt/sources.list</file>."
@@ -1013,8 +999,8 @@
 "Перед началом процесса обновления вы должны настроить файл конфигурации "
 "<package>apt</package> <file>/etc/apt/sources.list</file>."
 
-#. <p> 558--563
-#: release-notes.en.sgml:558
+#. <p> 550--555
+#: release-notes.en.sgml:550
 msgid ""
 "<package>apt</package> will consider all packages that can be found via any "
 "\"<tt>deb</tt>\" line, and install the package with the highest version "
@@ -1029,8 +1015,8 @@
 "случае использования нескольких зеркал обычно лучше первым указать каталог "
 "на локальном жёстком диске, затем компакт-диск и, наконец, зеркала HTTP/FTP)."
 
-#. <p> 565--573
-#: release-notes.en.sgml:565
+#. <p> 557--565
+#: release-notes.en.sgml:557
 msgid ""
 "A release can often be referred to by both its codename (e.g. "
 "&oldreleasename;, &releasename;) and by its status name (i.e. oldstable, "
@@ -1042,14 +1028,14 @@
 "as a release has happened."
 msgstr ""
 
-#. <heading> 575--575
-#: release-notes.en.sgml:575
+#. <heading> 567--567
+#: release-notes.en.sgml:567
 #, fuzzy
 msgid "Adding APT Internet sources"
 msgstr "Как добавить Интернет-источник"
 
-#. <p> 577--580
-#: release-notes.en.sgml:577
+#. <p> 569--572
+#: release-notes.en.sgml:569
 msgid ""
 "The default configuration is set up for installation from main Debian "
 "Internet servers, but you may wish to modify <file>/etc/apt/sources.list</"
@@ -1061,8 +1047,8 @@
 "использовать другие зеркала. Лучше использовать ближайшее к вам (в смысле "
 "скорости передачи данных) зеркало."
 
-#. <p> 588--591
-#: release-notes.en.sgml:588
+#. <p> 580--583
+#: release-notes.en.sgml:580
 msgid ""
 "Debian HTTP or FTP mirror addresses can be found at <url id=\"&url-debian-"
 "mirrors;\"> (look at the \"Full list of mirrors\" section). HTTP mirrors are "
@@ -1072,8 +1058,8 @@
 "mirrors;\"> (см. раздел \"Полный список зеркал\"). HTTP-зеркала обычно "
 "быстрее, чем FTP."
 
-#. <p> 593--601
-#: release-notes.en.sgml:593
+#. <p> 585--593
+#: release-notes.en.sgml:585
 #, fuzzy
 msgid ""
 "For example, suppose your closest Debian mirror is <tt>&url-debian-mirror-"
@@ -1093,8 +1079,8 @@
 "&url-debian-mirror-eg;/dists/stable/contrib/binary-&architecture;/...\n"
 "           </example>"
 
-#. <p> 603--608
-#: release-notes.en.sgml:603
+#. <p> 595--600
+#: release-notes.en.sgml:595
 #, fuzzy
 msgid ""
 "To use this mirror with <prgn>apt</prgn>, you add this line to your "
@@ -1107,9 +1093,9 @@
 "deb &url-debian-mirror-eg; &releasename; main contrib\n"
 "           </example>"
 
-#. <p> 610--612
-#. <p> 650--652
-#: release-notes.en.sgml:610 release-notes.en.sgml:650
+#. <p> 602--604
+#. <p> 642--644
+#: release-notes.en.sgml:602 release-notes.en.sgml:642
 msgid ""
 "Note that the `<tt>dists</tt>' is added implicitly, and the arguments after "
 "the release name are used to expand the path into multiple directories."
@@ -1118,9 +1104,9 @@
 "параметры после имени выпуска используются для дополнения сетевого пути до "
 "реальных каталогов."
 
-#. <p> 614--616
-#. <p> 654--656
-#: release-notes.en.sgml:614 release-notes.en.sgml:654
+#. <p> 606--608
+#. <p> 646--648
+#: release-notes.en.sgml:606 release-notes.en.sgml:646
 msgid ""
 "After adding your new sources, disable the previously existing \"<tt>deb</tt>"
 "\" lines in <file>sources.list</file>, by placing a hash sign (<tt>#</tt>) "
@@ -1130,8 +1116,8 @@
 "в файле <file>sources.list</file> строки <tt>deb</tt>, поставив в начале "
 "каждой строки знак диеза (<tt>#</tt>)."
 
-#. <p> 618--624
-#: release-notes.en.sgml:618
+#. <p> 610--616
+#: release-notes.en.sgml:610
 msgid ""
 "Any package needed for installation that is fetched from the network is "
 "stored in <file>/var/cache/apt/archives</file> (and the <file>partial/</"
@@ -1146,14 +1132,14 @@
 "должны убедиться в том, что там достаточно места. Для обычной установки "
 "понадобится приблизительно 300МБ дискового пространства."
 
-#. <heading> 628--628
-#: release-notes.en.sgml:628
+#. <heading> 620--620
+#: release-notes.en.sgml:620
 #, fuzzy
 msgid "Adding APT sources for a local mirror"
 msgstr "Как добавить локальное зеркало"
 
-#. <p> 630--632
-#: release-notes.en.sgml:630
+#. <p> 622--624
+#: release-notes.en.sgml:622
 #, fuzzy
 msgid ""
 "Instead of using HTTP or FTP packages mirrors, you may wish to modify <file>/"
@@ -1164,8 +1150,8 @@
 "<file>/etc/apt/sources.list</file>, использовать зеркало на локальном диске "
 "(возможно, смонтированном по сети)."
 
-#. <p> 634--641
-#: release-notes.en.sgml:634
+#. <p> 626--633
+#: release-notes.en.sgml:626
 #, fuzzy
 msgid ""
 "For example, your packages mirror may be under <file>/var/ftp/debian/</"
@@ -1181,8 +1167,8 @@
 "/var/ftp/debian/dists/stable/contrib/binary-&architecture;/...\n"
 "           </example>"
 
-#. <p> 643--648
-#: release-notes.en.sgml:643
+#. <p> 635--640
+#: release-notes.en.sgml:635
 #, fuzzy
 msgid ""
 "To use this with <prgn>apt</prgn>, add this line to your <file>sources.list</"
@@ -1195,14 +1181,14 @@
 "deb file:/var/ftp/debian &releasename; main contrib\n"
 "           </example>"
 
-#. <heading> 658--658
-#: release-notes.en.sgml:658
+#. <heading> 650--650
+#: release-notes.en.sgml:650
 #, fuzzy
 msgid "Adding APT source from CD-ROM or DVD"
 msgstr "Как добавить компакт-диск"
 
-#. <p> 660--662
-#: release-notes.en.sgml:660
+#. <p> 652--654
+#: release-notes.en.sgml:652
 msgid ""
 "If you want to use CDs <em>only</em>, comment out the existing \"<tt>deb</tt>"
 "\" lines in <file>/etc/apt/sources.list</file> by placing a hash sign "
@@ -1212,8 +1198,8 @@
 "все присутствующие в файле <file>/etc/apt/sources.list</file> строки "
 "<tt>deb</tt>, поставив в начале каждой строки знак диеза (<tt>#</tt>)."
 
-#. <p> 666--675
-#: release-notes.en.sgml:666
+#. <p> 658--667
+#: release-notes.en.sgml:658
 #, fuzzy
 msgid ""
 "Make sure there is a line in <file>/etc/fstab</file> that enables mounting "
@@ -1233,8 +1219,8 @@
 "/dev/hdc /cdrom auto defaults,noauto,ro 0 0\n"
 "          </example>"
 
-#. <p> 677--678
-#: release-notes.en.sgml:677
+#. <p> 669--670
+#: release-notes.en.sgml:669
 msgid ""
 "Note that there must be <em>no spaces</em> between the words <tt>defaults,"
 "noauto,ro</tt> in the fourth field."
@@ -1242,8 +1228,8 @@
 "Обратите внимание на то, что между словами <tt>defaults,noauto,ro</tt> в "
 "четвёртом поле строки <em>не должно быть пробелов</em>."
 
-#. <p> 680--686
-#: release-notes.en.sgml:680
+#. <p> 672--678
+#: release-notes.en.sgml:672
 #, fuzzy
 msgid ""
 "To verify it works, insert a CD and try running <example compact=\"compact"
@@ -1260,8 +1246,8 @@
 "umount /cdrom  # (размонтирование компакт-диска)\n"
 "          </example>"
 
-#. <p> 688--695
-#: release-notes.en.sgml:688
+#. <p> 680--687
+#: release-notes.en.sgml:680
 #, fuzzy
 msgid ""
 "Next, run: <example compact=\"compact\">\n"
@@ -1274,13 +1260,13 @@
 "apt-cdrom add\n"
 "</example>. Повторите для всех имеющихся у вас дисков Debian по очереди."
 
-#. <heading> 699--699
-#: release-notes.en.sgml:699
+#. <heading> 691--691
+#: release-notes.en.sgml:691
 msgid "Upgrading packages"
 msgstr "Обновление пакетов"
 
-#. <p> 701--704
-#: release-notes.en.sgml:701
+#. <p> 693--696
+#: release-notes.en.sgml:693
 msgid ""
 "The recommended tool for upgrading between &debian; releases is to use the "
 "package management tool <prgn>aptitude</prgn>. This tool makes safer "
@@ -1292,8 +1278,8 @@
 "принимает более безопасные решения об установке пакетов, чем при "
 "непосредственном запуске <prgn>apt-get</prgn>."
 
-#. <p> 706--712
-#: release-notes.en.sgml:706
+#. <p> 698--704
+#: release-notes.en.sgml:698
 #, fuzzy
 msgid ""
 "Don't forget to mount all needed partitions (notably the root and <file>/"
@@ -1308,8 +1294,8 @@
 "            mount -o remount,rw /<var>точка_монтирования</var>\n"
 "          </example>"
 
-#. <p> 714--718
-#: release-notes.en.sgml:714
+#. <p> 706--710
+#: release-notes.en.sgml:706
 msgid ""
 "Next you should double check that the APT source entries (in <file>/etc/apt/"
 "sources.list</file>) refer either to \"<tt>&releasename;</tt>\" or to "
@@ -1318,8 +1304,8 @@
 "em> change it."
 msgstr ""
 
-#. <p> 720--733
-#: release-notes.en.sgml:720
+#. <p> 712--725
+#: release-notes.en.sgml:712
 #, fuzzy
 msgid ""
 "It is strongly recommended that you use the <prgn>/usr/bin/script</prgn> "
@@ -1343,8 +1329,8 @@
 "<file>/tmp</file> и <file>/var/tmp</file> - файлы в этих каталогах могут "
 "быть удалены при обновлении или перезагрузке."
 
-#. <p> 735--738
-#: release-notes.en.sgml:735
+#. <p> 727--730
+#: release-notes.en.sgml:727
 msgid ""
 "The typescript will also allow you to review information that has scrolled "
 "off-screen. Just switch to VT2 (using <tt>alt-F2</tt>) and, after logging "
@@ -1352,21 +1338,21 @@
 "file."
 msgstr ""
 
-#. <p> 740--741
-#: release-notes.en.sgml:740
+#. <p> 732--733
+#: release-notes.en.sgml:732
 msgid ""
 "After you have completed the upgrade, you can stop the typescript by typing "
 "<tt>exit</tt> at the prompt."
 msgstr ""
 
-#. <heading> 743--743
-#: release-notes.en.sgml:743
+#. <heading> 735--735
+#: release-notes.en.sgml:735
 #, fuzzy
 msgid "Updating the package list"
 msgstr "Обновление пакетов"
 
-#. <p> 745--748
-#: release-notes.en.sgml:745
+#. <p> 737--740
+#: release-notes.en.sgml:737
 msgid ""
 "First the list of available packages for the new release needs to be "
 "fetched. This is done by executing<footnote><p>We use <prgn>apt-get</prgn> "
@@ -1375,8 +1361,8 @@
 "footnote>:"
 msgstr ""
 
-#. <p> 750--752
-#: release-notes.en.sgml:750
+#. <p> 742--744
+#: release-notes.en.sgml:742
 #, fuzzy
 msgid ""
 "<example compact=\"compact\">\n"
@@ -1387,14 +1373,40 @@
 "aptitude update\n"
 "</example>"
 
-#. <heading> 757--757
-#: release-notes.en.sgml:757
+#. <p> 753--757
+#: release-notes.en.sgml:753
+#, fuzzy
+msgid ""
+"On &arch-title; machines you will need to upgrade to a newer kernel version "
+"first before upgrading the system. This is necessary because of a "
+"inconsistent definition of the inter process communication of the new libc "
+"and the kernel, so you need an updated kernel that provides the correct "
+"definition first."
+msgstr ""
+"На 64-битных HPPA перед обновлением системы надо будет обновить ядро. Это "
+"вызвано тем, что новые версии glibc содержат команды процессора, которые на "
+"некоторых машинах недоступны. Новое ядро будет эмулировать недостающие "
+"команды."
+
+#. <p> 759--760
+#: release-notes.en.sgml:759
+#, fuzzy
+msgid ""
+"Detailed instructions on how to install the new kernel can be found in <ref "
+"id=\"kernel-upgrade-howto\">."
+msgstr ""
+"Все инструменты, необходимые для установки ядра sarge, доступны в виде "
+"бэкпортов. Подробные инструкции по установке нового ядра можно получить тут: "
+"<ref id=\"kernel-upgrade-howto\">."
+
+#. <heading> 765--765
+#: release-notes.en.sgml:765
 #, fuzzy
 msgid "Upgrading aptitude"
 msgstr "Обновление пакетов"
 
-#. <p> 759--768
-#: release-notes.en.sgml:759
+#. <p> 767--776
+#: release-notes.en.sgml:767
 msgid ""
 "Upgrade tests have shown that &releasename;'s version of <prgn>aptitude</"
 "prgn> is better at solving the complex dependencies during an upgrade than "
@@ -1405,8 +1417,8 @@
 "          </example>"
 msgstr ""
 
-#. <p> 772--774
-#: release-notes.en.sgml:772
+#. <p> 780--782
+#: release-notes.en.sgml:780
 #, fuzzy
 msgid ""
 "<example compact=\"compact\">\n"
@@ -1417,8 +1429,8 @@
 "         apt-get install aptitude\n"
 "         </example>"
 
-#. <p> 777--780
-#: release-notes.en.sgml:777
+#. <p> 785--788
+#: release-notes.en.sgml:785
 msgid ""
 "<prgn>aptitude</prgn> will show you a list of the changes that will be made "
 "and ask you to confirm them. You should take a careful look at the proposed "
@@ -1426,22 +1438,22 @@
 "confirm."
 msgstr ""
 
-#. <heading> 784--784
-#: release-notes.en.sgml:784
+#. <heading> 792--792
+#: release-notes.en.sgml:792
 #, fuzzy
 msgid "Upgrading doc-base"
 msgstr "Обновление пакетов"
 
-#. <p> 786--789
-#: release-notes.en.sgml:786
+#. <p> 794--797
+#: release-notes.en.sgml:794
 msgid ""
 "<em>If you have <package>doc-base</package> installed</em>, it must be "
 "upgraded before the rest of the system too. Reason is that it may fail if "
 "perl is upgraded at the same time. You can find out if it is installed using:"
 msgstr ""
 
-#. <p> 791--793
-#: release-notes.en.sgml:791
+#. <p> 799--801
+#: release-notes.en.sgml:799
 #, fuzzy
 msgid ""
 "<example compact=\"compact\">\n"
@@ -1452,8 +1464,8 @@
 "dpkg -l doc-base\n"
 "</example>"
 
-#. <p> 795--796
-#: release-notes.en.sgml:795
+#. <p> 803--804
+#: release-notes.en.sgml:803
 msgid ""
 "If the line of output begins with \"i\" then it is installed and must be "
 "upgraded before continuing."
@@ -1461,8 +1473,8 @@
 "Если первая буква в напечатанной строке - \"i\", то пакет установлен и "
 "должен быть обновлён в первую очередь."
 
-#. <p> 798--800
-#: release-notes.en.sgml:798
+#. <p> 806--808
+#: release-notes.en.sgml:806
 #, fuzzy
 msgid ""
 "<example compact=\"compact\">\n"
@@ -1473,20 +1485,20 @@
 "aptitude install doc-base\n"
 "</example>"
 
-#. <heading> 804--804
-#: release-notes.en.sgml:804
+#. <heading> 812--812
+#: release-notes.en.sgml:812
 #, fuzzy
 msgid "Upgrading the rest of the system"
 msgstr "Обновление ядра"
 
-#. <p> 806--807
-#: release-notes.en.sgml:806
+#. <p> 814--815
+#: release-notes.en.sgml:814
 msgid ""
 "You are now ready to continue with the main part of the upgrade. Execute:"
 msgstr "Теперь можно приступить собственно к обновлению. Выполните команду "
 
-#. <p> 808--810
-#: release-notes.en.sgml:808
+#. <p> 816--818
+#: release-notes.en.sgml:816
 #, fuzzy
 msgid ""
 "<example compact=\"compact\">\n"
@@ -1497,8 +1509,8 @@
 "aptitude -f --with-recommends dist-upgrade\n"
 "\t  </example>"
 
-#. <p> 812--817
-#: release-notes.en.sgml:812
+#. <p> 820--825
+#: release-notes.en.sgml:820
 msgid ""
 "This will perform a complete upgrade of the system, i.e. install the newest "
 "available versions of all packages, and resolve all possible dependency "
@@ -1514,8 +1526,8 @@
 "конфликты устаревшие пакеты (такие как <package>console-tools-libs</"
 "package>)."
 
-#. <p> 819--822
-#: release-notes.en.sgml:819
+#. <p> 827--830
+#: release-notes.en.sgml:827
 msgid ""
 "When upgrading from a set of CD-ROMs, you will be asked to insert specific "
 "CDs at several points during the upgrade. You might have to insert the same "
@@ -1527,8 +1539,8 @@
 "один диск по нескольку раз, это вызвано тем, что взаимосвязанные пакеты "
 "могут находится на разных дисках."
 
-#. <p> 824--829
-#: release-notes.en.sgml:824
+#. <p> 832--837
+#: release-notes.en.sgml:832
 #, fuzzy
 msgid ""
 "New versions of currently installed packages that cannot be upgraded without "
@@ -1543,8 +1555,8 @@
 "отметив такой пакет как подлежащий установке, либо выполнив команду "
 "<tt>aptitude -f install &lt;пакет&gt;</tt>."
 
-#. <p> 831--834
-#: release-notes.en.sgml:831
+#. <p> 839--842
+#: release-notes.en.sgml:839
 msgid ""
 "The <tt>--fix-broken</tt> (or just <tt>-f</tt>) option causes <package>apt</"
 "package> to attempt to correct a system with broken dependencies in place. "
@@ -1556,14 +1568,14 @@
 "зависимости. Система <package>apt</package> не позволяет, чтобы какие-либо "
 "зависимости в системе были не удовлетворены."
 
-#. <heading> 838--838
-#: release-notes.en.sgml:838
+#. <heading> 846--846
+#: release-notes.en.sgml:846
 #, fuzzy
 msgid "Possible issues during upgrade"
 msgstr "Возможные проблемы во время или после обновления"
 
-#. <p> 840--854
-#: release-notes.en.sgml:840
+#. <p> 848--862
+#: release-notes.en.sgml:848
 msgid ""
 "If an operation using <prgn>aptitude</prgn>, <prgn>apt-get</prgn> or "
 "<prgn>dpkg</prgn> fails with the error <example compact=\"compact\">\n"
@@ -1578,8 +1590,8 @@
 "assumes that you do not yet have this variable set in that file."
 msgstr ""
 
-#. <p> 856--861
-#: release-notes.en.sgml:856
+#. <p> 864--869
+#: release-notes.en.sgml:864
 msgid ""
 "Sometimes it's necessary to enable APT::Force-LoopBreak option in APT to be "
 "able to temporarily remove an essential package due to a Conflicts/Pre-"
@@ -1594,8 +1606,8 @@
 "Чтобы решить эту проблему, следует указать в командной строке "
 "<prgn>aptitude</prgn> параметр <tt>-o APT::Force-LoopBreak=1</tt>."
 
-#. <p> 864--877
-#: release-notes.en.sgml:864
+#. <p> 872--885
+#: release-notes.en.sgml:872
 #, fuzzy
 msgid ""
 "It is possible that a system's dependency structure can be so corrupt as to "
@@ -1618,8 +1630,8 @@
 "dpkg --configure --pending\n"
 "          </example>"
 
-#. <p> 879--884
-#: release-notes.en.sgml:879
+#. <p> 887--892
+#: release-notes.en.sgml:887
 #, fuzzy
 msgid ""
 "In extreme cases you might have to force re-installation with a command like "
@@ -1632,8 +1644,8 @@
 "dpkg --install /путь/к/пакету/имя_пакета.deb\n"
 "          </example>"
 
-#. <p> 890--892
-#: release-notes.en.sgml:890
+#. <p> 898--900
+#: release-notes.en.sgml:898
 #, fuzzy
 msgid ""
 "After fixing things up, you should be able to resume the upgrade by "
@@ -1642,8 +1654,8 @@
 "После исправления ошибок вы можете продолжить обновление, выполнив команду "
 "<tt>dist-upgrade</tt>, как описано выше."
 
-#. <p> 894--902
-#: release-notes.en.sgml:894
+#. <p> 902--910
+#: release-notes.en.sgml:902
 #, fuzzy
 msgid ""
 "During the upgrade, you will be asked questions regarding the configuration "
@@ -1663,8 +1675,8 @@
 "потому что файлы конфигурации будут сохранены с расширением <tt>.dpkg-old</"
 "tt>."
 
-#. <p> 904--907
-#: release-notes.en.sgml:904
+#. <p> 912--915
+#: release-notes.en.sgml:912
 msgid ""
 "If you're not sure what to do, write down the name of the package or file, "
 "and sort things out at a later time. You can search in the typescript file "
@@ -1674,13 +1686,13 @@
 "разберитесь с проблемой позднее. Информацию, выводившуюся на экран во время "
 "обновления, вы сможете найти в файле транскрипта."
 
-#. <heading> 912--912
-#: release-notes.en.sgml:912
+#. <heading> 920--920
+#: release-notes.en.sgml:920
 msgid "Things to do before rebooting"
 msgstr "Перед перезагрузкой"
 
-#. <p> 914--916
-#: release-notes.en.sgml:914
+#. <p> 922--924
+#: release-notes.en.sgml:922
 msgid ""
 "When <tt>aptitude dist-upgrade</tt> has finished, the \"formal\" upgrade is "
 "complete, but there are some other things that should be taken care of "
@@ -1690,8 +1702,8 @@
 "<em>формально</em> обновление завершено, но перед перезагрузкой следует "
 "проделать ещё несколько действий."
 
-#. <p> 918--922
-#: release-notes.en.sgml:918
+#. <p> 926--930
+#: release-notes.en.sgml:926
 #, fuzzy
 msgid ""
 "Read <file>/usr/share/doc/xfree86-common/README.Debian-upgrade.gz</file> for "
@@ -1703,13 +1715,13 @@
 "относится к пользователям всех предыдущих выпусков. Вам обязательно надо его "
 "прочитать."
 
-#. <heading> 924--924
-#: release-notes.en.sgml:924
+#. <heading> 932--932
+#: release-notes.en.sgml:932
 msgid "Upgrading your kernel"
 msgstr "Обновление ядра"
 
-#. <p> 926--929
-#: release-notes.en.sgml:926
+#. <p> 934--937
+#: release-notes.en.sgml:934
 #, fuzzy
 msgid ""
 "Note that the Linux kernel was <em>not</em> upgraded by these procedures. "
@@ -1722,8 +1734,8 @@
 "из пакетов <package>kernel-image-*</package>, либо скомпилировав ядро из "
 "исходного кода."
 
-#. <p> 936--938
-#: release-notes.en.sgml:936
+#. <p> 944--946
+#: release-notes.en.sgml:944
 msgid ""
 "&debian; comes with a &kernelversion; kernel which is in the 2.4 series, the "
 "older stable Linux kernel series. You may wish to use a 2.6 series kernel "
@@ -1734,8 +1746,8 @@
 "лучше поддерживающее различные устройства и обладающее улучшенной "
 "производительностью."
 
-#. <p> 940--943
-#: release-notes.en.sgml:940
+#. <p> 948--951
+#: release-notes.en.sgml:948
 msgid ""
 "However, you a strongly advised <strong>not</strong> to upgrade to a 2.6 "
 "kernel as part of the upgrade from &oldreleasename; to &releasename;. Some "
@@ -1746,8 +1758,8 @@
 "с обновлением всей системы &oldreleasename; на &releasename;. Некоторые "
 "проблемы перехода на ядро 2.6 описаны в разделе <ref id=\"upgrade-to-2.6\">."
 
-#. <p> 946--952
-#: release-notes.en.sgml:946
+#. <p> 954--960
+#: release-notes.en.sgml:954
 #, fuzzy
 msgid ""
 "To upgrade your kernel you must first choose the kernel most appropriate for "
@@ -1762,8 +1774,8 @@
 "           apt-cache search ^kernel-image\n"
 "         </example>"
 
-#. <p> 954--956
-#: release-notes.en.sgml:954
+#. <p> 962--964
+#: release-notes.en.sgml:962
 #, fuzzy
 msgid ""
 "You should then use <tt>aptitude install</tt> to install it. Once this new "
@@ -1773,8 +1785,8 @@
 "Затем ядро нужно установить с помощью <tt>aptitude install</aptitude>. После "
 "установки ядра следует перезагрузить систему при первой возможности."
 
-#. <p> 958--967
-#: release-notes.en.sgml:958
+#. <p> 966--975
+#: release-notes.en.sgml:966
 msgid ""
 "Please note that the installation system of &oldreleasename; (and previous "
 "releases) did <em>not</em> install the kernel as a package in your system. "
@@ -1794,8 +1806,8 @@
 "номер версии ядра (2.4 или 2.6), а  <tt>АРХИТЕКТУРА</tt> - любая из "
 "поддерживаемых архитектур."
 
-#. <p> 969--972
-#: release-notes.en.sgml:969
+#. <p> 977--980
+#: release-notes.en.sgml:977
 #, fuzzy
 msgid ""
 "For the more adventurous there is an easy way to compile your own custom "
@@ -1807,13 +1819,13 @@
 "прочитайте документацию в каталоге <file>/usr/share/doc/kernel-package</"
 "file>."
 
-#. <heading> 977--977
-#: release-notes.en.sgml:977
+#. <heading> 985--985
+#: release-notes.en.sgml:985
 msgid "Obsolete packages"
 msgstr "Устаревшие пакеты"
 
-#. <p> 984--994
-#: release-notes.en.sgml:984
+#. <p> 992--1002
+#: release-notes.en.sgml:992
 msgid ""
 "Introducing several thousand new packages, &releasename; also retires and "
 "omits more than two thousand old packages that were in &oldreleasename;. It "
@@ -1836,8 +1848,8 @@
 "исправления. Мы рекомендуем перейти на использование альтернативных пакетов, "
 "если есть такая возможность. "
 
-#. <p> 996--1002
-#: release-notes.en.sgml:996
+#. <p> 1004--1010
+#: release-notes.en.sgml:1004
 msgid ""
 "There are many reasons why packages might have been removed from the "
 "distribution: they are no longer maintained upstream, there is no longer a "
@@ -1854,8 +1866,8 @@
 "не может быть включён в &releasename;, в этом случае пакет всё-таки доступен "
 "в нестабильном (\"unstable\") дистрибутиве."
 
-#. <p> 1004--1017
-#: release-notes.en.sgml:1004
+#. <p> 1012--1025
+#: release-notes.en.sgml:1012
 #, fuzzy
 msgid ""
 "Detecting which packages in an updated system are \"obsolete\" is easy since "
@@ -1885,8 +1897,8 @@
 "которые вы установили явно (а не автоматически для удовлетворения "
 "зависимостей)."
 
-#. <p> 1019--1029
-#: release-notes.en.sgml:1019
+#. <p> 1027--1037
+#: release-notes.en.sgml:1027
 msgid ""
 "There are additional tools you can use to find obsolete packages such as "
 "<prgn>deborphan</prgn>, <prgn>debfoster</prgn> or <prgn>cruft</prgn>. "
@@ -1908,8 +1920,8 @@
 "нужного. Настоятельно рекомендуем перед удалением внимательно просмотреть "
 "список предложенных пакетов (прочесть описание, посмотреть входящие файлы)."
 
-#. <p> 1035--1040
-#: release-notes.en.sgml:1035
+#. <p> 1043--1048
+#: release-notes.en.sgml:1043
 msgid ""
 "The <url id=\"&url-bts;\" name=\"Debian Bug Tracking System\"> often "
 "provides additional information on why the package was removed. You should "
@@ -1923,13 +1935,13 @@
 "<url id=\"&url-bts;/cgi-bin/pkgreport.cgi?pkg=ftp.debian.org&amp;archive=yes"
 "\" name=\"псевдо-пакета ftp.debian.orge\">"
 
-#. <heading> 1042--1042
-#: release-notes.en.sgml:1042
+#. <heading> 1050--1050
+#: release-notes.en.sgml:1050
 msgid "Dummy packages"
 msgstr "Пакеты-пустышки"
 
-#. <p> 1046--1052
-#: release-notes.en.sgml:1046
+#. <p> 1054--1060
+#: release-notes.en.sgml:1054
 msgid ""
 "Some packages from &oldreleasename; have been split into several packages in "
 "&releasename;, often to improve system maintainability. To ease the upgrade "
@@ -1947,8 +1959,8 @@
 "установки \"пустышки\" становятся неиспользуемыми и их можно спокойно "
 "удалять."
 
-#. <p> 1054--1060
-#: release-notes.en.sgml:1054
+#. <p> 1062--1068
+#: release-notes.en.sgml:1062
 msgid ""
 "Most (but not all) dummy packages' descriptions indicate their purpose. "
 "Package descriptions for dummy packages are not uniform, however, so you "
@@ -1964,18 +1976,18 @@
 "нужно, так как они впоследствии используются для определения установленной "
 "версии программы."
 
-#. <heading> 1071--1071
-#: release-notes.en.sgml:1071
+#. <heading> 1079--1079
+#: release-notes.en.sgml:1079
 msgid "Issues to be aware of for &releasename;"
 msgstr "Что надо знать о &releasename;"
 
-#. <heading> 1102--1102
-#: release-notes.en.sgml:1102
+#. <heading> 1110--1110
+#: release-notes.en.sgml:1110
 msgid "Changes to Python packages"
 msgstr "Изменения в пакетах Python"
 
-#. <p> 1104--1108
-#: release-notes.en.sgml:1104
+#. <p> 1112--1116
+#: release-notes.en.sgml:1112
 msgid ""
 "None of the python2.X packages that are included with &releasename; include "
 "the standard modules 'profile' and 'pstats', because they are licensed under "
@@ -1989,14 +2001,14 @@
 "получить, установив пакеты python-profiler и python2.X-profiler из секции "
 "non-free архива Debian."
 
-#. <heading> 1113--1113
-#: release-notes.en.sgml:1113
+#. <heading> 1121--1121
+#: release-notes.en.sgml:1121
 #, fuzzy
 msgid "Upgrading to a 2.6 kernel"
 msgstr "Обновление ядра до версии 2.6"
 
-#. <p> 1115--1120
-#: release-notes.en.sgml:1115
+#. <p> 1123--1128
+#: release-notes.en.sgml:1123
 #, fuzzy
 msgid ""
 "The 2.6 kernel series contains major changes from the 2.4 series. Modules "
@@ -2011,8 +2023,8 @@
 "относиться легкомысленно. В этом разделе вы узнаете о некоторых проблемах, с "
 "которыми вы, возможно, скоро столкнётесь."
 
-#. <p> 1122--1126
-#: release-notes.en.sgml:1122
+#. <p> 1130--1134
+#: release-notes.en.sgml:1130
 msgid ""
 "You are therefore strongly advised not to upgrade to a 2.6 kernel as part of "
 "the upgrade from &oldreleasename; to &releasename;. Instead, you should "
@@ -2025,8 +2037,8 @@
 "убедитесь, что система нормально работает с вашим старым ядром (или с ядром "
 "2.4 из &releasename;), а затем отдельно обновите ядро до 2.6."
 
-#. <p> 1128--1132
-#: release-notes.en.sgml:1128
+#. <p> 1136--1140
+#: release-notes.en.sgml:1136
 msgid ""
 "If you compile your own kernel from source, make sure you install "
 "<package>module-init-tools</package> before you reboot with the 2.6 kernel. "
@@ -2041,8 +2053,8 @@
 "<package>module-init-tools</package> будет установлен автоматически, так как "
 "<package>kernel-image</package> от него зависят."
 
-#. <p> 1134--1139
-#: release-notes.en.sgml:1134
+#. <p> 1142--1147
+#: release-notes.en.sgml:1142
 msgid ""
 "If you use <em>LVM</em>, you should also install <package>lvm2</package> "
 "before you reboot as the 2.6 kernel does not directly support LVM1. To "
@@ -2058,8 +2070,8 @@
 "<package>lvm10</package> можно не удалять, сценарии первичной загрузки "
 "определят версию используемого ядра и загрузят подходящую версию пакета LVM."
 
-#. <p> 1141--1144
-#: release-notes.en.sgml:1141
+#. <p> 1149--1152
+#: release-notes.en.sgml:1149
 msgid ""
 "If you have entries in the <file>/etc/modules</file> file (the list of "
 "modules to be loaded during system boot), be aware that some module names "
@@ -2071,8 +2083,8 @@
 "некоторых модулей изменились. В этом случае файл надо соответствующим "
 "образом исправить."
 
-#. <p> 1147--1152
-#: release-notes.en.sgml:1147
+#. <p> 1155--1160
+#: release-notes.en.sgml:1155
 #, fuzzy
 msgid ""
 "For some SATA disk controllers, the device assigned to a drive and its "
@@ -2087,8 +2099,8 @@
 "конфигурацию вашего загрузчика ОС. При неверной настройке компьютер может "
 "перестать загружаться."
 
-#. <p> 1155--1160
-#: release-notes.en.sgml:1155
+#. <p> 1163--1168
+#: release-notes.en.sgml:1163
 msgid ""
 "Once you have installed your 2.6 kernel, but before you reboot, make sure "
 "you have a recovery method. First, make sure that the bootloader "
@@ -2103,13 +2115,13 @@
 "ядра. Достаньте \"спасательную\" дискету или компакт-диск на тот случай, "
 "если вдруг не удастся загрузить старое ядро при помощи загрузчика."
 
-#. <heading> 1164--1164
-#: release-notes.en.sgml:1164
+#. <heading> 1172--1172
+#: release-notes.en.sgml:1172
 msgid "Keyboard configuration"
 msgstr "Настройка клавиатуры"
 
-#. <p> 1166--1171
-#: release-notes.en.sgml:1166
+#. <p> 1174--1179
+#: release-notes.en.sgml:1174
 #, fuzzy
 msgid ""
 "The most invasive change in the 2.6 kernels is a fundamental change of the "
@@ -2124,8 +2136,8 @@
 "типа (например, USB-MAC или производства Sun), то после загрузки ядра 2.6 "
 "она, скорее всего, откажется работать."
 
-#. <p> 1173--1176
-#: release-notes.en.sgml:1173
+#. <p> 1181--1184
+#: release-notes.en.sgml:1181
 msgid ""
 "If you can SSH into the box from another system, you can resolve this issue "
 "by running <tt>dpkg-reconfigure console-data</tt>, choosing the option "
@@ -2135,8 +2147,8 @@
 "исправить ситуацию, запустив <tt>dpkg-reconfigure console-data</tt> и выбрав "
 "клавиатуру \"pc\" из полного списка клавиатур."
 
-#. <p> 1178--1182
-#: release-notes.en.sgml:1178
+#. <p> 1186--1190
+#: release-notes.en.sgml:1186
 msgid ""
 "If your console keyboard is affected, you will probably also need to "
 "reconfigure your keyboard for the X Windows System. You can do this either "
@@ -2150,8 +2162,8 @@
 "правкой файла <file>/etc/X11/XF86Config-4</file>. Не забудьте прочесть "
 "документацию, о которой упомянуто в <ref id=\"nownownow\">."
 
-#. <p> 1185--1187
-#: release-notes.en.sgml:1185
+#. <p> 1193--1195
+#: release-notes.en.sgml:1193
 msgid ""
 "This issue is unlikely to affect the &arch-title; architecture as all PS/2 "
 "and most USB keyboards will already be configured as a \"normal\" PC "
@@ -2161,8 +2173,8 @@
 "все клавиатуры PS/2 и большая часть клавиатур USB и раньше опознавались как "
 "\"стандартная клавиатура PC\""
 
-#. <p> 1190--1192
-#: release-notes.en.sgml:1190
+#. <p> 1198--1200
+#: release-notes.en.sgml:1198
 msgid ""
 "Note that if you are using a USB keyboard, this may be configured as either "
 "a \"normal\" PC keyboard or as a USB-MAC keyboard. In the first case you "
@@ -2172,13 +2184,13 @@
 "\"стандартная PC\", либо как \"клавиатура USB-MAC\". В первом случае "
 "проблема вас не затронет."
 
-#. <heading> 1197--1197
-#: release-notes.en.sgml:1197
+#. <heading> 1205--1205
+#: release-notes.en.sgml:1205
 msgid "Mouse configuration"
 msgstr "Настройка мыши"
 
-#. <p> 1199--1203
-#: release-notes.en.sgml:1199
+#. <p> 1207--1211
+#: release-notes.en.sgml:1207
 msgid ""
 "Again because of the changes in the input layer, you may have to reconfigure "
 "the X Window System and <package>gpm</package> if your mouse is not working "
@@ -2192,8 +2204,8 @@
 "всего, потому, что имя файла-устройсва мыши изменилось. Если поддержка мыши "
 "была реализована в виде модуля - то имя этого модуля тоже могло измениться."
 
-#. <p> 1206--1207
-#: release-notes.en.sgml:1206
+#. <p> 1214--1215
+#: release-notes.en.sgml:1214
 msgid ""
 "If you currently have X configured for <file>/dev/sunmouse</file>, you "
 "probably need to change this to <file>/dev/psaux</file>."
@@ -2202,14 +2214,14 @@
 "sunmouse</file>, то после установки нового ядра имя файла-устройства надо "
 "будет изменить на <file>/dev/psaux</file>."
 
-#. <heading> 1213--1213
-#: release-notes.en.sgml:1213
+#. <heading> 1221--1221
+#: release-notes.en.sgml:1221
 #, fuzzy
 msgid "Sound configuration"
 msgstr "Настройка клавиатуры"
 
-#. <p> 1215--1220
-#: release-notes.en.sgml:1215
+#. <p> 1223--1228
+#: release-notes.en.sgml:1223
 msgid ""
 "For the 2.6 kernel series the ALSA sound drivers are preferred over the OSS "
 "sound drivers. If you install <package>alsa-base</package>, ALSA modules for "
@@ -2219,13 +2231,13 @@
 "<file>/etc/modules</file>, you should remove them."
 msgstr ""
 
-#. <heading> 1226--1226
-#: release-notes.en.sgml:1226
+#. <heading> 1234--1234
+#: release-notes.en.sgml:1234
 msgid "Switching to 2.6 may activate udev"
 msgstr "Переход на 2.6 может привести в действие udev"
 
-#. <p> 1228--1232
-#: release-notes.en.sgml:1228
+#. <p> 1236--1240
+#: release-notes.en.sgml:1236
 msgid ""
 "<package>udev</package> is a userspace implementation of devfs. It is "
 "mounted over the <file>/dev/</file> directory and will dynamically populate "
@@ -2240,8 +2252,8 @@
 "определения подключаемых к системе устройств. Пакет <package>udev</package> "
 "работает только с ядрами серии 2.6."
 
-#. <p> 1234--1236
-#: release-notes.en.sgml:1234
+#. <p> 1242--1244
+#: release-notes.en.sgml:1242
 msgid ""
 "As <package>udev</package> is automatically installed as a dependency of e."
 "g. <package>gnome</package>, there is a chance that upgrading to a 2.6 "
@@ -2251,8 +2263,8 @@
 "примеру, он необходим для установки <package>gnome</package>), то есть "
 "вероятность, что после перехода на ядро 2.6 он может начать работать."
 
-#. <p> 1238--1242
-#: release-notes.en.sgml:1238
+#. <p> 1246--1250
+#: release-notes.en.sgml:1246
 msgid ""
 "Although <package>udev</package> has been tested extensively, you may "
 "experience minor problems with some devices that will need to be fixed. The "
@@ -2266,8 +2278,8 @@
 "устройства по умолчанию не могут быть созданы (например, <file>/dev/video</"
 "file> и <file>/dev/radio</file>)."
 
-#. <p> 1244--1246
-#: release-notes.en.sgml:1244
+#. <p> 1252--1254
+#: release-notes.en.sgml:1252
 msgid ""
 "<package>udev</package> provides configuration mechanisms to deal with these "
 "issues. See <manref section=\"8\" name=\"udev\"> and <file>/etc/udev</file> "
@@ -2277,13 +2289,13 @@
 "подробная информация - в <manref section=\"8\" name=\"udev\"> и <file>/etc/"
 "udev</file>."
 
-#. <heading> 1255--1255
-#: release-notes.en.sgml:1255
+#. <heading> 1263--1263
+#: release-notes.en.sgml:1263
 msgid "X Windows Systems fails to load"
 msgstr "X Window System не может запуститься"
 
-#. <p> 1257--1263
-#: release-notes.en.sgml:1257
+#. <p> 1265--1271
+#: release-notes.en.sgml:1265
 msgid ""
 "If after booting your machine, X Windows fails to load and you see an error "
 "\"missing core pointer\" in <file>/var/log/XFree86.0.log</file>, the problem "
@@ -2299,13 +2311,13 @@
 "org/255744\" name=\"#255744\"). Для исправления ошибки добавьте драйвер мыши "
 "(например, psmouse) в файл <file>/etc/modules</file>."
 
-#. <heading> 1268--1268
-#: release-notes.en.sgml:1268
+#. <heading> 1276--1276
+#: release-notes.en.sgml:1276
 msgid "X Window System on Transmeta Crusoe systems"
 msgstr "X Window System на компьютерах с процессором Transmeta Crusoe"
 
-#. <p> 1270--1283
-#: release-notes.en.sgml:1270
+#. <p> 1278--1291
+#: release-notes.en.sgml:1278
 msgid ""
 "The X server shipping in &releasename; contains optimized code which is not "
 "properly executed by many Transmeta(TM) Crusoe(TM) processors. The result of "
@@ -2330,8 +2342,8 @@
 "Serial number of failed request:  15\n"
 "Current serial number in output stream:  18</example>"
 
-#. <p> 1285--1289
-#: release-notes.en.sgml:1285
+#. <p> 1293--1297
+#: release-notes.en.sgml:1293
 #, fuzzy
 msgid ""
 "In practical terms, this means that after a few hours of operation, "
@@ -2345,8 +2357,8 @@
 "и начнёт постоянно перезапускаться. Так будет продолжаться, пока содержащий "
 "ошибку код Transmeta VLIW находится в кэше процессора."
 
-#. <p> 1291--1296
-#: release-notes.en.sgml:1291
+#. <p> 1299--1304
+#: release-notes.en.sgml:1299
 msgid ""
 "Since the bug is in the proprietary Transmeta Code Morphing Software (CMS), "
 "and the laptop BIOS checks the CMS for a vendor signature at boot time, this "
@@ -2363,8 +2375,8 @@
 "~fleury/bug_cms/\"> или в отчёте об ошибке Debian <url id=\"http://bugs."
 "debian.org/216933\" name=\"#216933\">."
 
-#. <p> 1298--1299
-#: release-notes.en.sgml:1298
+#. <p> 1306--1307
+#: release-notes.en.sgml:1306
 msgid ""
 "The workaround for this bug is to install an X server compiled without "
 "optimization, such as the <package>xserver-xfree86-dbg</package> package."
@@ -2372,19 +2384,19 @@
 "В качестве временного решения можно установить X-сервер, скомпилированный "
 "без оптимизации (например, из пакета <package>xserver-xfree86-dbg</package>)."
 
-#. <heading> 1309--1309
-#: release-notes.en.sgml:1309
+#. <heading> 1317--1317
+#: release-notes.en.sgml:1317
 msgid "More information on &debian;"
 msgstr "Более подробная информация о &debian;"
 
-#. <heading> 1311--1311
-#: release-notes.en.sgml:1311
+#. <heading> 1319--1319
+#: release-notes.en.sgml:1319
 #, fuzzy
 msgid "Further reading"
 msgstr "Что ещё можно прочитать"
 
-#. <p> 1312--1318
-#: release-notes.en.sgml:1312
+#. <p> 1320--1326
+#: release-notes.en.sgml:1320
 #, fuzzy
 msgid ""
 "Beyond these release notes and the installation guide further documentation "
@@ -2402,8 +2414,8 @@
 "сопровождающего Debian, FAQ по Debian и т.д. Полную информацию о доступных "
 "документах можно получить на web-сайте DDP по адресу <url id=\"&url-ddp;\">."
 
-#. <p> 1320--1323
-#: release-notes.en.sgml:1320
+#. <p> 1328--1331
+#: release-notes.en.sgml:1328
 msgid ""
 "Documentation for individual packages is installed into <file>/usr/share/doc/"
 "<var>package</var></file>, this may include copyright information, Debian "
@@ -2414,14 +2426,14 @@
 "авторских правах, специфичная для Debian информация и документация от "
 "авторов исходной программы."
 
-#. <heading> 1328--1328
-#: release-notes.en.sgml:1328
+#. <heading> 1336--1336
+#: release-notes.en.sgml:1336
 #, fuzzy
 msgid "Getting help"
 msgstr "Если нужна помощь"
 
-#. <p> 1330--1334
-#: release-notes.en.sgml:1330
+#. <p> 1338--1342
+#: release-notes.en.sgml:1338
 msgid ""
 "There are many sources of help, advice and support for Debian users, but "
 "these should only be considered if research into documentation of the issue "
@@ -2433,13 +2445,13 @@
 "ответа на вопрос в документации. Этот раздел содержит краткое описание "
 "дополнительных источников помощи для новых пользователей."
 
-#. <heading> 1337--1337
-#: release-notes.en.sgml:1337
+#. <heading> 1345--1345
+#: release-notes.en.sgml:1345
 msgid "Mailing lists"
 msgstr "Списки рассылки"
 
-#. <p> 1338--1343
-#: release-notes.en.sgml:1338
+#. <p> 1346--1351
+#: release-notes.en.sgml:1346
 msgid ""
 "The mailing lists of most interest to Debian users are the debian-user list "
 "(English) and other debian-user-<var>language</var> lists (for other "
@@ -2456,13 +2468,13 @@
 "как отправить вопрос в список рассылки, поищите ответ на него в архивах. "
 "Просим также придерживаться общепринятых норм почтового этикета."
 
-#. <heading> 1347--1347
-#: release-notes.en.sgml:1347
+#. <heading> 1355--1355
+#: release-notes.en.sgml:1355
 msgid "Internet Relay Chat"
 msgstr "IRC"
 
-#. <p> 1349--1353
-#: release-notes.en.sgml:1349
+#. <p> 1357--1361
+#: release-notes.en.sgml:1357
 #, fuzzy
 msgid ""
 "Debian has an IRC channel dedicated to the support and aid of Debian users "
@@ -2477,8 +2489,8 @@
 "каналу #debian. Для русскоязычных пользователей существует также канал "
 "#debian-russian в той же сети."
 
-#. <p> 1355--1357
-#: release-notes.en.sgml:1355
+#. <p> 1363--1365
+#: release-notes.en.sgml:1363
 #, fuzzy
 msgid ""
 "Please follow the channel guidelines, respecting other users fully. For more "
@@ -2489,14 +2501,14 @@
 "пользователей. Более подробную информацию о сети Freenode можно получить на "
 "их <url id=\"&url-irc-host;\" name=\"web-сайте\">."
 
-#. <heading> 1363--1363
-#: release-notes.en.sgml:1363
+#. <heading> 1371--1371
+#: release-notes.en.sgml:1371
 #, fuzzy
 msgid "Reporting bugs"
 msgstr "Как сообщить об ошибке"
 
-#. <p> 1365--1371
-#: release-notes.en.sgml:1365
+#. <p> 1373--1379
+#: release-notes.en.sgml:1373
 #, fuzzy
 msgid ""
 "We strive to make Debian GNU/Linux a high quality operating system, however "
@@ -2514,8 +2526,8 @@
 "name=\"bugs.debian.org\">. Такой подход согласуется с концепцией открытой "
 "разработки Debian."
 
-#. <p> 1373--1378
-#: release-notes.en.sgml:1373
+#. <p> 1381--1386
+#: release-notes.en.sgml:1381
 msgid ""
 "If you find a bug in the distribution or in packaged software that is part "
 "of it, please report it so that it can be properly fixed for next releases. "
@@ -2530,8 +2542,8 @@
 "связываться с отправителями отчётов об ошибках, если им понадобится "
 "дополнительная информация."
 
-#. <p> 1380--1386
-#: release-notes.en.sgml:1380
+#. <p> 1388--1394
+#: release-notes.en.sgml:1388
 #, fuzzy
 msgid ""
 "You can submit a bug report using the program <package>reportbug</package> "
@@ -2547,13 +2559,13 @@
 "<package>doc-debian</package> или на сайте <url id=\"&url-bts;\" name="
 "\"Системы отслеживания ошибок\">."
 
-#. <heading> 1391--1391
-#: release-notes.en.sgml:1391
+#. <heading> 1399--1399
+#: release-notes.en.sgml:1399
 msgid "Contributing to Debian"
 msgstr "Как помочь Debian"
 
-#. <p> 1393--1406
-#: release-notes.en.sgml:1393
+#. <p> 1401--1414
+#: release-notes.en.sgml:1401
 msgid ""
 "You do not need to be an expert to contribute to Debian. By assisting users "
 "with problems on the various user support <url id=\"&url-debian-list-"
@@ -2579,8 +2591,8 @@
 "name=\"документации\"> или <url id=\"&url-debian-i18n;\" name=\"переводе\"> "
 "существующей документации на родной язык."
 
-#. <p> 1408--1416
-#: release-notes.en.sgml:1408
+#. <p> 1416--1424
+#: release-notes.en.sgml:1416
 msgid ""
 "If you can dedicate more time, you could manage a piece of the Free Software "
 "collection within Debian. Especially helpful is if people adopt or maintain "
@@ -2602,8 +2614,8 @@
 "архитектуры, проекты <url id=\"&url-debian-jr;\" name=\"Debian для детей\"> "
 "и <url id=\"&url-debian-med;\" name=\"Debian в медицине\">."
 
-#. <p> 1418--1422
-#: release-notes.en.sgml:1418
+#. <p> 1426--1430
+#: release-notes.en.sgml:1426
 msgid ""
 "In any case, if you are working in the free software community in any way, "
 "as a user, programmer, writer or translator you are already helping the free "
@@ -2616,8 +2628,8 @@
 "удовольствие и радость, даёт возможность познакомиться с новыми людьми."
 
 # Про "ощущение внутренней теплоты" я, пожалуй, уберу. Смеяться будут.
-#. <p> 1431--1435
-#: release-notes.en.sgml:1431
+#. <p> 1440--1444
+#: release-notes.en.sgml:1440
 msgid ""
 "<strong>The information in this appendix is relevant only if, for a "
 "successful upgrade of the system, you need to upgrade the kernel <em>before</"
@@ -2629,15 +2641,15 @@
 "обновлением системы. Чтобы узнать, нужно ли это в вашем случае - прочтите "
 "<ref id=\"new-kernel\"></strong>."
 
-#. <p> 1438--1439
-#: release-notes.en.sgml:1438
+#. <p> 1448--1449
+#: release-notes.en.sgml:1448
 msgid ""
 "The following instructions explain step by step how to install the newer "
 "kernel."
 msgstr "Подробная инструкция по установке обновлённого ядра:"
 
-#. <p> 1442--1443
-#: release-notes.en.sgml:1442
+#. <p> 1452--1453
+#: release-notes.en.sgml:1452
 #, fuzzy
 msgid ""
 "The following instructions explain step by step how to use the available "
@@ -2646,8 +2658,9 @@
 "Данная инструкция пошагово объясняет методы применения адаптированныхк "
 "стабильной среде инструментов для установки новых версий ядра:"
 
-#. <p> 1446--1581
-#: release-notes.en.sgml:1446
+#. <p> 1456--1607
+#: release-notes.en.sgml:1456
+#, fuzzy
 msgid ""
 "\n"
 "<taglist compact=\"compact\">\n"
@@ -2655,89 +2668,82 @@
 "  <item><p>If you have an <em>SGI IP22</em> you should first prepare it to "
 "boot with <package>arcboot</package>, and not to boot the kernel directly. "
 "<package>arcboot</package> is available in &oldreleasename; so you can "
-"install it in the usual ways.</p><p>Fetch the current kernel package from "
-"&releasename; from the Debian mirror of your choice. The available packages "
-"are: <list compact=\"compact\">\n"
+"install it in the usual ways.</p><p><em>with apt</em>; if you not yet have "
+"done so change your <file>sources.list</file> file to point to &releasename; "
+"as described in <ref id=\"upgrade-process\">, update your packages lists and "
+"install the kernel-image for your machine. You can find a list of available "
+"kernel images below or with the command  <example compact=\"compact\">\n"
+"apt-cache search ^kernel-image\n"
+"         </example></p><p>During the install the package may complain about "
+"module mismatches and ask if the installation should continue. Answer "
+"<tt>YES</tt> to that question as these mismatches will be resolved as soon "
+"as you reboot with the new kernel.</p><p><em>with dpkg</em>: fetch the "
+"current kernel package from the Debian mirror of your choice. The available "
+"packages are: <list compact=\"compact\">\n"
 "  <item><p><![ %mips [ </p></item>\n"
-"  <item><p><url id=\"http://ftp.debian.org/debian/pool/main/k/kernel-patch-"
-"2.4.27-mips/kernel-image-2.4.27-r4k-ip22_2.4.27-8.040815-1_mips.deb\"> for "
-"R4XX0 processors and the SGI IP22 subarchitecture like the Indy and Indigo2."
-"</p></item>\n"
-"  <item><p><url id=\"http://ftp.debian.org/debian/pool/main/k/kernel-patch-"
-"2.4.27-mips/kernel-image-2.4.27-r5k-ip22_2.4.27-8.040815-1_mips.deb\"> for "
-"R5000 processors and the SGI IP22 subarchitecture like the Indy and Indigo2."
-"</p></item>\n"
-"  <item><p><url id=\"http://ftp.debian.org/debian/pool/main/k/kernel-patch-"
-"2.4.27-mips/kernel-image-2.4.27-sb1-swarm-bn_2.4.27-8.040815-1_mips.deb\"> "
-"for the Broadcom BCM91250A (aka SWARM) pass 2.2.</p></item>]]> <![ %mipsel "
-"[ \n"
-"  <item><p><url id=\"http://ftp.debian.org/debian/pool/main/k/kernel-patch-"
-"2.4.27-mips/kernel-image-2.4.27-r3k-kn02_2.4.27-8.040815-1_mipsel.deb\"> for "
-"R3000 based DECstations with KN02 (or compatible) mainboard, such as the "
-"DECstation 5000/1xx series with xx=20,25,33 and the DECstation 5000/240.</"
-"p></item>\n"
-"  <item><p><url id=\"http://ftp.debian.org/debian/pool/main/k/kernel-patch-"
-"2.4.27-mips/kernel-image-2.4.27-r4k-kn04_2.4.27-8.040815-1_mipsel.deb\"> for "
-"R4X00 based DECstations with KN04 (or compatible) mainboard, such as the "
-"DECstation 5000/150, the Personal DECstation 5000/50 and the DECstation "
-"5000/260.</p></item>\n"
-"  <item><p><url id=\"http://ftp.debian.org/debian/pool/main/k/kernel-patch-"
-"2.4.27-mips/kernel-image-2.4.27-r5k-cobalt_2.4.27-8.040815-1_mipsel.deb\"> "
-"for MIPS based Cobalt machines (such as the Qube, RaQ, Qube2 and RaQ2).</p></"
-"item>\n"
-"  <item><p><url id=\"http://ftp.debian.org/debian/pool/main/k/kernel-patch-"
-"2.4.27-mips/kernel-image-2.4.27-r5k-lasat_2.4.27-8.040815-1_mipsel.deb\"> "
-"for R5000 processors on the Lasat Masquerade Pro.</p></item>\n"
-"  <item><p><url id=\"http://ftp.debian.org/debian/pool/main/k/kernel-patch-"
-"2.4.27-mips/kernel-image-2.4.27-sb1-swarm-bn_2.4.27-8.040815-1_mipsel.deb\"> "
-"for the Broadcom BCM91250A (aka SWARM) pass 2.2.</p></item>\n"
-"  <item><p><url id=\"http://ftp.debian.org/debian/pool/main/k/kernel-patch-"
-"2.4.27-mips/kernel-image-2.4.27-xxs1500_2.4.27-8.040815-1_mipsel.deb\"> for "
-"the Au1500 based XXS1500 board.</p></item>]]> </list></p><p>Then install the "
-"package using <tt>dpkg -i</tt>. It may complain about module mismatches "
-"(from <package>modutils</package>) and ask if the installation should "
-"continue. Answer <tt>YES</tt> to that question as these mismatches will be "
-"resolved as soon as you reboot with the new kernel.</p></item>\n"
+"  <item><p><url id=\"&mips-kernel-patch;/&mips-kernel-image-r4k;\" name="
+"\"&mips-kernel-image-r4k;\"> for R4XX0 processors and the SGI IP22 "
+"subarchitecture like the Indy and Indigo2.</p></item>\n"
+"  <item><p><url id=\"&mips-kernel-patch;/&mips-kernel-image-r5k;\" name="
+"\"&mips-kernel-image-r5k;\"> for R5000 processors and the SGI IP22 "
+"subarchitecture like the Indy and Indigo2.</p></item>\n"
+"  <item><p><url id=\"&mips-kernel-patch;/&mips-kernel-image-swarm;\" name="
+"\"&mips-kernel-image-swarm;\"> for the Broadcom BCM91250A (aka SWARM) pass "
+"2.2.</p></item>]]> <![ %mipsel [ \n"
+"  <item><p><url id=\"&mips-kernel-patch;/&mipsel-kernel-image-r3k;\" name="
+"\"&mipsel-kernel-image-r3k;\"> for R3000 based DECstations with KN02 (or "
+"compatible) mainboard, such as the DECstation 5000/1xx series with "
+"xx=20,25,33 and the DECstation 5000/240.</p></item>\n"
+"  <item><p><url id=\"&mips-kernel-patch;/&mipsel-kernel-image-r4k;\" name="
+"\"&mipsel-kernel-image-r4k;\"> for R4X00 based DECstations with KN04 (or "
+"compatible) mainboard, such as the DECstation 5000/150, the Personal "
+"DECstation 5000/50 and the DECstation 5000/260.</p></item>\n"
+"  <item><p><url id=\"&mips-kernel-patch;/&mipsel-kernel-image-r5k-cobalt;\" "
+"name=\"&mipsel-kernel-image-r5k-cobalt;\"> for MIPS based Cobalt machines "
+"(such as the Qube, RaQ, Qube2 and RaQ2).</p></item>\n"
+"  <item><p><url id=\"&mips-kernel-patch;/&mipsel-kernel-image-r5k-lasat;\" "
+"name=\"&mipsel-kernel-image-r5k-lasat;\"> for R5000 processors on the Lasat "
+"Masquerade Pro.</p></item>\n"
+"  <item><p><url id=\"&mips-kernel-patch;/&mipsel-kernel-image-swarm;\" name="
+"\"&mipsel-kernel-image-swarm;\"> for the Broadcom BCM91250A (aka SWARM) pass "
+"2.2.</p></item>\n"
+"  <item><p><url id=\"&mips-kernel-patch;/&mipsel-kernel-image-xxs1500;\" "
+"name=\"&mipsel-kernel-image-xxs1500;\"> for the Au1500 based XXS1500 board.</"
+"p></item>]]> </list></p><p>Then install the package using <tt>dpkg -i</tt>. "
+"It may complain about module mismatches (from <package>modutils</package>) "
+"and ask if the installation should continue. Answer <tt>YES</tt> to that "
+"question as these mismatches will be resolved as soon as you reboot with the "
+"new kernel.</p></item>\n"
 "  <item><p><em>with apt</em>: to install the packages with <prgn>apt</prgn> "
 "or one of its frontends, add the following line in your <file>/etc/apt/"
 "sources.list</file>: <example compact=\"compact\">\n"
 "deb &url-kernel-upgrade;\n"
 "# sources are also available if you need them\n"
 "# deb-src &url-kernel-upgrade;</example></p><p>Then install the packages "
-"<package>kernel-image-2.4.27-2-sparc32</package>, <package>modutils</"
-"package> and <package>initrd-tools</package>.</p><p>Then install the "
-"packages <package>kernel-image-2.6.8-2-64</package>, <package>module-init-"
-"tools</package> and <package>initrd-tools</package>.</p><p><em>with dpkg</"
-"em>: to install the packages directly with <prgn>dpkg</prgn> you need to "
-"download the necessary files first.</p><p><list compact=\"compact\">\n"
-"  <item><p><url id=\"http://ftp.debian.org/debian/pool/main/k/kernel-image-"
-"2.6.8-hppa/kernel-image-2.6.8-2-64_2.6.8-6_hppa.deb\"></p></item>\n"
-"  <item><p><url id=\"&deb-kernel-upgrade;/module-init-tools_3.2-pre1-2."
-"woody1_hppa.deb\"></p></item>\n"
-"  <item><p><url id=\"&deb-kernel-upgrade;/initrd-tools_0.1.79-0.woody1_all."
-"deb\"></p></item>\n"
-"  <item><p><url id=\"&deb-kernel-upgrade;/cramfsprogs_1.1-6.woody1_hppa.deb"
-"\"></p></item></list></p><p>The kernel package depends on <package>module-"
-"init-tools</package>; <package>initrd-tools</package> depends on "
-"<package>cramfsprogs</package>. All other dependencies can be satisfied with "
+"<package>modutils</package> and <package>initrd-tools</package>. ]]> </"
+"p><p>Then install the packages <package>module-init-tools</package>, "
+"<package>palo</package>, and <package>initrd-tools</package>. ]]> "
+"(Afterwards you can safely drop the additional entry again.)</p><p>After "
+"that change your <file>sources.list</file> file to point to &releasename; as "
+"described in <ref id=\"upgrade-process\">, update your packages lists and "
+"install the package <package>&upgrade-kernel-image-name;</package>.</"
+"p><p><em>with dpkg</em>: to install the packages directly with <prgn>dpkg</"
+"prgn> you need to download the necessary files first.</p><p><list compact="
+"\"compact\">\n"
+"  <item><p><url id=\"&upgrade-kernel-image;\"></p></item>\n"
+"  <item><p><url id=\"&upgrade-kernel-modutils;\"></p></item>\n"
+"  <item><p><url id=\"&all-initrd-tools;\"></p></item>\n"
+"  <item><p><url id=\"&upgrade-kernel-cramfsprogs;\"></p></item></list></"
+"p><p>The kernel package depends on <package>&upgrade-kernel-modutils-name</"
+"package>; <package>initrd-tools</package> depends on <package>cramfsprogs</"
+"package>. All other dependencies (which are <package>stat</package>, "
+"<package>cpio</package> and <package>ash</package>) can be satisfied with "
 "packages from &oldreleasename; in the usual way.</p><p>If you use <em>LVM</"
 "em>, you should also install <package>lvm2</package> before you reboot as "
 "the 2.6 kernel does not directly support LVM1. To access LVM1 volumes, the "
 "compatibility layer of <package>lvm2</package> (the dm-mod module) is used. "
 "You can leave <package>lvm10</package> installed; the init scripts will "
-"detect which kernel is used and execute the appropriate version.</p><p><list "
-"compact=\"compact\">\n"
-"  <item><p><url id=\"http://ftp.debian.org/debian/pool/main/k/kernel-image-"
-"2.4.27-sparc/kernel-image-2.4.27-2-sparc32_2.4.27-2_sparc.deb\"></p></item>\n"
-"  <item><p><url id=\"&deb-kernel-upgrade;/modutils_2.4.26-1.2woody1_sparc.deb"
-"\"></p></item>\n"
-"  <item><p><url id=\"&deb-kernel-upgrade;/initrd-tools_0.1.77-0.woody1_all."
-"deb\"></p></item>\n"
-"  <item><p><url id=\"&deb-kernel-upgrade;/cramfsprogs_1.1-6.woody1_sparc.deb"
-"\"></p></item></list></p><p>The kernel package depends on <package>modutils</"
-"package>. <package>initrd-tools</package> depends on <package>cramfsprogs</"
-"package>. All other dependencies can be satisfied with packages from "
-"&oldreleasename; in the usual way.</p></item>\n"
+"detect which kernel is used and execute the appropriate version.</p></item>\n"
 "  <tag>Don't delete your old kernel yet</tag>\n"
 "  <item><p>You should first verify that the new one boots and all hardware "
 "needed for the upgrade works (e.g. network adaptors).</p></item><![ %sparc "
@@ -2862,27 +2868,27 @@
 "модули, ...</p></item>\n"
 "</taglist>"
 
-#. <heading> 1587--1587
-#: release-notes.en.sgml:1587
+#. <heading> 1613--1613
+#: release-notes.en.sgml:1613
 msgid "Managing your &oldreleasename; system"
 msgstr ""
 
-#. <p> 1589--1591
-#: release-notes.en.sgml:1589
+#. <p> 1615--1617
+#: release-notes.en.sgml:1615
 msgid ""
 "This appendix contains information on how to make sure you can install or "
 "upgrade &oldreleasename; packages before you upgrade to &releasename;. This "
 "should only be necessary in specific situations."
 msgstr ""
 
-#. <heading> 1594--1594
-#: release-notes.en.sgml:1594
+#. <heading> 1620--1620
+#: release-notes.en.sgml:1620
 #, fuzzy
 msgid "Upgrading your &oldreleasename; system"
 msgstr "Обновление ядра"
 
-#. <p> 1596--1599
-#: release-notes.en.sgml:1596
+#. <p> 1622--1625
+#: release-notes.en.sgml:1622
 msgid ""
 "Basically this is no different than any other upgrade of &oldreleasename; "
 "you've been doing. The only difference is that you first need to make sure "
@@ -2890,21 +2896,21 @@
 "<ref id=\"old-sources\">."
 msgstr ""
 
-#. <heading> 1605--1605
-#: release-notes.en.sgml:1605
+#. <heading> 1631--1631
+#: release-notes.en.sgml:1631
 msgid "Installing &oldreleasename; version of aptitude"
 msgstr ""
 
-#. <p> 1607--1609
-#: release-notes.en.sgml:1607
+#. <p> 1633--1635
+#: release-notes.en.sgml:1633
 msgid ""
 "First you need to make sure you will install &oldreleasename;'s version of "
 "<package>aptitude</package> and not &releasename;'s by following the "
 "instructions in <ref id=\"old-sources\">."
 msgstr ""
 
-#. <p> 1611--1617
-#: release-notes.en.sgml:1611
+#. <p> 1637--1643
+#: release-notes.en.sgml:1637
 #, fuzzy
 msgid ""
 "After that, just execute <example compact=\"compact\">\n"
@@ -2915,14 +2921,14 @@
 "         apt-get install aptitude\n"
 "         </example>"
 
-#. <heading> 1623--1623
-#: release-notes.en.sgml:1623
+#. <heading> 1649--1649
+#: release-notes.en.sgml:1649
 #, fuzzy
 msgid "Checking your sources list"
 msgstr "Проверка поддержки ядра"
 
-#. <p> 1625--1628
-#: release-notes.en.sgml:1625
+#. <p> 1651--1654
+#: release-notes.en.sgml:1651
 msgid ""
 "If any of the lines in your <file>/etc/apt/sources.list</file> refer to "
 "'stable', you are effectively already \"using\" &releasename;. If you have "
@@ -2930,8 +2936,8 @@
 "following the procedure below."
 msgstr ""
 
-#. <p> 1630--1634
-#: release-notes.en.sgml:1630
+#. <p> 1656--1660
+#: release-notes.en.sgml:1656
 msgid ""
 "If you have also already installed packages from &releasename;, there "
 "probably is not much point in installing packages from &oldreleasename; "
@@ -2940,8 +2946,8 @@
 "covered here."
 msgstr ""
 
-#. <p> 1636--1639
-#: release-notes.en.sgml:1636
+#. <p> 1662--1665
+#: release-notes.en.sgml:1662
 msgid ""
 "Open the file <file>/etc/apt/sources.list</file> with your favorite editor "
 "(as root) and check all lines beginning with <tt>deb http:</tt> or <tt>deb "
@@ -2949,16 +2955,16 @@
 "<tt>stable</tt> to <tt>&oldreleasename;</tt>."
 msgstr ""
 
-#. <p> 1641--1643
-#: release-notes.en.sgml:1641
+#. <p> 1667--1669
+#: release-notes.en.sgml:1667
 msgid ""
 "If you have any lines starting with <tt>deb file:</tt>, you will have to "
 "check for yourself if the location they refer to contains a &oldreleasename; "
 "or a &releasename; archive."
 msgstr ""
 
-#. <p> 1645--1648
-#: release-notes.en.sgml:1645
+#. <p> 1671--1674
+#: release-notes.en.sgml:1671
 msgid ""
 "<strong>Important!</strong> Do not change any lines that begin with <tt>deb "
 "cdrom:</tt>. Doing so would invalidate the line and you would have to run "
@@ -2966,8 +2972,8 @@
 "\"<tt>unstable</tt>\". Although confusing, this is normal."
 msgstr ""
 
-#. <p> 1650--1656
-#: release-notes.en.sgml:1650
+#. <p> 1676--1682
+#: release-notes.en.sgml:1676
 msgid ""
 "If you've made any changes, safe the file and execute <example compact="
 "\"compact\">\n"

Index: release-notes.en.sgml
===================================================================
RCS file: /cvsroot/l10n-russian/release-notes/release-notes.en.sgml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- release-notes.en.sgml	27 May 2005 07:37:37 -0000	1.7
+++ release-notes.en.sgml	28 May 2005 08:57:19 -0000	1.8
@@ -475,6 +475,7 @@
         </sect>
 
 <![ %glibcneedsnewkernel [
+<![ %not-mips-mipsel [
 
         <sect id="new-kernel">
         <heading>Checking kernel support</heading>
@@ -521,14 +522,6 @@
           CPUs or above.</p>
 ]]>
 
-<![ %mips-mipsel [
-          <p>On &arch-title; machines you will need to upgrade to a newer
-          kernel version first before upgrading the system. This is necessary
-          because of a inconsistent definition of the inter process communication
-          of the new libc and the kernel, so you need an updated kernel
-          that provides the correct definition first.</p>
-]]>
-
 <![ %upgradekernel [
         <sect1 id="kernel-upgrade"><heading>Upgrading the kernel</heading>
 
@@ -537,17 +530,16 @@
           should do so now.</p>
 
           <p>
-<![ %not-mips-mipsel [
           Backports are available of all tools needed to install the
           current kernel from &releasename;.
-]]>
           Detailed instructions on how to install the new kernel can be
           found in <ref id="kernel-upgrade-howto">.</p>
           
         </sect1>
 ]]>
         </sect>
-]]>
+]]> <!-- not-mips-mipsel -->
+]]> <!-- glibcneedsnewkernel -->
 
         <sect id="upgrade-process"><heading>Preparing sources for APT</heading>
 
@@ -753,6 +745,22 @@
 
         </sect1>
 
+
+<![ %mips-mipsel [
+        <sect1 id="upgrading_kernel_mipsen"><heading>Upgrading the kernel</heading>         
+
+
+          <p>On &arch-title; machines you will need to upgrade to a newer
+          kernel version first before upgrading the system. This is necessary
+          because of a inconsistent definition of the inter process communication
+          of the new libc and the kernel, so you need an updated kernel
+          that provides the correct definition first.</p>
+
+          <p>Detailed instructions on how to install the new kernel can be
+          found in <ref id="kernel-upgrade-howto">.</p>
+]]>
+
+
 <!-- FJP: This next section can probably be dropped for etch -->
         <sect1 id="upgrading_aptitude"><heading>Upgrading aptitude</heading>
 
@@ -1428,11 +1436,13 @@
 
     <appendix id="kernel-upgrade-howto"><heading>Upgrading the kernel</heading>
 
+<![ %not-mips-mipsel [
           <p><strong>The information in this appendix is relevant only
           if, for a successful upgrade of the system, you need to upgrade the
           kernel <em/before/ upgrading the system. Please read
           <ref id="new-kernel"> to find out if that is required for your
           system</strong>.</p>
+]]>
 
 <![ %mips-mipsel [
           <p>The following instructions explain step by step how to install
@@ -1449,28 +1459,53 @@
 <![ %mips-mipsel [
                 <item>
 <![ %mips [
+<!-- FIXME: needs to be relocated because of the new structure -->
                 <p>If you have an <em>SGI IP22</em> you should first prepare
                 it to boot with <package>arcboot</package>, and not to boot
                 the kernel directly. <package>arcboot</package> is available
                 in &oldreleasename; so you can install it in the usual ways.</p>
 ]]>
+ 	        <p><em>with apt</em>; if you not yet have done so
+		change your <file>sources.list</file> file to point
+	        to &releasename; as described in <ref id="upgrade-process">,
+	        update your packages lists and install the kernel-image for
+	        your machine. You can find a list of available kernel
+	        images below or with the command
+         
+	 <example>
+apt-cache search ^kernel-image
+         </example></p>
 
-                <p>Fetch the current kernel package from &releasename; from
+	        <p>During the install the package may complain about module mismatches
+		and ask if the installation should continue. Answer <tt>YES</tt> to that
+		question as these mismatches will be resolved as soon as you reboot with
+		the new kernel.</p>
+
+                <p><em>with dpkg</em>: fetch the current kernel package from
                 the Debian mirror of your choice. The available packages are:
 
                 <list>
 <![ %mips [
-                <item><p><url id="http://ftp.debian.org/debian/pool/main/k/kernel-patch-2.4.27-mips/kernel-image-2.4.27-r4k-ip22_2.4.27-8.040815-1_mips.deb"> for R4XX0 processors and the SGI IP22 subarchitecture like the Indy and Indigo2.</p></item>
-                <item><p><url id="http://ftp.debian.org/debian/pool/main/k/kernel-patch-2.4.27-mips/kernel-image-2.4.27-r5k-ip22_2.4.27-8.040815-1_mips.deb"> for R5000 processors and the SGI IP22 subarchitecture like the Indy and Indigo2.</p></item>
-                <item><p><url id="http://ftp.debian.org/debian/pool/main/k/kernel-patch-2.4.27-mips/kernel-image-2.4.27-sb1-swarm-bn_2.4.27-8.040815-1_mips.deb"> for the Broadcom BCM91250A (aka SWARM) pass 2.2.</p></item>
+                <item><p><url id="&mips-kernel-patch;/&mips-kernel-image-r4k;" name="&mips-kernel-image-r4k;">
+		for R4XX0 processors and the SGI IP22 subarchitecture like the Indy and Indigo2.</p></item>
+                <item><p><url id="&mips-kernel-patch;/&mips-kernel-image-r5k;" name="&mips-kernel-image-r5k;">
+		for R5000 processors and the SGI IP22 subarchitecture like the Indy and Indigo2.</p></item>
+                <item><p><url id="&mips-kernel-patch;/&mips-kernel-image-swarm;" name="&mips-kernel-image-swarm;">
+		for the Broadcom BCM91250A (aka SWARM) pass 2.2.</p></item>
 ]]>
 <![ %mipsel [
-                <item><p><url id="http://ftp.debian.org/debian/pool/main/k/kernel-patch-2.4.27-mips/kernel-image-2.4.27-r3k-kn02_2.4.27-8.040815-1_mipsel.deb"> for R3000 based DECstations with KN02 (or compatible) mainboard, such as the DECstation 5000/1xx series with xx=20,25,33 and the DECstation 5000/240.</p></item>
-                <item><p><url id="http://ftp.debian.org/debian/pool/main/k/kernel-patch-2.4.27-mips/kernel-image-2.4.27-r4k-kn04_2.4.27-8.040815-1_mipsel.deb"> for R4X00 based DECstations with KN04 (or compatible) mainboard, such as the DECstation 5000/150, the Personal DECstation 5000/50 and the DECstation 5000/260.</p></item>
-                <item><p><url id="http://ftp.debian.org/debian/pool/main/k/kernel-patch-2.4.27-mips/kernel-image-2.4.27-r5k-cobalt_2.4.27-8.040815-1_mipsel.deb"> for MIPS based Cobalt machines (such as the Qube, RaQ, Qube2 and RaQ2).</p></item>
-                <item><p><url id="http://ftp.debian.org/debian/pool/main/k/kernel-patch-2.4.27-mips/kernel-image-2.4.27-r5k-lasat_2.4.27-8.040815-1_mipsel.deb"> for R5000 processors on the Lasat Masquerade Pro.</p></item>
-                <item><p><url id="http://ftp.debian.org/debian/pool/main/k/kernel-patch-2.4.27-mips/kernel-image-2.4.27-sb1-swarm-bn_2.4.27-8.040815-1_mipsel.deb"> for the Broadcom BCM91250A (aka SWARM) pass 2.2.</p></item>
-                <item><p><url id="http://ftp.debian.org/debian/pool/main/k/kernel-patch-2.4.27-mips/kernel-image-2.4.27-xxs1500_2.4.27-8.040815-1_mipsel.deb"> for  the Au1500 based XXS1500 board.</p></item>
+                <item><p><url id="&mips-kernel-patch;/&mipsel-kernel-image-r3k;" name="&mipsel-kernel-image-r3k;">
+		for R3000 based DECstations with KN02 (or compatible) mainboard, such as the DECstation 5000/1xx series with xx=20,25,33 and the DECstation 5000/240.</p></item>
+                <item><p><url id="&mips-kernel-patch;/&mipsel-kernel-image-r4k;" name="&mipsel-kernel-image-r4k;">
+		for R4X00 based DECstations with KN04 (or compatible) mainboard, such as the DECstation 5000/150, the Personal DECstation 5000/50 and the DECstation 5000/260.</p></item>
+                <item><p><url id="&mips-kernel-patch;/&mipsel-kernel-image-r5k-cobalt;" name="&mipsel-kernel-image-r5k-cobalt;">
+		for MIPS based Cobalt machines (such as the Qube, RaQ, Qube2 and RaQ2).</p></item> 
+                <item><p><url id="&mips-kernel-patch;/&mipsel-kernel-image-r5k-lasat;" name="&mipsel-kernel-image-r5k-lasat;">
+		for R5000 processors on the Lasat Masquerade Pro.</p></item>
+                <item><p><url id="&mips-kernel-patch;/&mipsel-kernel-image-swarm;" name="&mipsel-kernel-image-swarm;">
+		for the Broadcom BCM91250A (aka SWARM) pass 2.2.</p></item>
+                <item><p><url id="&mips-kernel-patch;/&mipsel-kernel-image-xxs1500;" name="&mipsel-kernel-image-xxs1500;">
+		for the Au1500 based XXS1500 board.</p></item>
 ]]>
                 </list></p>
 
@@ -1498,53 +1533,44 @@
 
 <![ %sparc [
                <p>Then install the packages
-               <package>kernel-image-2.4.27-2-sparc32</package>,
                <package>modutils</package> and
-               <package>initrd-tools</package>.</p>
+               <package>initrd-tools</package>.
 ]]>
 <![ %hppa [
                <p>Then install the packages
-               <package>kernel-image-2.6.8-2-64</package>,
-               <package>module-init-tools</package> and
-               <package>initrd-tools</package>.</p>
+               <package>module-init-tools</package>,
+	       <package>palo</package>,
+	       and <package>initrd-tools</package>.
 ]]>
+       	       (Afterwards you can safely drop the additional entry again.)</p>
+
+	       <p>After that change your <file>sources.list</file> file to point
+	       to &releasename; as described in <ref id="upgrade-process">,
+	       update your packages lists and install the package
+	       <package>&upgrade-kernel-image-name;</package>.
+	       </p>
 
                <p><em>with dpkg</em>: to install the packages directly with <prgn>dpkg</prgn> you need to
                download the necessary files first.</p>
-<![ %hppa [
-<!-- note: download URLs not final yet -->
                <p><list>
-                 <item><url id="http://ftp.debian.org/debian/pool/main/k/kernel-image-2.6.8-hppa/kernel-image-2.6.8-2-64_2.6.8-6_hppa.deb"></item>
-                 <item><url id="&deb-kernel-upgrade;/module-init-tools_3.2-pre1-2.woody1_hppa.deb">
-                 <item><url id="&deb-kernel-upgrade;/initrd-tools_0.1.79-0.woody1_all.deb">
-                 <item><url id="&deb-kernel-upgrade;/cramfsprogs_1.1-6.woody1_hppa.deb">
+                 <item><url id="&upgrade-kernel-image;"></item>
+                 <item><url id="&upgrade-kernel-modutils;"></item>
+                 <item><url id="&all-initrd-tools;"></item>
+                 <item><url id="&upgrade-kernel-cramfsprogs;"></item>
                </list></p>
 
-               <p>The kernel package depends on <package>module-init-tools</package>;
+               <p>The kernel package depends on <package>&upgrade-kernel-modutils-name</package>;
                <package>initrd-tools</package> depends on <package>cramfsprogs</package>.
-               All other dependencies can be satisfied with packages from
-               &oldreleasename; in the usual way.</p>
-
+               All other dependencies (which are <package>stat</package>,
+               <package>cpio</package> and <package>ash</package>) can be
+               satisfied with packages from &oldreleasename; in the usual way.</p>
+<![ %hppa [
                <p>If you use <em/LVM/, you should also install <package/lvm2/
                before you reboot as the 2.6 kernel does not directly support LVM1.
                To access LVM1 volumes, the compatibility layer of <package/lvm2/
                (the dm-mod module) is used. You can leave <package/lvm10/ installed;
                the init scripts will detect which kernel is used and execute the
                appropriate version.</p>
-]]>
-
-<![ %sparc [
-               <p><list>
-                 <item><url id="http://ftp.debian.org/debian/pool/main/k/kernel-image-2.4.27-sparc/kernel-image-2.4.27-2-sparc32_2.4.27-2_sparc.deb">
-                 <item><url id="&deb-kernel-upgrade;/modutils_2.4.26-1.2woody1_sparc.deb">
-                 <item><url id="&deb-kernel-upgrade;/initrd-tools_0.1.77-0.woody1_all.deb">
-                 <item><url id="&deb-kernel-upgrade;/cramfsprogs_1.1-6.woody1_sparc.deb">
-               </list></p>
-
-               <p>The kernel package depends on <package>modutils</package>.
-               <package>initrd-tools</package> depends on <package>cramfsprogs</package>.
-               All other dependencies can be satisfied with packages from
-               &oldreleasename; in the usual way.</p>
 ]]>
                </item>
 ]]> <!-- %not-mips-mipsel -->

Index: release-notes.ru.sgml
===================================================================
RCS file: /cvsroot/l10n-russian/release-notes/release-notes.ru.sgml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- release-notes.ru.sgml	27 May 2005 07:37:37 -0000	1.5
+++ release-notes.ru.sgml	28 May 2005 08:57:19 -0000	1.6
@@ -538,6 +538,7 @@
         
 
 <![ %glibcneedsnewkernel [
+<![ %not-mips-mipsel [
 
         <sect id="new-kernel">
         <heading>Проверка поддержки ядра</heading>
@@ -596,14 +597,6 @@
 	  "80486" CPUs or above.</p>
 ]]>
 
-<![ %mips-mipsel [
-	  <p>On &arch-title; machines you will need to upgrade to a newer
-	  kernel version first before upgrading the system. This is necessary
-	  because of a inconsistent definition of the inter process
-	  communication of the new libc and the kernel, so you need an updated
-	  kernel that provides the correct definition first.</p>
-]]>
-
 <![ %upgradekernel [
         <sect1 id="kernel-upgrade"><heading>Upgrading the kernel</heading>
 
@@ -612,15 +605,15 @@
 	  ядра <em>перед</em> обновлением системы,
 	  сделайте это.</p>
 
-	  <p><![ %not-mips-mipsel [ Backports are available of all tools needed
-	  to install the current kernel from &releasename;. ]]> Detailed
-	  instructions on how to install the new kernel can be found in <ref
-	  id="kernel-upgrade-howto">.</p>
+	  <p>Backports are available of all tools needed to install the current
+	  kernel from &releasename;. Detailed instructions on how to install
+	  the new kernel can be found in <ref id="kernel-upgrade-howto">.</p>
 </sect1>          
         
 ]]></sect>
         
-]]>
+]]> <!-- not-mips-mipsel -->
+]]> <!-- glibcneedsnewkernel -->
 
         <sect id="upgrade-process"><heading>Preparing sources for APT</heading>
 
@@ -834,7 +827,23 @@
 </sect1>
         
 
-<!-- FJP: This next section can probably be dropped for etch -->
+
+<![ %mips-mipsel [
+        <sect1 id="upgrading_kernel_mipsen"><heading>Upgrading the kernel</heading>
+
+
+	  <p>On &arch-title; machines you will need to upgrade to a newer
+	  kernel version first before upgrading the system. This is necessary
+	  because of a inconsistent definition of the inter process
+	  communication of the new libc and the kernel, so you need an updated
+	  kernel that provides the correct definition first.</p>
+
+	  <p>Detailed instructions on how to install the new kernel can be
+	  found in <ref id="kernel-upgrade-howto">.</p>
+]]>
+
+
+<!-- FJP: This next section can probably be dropped for etch --></sect1>
         <sect1 id="upgrading_aptitude"><heading>Upgrading aptitude</heading>
 
 	  <p>Upgrade tests have shown that &releasename;'s version of
@@ -1651,6 +1660,7 @@
 
     <appendix id="kernel-upgrade-howto"><heading>Upgrading the kernel</heading>
 
+<![ %not-mips-mipsel [
 	  <p><strong>Информация этого раздела важна
 	  только в тех случаях, когда для
 	  успешного обновления системы вам
@@ -1658,6 +1668,7 @@
 	  обновлением системы. Чтобы узнать,
 	  нужно ли это в вашем случае - прочтите
 	  <ref id="new-kernel"></strong>.</p>
+]]>
 
 <![ %mips-mipsel [
 	  <p>Подробная инструкция по установке
@@ -1670,155 +1681,118 @@
 
 	  <p>
 <taglist compact="compact">
-  <tag>Скачайте и установите все необходимые пакеты</tag>
-  <item><p>Если вы обладатель <em>SGI IP22</em>, то
-	сначала надо подготовить его к
-	загрузке с помощью <package>arcboot</package>
-	(вместо прямой загрузки ядра).пакет
-	<package>arcboot</package> доступен в &oldreleasename;,
-	поэтому можете установить его обычным
-	образом.</p><p>Скачайте пакет с текущей
-	версией ядра из &releasename; с любого
-	зеркала Debian. Доступны следующие
-	пакеты: <list compact="compact">
+  <tag>Download and install the needed packages</tag>
+  <item><p>If you have an <em>SGI IP22</em> you should first prepare it to boot
+  with <package>arcboot</package>, and not to boot the kernel directly.
+  <package>arcboot</package> is available in &oldreleasename; so you can
+  install it in the usual ways.</p><p><em>with apt</em>; if you not yet have
+  done so change your <file>sources.list</file> file to point to &releasename;
+  as described in <ref id="upgrade-process">, update your packages lists and
+  install the kernel-image for your machine. You can find a list of available
+  kernel images below or with the command  <example compact="compact">
+apt-cache search ^kernel-image
+	 </example></p><p>During the install the package may complain about
+		       module mismatches and ask if the installation should
+		       continue. Answer <tt>YES</tt> to that question as these
+		       mismatches will be resolved as soon as you reboot with
+		       the new kernel.</p><p><em>with dpkg</em>: fetch the
+		       current kernel package from the Debian mirror of your
+		       choice. The available packages are: <list
+		       compact="compact">
   <item><p><![ %mips [ </p></item>
-  <item><p><url
-	id="http://ftp.debian.org/debian/pool/main/k/kernel-patch-2.4.27-mips/kernel-image-2.4.27-r4k-ip22_2.4.27-8.040815-1_mips.deb">
-	для процессоров R4XX0 и субархитектуры SGI
-	IP22 (например, Indy and Indigo2).</p></item>
-  <item><p><url
-	id="http://ftp.debian.org/debian/pool/main/k/kernel-patch-2.4.27-mips/kernel-image-2.4.27-r5k-ip22_2.4.27-8.040815-1_mips.deb">
-	для процессоров R5000 и субархитектуры SGI
-	IP22 (например, Indy and Indigo2).</p></item>
-  <item><p><url
-	id="http://ftp.debian.org/debian/pool/main/k/kernel-patch-2.4.27-mips/kernel-image-2.4.27-sb1-swarm-bn_2.4.27-8.040815-1_mips.deb">
-	для Broadcom BCM91250A (aka SWARM) pass 2.2.</p></item>]]> <![
-	%mipsel [ 
-  <item><p><url
-	id="http://ftp.debian.org/debian/pool/main/k/kernel-patch-2.4.27-mips/kernel-image-2.4.27-r3k-kn02_2.4.27-8.040815-1_mipsel.deb">
-	для DECstation на базе R3000 с материнской
-	платой KN02 (или совместимой), например,
-	DECstation серий 5000/1xx, где xx=20,25,33 или DECstation
-	5000/240.</p></item>
-  <item><p><url
-	id="http://ftp.debian.org/debian/pool/main/k/kernel-patch-2.4.27-mips/kernel-image-2.4.27-r4k-kn04_2.4.27-8.040815-1_mipsel.deb">
-	для DECstation на базе R4X00 с материнской
-	платой KN04 (или совместимой), таких как
-	DECstation 5000/150, Personal DECstation 5000/50 и DECstation
-	5000/260.</p></item>
-  <item><p><url
-	id="http://ftp.debian.org/debian/pool/main/k/kernel-patch-2.4.27-mips/kernel-image-2.4.27-r5k-cobalt_2.4.27-8.040815-1_mipsel.deb">
-	для компьютеров Cobalt на базе MIPS (таких
-	как Qube, RaQ, Qube2 and RaQ2).</p></item>
-  <item><p><url
-	id="http://ftp.debian.org/debian/pool/main/k/kernel-patch-2.4.27-mips/kernel-image-2.4.27-r5k-lasat_2.4.27-8.040815-1_mipsel.deb">
-	для процессоров R5000 на Lasat Masquerade
-	Pro.</p></item>
-  <item><p><url
-	id="http://ftp.debian.org/debian/pool/main/k/kernel-patch-2.4.27-mips/kernel-image-2.4.27-sb1-swarm-bn_2.4.27-8.040815-1_mipsel.deb">
-	для Broadcom BCM91250A (aka SWARM) pass 2.2.</p></item>
-  <item><p><url
-	id="http://ftp.debian.org/debian/pool/main/k/kernel-patch-2.4.27-mips/kernel-image-2.4.27-xxs1500_2.4.27-8.040815-1_mipsel.deb">
-	для платы XXS1500 на базе Au1500.</p></item>]]>
-	</list></p><p>Затем установите пакет с
-	помощью <tt>dpkg -i</tt>. Возможно, при
-	установке вы увидите сообщение о
-	несовпадении модулей (с пакетом
-	<package>modutils</package>). На вопрос о
-	продолжении установки отвечайте
-	<tt>YES</tt>(да), несовпадение модулей будет
-	разрешено при первой загрузке
-	ядра.</p></item>
-  <item><p><em>С помощью apt</em>: Чтобы установить
-  пакеты при помощи <prgn>apt</prgn> или одного её
-  интерфейсов, добавьте следующую строку в
-  файл <file>/etc/apt/sources.list</file>: <example compact="compact">
+  <item><p><url id="&mips-kernel-patch;/&mips-kernel-image-r4k;"
+	name="&mips-kernel-image-r4k;"> for R4XX0 processors and the SGI IP22
+	subarchitecture like the Indy and Indigo2.</p></item>
+  <item><p><url id="&mips-kernel-patch;/&mips-kernel-image-r5k;"
+	name="&mips-kernel-image-r5k;"> for R5000 processors and the SGI IP22
+	subarchitecture like the Indy and Indigo2.</p></item>
+  <item><p><url id="&mips-kernel-patch;/&mips-kernel-image-swarm;"
+	name="&mips-kernel-image-swarm;"> for the Broadcom BCM91250A (aka
+	SWARM) pass 2.2.</p></item>]]> <![ %mipsel [ 
+  <item><p><url id="&mips-kernel-patch;/&mipsel-kernel-image-r3k;"
+	name="&mipsel-kernel-image-r3k;"> for R3000 based DECstations with KN02
+	(or compatible) mainboard, such as the DECstation 5000/1xx series with
+	xx=20,25,33 and the DECstation 5000/240.</p></item>
+  <item><p><url id="&mips-kernel-patch;/&mipsel-kernel-image-r4k;"
+	name="&mipsel-kernel-image-r4k;"> for R4X00 based DECstations with KN04
+	(or compatible) mainboard, such as the DECstation 5000/150, the
+	Personal DECstation 5000/50 and the DECstation 5000/260.</p></item>
+  <item><p><url id="&mips-kernel-patch;/&mipsel-kernel-image-r5k-cobalt;"
+	name="&mipsel-kernel-image-r5k-cobalt;"> for MIPS based Cobalt machines
+	(such as the Qube, RaQ, Qube2 and RaQ2).</p></item>
+  <item><p><url id="&mips-kernel-patch;/&mipsel-kernel-image-r5k-lasat;"
+	name="&mipsel-kernel-image-r5k-lasat;"> for R5000 processors on the
+	Lasat Masquerade Pro.</p></item>
+  <item><p><url id="&mips-kernel-patch;/&mipsel-kernel-image-swarm;"
+	name="&mipsel-kernel-image-swarm;"> for the Broadcom BCM91250A (aka
+	SWARM) pass 2.2.</p></item>
+  <item><p><url id="&mips-kernel-patch;/&mipsel-kernel-image-xxs1500;"
+	name="&mipsel-kernel-image-xxs1500;"> for the Au1500 based XXS1500
+	board.</p></item>]]> </list></p><p>Then install the package using
+	<tt>dpkg -i</tt>. It may complain about module mismatches (from
+	<package>modutils</package>) and ask if the installation should
+	continue. Answer <tt>YES</tt> to that question as these mismatches will
+	be resolved as soon as you reboot with the new kernel.</p></item>
+  <item><p><em>with apt</em>: to install the packages with <prgn>apt</prgn> or
+  one of its frontends, add the following line in your
+  <file>/etc/apt/sources.list</file>: <example compact="compact">
 deb &url-kernel-upgrade;
-# Если ван нужен исходный код, то он также доступен
-# deb-src &url-kernel-upgrade;</example></p><p>Затем установите
-					    пакеты
-					    <package>kernel-image-2.4.27-2-sparc32</package>,
-					    <package>modutils</package> и
-					    <package>initrd-tools</package>.</p><p>Затем
-					    установите пакеты
-					    <package>kernel-image-2.6.8-2-64</package>,
-					    <package>module-init-tools</package>
-					    и
-					    <package>initrd-tools</package>.</p><p><em>С
-					    помощью dpkg</em>: для
-					    установки пакетов
-					    напрямую с помощью
-					    <prgn>dpkg</prgn>, вам
-					    понадобится
-					    вручную скачать
-					    необходимые
-					    файлы.</p><p><list
+# sources are also available if you need them
+# deb-src &url-kernel-upgrade;</example></p><p>Then install the packages
+					    <package>modutils</package> and
+					    <package>initrd-tools</package>.
+					    ]]> </p><p>Then install the
+					    packages
+					    <package>module-init-tools</package>,
+					    <package>palo</package>, and
+					    <package>initrd-tools</package>.
+					    ]]> (Afterwards you can safely drop
+					    the additional entry
+					    again.)</p><p>After that change
+					    your <file>sources.list</file> file
+					    to point to &releasename; as
+					    described in <ref
+					    id="upgrade-process">, update your
+					    packages lists and install the
+					    package
+					    <package>&upgrade-kernel-image-name;</package>.</p><p><em>with
+					    dpkg</em>: to install the packages
+					    directly with <prgn>dpkg</prgn> you
+					    need to download the necessary
+					    files first.</p><p><list
 					    compact="compact">
-  <item><p><url
-	id="http://ftp.debian.org/debian/pool/main/k/kernel-image-2.6.8-hppa/kernel-image-2.6.8-2-64_2.6.8-6_hppa.deb"></p></item>
-  <item><p><url
-	id="&deb-kernel-upgrade;/module-init-tools_3.2-pre1-2.woody1_hppa.deb"></p></item>
-  <item><p><url
-	id="&deb-kernel-upgrade;/initrd-tools_0.1.79-0.woody1_all.deb"></p></item>
-  <item><p><url
-	id="&deb-kernel-upgrade;/cramfsprogs_1.1-6.woody1_hppa.deb"></p></item></list></p><p>Пакет
-	ядра зависит от пакета
-	<package>module-init-tools</package>, пакет
-	<package>initrd-tools</package> - от
-	<package>cramfsprogs</package>.Остальные
-	зависимости могут быть разрешены
-	обычным способом с помощью пакетов из
-	&oldreleasename;.</p><p>Если вы используете
-	<em>LVM</em>, перед перезагрузкой придётся
-	также установить пакет
-	<package>lvm2</package>,так как ядро 2.6 само по
-	себе не поддерживает LVM1. Для доступа к
-	разделам LVM1 применяется модуль
-	совместимости dm-mod из пакета
-	<package>lvm2</package>. Пакет <package>lvm10</package> можно
-	не удалять, сценарии первичной
-	загрузки определят версию
-	используемого ядра и загрузят
-	подходящую версию пакета LVM.</p><p><list
-	compact="compact">
-  <item><p><url
-	id="http://ftp.debian.org/debian/pool/main/k/kernel-image-2.4.27-sparc/kernel-image-2.4.27-2-sparc32_2.4.27-2_sparc.deb"></p></item>
-  <item><p><url
-	id="&deb-kernel-upgrade;/modutils_2.4.26-1.2woody1_sparc.deb"></p></item>
-  <item><p><url
-	id="&deb-kernel-upgrade;/initrd-tools_0.1.77-0.woody1_all.deb"></p></item>
-  <item><p><url
-	id="&deb-kernel-upgrade;/cramfsprogs_1.1-6.woody1_sparc.deb"></p></item></list></p><p>Пакет
-	ядра зависит от пакета <package>modutils</package>,
-	<package>initrd-tools</package> - от <package>cramfsprogs</package>.
-	Остальные зависимости могут быть
-	разрешены обычным способом с помощью
-	пакетов из &oldreleasename;.</p></item>
-  <tag>Не удаляйте пока старое ядро</tag>
-  <item><p>Сначала проверьте, что новое ядро
-	загружается и поддерживает всё
-	аппаратное обеспечение, которое вам
-	понадобится для обновления (например,
-	сетевые карты).</p></item><![ %sparc [ 
-  <tag>Установите системный загрузчик</tag>
-  <item><p>Возможно, вам придётся исправить
-	настройки системного загрузчика в
-	файле <file>/etc/silo.conf</file>. Обратите
-	внимание, теперь при загрузке ядра
-	используется initrd (в &oldreleasename; initrd не
-	использовался).</p></item>]]> 
-  <tag>Перезагрузитесь с новым ядром</tag>
-  <tag>Проверьте, что система работает</tag>
-  <item><p>В первую очередь обратите внимание
-	на устройства ввода (клавиатуру),
-	вывода на консоль, устройства, которые
-	понадобятся вам при установке &releasename;
-	для получения пакетов (сетевые карты,
-	устройства CD/DVD-ROM) и т.д. Некоторые
-	модули устройств теперь называются
-	по-другому, некоторые драйвера были
-	раньше вкомпилированы в ядро теперь
-	поставляются как модули, ...</p></item>
+  <item><p><url id="&upgrade-kernel-image;"></p></item>
+  <item><p><url id="&upgrade-kernel-modutils;"></p></item>
+  <item><p><url id="&all-initrd-tools;"></p></item>
+  <item><p><url id="&upgrade-kernel-cramfsprogs;"></p></item></list></p><p>The
+	kernel package depends on
+	<package>&upgrade-kernel-modutils-name</package>;
+	<package>initrd-tools</package> depends on
+	<package>cramfsprogs</package>. All other dependencies (which are
+	<package>stat</package>, <package>cpio</package> and
+	<package>ash</package>) can be satisfied with packages from
+	&oldreleasename; in the usual way.</p><p>If you use <em>LVM</em>, you
+	should also install <package>lvm2</package> before you reboot as the
+	2.6 kernel does not directly support LVM1. To access LVM1 volumes, the
+	compatibility layer of <package>lvm2</package> (the dm-mod module) is
+	used. You can leave <package>lvm10</package> installed; the init
+	scripts will detect which kernel is used and execute the appropriate
+	version.</p></item>
+  <tag>Don't delete your old kernel yet</tag>
+  <item><p>You should first verify that the new one boots and all hardware
+	needed for the upgrade works (e.g. network adaptors).</p></item><![
+	%sparc [ 
+  <tag>Make your system bootable</tag>
+  <item><p>You will probably have to adapt your boot loader configuration
+	<file>/etc/silo.conf</file>. Note that the kernel now uses an initrd
+	while the Debian kernels in &oldreleasename; did not.</p></item>]]> 
+  <tag>Reboot to the new kernel</tag>
+  <tag>Check your system</tag>
+  <item><p>Check especially input devices, display devices, devices needed to
+	access the &releasename; packages (i.e. network adaptors, CD drives,
+	etc). Some driver modules may have been renamed, some drivers which
+	have been compiled into the old kernel might now be compiled as
+	modules, ...</p></item>
 </taglist></p>
 </appendix>