On Mon, May 23, 2005 at 01:07:44AM +0200, Jens Seidel wrote: > Hi, Hello, > the attached patch contains a few minor improvements to the release > notes such as > * corrected SGML tags > * the fixed file name of README.Debian-upgrade.gz for X updates > * instructions how to hold/unhold packages using dpkg when aptitude in > not available > * an additional conditional related to kernel 2.6 (please check) > * and a few wording improvements (check these very carefully!!) Ah, that will be the reason for your posting. > > Jens > Index: release-notes.en.sgml > =================================================================== > RCS file: /cvs/debian-doc/ddp/manuals.sgml/release-notes/en/release-notes.en.sgml,v > retrieving revision 1.38 > diff -u -r1.38 release-notes.en.sgml > --- release-notes.en.sgml 22 May 2005 19:11:24 -0000 1.38 > +++ release-notes.en.sgml 22 May 2005 23:00:37 -0000 > @@ -121,7 +121,7 @@ > update stable packages that contain information that quickly goes out > of date. Examples are a virus scanner's signatures list or a spam > filter's pattern set. An administrator can use the "volatile.debian.net" > - archive with similar ease to the "security.debian.org" archive, and > + archive with similar ease as the "security.debian.org" archive, and Okay, fine. > enjoy the use of packages with up-to-date information without the > hassle and risks of maintaining an entire (or partial) system based > on bleeding-edge packages. For more information and a list of mirrors, > @@ -168,7 +168,7 @@ > <![ %i386 [ > > <p>For the &arch-title; architecture, a special set of installation > - floppy disk images, "speakup", is available for the blind. > + floppy disk images, "speakup", is available for the blind man. Nope, the previous was fine. > These images have a special kernel that supports braille displays. > A complete list of supported models may be found in the brltty > documentation. See the <url id="&url-installer;index#speakup" > @@ -226,6 +226,7 @@ > > <![ %sparc [ > <sect id="sparc_kbd"><heading>Issues with keyboards on &arch-title;</heading> > + <!-- merge with keyboard section below? --> > > <p>There are several issues with keyboard selection during installation.</p> > > @@ -337,7 +338,7 @@ > are very rare. It is possible that sun4d CPUs with an MMU work.</p> > > <p>sun4m CPUs are still supported but you need to install a newer kernel > - version first before upgrading the system. This because newer > + version first before upgrading the system. This is necessary because newer Fine with me. > versions of glibc use assembler instructions not available on certain > machines, so you need a updated kernel first that emulates the missing > instructions.</p> > @@ -358,7 +359,7 @@ > > <![ %hppa [ > <p>On 64bit HPPA machines you will need to upgrade to a newer > - kernel version first before upgrading the system. This because newer > + kernel version first before upgrading the system. This is necessary because newer Fine with me. > versions of glibc use assembler instructions not available on certain > machines, so you need an updated kernel first that emulates the missing > instructions.</p> > @@ -372,7 +373,8 @@ > > <![ %mips-mipsel [ > <p>On &arch-title; machines you will need to upgrade to a newer > - kernel version first before upgrading the system. This is because > + <!-- FIXME: what kernel version is required? --> > + kernel version first before upgrading the system. This is necessary because Fine with me. > of a inconsistent definition of the inter process communication > of the new libc and the kernel, so you need an updated kernel > that provides the correct definition first.</p> > @@ -401,7 +403,7 @@ > <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 > + distribution other than stable (e.g. from testing), you may have to Fine with me. > 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 > @@ -447,10 +449,14 @@ > <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 > + using <prgn/dpkg/ with either > > <example> > -aptitude hold | unhold <package> > +echo "<var>package</var> hold" | dpkg --set-selections > + </example> > + or > + <example> > +echo "<var>package</var> install" | dpkg --set-selections > </example> > </p> > </sect1> > @@ -529,7 +535,7 @@ > > <p>Instead of using HTTP or FTP packages mirrors, you may wish to > modify <file>/etc/apt/sources.list</file> to use a mirror on a > - local disk (possibly NFS-mounted).</p> > + local disk (possibly NFS mounted).</p> > > <p>For example, your packages mirror may be under > <file>/var/ftp/debian/</file>, and have main directories like > @@ -557,12 +563,12 @@ > > <sect1 id="cdroms"><heading>Adding APT source from CD-ROM</heading> > > -<!-- FJP: Are these instructions also valid for adding DVD's? --> > - > - <p>If you want to use CDs <em/only/, comment out the existing > + <p>If you want to use CDs (or DVDs) <em/only/, comment out the existing The '<em' looks strange to me, I would expect '<em>' > "<tt/deb/" lines in <file>/etc/apt/sources.list</file> by placing > a hash sign (<tt/#/) in front of them.</p> Here the same, '<tt' not '<tt>' or '<tt' ??? > > + <!-- default cdrom mount point is /cdrom not /media/cdrom and fixed!, see #282344, > + (but the -d option of apt-cdrom allows scanning from somewhere else) --> > <p>Make sure there is a line in <file>/etc/fstab</file> that > enables mounting your CD-ROM drive at the <file>/cdrom</file> > mount point (the exact <file>/cdrom</file> mount point is required > @@ -618,7 +624,7 @@ > > <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 any problems develop, you will have a log of > + upgrade session. Then if any problem occurs, you will have a log of upgrade session. When 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: > > @@ -677,7 +683,7 @@ > be left at their current version (displayed as "held back"). This can > be resolved by either using <prgn>aptitude</prgn> to choose these > packages for installation or by trying <tt>aptitude -f install > - <package></tt>.</p> > + <var>package</var></tt>.</p> > > <p>The <tt/--fix-broken/ (or just <tt/-f/) option causes > <package/apt/ to attempt to correct a system with broken > @@ -713,7 +719,7 @@ > command like > > <example> > -dpkg --install /path/to/packagename.deb > +dpkg --install <var>/path/to/packagename.deb</var> > </example></p> > > <p>After fixing things up, you should be able to resume the > @@ -741,8 +747,8 @@ > "formal" upgrade is complete, but there are some other things > that should be taken care of <em/before/ the next reboot.</p> > > - <p>Read > - <file>/usr/share/doc/xfree86-common/README.Debian-upgrade</file> for > + <p>Read > + <file>/usr/share/doc/xfree86-common/README.Debian-upgrade.gz</file> for > more 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> > @@ -843,10 +849,11 @@ > </sect> > > <![ %not-s390 [ > + <![ %available-2.6 [ > <sect id="kernel_update"> > <heading>Keyboard issues on upgrades to a 2.6 kernel</heading> > > - <p>After the upgrade to &releasename;, you may have 2.6 kernel images > + <p>After the upgrade to &releasename;, you have 2.6 kernel images > available for installation. There is an important change in the > input layer for 2.6 kernels that you should be aware of before you > attempt to switch from using a 2.4 to a 2.6 kernel.</p> > @@ -858,7 +865,7 @@ > after rebooting with the new 2.6 kernel.</p> > > <p>If you can SSH into the box from another system, you can resolve > - this issue by running 'dpkg-reconfigure console-data', choosing > + this issue by running <tt>dpkg-reconfigure console-data</tt>, choosing > the option "Select keymap from full list" and selecting a "pc" > keyboard.</p> > > @@ -874,6 +881,7 @@ > ]]> > </sect> > ]]> > +]]> > > <![ %i386 [ > > @@ -887,6 +895,7 @@ > X client applications which connect with it fail with the following > error message: > > +<!-- line to long for PDF, wrap?--> > <example> > X Error of failed request: BadLength (poly request too large or internal Xlib length error) > Major opcode of failed request: 18 (X_ChangeProperty) > @@ -1087,7 +1096,7 @@ > </list></p> > > <p>Then install the package using <tt>dpkg -i</tt>. It may > - complain about module mismatches (from modutils) and ask if > + complain about module mismatches (from <package>modutils</package>) and ask if Okay. > the installation should continue. Answer <tt>YES</tt> to > that question as these mismatches will be resolved as soon > as you reboot with the new kernel.</p> Jens, you are doing fine. Keep up the good work. Cheers Geert Stappers
Attachment:
signature.asc
Description: Digital signature