[l10n-russian CVS] release-notes release-notes.en.sgml,1.6,1.7 release-notes.ru.po,1.18,1.19 release-notes.ru.sgml,1.4,1.5
Nikolai Prokoschenko
debian-l10n-russian@lists.debian.org
Fri, 27 May 2005 07:37:40 +0000
- Previous message: [l10n-russian CVS] webpage/htdocs/release-notes.ru.html release-notes.ru.txt,NONE,1.1
- Next message: [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
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/l10n-russian/release-notes
In directory haydn:/tmp/cvs-serv16908
Modified Files:
release-notes.en.sgml release-notes.ru.po
release-notes.ru.sgml
Log Message:
sync with the current version
Index: release-notes.ru.po
===================================================================
RCS file: /cvsroot/l10n-russian/release-notes/release-notes.ru.po,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- release-notes.ru.po 26 May 2005 14:18:15 -0000 1.18
+++ release-notes.ru.po 27 May 2005 07:37:37 -0000 1.19
@@ -22,9 +22,10 @@
#. <author> 14--17
#: release-notes.en.sgml:14
+#, fuzzy
msgid ""
"<name>Josip Rodin, Bob Hilliard, Adam Di Carlo, Anne Bezemer, Rob Bradford "
-"(current)</name><email></email>"
+"(current), Frans Pop (current)</name><email></email>"
msgstr ""
"<name>Josip Rodin, Bob Hilliard, Adam Di Carlo, Anne Bezemer, Rob Bradford "
"(current)</name><email></email>"
@@ -620,10 +621,11 @@
#. <p> 326--328
#: release-notes.en.sgml:326
+#, fuzzy
msgid ""
"The main things you'll want to back up are the contents of <file>/etc</"
"file>, <file>/var/lib/dpkg</file> and the output of <tt>dpkg --get-"
-"selections \\*</tt>."
+"selections \"*\"</tt> (the quotes are important)."
msgstr ""
"В первую очередь необходимо сохранить резервные копии содержимого каталогов "
"<file>/etc</file> и <file>/var/lib/dpkg</file>, а также вывод команды "
@@ -661,13 +663,14 @@
#. <p> 342--347
#: release-notes.en.sgml:342
+#, fuzzy
msgid ""
-"<em>Important</em>: You should <em>not</em> upgrade using <prgn>telnet</"
-"prgn>, <prgn>rlogin</prgn>, <prgn>rsh</prgn>, or from an X session managed "
-"by <prgn>xdm</prgn>, <prgn>gdm</prgn> or <prgn>kdm</prgn> etc on the machine "
-"you are upgrading. That is because each of those services may well be "
-"terminated during the upgrade, which can result in an <em>inaccessible</em> "
-"system that is only half-upgraded."
+"<strong>Important!</strong> You should <em>not</em> upgrade using "
+"<prgn>telnet</prgn>, <prgn>rlogin</prgn>, <prgn>rsh</prgn>, or from an X "
+"session managed by <prgn>xdm</prgn>, <prgn>gdm</prgn> or <prgn>kdm</prgn> "
+"etc on the machine you are upgrading. That is because each of those services "
+"may well be terminated during the upgrade, which can result in an "
+"<em>inaccessible</em> system that is only half-upgraded."
msgstr ""
"<em>Внимание!</em> <em>Ни в коем случае</em> не обновляйте систему через "
"<prgn>telnet</prgn>, <prgn>rlogin</prgn>, <prgn>rsh</prgn> или из "
@@ -679,17 +682,6 @@
#. <p> 349--351
#: release-notes.en.sgml:349
msgid ""
-"The recommended method of upgrading is to use <prgn>aptitude</prgn>, as "
-"described here. The built-in dependency analysis enables smooth upgrades and "
-"easy installations."
-msgstr ""
-"Производить обновление рекомендуется с помощью <prgn>apritude</prgn>, как "
-"описано в данном документе. Встроенный анализ зависимостей делает процесс "
-"обновления достаточно лёгким и простым."
-
-#. <p> 353--355
-#: release-notes.en.sgml:353
-msgid ""
"Any package installation operation must be run with superuser privileges, so "
"either login as root or use <prgn>su</prgn> or <prgn>sudo</prgn> to gain the "
"necessary access rights."
@@ -699,45 +691,183 @@
"суперпользователя (root), либо использовать программы <prgn>su</prgn> или "
"<prgn>sudo</prgn>."
-#. <p> 357--358
-#: release-notes.en.sgml:357
+#. <heading> 356--356
+#: release-notes.en.sgml:356
#, fuzzy
+msgid "Checking system status"
+msgstr "Проверка состояния пакетов"
+
+#. <p> 358--362
+#: release-notes.en.sgml:358
msgid ""
-"First the <package>aptitude</package> package needs to be installed. This is "
-"done with:"
+"The upgrade process described in this chapter has been designed for upgrades "
+"from \"pure\" &oldreleasename; systems. It assumes your system has been "
+"updated to the latest point release of &oldreleasename;. If you have not or "
+"are unsure, follow the instructions in <ref id=\"old-upgrade\">"
msgstr ""
-"Сначала надо установить пакет <package>aptitude</package>. Это можно сделать "
-"командой"
-#. <p> 360--362
-#: release-notes.en.sgml:360
+#. <p> 365--374
+#: release-notes.en.sgml:365
+msgid ""
+"It also assumes you have the &oldreleasename; version of <prgn>aptitude</"
+"prgn> installed. You can check if it is installed using <example compact="
+"\"compact\">\n"
+"$ dpkg -l aptitude\n"
+" </example> If the line of output does <em>not</em> begin with \"i"
+"\", you should install it before you start the upgrade using the "
+"instructions in <ref id=\"old-aptitude\">."
+msgstr ""
+
+#. <heading> 377--377
+#: release-notes.en.sgml:377
+#, fuzzy
+msgid "Disabling APT pinning"
+msgstr "Отключение фиксации APT"
+
+#. <p> 379--384
+#: release-notes.en.sgml:379
#, fuzzy
msgid ""
-"<example compact=\"compact\">\n"
-"apt-get install aptitude\n"
-"\t </example>"
+"If you have configured APT to install certain packages from a distribution "
+"other than stable (e.g. from testing), you may have to change your APT "
+"pinning configuration (stored in <file>/etc/apt/preferences</file>) to allow "
+"the upgrade of packages to the versions in the new stable release. Further "
+"information on APT pinning can be found in <manref section=\"5\" name="
+"\"apt_preferences\">."
+msgstr ""
+"Если вы настроили APT на установку некоторых пакетов из дистрибутива, "
+"отличного от стабильного (например, тестируемого), вам, возможно, придётся "
+"изменить конфигурацию APT (сохранённую в файле <file>/etc/apt/preferences</"
+"file>), чтобы было возможным обновление пакетов до версии в новом стабильном "
+"выпуске. Более подробную информацию о фиксации пакетов в APT можно найти в "
+"<manref section=\"5\" name=\"apt_preferences\">."
+
+#. <heading> 388--388
+#: release-notes.en.sgml:388
+#, fuzzy
+msgid "Checking packages status"
+msgstr "Проверка состояния пакетов"
+
+#. <p> 390--398
+#: release-notes.en.sgml:390
+#, fuzzy
+msgid ""
+"Regardless of the method used for upgrading, it is recommended that you "
+"check the status of all packages first, and verify that all packages are in "
+"an upgradable state. The following command will show any packages which have "
+"a status of Half-Installed or Failed-Config, and those with any error "
+"status. <example compact=\"compact\">\n"
+"# dpkg --audit\n"
+" </example>"
msgstr ""
+"Независимо от способа обновления, рекомендуется сначала проверить состояние "
+"всех пакетов и убедиться, что все пакеты могут быть обновлены. Следующая "
+"команда покажет частично установленные (Half-Installed) пакеты, пакеты, "
+"настройка которых не удалась (Failed-Config), а также все пакеты в ошибочных "
+"состояниях. <example compact=\"compact\">\n"
+"# dpkg --audit\n"
+" </example>"
+
+#. <p> 400--411
+#: release-notes.en.sgml:400
+#, fuzzy
+msgid ""
+"You could also inspect the state of all packages on your system using "
+"<prgn>dselect</prgn>, <prgn>aptitude</prgn>, or with commands such as "
"<example compact=\"compact\">\n"
-" apt-get install aptitude\n"
-" </example>"
+"# dpkg -l | pager \n"
+" </example> or <example compact=\"compact\">\n"
+"# dpkg --get-selections > ~/curr-pkgs.txt\n"
+" </example>"
+msgstr ""
+"Можно также проверить состояние всех пакетов системы с помощью программ "
+"<prgn>dselect</prgn>, <prgn>aptitude</prgn> или таких команд, как <example "
+"compact=\"compact\">\n"
+"# dpkg -l | pager \n"
+"</example> или <example compact=\"compact\">\n"
+"# dpkg --get-selections > ~/curr-pkgs.txt\n"
+"</example>"
-#. <p> 364--367
-#: release-notes.en.sgml:364
+#. <p> 413--419
+#: release-notes.en.sgml:413
#, fuzzy
msgid ""
-"Provided that you have a working APT configuration this will install the "
-"&oldreleasename; version of <prgn>aptitude</prgn>."
+"It is desirable to remove any holds before upgrading. If any package that is "
+"essential for the upgrade is on hold, the upgrade will fail. You can "
+"identify packages on hold with <example compact=\"compact\">\n"
+"# dpkg --audit\n"
+" </example>"
msgstr ""
-"Если у вас правильно настроена система APT, эта команда установит версию "
-"<prgn>aptitude</prgn> из &releasename;."
+"Перед обновлением желательно снять все фиксации пакетов. Если один из "
+"необходимых для обновления пакетов зафиксирован, обновление будет "
+"невозможно. Определить, какие пакеты зафиксированы, можно с помощью команды "
+"<example compact=\"compact\">\n"
+"# dpkg --audit\n"
+" </example>"
-#. <heading> 372--372
-#: release-notes.en.sgml:372
+#. <p> 421--446
+#: release-notes.en.sgml:421
+msgid ""
+"If you changed and recompiled a package locally, and didn't rename it or put "
+"an epoch in the version, you must put it on hold to prevent it from being "
+"upgraded. <![ %has-woody-aptitude [ The `hold' package state can be changed "
+"by using <prgn>aptitude</prgn>: <example compact=\"compact\">\n"
+"# aptitude hold | unhold <package name>\n"
+" </example> ]]> <![ %no-woody-aptitude [ The `hold' package state "
+"can be changed either by using <prgn>dselect</prgn> (in the Select menu, use "
+"the `H' and `G' keys to hold and unhold, respectively), or by editing the "
+"file produced by <example compact=\"compact\">\n"
+"# dpkg --get-selections > ~/curr-sels.txt\n"
+" </example> to change \"hold\" to \"install\" (or vice versa), and "
+"then doing <example compact=\"compact\">\n"
+"# dpkg --set-selections < ~/curr-sels.txt\n"
+" </example> ]]>"
+msgstr ""
+
+#. <p> 449--451
+#: release-notes.en.sgml:449
+msgid ""
+"If there is anything you need to fix, it is best to make sure your "
+"<file>sources.list</file> still refers to &oldreleasename; as explained in "
+"<ref id=\"old-sources\">."
+msgstr ""
+
+#. <heading> 454--454
+#: release-notes.en.sgml:454
+msgid "Unofficial sources and backports"
+msgstr ""
+
+#. <p> 456--462
+#: release-notes.en.sgml:456
+msgid ""
+"If you have any non-Debian packages on your system, you should be aware that "
+"these may be removed during the upgrade because of conflicting dependencies. "
+"If these packages were installed by adding an extra package archive in your "
+"<file>/etc/apt/sources.list</file>, you should check if that archive also "
+"offers packages compiled for &releasename; and change the source line "
+"accordingly at the same time as your source lines for Debian packages."
+msgstr ""
+
+#. <p> 464--472
+#: release-notes.en.sgml:464
+msgid ""
+"Some users may have unofficial backported \"newer\" versions of packages "
+"that <em>are</em> in Debian installed on their &oldreleasename; system. Such "
+"packages are most likely to cause problems during an upgrade as they may "
+"result in file conflicts<footnote><p>Debian's package management system "
+"normally does not allow a package to remove or replace a file owned by "
+"another package; not unless it has been defined to replace that package.</"
+"p></footnote>. Section <ref id=\"trouble\"> has some information on how to "
+"deal with file conflicts if they should occur."
+msgstr ""
+
+#. <heading> 480--480
+#: release-notes.en.sgml:480
msgid "Checking kernel support"
msgstr "Проверка поддержки ядра"
-#. <p> 375--376
-#: release-notes.en.sgml:375
+#. <p> 483--484
+#: release-notes.en.sgml:483
msgid ""
"All machines with a 64bit SPARC CPU (sun4u) should be upgradable without any "
"special considerations about kernel support."
@@ -745,8 +875,8 @@
"Все системы с 64-битными процессорами SPARC (sun4u) должны обновиться не "
"требуя никакой специальной поддержки ядра."
-#. <p> 378--380
-#: release-notes.en.sgml:378
+#. <p> 486--488
+#: release-notes.en.sgml:486
#, fuzzy
msgid ""
"sun4c CPUs are <em>no longer supported</em> in &releasename;. The support "
@@ -757,8 +887,8 @@
"почти ничего неизвестно, так как они очень редки. Вполне возможно, что "
"процессоры sun4d с MMU будут работать."
-#. <p> 382--386
-#: release-notes.en.sgml:382
+#. <p> 490--494
+#: release-notes.en.sgml:490
#, fuzzy
msgid ""
"sun4m CPUs are still supported but you need to install a newer kernel "
@@ -772,8 +902,8 @@
"содержат команды процессора, которые на некоторых машинах недоступны. Новое "
"ядро будет эмулировать недостающие команды."
-#. <p> 388--391
-#: release-notes.en.sgml:388
+#. <p> 496--499
+#: release-notes.en.sgml:496
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 "
@@ -784,8 +914,8 @@
"процессором, то он просто откажется устанавливаться на любую 32-битную "
"систему на базе SPARC без исправленного ядра."
-#. <p> 393--398
-#: release-notes.en.sgml:393
+#. <p> 501--506
+#: release-notes.en.sgml:501
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/"
@@ -800,8 +930,8 @@
"6xxMP. Более поздние модели использовали чипы производства TI. Пока нам "
"неизвестно, распространяется ли на них этот недостаток."
-#. <p> 403--407
-#: release-notes.en.sgml:403
+#. <p> 511--515
+#: release-notes.en.sgml:511
#, fuzzy
msgid ""
"On 64bit HPPA machines you will need to upgrade to a newer kernel version "
@@ -814,8 +944,8 @@
"некоторых машинах недоступны. Новое ядро будет эмулировать недостающие "
"команды."
-#. <p> 411--413
-#: release-notes.en.sgml:411
+#. <p> 519--521
+#: release-notes.en.sgml:519
#, fuzzy
msgid ""
"True \"80386\" CPUs are <em>no longer supported</em> by &releasename;. This "
@@ -824,8 +954,8 @@
"\"Настоящие\" 386 (процессоры Intel 80386) <em>теперь не поддерживаются</em> "
"sarge. Это, конечно, не касается процессоров \"80486\" и более новых."
-#. <p> 417--421
-#: release-notes.en.sgml:417
+#. <p> 525--529
+#: release-notes.en.sgml:525
#, fuzzy
msgid ""
"On &arch-title; machines you will need to upgrade to a newer kernel version "
@@ -839,15 +969,15 @@
"некоторых машинах недоступны. Новое ядро будет эмулировать недостающие "
"команды."
-#. <heading> 425--425
-#. <heading> 1318--1318
-#: release-notes.en.sgml:425 release-notes.en.sgml:1318
+#. <heading> 533--533
+#. <heading> 1429--1429
+#: release-notes.en.sgml:533 release-notes.en.sgml:1429
#, fuzzy
msgid "Upgrading the kernel"
msgstr "Обновление ядра"
-#. <p> 427--429
-#: release-notes.en.sgml:427
+#. <p> 535--537
+#: release-notes.en.sgml:535
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."
@@ -855,8 +985,8 @@
"Если в предыдущем разделе было сказано, что вам надо обновить версию ядра "
"<em>перед</em> обновлением системы, сделайте это."
-#. <p> 431--437
-#: release-notes.en.sgml:431
+#. <p> 539--545
+#: release-notes.en.sgml:539
#, fuzzy
msgid ""
"<![ %not-mips-mipsel [ Backports are available of all tools needed to "
@@ -868,120 +998,14 @@
"бэкпортов. Подробные инструкции по установке нового ядра можно получить тут: "
"<ref id=\"kernel-upgrade-howto\">."
-#. <heading> 444--444
-#: release-notes.en.sgml:444
-#, fuzzy
-msgid "Disabling APT pinning"
-msgstr "Отключение фиксации APT"
-
-#. <p> 446--451
-#: release-notes.en.sgml:446
-#, fuzzy
-msgid ""
-"If you have configured APT to install certain packages from a distribution "
-"other than stable (e.g. from testing), you may have to change your APT "
-"pinning configuration (stored in <file>/etc/apt/preferences</file>) to allow "
-"the upgrade of packages to the versions in the new stable release. Further "
-"information on APT pinning can be found in <manref section=\"5\" name="
-"\"apt_preferences\">."
-msgstr ""
-"Если вы настроили APT на установку некоторых пакетов из дистрибутива, "
-"отличного от стабильного (например, тестируемого), вам, возможно, придётся "
-"изменить конфигурацию APT (сохранённую в файле <file>/etc/apt/preferences</"
-"file>), чтобы было возможным обновление пакетов до версии в новом стабильном "
-"выпуске. Более подробную информацию о фиксации пакетов в APT можно найти в "
-"<manref section=\"5\" name=\"apt_preferences\">."
-
-#. <heading> 457--457
-#: release-notes.en.sgml:457
-#, fuzzy
-msgid "Checking packages status"
-msgstr "Проверка состояния пакетов"
-
-#. <p> 459--467
-#: release-notes.en.sgml:459
-#, fuzzy
-msgid ""
-"Regardless of the method used for upgrading, it is recommended that you "
-"check the status of all packages first, and verify that all packages are in "
-"an upgradable state. The following command will show any packages which have "
-"a status of Half-Installed or Failed-Config, and those with any error "
-"status. <example compact=\"compact\">\n"
-"# dpkg --audit\n"
-" </example>"
-msgstr ""
-"Независимо от способа обновления, рекомендуется сначала проверить состояние "
-"всех пакетов и убедиться, что все пакеты могут быть обновлены. Следующая "
-"команда покажет частично установленные (Half-Installed) пакеты, пакеты, "
-"настройка которых не удалась (Failed-Config), а также все пакеты в ошибочных "
-"состояниях. <example compact=\"compact\">\n"
-"# dpkg --audit\n"
-" </example>"
-
-#. <p> 469--480
-#: release-notes.en.sgml:469
-#, fuzzy
-msgid ""
-"You could also inspect the state of all packages on your system using "
-"<prgn>dselect</prgn>, <prgn>aptitude</prgn>, or with commands such as "
-"<example compact=\"compact\">\n"
-"# dpkg -l | pager \n"
-" </example> or <example compact=\"compact\">\n"
-"# dpkg --get-selections > ~/curr-pkgs.txt\n"
-" </example>"
-msgstr ""
-"Можно также проверить состояние всех пакетов системы с помощью программ "
-"<prgn>dselect</prgn>, <prgn>aptitude</prgn> или таких команд, как <example "
-"compact=\"compact\">\n"
-"# dpkg -l | pager \n"
-"</example> или <example compact=\"compact\">\n"
-"# dpkg --get-selections > ~/curr-pkgs.txt\n"
-"</example>"
-
-#. <p> 482--488
-#: release-notes.en.sgml:482
-#, fuzzy
-msgid ""
-"It is desirable to remove any holds before upgrading. If any package that is "
-"essential for the upgrade is on hold, the upgrade will fail. You can "
-"identify packages on hold with <example compact=\"compact\">\n"
-"# dpkg --audit\n"
-" </example>"
-msgstr ""
-"Перед обновлением желательно снять все фиксации пакетов. Если один из "
-"необходимых для обновления пакетов зафиксирован, обновление будет "
-"невозможно. Определить, какие пакеты зафиксированы, можно с помощью команды "
-"<example compact=\"compact\">\n"
-"# dpkg --audit\n"
-" </example>"
-
-#. <p> 490--497
-#: release-notes.en.sgml:490
-#, fuzzy
-msgid ""
-"If you changed and recompiled a package locally, and didn't rename it or put "
-"an epoch in the version, you must put it on hold to prevent it from being "
-"upgraded. The `hold' package state can be changed by using <prgn>aptitude</"
-"prgn>. With <example compact=\"compact\">\n"
-"aptitude hold | unhold <package>\n"
-" \t </example>"
-msgstr ""
-"Если вы изменили или перекомпилировали пакет на своей машине, при этом не "
-"переименовали его и не изменили \"эпоху\" его версии, вы должны "
-"зафиксировать его, чтобы он не был обновлён. Зафиксировать пакет или снять "
-"фиксацию можно с помощью <prgn>aptitude</prgn> командой <example compact="
-"\"compact\">\n"
-" aptitude hold | unhold <package>\n"
-" </example>"
-
-#. <heading> 502--502
-#: release-notes.en.sgml:502
+#. <heading> 552--552
+#: release-notes.en.sgml:552
#, fuzzy
msgid "Preparing sources for APT"
msgstr "Подготовка источников APT"
-#. <p> 504--506
-#: release-notes.en.sgml:504
+#. <p> 554--556
+#: release-notes.en.sgml:554
msgid ""
"Before starting the upgrade you must set up <package>apt</package>'s "
"configuration file for package lists, <file>/etc/apt/sources.list</file>."
@@ -989,8 +1013,8 @@
"Перед началом процесса обновления вы должны настроить файл конфигурации "
"<package>apt</package> <file>/etc/apt/sources.list</file>."
-#. <p> 508--513
-#: release-notes.en.sgml:508
+#. <p> 558--563
+#: release-notes.en.sgml:558
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 "
@@ -1005,14 +1029,27 @@
"случае использования нескольких зеркал обычно лучше первым указать каталог "
"на локальном жёстком диске, затем компакт-диск и, наконец, зеркала HTTP/FTP)."
-#. <heading> 515--515
-#: release-notes.en.sgml:515
+#. <p> 565--573
+#: release-notes.en.sgml:565
+msgid ""
+"A release can often be referred to by both its codename (e.g. "
+"&oldreleasename;, &releasename;) and by its status name (i.e. oldstable, "
+"stable, testing, unstable). Referring to a release by its codename has the "
+"advantage that you will never be surprised by a new release and for this "
+"reason is the approach taken here. It does of course mean that you will have "
+"to watch out for release announcements yourself. If you use the status name "
+"instead, you will just see loads of updates for packages available as soon "
+"as a release has happened."
+msgstr ""
+
+#. <heading> 575--575
+#: release-notes.en.sgml:575
#, fuzzy
msgid "Adding APT Internet sources"
msgstr "Как добавить Интернет-источник"
-#. <p> 517--520
-#: release-notes.en.sgml:517
+#. <p> 577--580
+#: release-notes.en.sgml:577
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</"
@@ -1024,8 +1061,8 @@
"использовать другие зеркала. Лучше использовать ближайшее к вам (в смысле "
"скорости передачи данных) зеркало."
-#. <p> 528--531
-#: release-notes.en.sgml:528
+#. <p> 588--591
+#: release-notes.en.sgml:588
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 "
@@ -1035,16 +1072,17 @@
"mirrors;\"> (см. раздел \"Полный список зеркал\"). HTTP-зеркала обычно "
"быстрее, чем FTP."
-#. <p> 536--544
-#: release-notes.en.sgml:536
+#. <p> 593--601
+#: release-notes.en.sgml:593
#, fuzzy
msgid ""
"For example, suppose your closest Debian mirror is <tt>&url-debian-mirror-"
"eg;/</tt>. When inspecting that mirror with a web browser or FTP program, "
"you will notice that the main directories are organized like this: <example "
"compact=\"compact\">\n"
-"&url-debian-mirror-eg;/dists/stable/main/binary-&architecture;/...\n"
-"&url-debian-mirror-eg;/dists/stable/contrib/binary-&architecture;/...\n"
+"&url-debian-mirror-eg;/dists/&releasename;/main/binary-&architecture;/...\n"
+"&url-debian-mirror-eg;/dists/&releasename;/contrib/binary-"
+"&architecture;/...\n"
" </example>"
msgstr ""
"Пусть, например, ближайшим к вам зеркалом Debian является <tt>&url-debian-"
@@ -1055,8 +1093,8 @@
"&url-debian-mirror-eg;/dists/stable/contrib/binary-&architecture;/...\n"
" </example>"
-#. <p> 546--551
-#: release-notes.en.sgml:546
+#. <p> 603--608
+#: release-notes.en.sgml:603
#, fuzzy
msgid ""
"To use this mirror with <prgn>apt</prgn>, you add this line to your "
@@ -1069,9 +1107,9 @@
"deb &url-debian-mirror-eg; &releasename; main contrib\n"
" </example>"
-#. <p> 553--555
-#. <p> 593--595
-#: release-notes.en.sgml:553 release-notes.en.sgml:593
+#. <p> 610--612
+#. <p> 650--652
+#: release-notes.en.sgml:610 release-notes.en.sgml:650
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."
@@ -1080,9 +1118,9 @@
"параметры после имени выпуска используются для дополнения сетевого пути до "
"реальных каталогов."
-#. <p> 557--559
-#. <p> 597--599
-#: release-notes.en.sgml:557 release-notes.en.sgml:597
+#. <p> 614--616
+#. <p> 654--656
+#: release-notes.en.sgml:614 release-notes.en.sgml:654
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>) "
@@ -1092,8 +1130,8 @@
"в файле <file>sources.list</file> строки <tt>deb</tt>, поставив в начале "
"каждой строки знак диеза (<tt>#</tt>)."
-#. <p> 561--567
-#: release-notes.en.sgml:561
+#. <p> 618--624
+#: release-notes.en.sgml:618
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/</"
@@ -1108,14 +1146,14 @@
"должны убедиться в том, что там достаточно места. Для обычной установки "
"понадобится приблизительно 300МБ дискового пространства."
-#. <heading> 571--571
-#: release-notes.en.sgml:571
+#. <heading> 628--628
+#: release-notes.en.sgml:628
#, fuzzy
msgid "Adding APT sources for a local mirror"
msgstr "Как добавить локальное зеркало"
-#. <p> 573--575
-#: release-notes.en.sgml:573
+#. <p> 630--632
+#: release-notes.en.sgml:630
#, fuzzy
msgid ""
"Instead of using HTTP or FTP packages mirrors, you may wish to modify <file>/"
@@ -1126,14 +1164,14 @@
"<file>/etc/apt/sources.list</file>, использовать зеркало на локальном диске "
"(возможно, смонтированном по сети)."
-#. <p> 577--584
-#: release-notes.en.sgml:577
+#. <p> 634--641
+#: release-notes.en.sgml:634
#, fuzzy
msgid ""
"For example, your packages mirror may be under <file>/var/ftp/debian/</"
"file>, and have main directories like this: <example compact=\"compact\">\n"
-"/var/ftp/debian/dists/stable/main/binary-&architecture;/...\n"
-"/var/ftp/debian/dists/stable/contrib/binary-&architecture;/...\n"
+"/var/ftp/debian/dists/&releasename;/main/binary-&architecture;/...\n"
+"/var/ftp/debian/dists/&releasename;/contrib/binary-&architecture;/...\n"
" </example>"
msgstr ""
"Например, если ваше зеркало пакетов находится в каталоге <file>/var/ftp/"
@@ -1143,13 +1181,13 @@
"/var/ftp/debian/dists/stable/contrib/binary-&architecture;/...\n"
" </example>"
-#. <p> 586--591
-#: release-notes.en.sgml:586
+#. <p> 643--648
+#: release-notes.en.sgml:643
#, fuzzy
msgid ""
"To use this with <prgn>apt</prgn>, add this line to your <file>sources.list</"
"file> file: <example compact=\"compact\">\n"
-"deb file:/var/ftp/debian stable main contrib\n"
+"deb file:/var/ftp/debian &releasename; main contrib\n"
" </example>"
msgstr ""
"Чтобы программа apt могла использовать этот источник пакетов, добавьте в "
@@ -1157,14 +1195,14 @@
"deb file:/var/ftp/debian &releasename; main contrib\n"
" </example>"
-#. <heading> 601--601
-#: release-notes.en.sgml:601
+#. <heading> 658--658
+#: release-notes.en.sgml:658
#, fuzzy
-msgid "Adding APT source from CD-ROM"
+msgid "Adding APT source from CD-ROM or DVD"
msgstr "Как добавить компакт-диск"
-#. <p> 605--607
-#: release-notes.en.sgml:605
+#. <p> 660--662
+#: release-notes.en.sgml:660
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 "
@@ -1174,8 +1212,8 @@
"все присутствующие в файле <file>/etc/apt/sources.list</file> строки "
"<tt>deb</tt>, поставив в начале каждой строки знак диеза (<tt>#</tt>)."
-#. <p> 611--620
-#: release-notes.en.sgml:611
+#. <p> 666--675
+#: release-notes.en.sgml:666
#, fuzzy
msgid ""
"Make sure there is a line in <file>/etc/fstab</file> that enables mounting "
@@ -1195,8 +1233,8 @@
"/dev/hdc /cdrom auto defaults,noauto,ro 0 0\n"
" </example>"
-#. <p> 622--623
-#: release-notes.en.sgml:622
+#. <p> 677--678
+#: release-notes.en.sgml:677
msgid ""
"Note that there must be <em>no spaces</em> between the words <tt>defaults,"
"noauto,ro</tt> in the fourth field."
@@ -1204,15 +1242,15 @@
"Обратите внимание на то, что между словами <tt>defaults,noauto,ro</tt> в "
"четвёртом поле строки <em>не должно быть пробелов</em>."
-#. <p> 625--631
-#: release-notes.en.sgml:625
+#. <p> 680--686
+#: release-notes.en.sgml:680
#, fuzzy
msgid ""
"To verify it works, insert a CD and try running <example compact=\"compact"
"\">\n"
-"mount /cdrom # this will mount the CD to the mount point\n"
-"ls -alF /cdrom # this should show the CD's root directory\n"
-"umount /cdrom # this will unmount the CD\n"
+"# mount /cdrom # this will mount the CD to the mount point\n"
+"# ls -alF /cdrom # this should show the CD's root directory\n"
+"# umount /cdrom # this will unmount the CD\n"
" </example>"
msgstr ""
"Чтобы проверить, что строка fstab написана верно, вставьте компакт-диск в "
@@ -1222,12 +1260,12 @@
"umount /cdrom # (размонтирование компакт-диска)\n"
" </example>"
-#. <p> 633--640
-#: release-notes.en.sgml:633
+#. <p> 688--695
+#: release-notes.en.sgml:688
#, fuzzy
msgid ""
"Next, run: <example compact=\"compact\">\n"
-"apt-cdrom add\n"
+"# apt-cdrom add\n"
" </example> for each Debian Binary CD-ROM you have, to add the data "
"about each CD to APT's database."
msgstr ""
@@ -1236,13 +1274,13 @@
"apt-cdrom add\n"
"</example>. Повторите для всех имеющихся у вас дисков Debian по очереди."
-#. <heading> 644--644
-#: release-notes.en.sgml:644
+#. <heading> 699--699
+#: release-notes.en.sgml:699
msgid "Upgrading packages"
msgstr "Обновление пакетов"
-#. <p> 646--649
-#: release-notes.en.sgml:646
+#. <p> 701--704
+#: release-notes.en.sgml:701
msgid ""
"The recommended tool for upgrading between &debian; releases is to use the "
"package management tool <prgn>aptitude</prgn>. This tool makes safer "
@@ -1254,14 +1292,14 @@
"принимает более безопасные решения об установке пакетов, чем при "
"непосредственном запуске <prgn>apt-get</prgn>."
-#. <p> 651--657
-#: release-notes.en.sgml:651
+#. <p> 706--712
+#: release-notes.en.sgml:706
#, fuzzy
msgid ""
"Don't forget to mount all needed partitions (notably the root and <file>/"
"usr</file> partitions) read-write, with a command like: <example compact="
"\"compact\">\n"
-"mount -o remount,rw /<var>mountpoint</var>\n"
+"# mount -o remount,rw /<var>mountpoint</var>\n"
" </example>"
msgstr ""
"Не забудьте смонтировать все необходимые разделы (в первую очередь, корневой "
@@ -1270,20 +1308,18 @@
" mount -o remount,rw /<var>точка_монтирования</var>\n"
" </example>"
-#. <p> 659--662
-#: release-notes.en.sgml:659
+#. <p> 714--718
+#: release-notes.en.sgml:714
msgid ""
-"Next ensure that the APT source entries (in <file>/etc/apt/sources.list</"
-"file>) refer to the <tt>'stable'</tt> distribution and do not refer to it by "
-"its codename (e.g. <tt>&oldreleasename;</tt>)."
+"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 "
+"\"<tt>stable</tt>\". Note: source lines for a CD-ROM will often refer to "
+"\"<tt>unstable</tt>\"; although this may be confusing, you should <em>not</"
+"em> change it."
msgstr ""
-"После этого убедитесь в том, что источники, указанные в файле <file>/etc/apt/"
-"sources.list</file>, ссылаются на стабильный (<tt>stable</tt>) дистрибутив и "
-"не ссылаются на дистрибутив по кодовому имени (например, <tt>&oldreleasename;"
-"</tt>)."
-#. <p> 664--677
-#: release-notes.en.sgml:664
+#. <p> 720--733
+#: release-notes.en.sgml:720
#, fuzzy
msgid ""
"It is strongly recommended that you use the <prgn>/usr/bin/script</prgn> "
@@ -1291,7 +1327,7 @@
"occurs, you will have a log of what happened, and if needed, can provide "
"exact information in a bug report. To start the recording, type: <example "
"compact=\"compact\">\n"
-"script -a ~/upgrade-to-&releasename;.typescript\n"
+"# script -a ~/upgrade-to-&releasename;.typescript\n"
" </example> or similar. Do not put the typescript file in a "
"temporary directory such as <file>/tmp</file> or <file>/var/tmp</file> "
"(files in those directories may be deleted during the upgrade or during any "
@@ -1307,55 +1343,117 @@
"<file>/tmp</file> и <file>/var/tmp</file> - файлы в этих каталогах могут "
"быть удалены при обновлении или перезагрузке."
-#. <p> 679--680
-#: release-notes.en.sgml:679
+#. <p> 735--738
+#: release-notes.en.sgml:735
msgid ""
-"First <prgn>aptitude</prgn> needs to fetch a list of new and updated "
-"packages for the new release. This is done by executing:"
+"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 "
+"in, use <tt>less ~root/upgrade-to-&releasename;.typescript</tt> to view the "
+"file."
msgstr ""
-"Сначала программе <prgn>aptitude</prgn> нужен список новых и обновлённых "
-"пакетов нового выпуска. Его можно получить командой"
-#. <p> 682--684
-#: release-notes.en.sgml:682
+#. <p> 740--741
+#: release-notes.en.sgml:740
+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
+#, fuzzy
+msgid "Updating the package list"
+msgstr "Обновление пакетов"
+
+#. <p> 745--748
+#: release-notes.en.sgml:745
+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> "
+"for this because the &oldreleasename; version <prgn>aptitude</prgn> may fail "
+"when new sources have been added to <file>sources.list</file>.</p></"
+"footnote>:"
+msgstr ""
+
+#. <p> 750--752
+#: release-notes.en.sgml:750
#, fuzzy
msgid ""
"<example compact=\"compact\">\n"
-"aptitude update\n"
+"# apt-get update\n"
"\t </example>"
msgstr ""
"<example compact=\"compact\">\n"
"aptitude update\n"
"</example>"
-#. <p> 686--690
-#: release-notes.en.sgml:686
+#. <heading> 757--757
+#: release-notes.en.sgml:757
#, fuzzy
+msgid "Upgrading aptitude"
+msgstr "Обновление пакетов"
+
+#. <p> 759--768
+#: release-notes.en.sgml:759
msgid ""
-"Once <prgn>aptitude</prgn> has information on all the available packages, "
-"the system is almost ready to be fully upgraded. First however the "
-"<package>doc-base</package> package must be upgraded <em>if it is installed</"
-"em>. You can find out if it is installed using:"
+"Upgrade tests have shown that &releasename;'s version of <prgn>aptitude</"
+"prgn> is better at solving the complex dependencies during an upgrade than "
+"either <prgn>apt-get</prgn> or &oldreleasename;'s <prgn>aptitude</prgn>. <!"
+"[ %has-woody-aptitude [ It should therefore be upgraded first using: "
+"<example compact=\"compact\">\n"
+"# aptitude install aptitude\n"
+" </example>"
msgstr ""
-"После того, как программа <prgn>aptitude> получила информацию обо всех "
-"доступных пакетах, система почти готова к полному обновлению. В первую "
-"очередь нужно обновить пакет <package>doc-base</package> <em>если он "
-"установлен</em>. Установлен он или нет можно узнать, запустив "
-#. <p> 692--694
-#: release-notes.en.sgml:692
+#. <p> 772--774
+#: release-notes.en.sgml:772
#, fuzzy
msgid ""
"<example compact=\"compact\">\n"
-"dpkg -l doc-base\n"
+"# apt-get install aptitude\n"
+" </example>"
+msgstr ""
+"<example compact=\"compact\">\n"
+" apt-get install aptitude\n"
+" </example>"
+
+#. <p> 777--780
+#: release-notes.en.sgml:777
+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 "
+"changes, especially packages that will be removed by the upgrade, before you "
+"confirm."
+msgstr ""
+
+#. <heading> 784--784
+#: release-notes.en.sgml:784
+#, fuzzy
+msgid "Upgrading doc-base"
+msgstr "Обновление пакетов"
+
+#. <p> 786--789
+#: release-notes.en.sgml:786
+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
+#, fuzzy
+msgid ""
+"<example compact=\"compact\">\n"
+"# dpkg -l doc-base\n"
" </example>"
msgstr ""
"<example compact=\"compact\">\n"
"dpkg -l doc-base\n"
"</example>"
-#. <p> 696--697
-#: release-notes.en.sgml:696
+#. <p> 795--796
+#: release-notes.en.sgml:795
msgid ""
"If the line of output begins with \"i\" then it is installed and must be "
"upgraded before continuing."
@@ -1363,38 +1461,44 @@
"Если первая буква в напечатанной строке - \"i\", то пакет установлен и "
"должен быть обновлён в первую очередь."
-#. <p> 699--701
-#: release-notes.en.sgml:699
+#. <p> 798--800
+#: release-notes.en.sgml:798
#, fuzzy
msgid ""
"<example compact=\"compact\">\n"
-"aptitude install doc-base\n"
+"# aptitude install doc-base\n"
" </example>"
msgstr ""
"<example compact=\"compact\">\n"
"aptitude install doc-base\n"
"</example>"
-#. <p> 702--703
-#: release-notes.en.sgml:702
+#. <heading> 804--804
+#: release-notes.en.sgml:804
+#, fuzzy
+msgid "Upgrading the rest of the system"
+msgstr "Обновление ядра"
+
+#. <p> 806--807
+#: release-notes.en.sgml:806
msgid ""
"You are now ready to continue with the main part of the upgrade. Execute:"
msgstr "Теперь можно приступить собственно к обновлению. Выполните команду "
-#. <p> 704--706
-#: release-notes.en.sgml:704
+#. <p> 808--810
+#: release-notes.en.sgml:808
#, fuzzy
msgid ""
"<example compact=\"compact\">\n"
-"aptitude -f --with-recommends dist-upgrade\n"
+"# aptitude -f --with-recommends dist-upgrade\n"
"\t </example>"
msgstr ""
"<example compact=\"compact\">\n"
"aptitude -f --with-recommends dist-upgrade\n"
"\t </example>"
-#. <p> 708--713
-#: release-notes.en.sgml:708
+#. <p> 812--817
+#: release-notes.en.sgml:812
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 "
@@ -1410,8 +1514,8 @@
"конфликты устаревшие пакеты (такие как <package>console-tools-libs</"
"package>)."
-#. <p> 715--718
-#: release-notes.en.sgml:715
+#. <p> 819--822
+#: release-notes.en.sgml:819
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 "
@@ -1423,8 +1527,8 @@
"один диск по нескольку раз, это вызвано тем, что взаимосвязанные пакеты "
"могут находится на разных дисках."
-#. <p> 720--725
-#: release-notes.en.sgml:720
+#. <p> 824--829
+#: release-notes.en.sgml:824
#, fuzzy
msgid ""
"New versions of currently installed packages that cannot be upgraded without "
@@ -1439,8 +1543,8 @@
"отметив такой пакет как подлежащий установке, либо выполнив команду "
"<tt>aptitude -f install <пакет></tt>."
-#. <p> 727--730
-#: release-notes.en.sgml:727
+#. <p> 831--834
+#: release-notes.en.sgml:831
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. "
@@ -1452,14 +1556,14 @@
"зависимости. Система <package>apt</package> не позволяет, чтобы какие-либо "
"зависимости в системе были не удовлетворены."
-#. <heading> 732--732
-#: release-notes.en.sgml:732
+#. <heading> 838--838
+#: release-notes.en.sgml:838
#, fuzzy
msgid "Possible issues during upgrade"
msgstr "Возможные проблемы во время или после обновления"
-#. <p> 734--748
-#: release-notes.en.sgml:734
+#. <p> 840--854
+#: release-notes.en.sgml:840
msgid ""
"If an operation using <prgn>aptitude</prgn>, <prgn>apt-get</prgn> or "
"<prgn>dpkg</prgn> fails with the error <example compact=\"compact\">\n"
@@ -1470,12 +1574,12 @@
"in <file>/etc/apt/apt.conf</file>. The following command will set it to a "
"value that should be sufficient for the upgrade: <example compact=\"compact"
"\">\n"
-"echo 'APT::Cache-Limit \"12500000\";' >> /etc/apt/apt.conf</example> This "
+"# echo 'APT::Cache-Limit \"12500000\";' >> /etc/apt/apt.conf</example> This "
"assumes that you do not yet have this variable set in that file."
msgstr ""
-#. <p> 750--755
-#: release-notes.en.sgml:750
+#. <p> 856--861
+#: release-notes.en.sgml:856
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-"
@@ -1490,18 +1594,18 @@
"Чтобы решить эту проблему, следует указать в командной строке "
"<prgn>aptitude</prgn> параметр <tt>-o APT::Force-LoopBreak=1</tt>."
-#. <p> 758--771
-#: release-notes.en.sgml:758
+#. <p> 864--877
+#: release-notes.en.sgml:864
#, fuzzy
msgid ""
"It is possible that a system's dependency structure can be so corrupt as to "
"require manual intervention. Usually this means using <prgn>aptitude</prgn> "
"or <example compact=\"compact\">\n"
-"dpkg --remove <var>packagename</var>\n"
+"# dpkg --remove <var>packagename</var>\n"
" </example> to eliminate some of the offending packages, or "
"<example compact=\"compact\">\n"
-"aptitude --fix-broken install\n"
-"dpkg --configure --pending\n"
+"# aptitude --fix-broken install\n"
+"# dpkg --configure --pending\n"
" </example>"
msgstr ""
"Возможна ситуация, когда структура зависимостей системы будет настолько "
@@ -1514,13 +1618,13 @@
"dpkg --configure --pending\n"
" </example>"
-#. <p> 773--778
-#: release-notes.en.sgml:773
+#. <p> 879--884
+#: release-notes.en.sgml:879
#, fuzzy
msgid ""
"In extreme cases you might have to force re-installation with a command like "
"<example compact=\"compact\">\n"
-"dpkg --install <var>/path/to/packagename.deb</var>\n"
+"# dpkg --install <var>/path/to/packagename.deb</var>\n"
" </example>"
msgstr ""
"В чрезвычайных случаях вам может потребоваться принудительная переустановка "
@@ -1528,8 +1632,8 @@
"dpkg --install /путь/к/пакету/имя_пакета.deb\n"
" </example>"
-#. <p> 780--782
-#: release-notes.en.sgml:780
+#. <p> 890--892
+#: release-notes.en.sgml:890
#, fuzzy
msgid ""
"After fixing things up, you should be able to resume the upgrade by "
@@ -1538,8 +1642,8 @@
"После исправления ошибок вы можете продолжить обновление, выполнив команду "
"<tt>dist-upgrade</tt>, как описано выше."
-#. <p> 784--792
-#: release-notes.en.sgml:784
+#. <p> 894--902
+#: release-notes.en.sgml:894
#, fuzzy
msgid ""
"During the upgrade, you will be asked questions regarding the configuration "
@@ -1559,8 +1663,8 @@
"потому что файлы конфигурации будут сохранены с расширением <tt>.dpkg-old</"
"tt>."
-#. <p> 794--797
-#: release-notes.en.sgml:794
+#. <p> 904--907
+#: release-notes.en.sgml:904
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 "
@@ -1570,13 +1674,13 @@
"разберитесь с проблемой позднее. Информацию, выводившуюся на экран во время "
"обновления, вы сможете найти в файле транскрипта."
-#. <heading> 799--799
-#: release-notes.en.sgml:799
+#. <heading> 912--912
+#: release-notes.en.sgml:912
msgid "Things to do before rebooting"
msgstr "Перед перезагрузкой"
-#. <p> 801--803
-#: release-notes.en.sgml:801
+#. <p> 914--916
+#: release-notes.en.sgml:914
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 "
@@ -1586,8 +1690,8 @@
"<em>формально</em> обновление завершено, но перед перезагрузкой следует "
"проделать ещё несколько действий."
-#. <p> 805--809
-#: release-notes.en.sgml:805
+#. <p> 918--922
+#: release-notes.en.sgml:918
#, fuzzy
msgid ""
"Read <file>/usr/share/doc/xfree86-common/README.Debian-upgrade.gz</file> for "
@@ -1599,13 +1703,13 @@
"относится к пользователям всех предыдущих выпусков. Вам обязательно надо его "
"прочитать."
-#. <heading> 811--811
-#: release-notes.en.sgml:811
+#. <heading> 924--924
+#: release-notes.en.sgml:924
msgid "Upgrading your kernel"
msgstr "Обновление ядра"
-#. <p> 813--816
-#: release-notes.en.sgml:813
+#. <p> 926--929
+#: release-notes.en.sgml:926
#, fuzzy
msgid ""
"Note that the Linux kernel was <em>not</em> upgraded by these procedures. "
@@ -1618,8 +1722,8 @@
"из пакетов <package>kernel-image-*</package>, либо скомпилировав ядро из "
"исходного кода."
-#. <p> 823--825
-#: release-notes.en.sgml:823
+#. <p> 936--938
+#: release-notes.en.sgml:936
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 "
@@ -1630,8 +1734,8 @@
"лучше поддерживающее различные устройства и обладающее улучшенной "
"производительностью."
-#. <p> 827--830
-#: release-notes.en.sgml:827
+#. <p> 940--943
+#: release-notes.en.sgml:940
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 "
@@ -1642,14 +1746,14 @@
"с обновлением всей системы &oldreleasename; на &releasename;. Некоторые "
"проблемы перехода на ядро 2.6 описаны в разделе <ref id=\"upgrade-to-2.6\">."
-#. <p> 833--840
-#: release-notes.en.sgml:833
+#. <p> 946--952
+#: release-notes.en.sgml:946
#, fuzzy
msgid ""
"To upgrade your kernel you must first choose the kernel most appropriate for "
"your subarchitecture. A list of kernels available for you to install can be "
-"found with: <example compact=\"compact\">\n"
-"apt-cache search ^kernel-image\n"
+"found with: <example compact=\"compact\">\n"
+"# apt-cache search ^kernel-image\n"
" </example>"
msgstr ""
"Чтобы обновить ядро, вы должны выбрать ядро, подходящее для вашей "
@@ -1658,8 +1762,8 @@
" apt-cache search ^kernel-image\n"
" </example>"
-#. <p> 842--844
-#: release-notes.en.sgml:842
+#. <p> 954--956
+#: release-notes.en.sgml:954
#, fuzzy
msgid ""
"You should then use <tt>aptitude install</tt> to install it. Once this new "
@@ -1669,8 +1773,8 @@
"Затем ядро нужно установить с помощью <tt>aptitude install</aptitude>. После "
"установки ядра следует перезагрузить систему при первой возможности."
-#. <p> 846--855
-#: release-notes.en.sgml:846
+#. <p> 958--967
+#: release-notes.en.sgml:958
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. "
@@ -1690,8 +1794,8 @@
"номер версии ядра (2.4 или 2.6), а <tt>АРХИТЕКТУРА</tt> - любая из "
"поддерживаемых архитектур."
-#. <p> 857--860
-#: release-notes.en.sgml:857
+#. <p> 969--972
+#: release-notes.en.sgml:969
#, fuzzy
msgid ""
"For the more adventurous there is an easy way to compile your own custom "
@@ -1703,13 +1807,13 @@
"прочитайте документацию в каталоге <file>/usr/share/doc/kernel-package</"
"file>."
-#. <heading> 866--866
-#: release-notes.en.sgml:866
+#. <heading> 977--977
+#: release-notes.en.sgml:977
msgid "Obsolete packages"
msgstr "Устаревшие пакеты"
-#. <p> 873--883
-#: release-notes.en.sgml:873
+#. <p> 984--994
+#: release-notes.en.sgml:984
msgid ""
"Introducing several thousand new packages, &releasename; also retires and "
"omits more than two thousand old packages that were in &oldreleasename;. It "
@@ -1732,8 +1836,8 @@
"исправления. Мы рекомендуем перейти на использование альтернативных пакетов, "
"если есть такая возможность. "
-#. <p> 885--891
-#: release-notes.en.sgml:885
+#. <p> 996--1002
+#: release-notes.en.sgml:996
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 "
@@ -1750,8 +1854,8 @@
"не может быть включён в &releasename;, в этом случае пакет всё-таки доступен "
"в нестабильном (\"unstable\") дистрибутиве."
-#. <p> 893--906
-#: release-notes.en.sgml:893
+#. <p> 1004--1017
+#: release-notes.en.sgml:1004
#, fuzzy
msgid ""
"Detecting which packages in an updated system are \"obsolete\" is easy since "
@@ -1781,8 +1885,8 @@
"которые вы установили явно (а не автоматически для удовлетворения "
"зависимостей)."
-#. <p> 908--918
-#: release-notes.en.sgml:908
+#. <p> 1019--1029
+#: release-notes.en.sgml:1019
msgid ""
"There are additional tools you can use to find obsolete packages such as "
"<prgn>deborphan</prgn>, <prgn>debfoster</prgn> or <prgn>cruft</prgn>. "
@@ -1804,8 +1908,8 @@
"нужного. Настоятельно рекомендуем перед удалением внимательно просмотреть "
"список предложенных пакетов (прочесть описание, посмотреть входящие файлы)."
-#. <p> 924--929
-#: release-notes.en.sgml:924
+#. <p> 1035--1040
+#: release-notes.en.sgml:1035
msgid ""
"The <url id=\"&url-bts;\" name=\"Debian Bug Tracking System\"> often "
"provides additional information on why the package was removed. You should "
@@ -1819,13 +1923,13 @@
"<url id=\"&url-bts;/cgi-bin/pkgreport.cgi?pkg=ftp.debian.org&archive=yes"
"\" name=\"псевдо-пакета ftp.debian.orge\">"
-#. <heading> 931--931
-#: release-notes.en.sgml:931
+#. <heading> 1042--1042
+#: release-notes.en.sgml:1042
msgid "Dummy packages"
msgstr "Пакеты-пустышки"
-#. <p> 935--941
-#: release-notes.en.sgml:935
+#. <p> 1046--1052
+#: release-notes.en.sgml:1046
msgid ""
"Some packages from &oldreleasename; have been split into several packages in "
"&releasename;, often to improve system maintainability. To ease the upgrade "
@@ -1843,8 +1947,8 @@
"установки \"пустышки\" становятся неиспользуемыми и их можно спокойно "
"удалять."
-#. <p> 943--949
-#: release-notes.en.sgml:943
+#. <p> 1054--1060
+#: release-notes.en.sgml:1054
msgid ""
"Most (but not all) dummy packages' descriptions indicate their purpose. "
"Package descriptions for dummy packages are not uniform, however, so you "
@@ -1860,18 +1964,18 @@
"нужно, так как они впоследствии используются для определения установленной "
"версии программы."
-#. <heading> 960--960
-#: release-notes.en.sgml:960
+#. <heading> 1071--1071
+#: release-notes.en.sgml:1071
msgid "Issues to be aware of for &releasename;"
msgstr "Что надо знать о &releasename;"
-#. <heading> 991--991
-#: release-notes.en.sgml:991
+#. <heading> 1102--1102
+#: release-notes.en.sgml:1102
msgid "Changes to Python packages"
msgstr "Изменения в пакетах Python"
-#. <p> 993--997
-#: release-notes.en.sgml:993
+#. <p> 1104--1108
+#: release-notes.en.sgml:1104
msgid ""
"None of the python2.X packages that are included with &releasename; include "
"the standard modules 'profile' and 'pstats', because they are licensed under "
@@ -1885,14 +1989,14 @@
"получить, установив пакеты python-profiler и python2.X-profiler из секции "
"non-free архива Debian."
-#. <heading> 1002--1002
-#: release-notes.en.sgml:1002
+#. <heading> 1113--1113
+#: release-notes.en.sgml:1113
#, fuzzy
msgid "Upgrading to a 2.6 kernel"
msgstr "Обновление ядра до версии 2.6"
-#. <p> 1004--1009
-#: release-notes.en.sgml:1004
+#. <p> 1115--1120
+#: release-notes.en.sgml:1115
#, fuzzy
msgid ""
"The 2.6 kernel series contains major changes from the 2.4 series. Modules "
@@ -1907,8 +2011,8 @@
"относиться легкомысленно. В этом разделе вы узнаете о некоторых проблемах, с "
"которыми вы, возможно, скоро столкнётесь."
-#. <p> 1011--1015
-#: release-notes.en.sgml:1011
+#. <p> 1122--1126
+#: release-notes.en.sgml:1122
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 "
@@ -1921,8 +2025,8 @@
"убедитесь, что система нормально работает с вашим старым ядром (или с ядром "
"2.4 из &releasename;), а затем отдельно обновите ядро до 2.6."
-#. <p> 1017--1021
-#: release-notes.en.sgml:1017
+#. <p> 1128--1132
+#: release-notes.en.sgml:1128
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. "
@@ -1937,8 +2041,8 @@
"<package>module-init-tools</package> будет установлен автоматически, так как "
"<package>kernel-image</package> от него зависят."
-#. <p> 1023--1028
-#: release-notes.en.sgml:1023
+#. <p> 1134--1139
+#: release-notes.en.sgml:1134
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 "
@@ -1954,8 +2058,8 @@
"<package>lvm10</package> можно не удалять, сценарии первичной загрузки "
"определят версию используемого ядра и загрузят подходящую версию пакета LVM."
-#. <p> 1030--1033
-#: release-notes.en.sgml:1030
+#. <p> 1141--1144
+#: release-notes.en.sgml:1141
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 "
@@ -1967,8 +2071,8 @@
"некоторых модулей изменились. В этом случае файл надо соответствующим "
"образом исправить."
-#. <p> 1036--1041
-#: release-notes.en.sgml:1036
+#. <p> 1147--1152
+#: release-notes.en.sgml:1147
#, fuzzy
msgid ""
"For some SATA disk controllers, the device assigned to a drive and its "
@@ -1983,8 +2087,8 @@
"конфигурацию вашего загрузчика ОС. При неверной настройке компьютер может "
"перестать загружаться."
-#. <p> 1044--1049
-#: release-notes.en.sgml:1044
+#. <p> 1155--1160
+#: release-notes.en.sgml:1155
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 "
@@ -1999,13 +2103,13 @@
"ядра. Достаньте \"спасательную\" дискету или компакт-диск на тот случай, "
"если вдруг не удастся загрузить старое ядро при помощи загрузчика."
-#. <heading> 1053--1053
-#: release-notes.en.sgml:1053
+#. <heading> 1164--1164
+#: release-notes.en.sgml:1164
msgid "Keyboard configuration"
msgstr "Настройка клавиатуры"
-#. <p> 1055--1060
-#: release-notes.en.sgml:1055
+#. <p> 1166--1171
+#: release-notes.en.sgml:1166
#, fuzzy
msgid ""
"The most invasive change in the 2.6 kernels is a fundamental change of the "
@@ -2020,8 +2124,8 @@
"типа (например, USB-MAC или производства Sun), то после загрузки ядра 2.6 "
"она, скорее всего, откажется работать."
-#. <p> 1062--1065
-#: release-notes.en.sgml:1062
+#. <p> 1173--1176
+#: release-notes.en.sgml:1173
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 "
@@ -2031,8 +2135,8 @@
"исправить ситуацию, запустив <tt>dpkg-reconfigure console-data</tt> и выбрав "
"клавиатуру \"pc\" из полного списка клавиатур."
-#. <p> 1067--1071
-#: release-notes.en.sgml:1067
+#. <p> 1178--1182
+#: release-notes.en.sgml:1178
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 "
@@ -2046,8 +2150,8 @@
"правкой файла <file>/etc/X11/XF86Config-4</file>. Не забудьте прочесть "
"документацию, о которой упомянуто в <ref id=\"nownownow\">."
-#. <p> 1074--1076
-#: release-notes.en.sgml:1074
+#. <p> 1185--1187
+#: release-notes.en.sgml:1185
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 "
@@ -2057,8 +2161,8 @@
"все клавиатуры PS/2 и большая часть клавиатур USB и раньше опознавались как "
"\"стандартная клавиатура PC\""
-#. <p> 1079--1081
-#: release-notes.en.sgml:1079
+#. <p> 1190--1192
+#: release-notes.en.sgml:1190
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 "
@@ -2068,13 +2172,13 @@
"\"стандартная PC\", либо как \"клавиатура USB-MAC\". В первом случае "
"проблема вас не затронет."
-#. <heading> 1086--1086
-#: release-notes.en.sgml:1086
+#. <heading> 1197--1197
+#: release-notes.en.sgml:1197
msgid "Mouse configuration"
msgstr "Настройка мыши"
-#. <p> 1088--1092
-#: release-notes.en.sgml:1088
+#. <p> 1199--1203
+#: release-notes.en.sgml:1199
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 "
@@ -2088,8 +2192,8 @@
"всего, потому, что имя файла-устройсва мыши изменилось. Если поддержка мыши "
"была реализована в виде модуля - то имя этого модуля тоже могло измениться."
-#. <p> 1095--1096
-#: release-notes.en.sgml:1095
+#. <p> 1206--1207
+#: release-notes.en.sgml:1206
msgid ""
"If you currently have X configured for <file>/dev/sunmouse</file>, you "
"probably need to change this to <file>/dev/psaux</file>."
@@ -2098,14 +2202,14 @@
"sunmouse</file>, то после установки нового ядра имя файла-устройства надо "
"будет изменить на <file>/dev/psaux</file>."
-#. <heading> 1102--1102
-#: release-notes.en.sgml:1102
+#. <heading> 1213--1213
+#: release-notes.en.sgml:1213
#, fuzzy
msgid "Sound configuration"
msgstr "Настройка клавиатуры"
-#. <p> 1104--1109
-#: release-notes.en.sgml:1104
+#. <p> 1215--1220
+#: release-notes.en.sgml:1215
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 "
@@ -2115,13 +2219,13 @@
"<file>/etc/modules</file>, you should remove them."
msgstr ""
-#. <heading> 1115--1115
-#: release-notes.en.sgml:1115
+#. <heading> 1226--1226
+#: release-notes.en.sgml:1226
msgid "Switching to 2.6 may activate udev"
msgstr "Переход на 2.6 может привести в действие udev"
-#. <p> 1117--1121
-#: release-notes.en.sgml:1117
+#. <p> 1228--1232
+#: release-notes.en.sgml:1228
msgid ""
"<package>udev</package> is a userspace implementation of devfs. It is "
"mounted over the <file>/dev/</file> directory and will dynamically populate "
@@ -2136,8 +2240,8 @@
"определения подключаемых к системе устройств. Пакет <package>udev</package> "
"работает только с ядрами серии 2.6."
-#. <p> 1123--1125
-#: release-notes.en.sgml:1123
+#. <p> 1234--1236
+#: release-notes.en.sgml:1234
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 "
@@ -2147,8 +2251,8 @@
"примеру, он необходим для установки <package>gnome</package>), то есть "
"вероятность, что после перехода на ядро 2.6 он может начать работать."
-#. <p> 1127--1131
-#: release-notes.en.sgml:1127
+#. <p> 1238--1242
+#: release-notes.en.sgml:1238
msgid ""
"Although <package>udev</package> has been tested extensively, you may "
"experience minor problems with some devices that will need to be fixed. The "
@@ -2162,8 +2266,8 @@
"устройства по умолчанию не могут быть созданы (например, <file>/dev/video</"
"file> и <file>/dev/radio</file>)."
-#. <p> 1133--1135
-#: release-notes.en.sgml:1133
+#. <p> 1244--1246
+#: release-notes.en.sgml:1244
msgid ""
"<package>udev</package> provides configuration mechanisms to deal with these "
"issues. See <manref section=\"8\" name=\"udev\"> and <file>/etc/udev</file> "
@@ -2173,13 +2277,13 @@
"подробная информация - в <manref section=\"8\" name=\"udev\"> и <file>/etc/"
"udev</file>."
-#. <heading> 1144--1144
-#: release-notes.en.sgml:1144
+#. <heading> 1255--1255
+#: release-notes.en.sgml:1255
msgid "X Windows Systems fails to load"
msgstr "X Window System не может запуститься"
-#. <p> 1146--1152
-#: release-notes.en.sgml:1146
+#. <p> 1257--1263
+#: release-notes.en.sgml:1257
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 "
@@ -2195,13 +2299,13 @@
"org/255744\" name=\"#255744\"). Для исправления ошибки добавьте драйвер мыши "
"(например, psmouse) в файл <file>/etc/modules</file>."
-#. <heading> 1157--1157
-#: release-notes.en.sgml:1157
+#. <heading> 1268--1268
+#: release-notes.en.sgml:1268
msgid "X Window System on Transmeta Crusoe systems"
msgstr "X Window System на компьютерах с процессором Transmeta Crusoe"
-#. <p> 1159--1172
-#: release-notes.en.sgml:1159
+#. <p> 1270--1283
+#: release-notes.en.sgml:1270
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 "
@@ -2226,8 +2330,8 @@
"Serial number of failed request: 15\n"
"Current serial number in output stream: 18</example>"
-#. <p> 1174--1178
-#: release-notes.en.sgml:1174
+#. <p> 1285--1289
+#: release-notes.en.sgml:1285
#, fuzzy
msgid ""
"In practical terms, this means that after a few hours of operation, "
@@ -2241,8 +2345,8 @@
"и начнёт постоянно перезапускаться. Так будет продолжаться, пока содержащий "
"ошибку код Transmeta VLIW находится в кэше процессора."
-#. <p> 1180--1185
-#: release-notes.en.sgml:1180
+#. <p> 1291--1296
+#: release-notes.en.sgml:1291
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 "
@@ -2259,8 +2363,8 @@
"~fleury/bug_cms/\"> или в отчёте об ошибке Debian <url id=\"http://bugs."
"debian.org/216933\" name=\"#216933\">."
-#. <p> 1187--1188
-#: release-notes.en.sgml:1187
+#. <p> 1298--1299
+#: release-notes.en.sgml:1298
msgid ""
"The workaround for this bug is to install an X server compiled without "
"optimization, such as the <package>xserver-xfree86-dbg</package> package."
@@ -2268,19 +2372,19 @@
"В качестве временного решения можно установить X-сервер, скомпилированный "
"без оптимизации (например, из пакета <package>xserver-xfree86-dbg</package>)."
-#. <heading> 1198--1198
-#: release-notes.en.sgml:1198
+#. <heading> 1309--1309
+#: release-notes.en.sgml:1309
msgid "More information on &debian;"
msgstr "Более подробная информация о &debian;"
-#. <heading> 1200--1200
-#: release-notes.en.sgml:1200
+#. <heading> 1311--1311
+#: release-notes.en.sgml:1311
#, fuzzy
msgid "Further reading"
msgstr "Что ещё можно прочитать"
-#. <p> 1201--1207
-#: release-notes.en.sgml:1201
+#. <p> 1312--1318
+#: release-notes.en.sgml:1312
#, fuzzy
msgid ""
"Beyond these release notes and the installation guide further documentation "
@@ -2298,8 +2402,8 @@
"сопровождающего Debian, FAQ по Debian и т.д. Полную информацию о доступных "
"документах можно получить на web-сайте DDP по адресу <url id=\"&url-ddp;\">."
-#. <p> 1209--1212
-#: release-notes.en.sgml:1209
+#. <p> 1320--1323
+#: release-notes.en.sgml:1320
msgid ""
"Documentation for individual packages is installed into <file>/usr/share/doc/"
"<var>package</var></file>, this may include copyright information, Debian "
@@ -2310,14 +2414,14 @@
"авторских правах, специфичная для Debian информация и документация от "
"авторов исходной программы."
-#. <heading> 1217--1217
-#: release-notes.en.sgml:1217
+#. <heading> 1328--1328
+#: release-notes.en.sgml:1328
#, fuzzy
msgid "Getting help"
msgstr "Если нужна помощь"
-#. <p> 1219--1223
-#: release-notes.en.sgml:1219
+#. <p> 1330--1334
+#: release-notes.en.sgml:1330
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 "
@@ -2329,13 +2433,13 @@
"ответа на вопрос в документации. Этот раздел содержит краткое описание "
"дополнительных источников помощи для новых пользователей."
-#. <heading> 1226--1226
-#: release-notes.en.sgml:1226
+#. <heading> 1337--1337
+#: release-notes.en.sgml:1337
msgid "Mailing lists"
msgstr "Списки рассылки"
-#. <p> 1227--1232
-#: release-notes.en.sgml:1227
+#. <p> 1338--1343
+#: release-notes.en.sgml:1338
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 "
@@ -2352,13 +2456,13 @@
"как отправить вопрос в список рассылки, поищите ответ на него в архивах. "
"Просим также придерживаться общепринятых норм почтового этикета."
-#. <heading> 1236--1236
-#: release-notes.en.sgml:1236
+#. <heading> 1347--1347
+#: release-notes.en.sgml:1347
msgid "Internet Relay Chat"
msgstr "IRC"
-#. <p> 1238--1242
-#: release-notes.en.sgml:1238
+#. <p> 1349--1353
+#: release-notes.en.sgml:1349
#, fuzzy
msgid ""
"Debian has an IRC channel dedicated to the support and aid of Debian users "
@@ -2373,8 +2477,8 @@
"каналу #debian. Для русскоязычных пользователей существует также канал "
"#debian-russian в той же сети."
-#. <p> 1244--1246
-#: release-notes.en.sgml:1244
+#. <p> 1355--1357
+#: release-notes.en.sgml:1355
#, fuzzy
msgid ""
"Please follow the channel guidelines, respecting other users fully. For more "
@@ -2385,14 +2489,14 @@
"пользователей. Более подробную информацию о сети Freenode можно получить на "
"их <url id=\"&url-irc-host;\" name=\"web-сайте\">."
-#. <heading> 1252--1252
-#: release-notes.en.sgml:1252
+#. <heading> 1363--1363
+#: release-notes.en.sgml:1363
#, fuzzy
msgid "Reporting bugs"
msgstr "Как сообщить об ошибке"
-#. <p> 1254--1260
-#: release-notes.en.sgml:1254
+#. <p> 1365--1371
+#: release-notes.en.sgml:1365
#, fuzzy
msgid ""
"We strive to make Debian GNU/Linux a high quality operating system, however "
@@ -2410,8 +2514,8 @@
"name=\"bugs.debian.org\">. Такой подход согласуется с концепцией открытой "
"разработки Debian."
-#. <p> 1262--1267
-#: release-notes.en.sgml:1262
+#. <p> 1373--1378
+#: release-notes.en.sgml:1373
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. "
@@ -2426,8 +2530,8 @@
"связываться с отправителями отчётов об ошибках, если им понадобится "
"дополнительная информация."
-#. <p> 1269--1275
-#: release-notes.en.sgml:1269
+#. <p> 1380--1386
+#: release-notes.en.sgml:1380
#, fuzzy
msgid ""
"You can submit a bug report using the program <package>reportbug</package> "
@@ -2443,13 +2547,13 @@
"<package>doc-debian</package> или на сайте <url id=\"&url-bts;\" name="
"\"Системы отслеживания ошибок\">."
-#. <heading> 1280--1280
-#: release-notes.en.sgml:1280
+#. <heading> 1391--1391
+#: release-notes.en.sgml:1391
msgid "Contributing to Debian"
msgstr "Как помочь Debian"
-#. <p> 1282--1295
-#: release-notes.en.sgml:1282
+#. <p> 1393--1406
+#: release-notes.en.sgml:1393
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-"
@@ -2471,12 +2575,12 @@
"разработчиков\">, также очень важно. Чтобы помочь поддерживать высокое "
"качество Debian, <url id=\"&url-bts;\" name=\"отправляйте сообщения об "
"ошибках\"> и помогайте разработчикам отслеживать и исправлять их. Если вы "
-"хорошо владеете языком, вы можете помочь в написании <url id=\"&url-ddp;\" name="
-"\"документации\"> или <url id=\"&url-debian-i18n;\" name=\"переводе\"> "
+"хорошо владеете языком, вы можете помочь в написании <url id=\"&url-ddp;\" "
+"name=\"документации\"> или <url id=\"&url-debian-i18n;\" name=\"переводе\"> "
"существующей документации на родной язык."
-#. <p> 1297--1305
-#: release-notes.en.sgml:1297
+#. <p> 1408--1416
+#: release-notes.en.sgml:1408
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 "
@@ -2495,11 +2599,11 @@
"\"требующих доработки и планируемых пакетов\">. Если вам интересна какая-то "
"специфическая группа пользователей, возможно, вы захотите участвовать в "
"одном из дочерних проектов Debian. Среди них портирование Debian на другие "
-"архитектуры, проекты <url id=\"&url-debian-jr;" name=\"Debian для детей\"> и "
-"<url id=\"&url-debian-med;\" name=\"Debian в медицине\">."
+"архитектуры, проекты <url id=\"&url-debian-jr;\" name=\"Debian для детей\"> "
+"и <url id=\"&url-debian-med;\" name=\"Debian в медицине\">."
-#. <p> 1307--1311
-#: release-notes.en.sgml:1307
+#. <p> 1418--1422
+#: release-notes.en.sgml:1418
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 "
@@ -2512,8 +2616,8 @@
"удовольствие и радость, даёт возможность познакомиться с новыми людьми."
# Про "ощущение внутренней теплоты" я, пожалуй, уберу. Смеяться будут.
-#. <p> 1320--1324
-#: release-notes.en.sgml:1320
+#. <p> 1431--1435
+#: release-notes.en.sgml:1431
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</"
@@ -2525,15 +2629,15 @@
"обновлением системы. Чтобы узнать, нужно ли это в вашем случае - прочтите "
"<ref id=\"new-kernel\"></strong>."
-#. <p> 1327--1328
-#: release-notes.en.sgml:1327
+#. <p> 1438--1439
+#: release-notes.en.sgml:1438
msgid ""
"The following instructions explain step by step how to install the newer "
"kernel."
msgstr "Подробная инструкция по установке обновлённого ядра:"
-#. <p> 1331--1332
-#: release-notes.en.sgml:1331
+#. <p> 1442--1443
+#: release-notes.en.sgml:1442
#, fuzzy
msgid ""
"The following instructions explain step by step how to use the available "
@@ -2542,8 +2646,8 @@
"Данная инструкция пошагово объясняет методы применения адаптированныхк "
"стабильной среде инструментов для установки новых версий ядра:"
-#. <p> 1335--1470
-#: release-notes.en.sgml:1335
+#. <p> 1446--1581
+#: release-notes.en.sgml:1446
msgid ""
"\n"
"<taglist compact=\"compact\">\n"
@@ -2757,6 +2861,190 @@
"некоторые драйвера были раньше вкомпилированы в ядро теперь поставляются как "
"модули, ...</p></item>\n"
"</taglist>"
+
+#. <heading> 1587--1587
+#: release-notes.en.sgml:1587
+msgid "Managing your &oldreleasename; system"
+msgstr ""
+
+#. <p> 1589--1591
+#: release-notes.en.sgml:1589
+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
+#, fuzzy
+msgid "Upgrading your &oldreleasename; system"
+msgstr "Обновление ядра"
+
+#. <p> 1596--1599
+#: release-notes.en.sgml:1596
+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 "
+"your package list still contains &oldreleasename; packages as explained in "
+"<ref id=\"old-sources\">."
+msgstr ""
+
+#. <heading> 1605--1605
+#: release-notes.en.sgml:1605
+msgid "Installing &oldreleasename; version of aptitude"
+msgstr ""
+
+#. <p> 1607--1609
+#: release-notes.en.sgml:1607
+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
+#, fuzzy
+msgid ""
+"After that, just execute <example compact=\"compact\">\n"
+"# apt-get install aptitude\n"
+" </example> to install <package>aptitude</package>."
+msgstr ""
+"<example compact=\"compact\">\n"
+" apt-get install aptitude\n"
+" </example>"
+
+#. <heading> 1623--1623
+#: release-notes.en.sgml:1623
+#, fuzzy
+msgid "Checking your sources list"
+msgstr "Проверка поддержки ядра"
+
+#. <p> 1625--1628
+#: release-notes.en.sgml:1625
+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 "
+"already run <tt>apt-get update</tt>, you can still get back without problems "
+"following the procedure below."
+msgstr ""
+
+#. <p> 1630--1634
+#: release-notes.en.sgml:1630
+msgid ""
+"If you have also already installed packages from &releasename;, there "
+"probably is not much point in installing packages from &oldreleasename; "
+"anymore. In that case you will have to decide for yourself whether you want "
+"to continue or not. It is possible to downgrade packages, but that is not "
+"covered here."
+msgstr ""
+
+#. <p> 1636--1639
+#: release-notes.en.sgml:1636
+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 "
+"ftp:</tt> for a reference to \"<tt>stable</tt>\". If you find any, change "
+"<tt>stable</tt> to <tt>&oldreleasename;</tt>."
+msgstr ""
+
+#. <p> 1641--1643
+#: release-notes.en.sgml:1641
+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
+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 "
+"apt-cdrom again. Do not be alarmed if a 'cdrom' source line refers to "
+"\"<tt>unstable</tt>\". Although confusing, this is normal."
+msgstr ""
+
+#. <p> 1650--1656
+#: release-notes.en.sgml:1650
+msgid ""
+"If you've made any changes, safe the file and execute <example compact="
+"\"compact\">\n"
+"# apt-get update\n"
+" </example> to refresh the package list."
+msgstr ""
+
+#~ msgid ""
+#~ "The recommended method of upgrading is to use <prgn>aptitude</prgn>, as "
+#~ "described here. The built-in dependency analysis enables smooth upgrades "
+#~ "and easy installations."
+#~ msgstr ""
+#~ "Производить обновление рекомендуется с помощью <prgn>apritude</prgn>, как "
+#~ "описано в данном документе. Встроенный анализ зависимостей делает процесс "
+#~ "обновления достаточно лёгким и простым."
+
+#, fuzzy
+#~ msgid ""
+#~ "First the <package>aptitude</package> package needs to be installed. This "
+#~ "is done with:"
+#~ msgstr ""
+#~ "Сначала надо установить пакет <package>aptitude</package>. Это можно "
+#~ "сделать командой"
+
+#, fuzzy
+#~ msgid ""
+#~ "Provided that you have a working APT configuration this will install the "
+#~ "&oldreleasename; version of <prgn>aptitude</prgn>."
+#~ msgstr ""
+#~ "Если у вас правильно настроена система APT, эта команда установит версию "
+#~ "<prgn>aptitude</prgn> из &releasename;."
+
+#, fuzzy
+#~ msgid ""
+#~ "If you changed and recompiled a package locally, and didn't rename it or "
+#~ "put an epoch in the version, you must put it on hold to prevent it from "
+#~ "being upgraded. The `hold' package state can be changed by using "
+#~ "<prgn>aptitude</prgn>. With <example compact=\"compact\">\n"
+#~ "aptitude hold | unhold <package>\n"
+#~ " \t </example>"
+#~ msgstr ""
+#~ "Если вы изменили или перекомпилировали пакет на своей машине, при этом не "
+#~ "переименовали его и не изменили \"эпоху\" его версии, вы должны "
+#~ "зафиксировать его, чтобы он не был обновлён. Зафиксировать пакет или "
+#~ "снять фиксацию можно с помощью <prgn>aptitude</prgn> командой <example "
+#~ "compact=\"compact\">\n"
+#~ " aptitude hold | unhold <package>\n"
+#~ " </example>"
+
+#~ msgid ""
+#~ "Next ensure that the APT source entries (in <file>/etc/apt/sources.list</"
+#~ "file>) refer to the <tt>'stable'</tt> distribution and do not refer to it "
+#~ "by its codename (e.g. <tt>&oldreleasename;</tt>)."
+#~ msgstr ""
+#~ "После этого убедитесь в том, что источники, указанные в файле <file>/etc/"
+#~ "apt/sources.list</file>, ссылаются на стабильный (<tt>stable</tt>) "
+#~ "дистрибутив и не ссылаются на дистрибутив по кодовому имени (например, "
+#~ "<tt>&oldreleasename;</tt>)."
+
+#~ msgid ""
+#~ "First <prgn>aptitude</prgn> needs to fetch a list of new and updated "
+#~ "packages for the new release. This is done by executing:"
+#~ msgstr ""
+#~ "Сначала программе <prgn>aptitude</prgn> нужен список новых и обновлённых "
+#~ "пакетов нового выпуска. Его можно получить командой"
+
+#, fuzzy
+#~ msgid ""
+#~ "Once <prgn>aptitude</prgn> has information on all the available packages, "
+#~ "the system is almost ready to be fully upgraded. First however the "
+#~ "<package>doc-base</package> package must be upgraded <em>if it is "
+#~ "installed</em>. You can find out if it is installed using:"
+#~ msgstr ""
+#~ "После того, как программа <prgn>aptitude> получила информацию обо всех "
+#~ "доступных пакетах, система почти готова к полному обновлению. В первую "
+#~ "очередь нужно обновить пакет <package>doc-base</package> <em>если он "
+#~ "установлен</em>. Установлен он или нет можно узнать, запустив "
#~ msgid ""
#~ "To replace the aging, much-maligned, yet still popular <package>dselect</"
Index: release-notes.en.sgml
===================================================================
RCS file: /cvsroot/l10n-russian/release-notes/release-notes.en.sgml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- release-notes.en.sgml 26 May 2005 14:18:15 -0000 1.6
+++ release-notes.en.sgml 27 May 2005 07:37:37 -0000 1.7
@@ -13,7 +13,7 @@
<title>Release Notes for &debian; &release; (`&releasename'), &arch-title;</title>
<author>
<name>Josip Rodin, Bob Hilliard, Adam Di Carlo, Anne Bezemer, Rob
- Bradford (current)</name><email></email>
+ Bradford (current), Frans Pop (current)</name><email></email>
</author>
<author>
<name></name><email>debian-doc@lists.debian.org</email>
@@ -325,7 +325,7 @@
<p>The main things you'll want to back up are the contents of
<file>/etc</file>, <file>/var/lib/dpkg</file> and the output of
- <tt>dpkg --get-selections \*</tt>.</p>
+ <tt>dpkg --get-selections "*"</tt> (the quotes are important).</p>
<p>It's wise to inform all users in advance of any upgrades you're
planning, although users accessing your system via SSH (at least)
@@ -339,36 +339,144 @@
textmode virtual console (or a directly connected serial
terminal), or remotely via an <prgn/ssh/ link.</p>
- <p><em/Important/: You should <em/not/ upgrade using <prgn/telnet/,
+ <p><strong/Important!/ You should <em/not/ upgrade using <prgn/telnet/,
<prgn/rlogin/, <prgn/rsh/, or from an X session managed by <prgn/xdm/,
<prgn/gdm/ or <prgn/kdm/ etc on the machine you are upgrading. That is
because each of those services may well be terminated during the
upgrade, which can result in an <em/inaccessible/ system that is only
half-upgraded.</p>
-
- <p>The recommended method of upgrading is to use <prgn/aptitude/, as
- described here. The built-in dependency analysis enables smooth
- upgrades and easy installations.</p>
-
- <p>Any package installation operation must be run with superuser
+
+ <p>Any package installation operation must be run with superuser
privileges, so either login as root or use <prgn/su/ or
<prgn/sudo/ to gain the necessary access rights.</p>
-
- <p>First the <package>aptitude</package> package needs to be installed.
- This is done with:</p>
- <p><example>
-apt-get install aptitude
- </example></p>
+ </sect>
- <p>Provided that you have a working APT configuration this will
- install the &oldreleasename; version of
-
- <prgn>aptitude</prgn>.</p>
+ <sect id="system-status">
+ <heading>Checking system status</heading>
+
+ <p>The upgrade process described in this chapter has been designed for
+ upgrades from "pure" &oldreleasename; systems. It assumes your system
+ has been updated to the latest point release of &oldreleasename;.
+ If you have not or are unsure, follow the instructions in
+ <ref id="old-upgrade"></p>
+
+<![ %has-woody-aptitude [
+ <p>It also assumes you have the &oldreleasename; version of
+ <prgn/aptitude/ installed. You can check if it is installed using
+
+ <example>
+$ dpkg -l aptitude
+ </example>
+
+ If the line of output does <em/not/ begin with "i", you should install
+ it before you start the upgrade using the instructions in
+ <ref id="old-aptitude">.</p>
+]]>
+
+ <sect1><heading>Disabling APT pinning</heading>
+
+ <p>If you have configured APT to install certain packages from a
+ distribution other than stable (e.g. from testing), you may have to
+ change your APT pinning configuration (stored in
+ <file>/etc/apt/preferences</file>) to allow the upgrade of packages to
+ the versions in the new stable release. Further information on APT
+ pinning can be found in <manref name="apt_preferences" section="5">.</p>
+
+ </sect1>
+
+ <sect1><heading>Checking packages status</heading>
+
+ <p>Regardless of the method used for upgrading, it is recommended
+ that you check the status of all packages first, and verify that
+ all packages are in an upgradable state. The following command
+ will show any packages which have a status of Half-Installed or
+ Failed-Config, and those with any error status.
+
+ <example>
+# dpkg --audit
+ </example></p>
+
+ <p>You could also inspect the state of all packages on your system
+ using <prgn/dselect/, <prgn/aptitude/, or with commands such as
+
+ <example>
+# dpkg -l | pager
+ </example>
+
+ or
+
+ <example>
+# dpkg --get-selections > ~/curr-pkgs.txt
+ </example></p>
+
+ <p>It is desirable to remove any holds before upgrading. If any
+ package that is essential for the upgrade is on hold, the upgrade
+ will fail. You can identify packages on hold with
+
+ <example>
+# dpkg --audit
+ </example></p>
+
+ <p>If you changed and recompiled a package locally, and didn't rename
+ it or put an epoch in the version, you must put it on hold to prevent
+ it from being upgraded.
+
+<![ %has-woody-aptitude [
+ The `hold' package state can be changed by using <prgn/aptitude/:
+
+ <example>
+# aptitude hold | unhold <package name>
+ </example>
+]]>
+<![ %no-woody-aptitude [
+ The `hold' package state can be changed either by using <prgn/dselect/
+ (in the Select menu, use the `H' and `G' keys to hold and unhold,
+ respectively), or by editing the file produced by
+
+ <example>
+# dpkg --get-selections > ~/curr-sels.txt
+ </example>
+
+ to change "hold" to "install" (or vice versa), and then doing
+
+ <example>
+# dpkg --set-selections < ~/curr-sels.txt
+ </example>
+]]>
+ </p>
+
+ <p>If there is anything you need to fix, it is best to make sure your
+ <file/sources.list/ still refers to &oldreleasename; as explained in
+ <ref id="old-sources">.</p>
+ </sect1>
+
+ <sect1 id="backports"><heading>Unofficial sources and backports</heading>
+
+ <p>If you have any non-Debian packages on your system, you should be
+ aware that these may be removed during the upgrade because of
+ conflicting dependencies. If these packages were installed by adding
+ an extra package archive in your <file>/etc/apt/sources.list</file>,
+ you should check if that archive also offers packages compiled for
+ &releasename; and change the source line accordingly at the same time
+ as your source lines for Debian packages.</p>
+
+ <p>Some users may have unofficial backported "newer" versions of
+ packages that <em/are/ in Debian installed on their &oldreleasename;
+ system. Such packages are most likely to cause problems during an
+ upgrade as they may result in file conflicts<footnote>Debian's
+ package management system normally does not allow a package to remove
+ or replace a file owned by another package; not unless it has been
+ defined to replace that package.</footnote>. Section <ref id="trouble">
+ has some information on how to deal with file conflicts if they should
+ occur.</p>
+
+ </sect1>
+ </sect>
<![ %glibcneedsnewkernel [
- <sect1 id="new-kernel">
+ <sect id="new-kernel">
<heading>Checking kernel support</heading>
<![ %sparc [
@@ -422,7 +530,7 @@
]]>
<![ %upgradekernel [
- <sect2 id="kernel-upgrade"><heading>Upgrading the kernel</heading>
+ <sect1 id="kernel-upgrade"><heading>Upgrading the kernel</heading>
<p>If (and only if) the previous section indicates that you should
upgrade your kernel <em/before/ the upgrade of the system, you
@@ -436,68 +544,10 @@
Detailed instructions on how to install the new kernel can be
found in <ref id="kernel-upgrade-howto">.</p>
- </sect2>
-]]>
- </sect1>
-]]>
-
- <sect1><heading>Disabling APT pinning</heading>
-
- <p>If you have configured APT to install certain packages from a
- distribution other than stable (e.g. from testing), you may have to
- change your APT pinning configuration (stored in
- <file>/etc/apt/preferences</file>) to allow the upgrade of packages to
- the versions in the new stable release. Further information on APT
- pinning can be found in <manref name="apt_preferences" section="5">.</p>
-<!-- FJP: Couldn't the advise to hold such packages prevent the upgrade of e.g.
- libc6 if the package depends on the old version! -->
-
- </sect1>
-
- <sect1><heading>Checking packages status</heading>
-
- <p>Regardless of the method used for upgrading, it is recommended
- that you check the status of all packages first, and verify that
- all packages are in an upgradable state. The following command
- will show any packages which have a status of Half-Installed or
- Failed-Config, and those with any error status.
-
- <example>
-# dpkg --audit
- </example></p>
-
- <p>You could also inspect the state of all packages on your system
- using <prgn/dselect/, <prgn/aptitude/, or with commands such as
-
- <example>
-# dpkg -l | pager
- </example>
-
- or
-
- <example>
-# dpkg --get-selections > ~/curr-pkgs.txt
- </example></p>
-
- <p>It is desirable to remove any holds before upgrading. If any
- package that is essential for the upgrade is on hold, the upgrade
- will fail. You can identify packages on hold with
-
- <example>
-# dpkg --audit
- </example></p>
-
- <p>If you changed and recompiled a package locally, and didn't rename
- it or put an epoch in the version, you must put it on hold to prevent
- it from being upgraded. The `hold' package state can be changed by
- using <prgn/aptitude/. With
-
- <example>
-aptitude hold | unhold <package>
- </example>
- </p>
</sect1>
+]]>
</sect>
+]]>
<sect id="upgrade-process"><heading>Preparing sources for APT</heading>
@@ -512,6 +562,16 @@
name a local harddisk, then CD-ROMs, and then HTTP/FTP
mirrors).</p>
+ <p>A release can often be referred to by both its codename (e.g.
+ &oldreleasename;, &releasename;) and by its status name (i.e.
+ oldstable, stable, testing, unstable). Referring to a release by its
+ codename has the advantage that you will never be surprised by a
+ new release and for this reason is the approach taken here. It
+ does of course mean that you will have to watch out for release
+ announcements yourself. If you use the status name instead, you
+ will just see loads of updates for packages available as soon as a
+ release has happened.</p>
+
<sect1 id="network"><heading>Adding APT Internet sources</heading>
<p>The default configuration is set up for installation from main
@@ -529,9 +589,6 @@
<url id="&url-debian-mirrors;"> (look at the "Full list of
mirrors" section). HTTP mirrors are generally speedier than FTP
mirrors.</p>
-<!-- FJP: 'Otherwise' does not refer back to anything here, so I deleted it
- (unless the intention was to refer to local intr_a_net HTTP
- servers in the previous para). -->
<p>For example, suppose your closest Debian mirror is
<tt>&url-debian-mirror-eg;/</tt>. When inspecting that mirror
@@ -539,8 +596,8 @@
directories are organized like this:
<example>
-&url-debian-mirror-eg;/dists/stable/main/binary-&architecture;/...
-&url-debian-mirror-eg;/dists/stable/contrib/binary-&architecture;/...
+&url-debian-mirror-eg;/dists/&releasename;/main/binary-&architecture;/...
+&url-debian-mirror-eg;/dists/&releasename;/contrib/binary-&architecture;/...
</example></p>
<p>To use this mirror with <prgn/apt/, you add this line to your
@@ -579,15 +636,15 @@
this:
<example>
-/var/ftp/debian/dists/stable/main/binary-&architecture;/...
-/var/ftp/debian/dists/stable/contrib/binary-&architecture;/...
+/var/ftp/debian/dists/&releasename;/main/binary-&architecture;/...
+/var/ftp/debian/dists/&releasename;/contrib/binary-&architecture;/...
</example></p>
<p>To use this with <prgn/apt/, add this line to your
<file/sources.list/ file:
<example>
-deb file:/var/ftp/debian stable main contrib
+deb file:/var/ftp/debian &releasename; main contrib
</example></p>
<p>Note that the `<tt>dists</tt>' is added implicitly, and the
@@ -598,9 +655,7 @@
existing "<tt/deb/" lines in <file/sources.list/, by placing a
hash sign (<tt/#/) in front of them.</p></sect1>
- <sect1 id="cdroms"><heading>Adding APT source from CD-ROM</heading>
-
-<!-- FJP: Are these instructions also valid for adding DVD's? -->
+ <sect1 id="cdroms"><heading>Adding APT source from CD-ROM or DVD</heading>
<p>If you want to use CDs <em/only/, comment out the existing
"<tt/deb/" lines in <file>/etc/apt/sources.list</file> by placing
@@ -625,15 +680,15 @@
<p>To verify it works, insert a CD and try running
<example>
-mount /cdrom # this will mount the CD to the mount point
-ls -alF /cdrom # this should show the CD's root directory
-umount /cdrom # this will unmount the CD
+# mount /cdrom # this will mount the CD to the mount point
+# ls -alF /cdrom # this should show the CD's root directory
+# umount /cdrom # this will unmount the CD
</example></p>
<p>Next, run:
<example>
-apt-cdrom add
+# apt-cdrom add
</example>
for each Debian Binary CD-ROM you have, to add the data about
@@ -642,25 +697,26 @@
</sect>
<sect id="upgradingpackages"><heading>Upgrading packages</heading>
-
+
<p>The recommended tool for upgrading between &debian; releases is
to use the package management tool <prgn>aptitude</prgn>. This tool
makes safer decisions about package installations than running
<prgn>apt-get</prgn> directly.</p>
-
+
<p>Don't forget to mount all needed partitions (notably the root
and <file>/usr</file> partitions) read-write, with a command
like:
<example>
-mount -o remount,rw /<var>mountpoint</var>
+# mount -o remount,rw /<var>mountpoint</var>
</example></p>
- <p>Next ensure that the APT source entries (in
- <file>/etc/apt/sources.list</file>) refer to the <tt>'stable'</tt>
- distribution and do not refer to it by its codename (e.g.
- <tt>&oldreleasename;</tt>).
-
+ <p>Next you should double check that the APT source entries (in
+ <file>/etc/apt/sources.list</file>) refer either to
+ "<tt/&releasename;/" or to "<tt>stable</tt>". Note: source
+ lines for a CD-ROM will often refer to "<tt/unstable/";
+ although this may be confusing, you should <em/not/ change it.</p>
+
<p>It is strongly recommended that you use the
<prgn>/usr/bin/script</prgn> program to record a transcript of the
upgrade session. Then if a problem occurs, you will have a log of
@@ -668,44 +724,92 @@
report. To start the recording, type:
<example>
-script -a ~/upgrade-to-&releasename;.typescript
+# script -a ~/upgrade-to-&releasename;.typescript
</example>
or similar. Do not put the typescript file in a temporary
directory such as <file>/tmp</file> or <file>/var/tmp</file> (files
in those directories may be deleted during the upgrade or during any
restart).</p>
-
- <p>First <prgn>aptitude</prgn> needs to fetch a list of new and
- updated packages for the new release. This is done by executing:</p>
-
+
+ <p>The typescript will also allow you to review information that has
+ scrolled off-screen. Just switch to VT2 (using <tt/alt-F2/) and, after
+ logging in, use <tt>less ~root/upgrade-to-&releasename;.typescript</tt>
+ to view the file.</p>
+
+ <p>After you have completed the upgrade, you can stop the typescript
+ by typing <tt/exit/ at the prompt.</p>
+
+ <sect1 id="updating_lists"><heading>Updating the package list</heading>
+
+ <p>First the list of available packages for the new release needs to
+ be fetched. This is done by executing<footnote>We use <prgn/apt-get/
+ for this because the &oldreleasename; version <prgn/aptitude/ may fail
+ when new sources have been added to <file/sources.list/.</footnote>:</p>
+
<p><example>
-aptitude update
+# apt-get update
</example></p>
- <p>Once <prgn>aptitude</prgn> has information on all the available
- packages, the system is almost ready to be fully upgraded. First
- however the <package>doc-base</package> package must be upgraded
- <em>if it is installed</em>. You can find out if it is installed
- using:</p>
+ </sect1>
+
+<!-- FJP: This next section can probably be dropped for etch -->
+ <sect1 id="upgrading_aptitude"><heading>Upgrading aptitude</heading>
+
+ <p>Upgrade tests have shown that &releasename;'s version of
+ <prgn/aptitude/ is better at solving the complex dependencies during
+ an upgrade than either <prgn/apt-get/ or &oldreleasename;'s
+ <prgn/aptitude/.
+
+<![ %has-woody-aptitude [
+ It should therefore be upgraded first using:
+ <example>
+# aptitude install aptitude
+ </example></p>
+]]>
+<![ %no-woody-aptitude [
+ It should therefore be installed first using:
+ <example>
+# apt-get install aptitude
+ </example></p>
+]]>
+
+ <p><prgn/aptitude/ 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 changes, especially packages that will be removed by the
+ upgrade, before you confirm.</p>
+
+ </sect1>
+
+ <sect1 id="upgrading_doc-base"><heading>Upgrading doc-base</heading>
+
+ <p><em>If you have <package/doc-base/ 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:</p>
<p><example>
-dpkg -l doc-base
+# dpkg -l doc-base
</example></p>
<p>If the line of output begins with "i" then it is installed and
must be upgraded before continuing.</p>
<p><example>
-aptitude install doc-base
+# aptitude install doc-base
</example></p>
+
+ </sect1>
+
+ <sect1 id="upgrading_other"><heading>Upgrading the rest of the system</heading>
+
<p>You are now ready to continue with the main part of the
upgrade. Execute:</p>
<p><example>
-aptitude -f --with-recommends dist-upgrade
+# aptitude -f --with-recommends dist-upgrade
</example></p>
- <p>This will perform a complete upgrade of the system, i.e. install
+ <p>This will perform a complete upgrade of the system, i.e. install
the newest available versions of all packages, and resolve all
possible dependency changes between packages in different releases.
If necessary, it will install some new packages (usually new library
@@ -729,6 +833,8 @@
dependencies in place. <package/apt/ does not allow broken package
dependencies to exist on a system.</p>
+ </sect1>
+
<sect1 id="trouble"><heading>Possible issues during upgrade</heading>
<p>If an operation using <prgn/aptitude/, <prgn/apt-get/ or
@@ -743,7 +849,7 @@
<file>/etc/apt/apt.conf</file>. The following command will set it
to a value that should be sufficient for the upgrade:
<example>
-echo 'APT::Cache-Limit "12500000";' >> /etc/apt/apt.conf
+# echo 'APT::Cache-Limit "12500000";' >> /etc/apt/apt.conf
</example>
This assumes that you do not yet have this variable set in that file.</p>
@@ -760,23 +866,27 @@
using <prgn/aptitude/ or
<example>
-dpkg --remove <var>packagename</var>
+# dpkg --remove <var>packagename</var>
</example>
to eliminate some of the offending packages, or
<example>
-aptitude --fix-broken install
-dpkg --configure --pending
+# aptitude --fix-broken install
+# dpkg --configure --pending
</example></p>
<p>In extreme cases you might have to force re-installation with a
command like
<example>
-dpkg --install <var>/path/to/packagename.deb</var>
+# dpkg --install <var>/path/to/packagename.deb</var>
</example></p>
+<!-- FJP Add instructions what to do in case of file conflicts
+ dpkg -r \-\-force-depends <package name>
+-->
+
<p>After fixing things up, you should be able to resume the
upgrade by repeating the previously described <tt/aptitude/
commands.</p>
@@ -794,9 +904,12 @@
<p>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 to review the information that
- was on the screen during the upgrade.</p></sect1>
+ was on the screen during the upgrade.</p>
- <sect1 id="nownownow"><heading>Things to do before rebooting</heading>
+ </sect1>
+ </sect>
+
+ <sect id="nownownow"><heading>Things to do before rebooting</heading>
<p>When <tt>aptitude dist-upgrade</tt> has finished, the
"formal" upgrade is complete, but there are some other things
@@ -808,7 +921,7 @@
relevant for users of all previous Debian releases. In short, you
need to read it.</p>
- <sect2 id="newkernel"><heading>Upgrading your kernel</heading>
+ <sect1 id="newkernel"><heading>Upgrading your kernel</heading>
<p>Note that the Linux kernel was <em/not/ upgraded by these
procedures. You may wish to do so yourself, either by installing one
@@ -833,10 +946,9 @@
<p>To upgrade your kernel you must first choose the kernel most
appropriate for your subarchitecture. A list of kernels available for
you to install can be found with:
-<!-- FJP: s/subarchitecture/subarchitecture and processor/ ??? -->
<example>
-apt-cache search ^kernel-image
+# apt-cache search ^kernel-image
</example></p>
<p>You should then use <tt/aptitude install/ to install it. Once
@@ -859,7 +971,6 @@
<package>kernel-package</package> tool and read the documentation
in <file>/usr/share/doc/kernel-package</file>.</p>
- </sect2>
</sect1>
</sect>
@@ -1471,6 +1582,82 @@
</appendix>
]]>
+
+ <appendix id="old-stuff">
+ <heading>Managing your &oldreleasename; system</heading>
+
+ <p>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.</p>
+
+ <sect id="old-upgrade">
+ <heading>Upgrading your &oldreleasename; system</heading>
+
+ <p>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 your package list still contains
+ &oldreleasename; packages as explained in <ref id="old-sources">.</p>
+
+ </sect>
+
+<![ %has-woody-aptitude [
+ <sect id="old-aptitude">
+ <heading>Installing &oldreleasename; version of aptitude</heading>
+
+ <p>First you need to make sure you will install &oldreleasename;'s
+ version of <package/aptitude/ and not &releasename;'s by following
+ the instructions in <ref id="old-sources">.</p>
+
+ <p>After that, just execute
+
+ <example>
+# apt-get install aptitude
+ </example>
+
+ to install <package/aptitude/.</p>
+
+ </sect>
+]]>
+
+ <sect id="old-sources">
+ <heading>Checking your sources list</heading>
+
+ <p>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 already run <tt>apt-get update</tt>, you can still get
+ back without problems following the procedure below.</p>
+
+ <p>If you have also already installed packages from &releasename;,
+ there probably is not much point in installing packages from
+ &oldreleasename; anymore. In that case you will have to decide for
+ yourself whether you want to continue or not. It is possible to
+ downgrade packages, but that is not covered here.</p>
+
+ <p>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 ftp:</tt> for a reference to "<tt/stable/". If you find any,
+ change <tt/stable/ to <tt/&oldreleasename;/.</p>
+
+ <p>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.</p>
+
+ <p><strong/Important!/ Do not change any lines that begin with
+ <tt>deb cdrom:</tt>. Doing so would invalidate the line and you would
+ have to run apt-cdrom again. Do not be alarmed if a 'cdrom' source
+ line refers to "<tt/unstable/". Although confusing, this is normal.</p>
+
+ <p>If you've made any changes, safe the file and execute
+
+ <example>
+# apt-get update
+ </example>
+
+ to refresh the package list.</p>
+
+ </sect>
+
+ </appendix>
</book>
</debiandoc>
Index: release-notes.ru.sgml
===================================================================
RCS file: /cvsroot/l10n-russian/release-notes/release-notes.ru.sgml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- release-notes.ru.sgml 26 May 2005 14:18:15 -0000 1.4
+++ release-notes.ru.sgml 27 May 2005 07:37:37 -0000 1.5
@@ -25,7 +25,7 @@
<book>
<titlepag>
<title>Информация о выпуске &debian; &release; (`&releasename') для архитектуры &arch-title;</title>
- <author><name>Josip Rodin, Bob Hilliard, Adam Di Carlo, Anne Bezemer, Rob Bradford (current)</name><email></email></author>
+ <author><name>Josip Rodin, Bob Hilliard, Adam Di Carlo, Anne Bezemer, Rob Bradford (current), Frans Pop (current)</name><email></email></author>
<author><name></name><email>debian-doc@lists.debian.org</email></author>
<version>&docid;</version>
</titlepag>
@@ -409,11 +409,9 @@
обновления может привести к
серьёзному повреждению системы.</p>
- <p>В первую очередь необходимо
- сохранить резервные копии
- содержимого каталогов <file>/etc</file> и
- <file>/var/lib/dpkg</file>, а также вывод команды
- <tt>dpkg --get-selections \*</tt>.</p>
+ <p>The main things you'll want to back up are the contents of
+ <file>/etc</file>, <file>/var/lib/dpkg</file> and the output of
+ <tt>dpkg --get-selections "*"</tt> (the quotes are important).</p>
<p>It's wise to inform all users in advance of any upgrades you're
planning, although users accessing your system via SSH (at least)
@@ -429,46 +427,119 @@
последовательного терминала), так и
удалённо через канал <prgn>ssh</prgn>.</p>
- <p><em>Внимание!</em> <em>Ни в коем случае</em>
- не обновляйте систему через
- <prgn>telnet</prgn>, <prgn>rlogin</prgn>, <prgn>rsh</prgn> или
- из графического сеанса под
- управлением <prgn>xdm</prgn>, <prgn>gdm</prgn>,
- <prgn>kdm</prgn> и т.д., запущенного на
- обновляемой системе. Это связано с
- тем, что все эти серверы могут быть
- перезапущены при обновлении, что
- может привести к <em>недоступности</em>
- системы, обновлённой только
- наполовину.</p>
-
- <p>Производить обновление
- рекомендуется с помощью <prgn>apritude</prgn>,
- как описано в данном документе.
- Встроенный анализ зависимостей
- делает процесс обновления достаточно
- лёгким и простым.</p>
-
+ <p><strong>Important!</strong> You should <em>not</em> upgrade using
+ <prgn>telnet</prgn>, <prgn>rlogin</prgn>, <prgn>rsh</prgn>, or from
+ an X session managed by <prgn>xdm</prgn>, <prgn>gdm</prgn> or
+ <prgn>kdm</prgn> etc on the machine you are upgrading. That is
+ because each of those services may well be terminated during the
+ upgrade, which can result in an <em>inaccessible</em> system that is
+ only half-upgraded.</p>
+
<p>Установка любого пакета должна
- производиться с привилегиями
- суперпользователя. Поэтому вы должны
- либо войти в систему под именем
- суперпользователя (root), либо использовать
- программы <prgn>su</prgn> или <prgn>sudo</prgn>.</p>
-
- <p>First the <package>aptitude</package> package needs to be
- installed. This is done with:</p>
+ производиться с привилегиями
+ суперпользователя. Поэтому вы должны
+ либо войти в систему под именем
+ суперпользователя (root), либо
+ использовать программы <prgn>su</prgn> или
+ <prgn>sudo</prgn>.</p>
+</sect>
+
+
+ <sect id="system-status">
+ <heading>Checking system status</heading>
+
+ <p>The upgrade process described in this chapter has been designed for
+ upgrades from "pure" &oldreleasename; systems. It assumes your system
+ has been updated to the latest point release of &oldreleasename;. If
+ you have not or are unsure, follow the instructions in <ref
+ id="old-upgrade"></p>
+
+<![ %has-woody-aptitude [
+ <p>It also assumes you have the &oldreleasename; version of
+ <prgn>aptitude</prgn> installed. You can check if it is installed using <example compact="compact">
+$ dpkg -l aptitude
+ </example> If the line of output does <em>not</em> begin with "i", you should install it before you start the upgrade using the instructions in <ref id="old-aptitude">.</p>
+]]>
+
+ <sect1><heading>Disabling APT pinning</heading>
+
+ <p>If you have configured APT to install certain packages from a
+ distribution other than stable (e.g. from testing), you may have to change
+ your APT pinning configuration (stored in <file>/etc/apt/preferences</file>)
+ to allow the upgrade of packages to the versions in the new stable release.
+ Further information on APT pinning can be found in <manref section="5"
+ name="apt_preferences">.</p>
+</sect1>
+
+
+ <sect1><heading>Checking packages status</heading>
+
+ <p>Regardless of the method used for upgrading, it is recommended
+ that you check the status of all packages first, and verify that all
+ packages are in an upgradable state. The following command will show
+ any packages which have a status of Half-Installed or Failed-Config,
+ and those with any error status. <example compact="compact">
+# dpkg --audit
+ </example></p>
- <p><example compact="compact">
-apt-get install aptitude
- </example></p>
+ <p>You could also inspect the state of all packages on your system
+ using <prgn>dselect</prgn>, <prgn>aptitude</prgn>, or with commands
+ such as <example compact="compact">
+# dpkg -l | pager
+ </example> or <example compact="compact">
+# dpkg --get-selections > ~/curr-pkgs.txt
+ </example></p>
- <p>Provided that you have a working APT configuration this will
- install the &oldreleasename; version of <prgn>aptitude</prgn>.</p>
+ <p>It is desirable to remove any holds before upgrading. If any
+ package that is essential for the upgrade is on hold, the upgrade
+ will fail. You can identify packages on hold with <example compact="compact">
+# dpkg --audit
+ </example></p>
+
+ <p>If you changed and recompiled a package locally, and didn't rename
+ it or put an epoch in the version, you must put it on hold to prevent
+ it from being upgraded. <![ %has-woody-aptitude [ The `hold' package
+ state can be changed by using <prgn>aptitude</prgn>: <example compact="compact">
+# aptitude hold | unhold <package name>
+ </example> ]]> <![ %no-woody-aptitude [ The `hold' package state can be changed either by using <prgn>dselect</prgn> (in the Select menu, use the `H' and `G' keys to hold and unhold, respectively), or by editing the file produced by <example compact="compact">
+# dpkg --get-selections > ~/curr-sels.txt
+ </example> to change "hold" to "install" (or vice versa), and then doing <example compact="compact">
+# dpkg --set-selections < ~/curr-sels.txt
+ </example> ]]></p>
+
+
+ <p>If there is anything you need to fix, it is best to make sure your
+ <file>sources.list</file> still refers to &oldreleasename; as
+ explained in <ref id="old-sources">.</p>
+</sect1>
+
+ <sect1 id="backports"><heading>Unofficial sources and backports</heading>
+
+ <p>If you have any non-Debian packages on your system, you should be
+ aware that these may be removed during the upgrade because of
+ conflicting dependencies. If these packages were installed by adding
+ an extra package archive in your <file>/etc/apt/sources.list</file>,
+ you should check if that archive also offers packages compiled for
+ &releasename; and change the source line accordingly at the same time
+ as your source lines for Debian packages.</p>
+
+ <p>Some users may have unofficial backported "newer" versions of
+ packages that <em>are</em> in Debian installed on their
+ &oldreleasename; system. Such packages are most likely to cause
+ problems during an upgrade as they may result in file
+ conflicts<footnote><p>Debian's package management system normally
+ does not allow a package to remove or replace a file owned by another
+ package; not unless it has been defined to replace that
+ package.</p></footnote>. Section <ref id="trouble"> has some
+ information on how to deal with file conflicts if they should
+ occur.</p>
+</sect1></sect>
+
+
<![ %glibcneedsnewkernel [
- <sect1 id="new-kernel">
+ <sect id="new-kernel">
<heading>Проверка поддержки ядра</heading>
<![ %sparc [
@@ -534,7 +605,7 @@
]]>
<![ %upgradekernel [
- <sect2 id="kernel-upgrade"><heading>Upgrading the kernel</heading>
+ <sect1 id="kernel-upgrade"><heading>Upgrading the kernel</heading>
<p>Если в предыдущем разделе было
сказано, что вам надо обновить версию
@@ -545,58 +616,11 @@
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>
-</sect2>
-
-]]></sect1>
-
-]]>
-
- <sect1><heading>Disabling APT pinning</heading>
-
- <p>If you have configured APT to install certain packages from a
- distribution other than stable (e.g. from testing), you may have to change
- your APT pinning configuration (stored in <file>/etc/apt/preferences</file>)
- to allow the upgrade of packages to the versions in the new stable release.
- Further information on APT pinning can be found in <manref section="5"
- name="apt_preferences">.</p>
-<!-- FJP: Couldn't the advise to hold such packages prevent the upgrade of e.g.
- libc6 if the package depends on the old version! --></sect1>
-
-
-
- <sect1><heading>Checking packages status</heading>
-
- <p>Regardless of the method used for upgrading, it is recommended
- that you check the status of all packages first, and verify that all
- packages are in an upgradable state. The following command will show
- any packages which have a status of Half-Installed or Failed-Config,
- and those with any error status. <example compact="compact">
-# dpkg --audit
- </example></p>
-
- <p>You could also inspect the state of all packages on your system
- using <prgn>dselect</prgn>, <prgn>aptitude</prgn>, or with commands
- such as <example compact="compact">
-# dpkg -l | pager
- </example> or <example compact="compact">
-# dpkg --get-selections > ~/curr-pkgs.txt
- </example></p>
-
- <p>It is desirable to remove any holds before upgrading. If any
- package that is essential for the upgrade is on hold, the upgrade
- will fail. You can identify packages on hold with <example compact="compact">
-# dpkg --audit
- </example></p>
-
- <p>If you changed and recompiled a package locally, and didn't rename
- it or put an epoch in the version, you must put it on hold to prevent
- it from being upgraded. The `hold' package state can be changed by
- using <prgn>aptitude</prgn>. With <example compact="compact">
-aptitude hold | unhold <package>
- </example></p>
-</sect1></sect>
+</sect1>
+]]></sect>
+]]>
<sect id="upgrade-process"><heading>Preparing sources for APT</heading>
@@ -619,6 +643,16 @@
компакт-диск и, наконец, зеркала
HTTP/FTP).</p>
+ <p>A release can often be referred to by both its codename (e.g.
+ &oldreleasename;, &releasename;) and by its status name (i.e.
+ oldstable, stable, testing, unstable). Referring to a release by its
+ codename has the advantage that you will never be surprised by a new
+ release and for this reason is the approach taken here. It does of
+ course mean that you will have to watch out for release announcements
+ yourself. If you use the status name instead, you will just see loads
+ of updates for packages available as soon as a release has
+ happened.</p>
+
<sect1 id="network"><heading>Adding APT Internet sources</heading>
<p>Конфигурация по умолчанию
@@ -640,16 +674,13 @@
найти по адресу <url id="&url-debian-mirrors;"> (см.
раздел "Полный список зеркал").
HTTP-зеркала обычно быстрее, чем FTP.</p>
-<!-- FJP: 'Otherwise' does not refer back to anything here, so I deleted it
- (unless the intention was to refer to local intr_a_net HTTP
- servers in the previous para). -->
<p>For example, suppose your closest Debian mirror is
<tt>&url-debian-mirror-eg;/</tt>. When inspecting that mirror with a
web browser or FTP program, you will notice that the main
directories are organized like this: <example compact="compact">
-&url-debian-mirror-eg;/dists/stable/main/binary-&architecture;/...
-&url-debian-mirror-eg;/dists/stable/contrib/binary-&architecture;/...
+&url-debian-mirror-eg;/dists/&releasename;/main/binary-&architecture;/...
+&url-debian-mirror-eg;/dists/&releasename;/contrib/binary-&architecture;/...
</example></p>
<p>To use this mirror with <prgn>apt</prgn>, you add this line to
@@ -693,13 +724,13 @@
<p>For example, your packages mirror may be under
<file>/var/ftp/debian/</file>, and have main directories like this: <example compact="compact">
-/var/ftp/debian/dists/stable/main/binary-&architecture;/...
-/var/ftp/debian/dists/stable/contrib/binary-&architecture;/...
+/var/ftp/debian/dists/&releasename;/main/binary-&architecture;/...
+/var/ftp/debian/dists/&releasename;/contrib/binary-&architecture;/...
</example></p>
<p>To use this with <prgn>apt</prgn>, add this line to your
<file>sources.list</file> file: <example compact="compact">
-deb file:/var/ftp/debian stable main contrib
+deb file:/var/ftp/debian &releasename; main contrib
</example></p>
<p>Обратите внимание на то, что
@@ -715,9 +746,7 @@
<tt>deb</tt>, поставив в начале каждой
строки знак диеза (<tt>#</tt>).</p>
</sect1>
- <sect1 id="cdroms"><heading>Adding APT source from CD-ROM</heading>
-
-<!-- FJP: Are these instructions also valid for adding DVD's? -->
+ <sect1 id="cdroms"><heading>Adding APT source from CD-ROM or DVD</heading>
<p>Если вы хотите использовать
<em>только</em> компакт-диски,
@@ -743,19 +772,19 @@
пробелов</em>.</p>
<p>To verify it works, insert a CD and try running <example compact="compact">
-mount /cdrom # this will mount the CD to the mount point
-ls -alF /cdrom # this should show the CD's root directory
-umount /cdrom # this will unmount the CD
+# mount /cdrom # this will mount the CD to the mount point
+# ls -alF /cdrom # this should show the CD's root directory
+# umount /cdrom # this will unmount the CD
</example></p>
<p>Next, run: <example compact="compact">
-apt-cdrom add
+# apt-cdrom add
</example> for each Debian Binary CD-ROM you have, to add the data about each CD to APT's database.</p>
</sect1></sect>
<sect id="upgradingpackages"><heading>Обновление пакетов</heading>
-
+
<p>Для обновления &debian; до нового
выпуска рекомендуется использовать
программу управления пакетами
@@ -763,43 +792,82 @@
более безопасные решения об установке
пакетов, чем при непосредственном
запуске <prgn>apt-get</prgn>.</p>
-
+
<p>Don't forget to mount all needed partitions (notably the root and
<file>/usr</file> partitions) read-write, with a command like: <example compact="compact">
-mount -o remount,rw /<var>mountpoint</var>
+# mount -o remount,rw /<var>mountpoint</var>
</example></p>
- <p>После этого убедитесь в том, что
- источники, указанные в файле
- <file>/etc/apt/sources.list</file>, ссылаются на
- стабильный (<tt>stable</tt>) дистрибутив и не
- ссылаются на дистрибутив по кодовому
- имени (например, <tt>&oldreleasename;</tt>).</p>
-
+ <p>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 "<tt>stable</tt>". Note: source lines for a CD-ROM will often refer to
+ "<tt>unstable</tt>"; although this may be confusing, you should <em>not</em>
+ change it.</p>
+
<p>It is strongly recommended that you use the
<prgn>/usr/bin/script</prgn> program to record a transcript of the
upgrade session. Then if a problem occurs, you will have a log of
what happened, and if needed, can provide exact information in a bug
report. To start the recording, type: <example compact="compact">
-script -a ~/upgrade-to-&releasename;.typescript
+# script -a ~/upgrade-to-&releasename;.typescript
</example> or similar. Do not put the typescript file in a temporary directory such as <file>/tmp</file> or <file>/var/tmp</file> (files in those directories may be deleted during the upgrade or during any restart).</p>
-
- <p>Сначала программе <prgn>aptitude</prgn> нужен
- список новых и обновлённых пакетов
- нового выпуска. Его можно получить
- командой</p>
-
+
+ <p>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 in, use <tt>less
+ ~root/upgrade-to-&releasename;.typescript</tt> to view the file.</p>
+
+ <p>After you have completed the upgrade, you can stop the typescript
+ by typing <tt>exit</tt> at the prompt.</p>
+
+ <sect1 id="updating_lists"><heading>Updating the package list</heading>
+
+ <p>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> for this because the &oldreleasename; version
+ <prgn>aptitude</prgn> may fail when new sources have been added to
+ <file>sources.list</file>.</p></footnote>:</p>
+
<p><example compact="compact">
-aptitude update
+# apt-get update
</example></p>
+</sect1>
+
- <p>Once <prgn>aptitude</prgn> has information on all the available
- packages, the system is almost ready to be fully upgraded. First however the
- <package>doc-base</package> package must be upgraded <em>if it is
- installed</em>. You can find out if it is installed using:</p>
+<!-- FJP: This next section can probably be dropped for etch -->
+ <sect1 id="upgrading_aptitude"><heading>Upgrading aptitude</heading>
+
+ <p>Upgrade tests have shown that &releasename;'s version of
+ <prgn>aptitude</prgn> is better at solving the complex dependencies
+ during an upgrade than either <prgn>apt-get</prgn> or
+ &oldreleasename;'s <prgn>aptitude</prgn>. <![ %has-woody-aptitude [
+ It should therefore be upgraded first using: <example compact="compact">
+# aptitude install aptitude
+ </example></p>
+]]>
+<![ %no-woody-aptitude [
+ It should therefore be installed first using:
+ <p><example compact="compact">
+# apt-get install aptitude
+ </example></p>
+]]>
+
+ <p><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 changes, especially packages that will be
+ removed by the upgrade, before you confirm.</p>
+</sect1>
+
+
+ <sect1 id="upgrading_doc-base"><heading>Upgrading doc-base</heading>
+
+ <p><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:</p>
<p><example compact="compact">
-dpkg -l doc-base
+# dpkg -l doc-base
</example></p>
<p>Если первая буква в напечатанной
@@ -808,12 +876,17 @@
очередь.</p>
<p><example compact="compact">
-aptitude install doc-base
+# aptitude install doc-base
</example></p>
+</sect1>
+
+
+ <sect1 id="upgrading_other"><heading>Upgrading the rest of the system</heading>
+
<p>Теперь можно приступить собственно
к обновлению. Выполните команду </p>
<p><example compact="compact">
-aptitude -f --with-recommends dist-upgrade
+# aptitude -f --with-recommends dist-upgrade
</example></p>
<p>Эта команда произведёт полное
@@ -849,13 +922,15 @@
Система <package>apt</package> не позволяет,
чтобы какие-либо зависимости в
системе были не удовлетворены.</p>
+</sect1>
+
<sect1 id="trouble"><heading>Possible issues during upgrade</heading>
<p>If an operation using <prgn>aptitude</prgn>, <prgn>apt-get</prgn>
or <prgn>dpkg</prgn> fails with the error <example compact="compact">
E: Dynamic MMap ran out of room</example> the default cache space is insufficient. You can solve this by either removing or commenting lines you don't need in <file>/etc/apt/sources.list</file> or by increasing the cache size. The cache size can be increased by setting <tt>APT::Cache-Limit</tt> in <file>/etc/apt/apt.conf</file>. The following command will set it to a value that should be sufficient for the upgrade: <example compact="compact">
-echo 'APT::Cache-Limit "12500000";' >> /etc/apt/apt.conf</example> This assumes that you do not yet have this variable set in that file.</p>
+# echo 'APT::Cache-Limit "12500000";' >> /etc/apt/apt.conf</example> This assumes that you do not yet have this variable set in that file.</p>
<p>Иногда необходимо активизировать
параметр APT::Force-LoopBreak, чтобы разрешить
@@ -874,17 +949,21 @@
<p>It is possible that a system's dependency structure can be so
corrupt as to require manual intervention. Usually this means using
<prgn>aptitude</prgn> or <example compact="compact">
-dpkg --remove <var>packagename</var>
+# dpkg --remove <var>packagename</var>
</example> to eliminate some of the offending packages, or <example compact="compact">
-aptitude --fix-broken install
-dpkg --configure --pending
+# aptitude --fix-broken install
+# dpkg --configure --pending
</example></p>
<p>In extreme cases you might have to force re-installation with a
command like <example compact="compact">
-dpkg --install <var>/path/to/packagename.deb</var>
+# dpkg --install <var>/path/to/packagename.deb</var>
</example></p>
+<!-- FJP Add instructions what to do in case of file conflicts
+ dpkg -r \-\-force-depends <package name>
+-->
+
<p>After fixing things up, you should be able to resume the upgrade
by repeating the previously described <tt>aptitude</tt> commands.</p>
@@ -904,8 +983,11 @@
Информацию, выводившуюся на экран во
время обновления, вы сможете найти в
файле транскрипта.</p>
-</sect1>
- <sect1 id="nownownow"><heading>Перед перезагрузкой</heading>
+</sect1></sect>
+
+
+
+ <sect id="nownownow"><heading>Перед перезагрузкой</heading>
<p>Когда команда <tt>aptitude dist-upgrade</tt>
закончила работу, <em>формально</em>
@@ -918,7 +1000,7 @@
info on the upgrade of the X window system packages. This is relevant for
users of all previous Debian releases. In short, you need to read it.</p>
- <sect2 id="newkernel"><heading>Обновление ядра</heading>
+ <sect1 id="newkernel"><heading>Обновление ядра</heading>
<p>Note that the Linux kernel was <em>not</em> upgraded by these
procedures. You may wish to do so yourself, either by installing one of the
@@ -947,8 +1029,8 @@
<p>To upgrade your kernel you must first choose the kernel most
appropriate for your subarchitecture. A list of kernels available for
- you to install can be found with: <example compact="compact">
-apt-cache search ^kernel-image
+ you to install can be found with: <example compact="compact">
+# apt-cache search ^kernel-image
</example></p>
<p>You should then use <tt>aptitude install</tt> to install it. Once
@@ -972,8 +1054,7 @@
custom kernel on &debian;. Install the
<package>kernel-package</package> tool and read the documentation in
<file>/usr/share/doc/kernel-package</file>.</p>
-</sect2></sect1></sect>
-
+</sect1></sect>
@@ -1742,6 +1823,76 @@
</appendix>
]]>
+
+ <appendix id="old-stuff">
+ <heading>Managing your &oldreleasename; system</heading>
+
+ <p>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.</p>
+
+ <sect id="old-upgrade">
+ <heading>Upgrading your &oldreleasename; system</heading>
+
+ <p>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 your package list still contains
+ &oldreleasename; packages as explained in <ref id="old-sources">.</p>
+</sect>
+
+
+<![ %has-woody-aptitude [
+ <sect id="old-aptitude">
+ <heading>Installing &oldreleasename; version of aptitude</heading>
+
+ <p>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">.</p>
+
+ <p>After that, just execute <example compact="compact">
+# apt-get install aptitude
+ </example> to install <package>aptitude</package>.</p>
+</sect>
+
+]]>
+
+ <sect id="old-sources">
+ <heading>Checking your sources list</heading>
+
+ <p>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 already run <tt>apt-get update</tt>, you can still get
+ back without problems following the procedure below.</p>
+
+ <p>If you have also already installed packages from &releasename;,
+ there probably is not much point in installing packages from
+ &oldreleasename; anymore. In that case you will have to decide for
+ yourself whether you want to continue or not. It is possible to
+ downgrade packages, but that is not covered here.</p>
+
+ <p>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 ftp:</tt> for a reference to "<tt>stable</tt>".
+ If you find any, change <tt>stable</tt> to
+ <tt>&oldreleasename;</tt>.</p>
+
+ <p>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.</p>
+
+ <p><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 apt-cdrom again. Do not be alarmed if a 'cdrom'
+ source line refers to "<tt>unstable</tt>". Although confusing, this
+ is normal.</p>
+
+ <p>If you've made any changes, safe the file and execute <example compact="compact">
+# apt-get update
+ </example> to refresh the package list.</p>
+</sect></appendix>
+
+
+
</book>
</debiandoc>
- Previous message: [l10n-russian CVS] webpage/htdocs/release-notes.ru.html release-notes.ru.txt,NONE,1.1
- Next message: [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
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]