From fa296d78a6cc4d6555cfd8b711d00d198a0263a1 Mon Sep 17 00:00:00 2001 From: Giorgos Keramidas Date: Wed, 22 May 2002 04:37:41 +0000 Subject: [PATCH] - Refer to the old, pre-4.0, kernel build procedure as `old' instead of `standard'. - Various grammar fixes. PR: docs/38398 Submitted by: Chris Pepper --- .../books/handbook/cutting-edge/chapter.sgml | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml b/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml index 46dcde88d9..b3f0d23c48 100644 --- a/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml +++ b/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml @@ -1003,7 +1003,7 @@ Script done, … can then build a new kernel based on your normal kernel configuration file. - If you are upgrading to &os; 4.0 or above then the standard + If you are upgrading to &os; 4.0 or above then the old kernel build procedure (as described in ) is deprecated. Instead, you should run these commands after you have &prompt.root; make installkernel If you are upgrading to a version of &os; below 4.0 you should - use the standard kernel build procedure. However, it is recommended + use the old kernel build procedure. However, it is recommended that you use the new version of &man.config.8;, using a command line like this. @@ -1101,23 +1101,23 @@ Script done, … to the ones currently installed in your system. At this point, files that differ will be shown in &man.diff.1; format, with the sign representing added or modified lines, and representing - lines that will be removed either completely, or replaced with a new line. + lines that will be either removed completely, or replaced with a new line. See the &man.diff.1; manual page for more information about the &man.diff.1; syntax and how file differences are shown. &man.mergemaster.8; will then show you each file that displays variances, and at this point you will have the option of either deleting the new file (referred - to as the temporary file), install the temporary file in its unmodified state, - merge the temporary file with the currently installed file, or view the + to as the temporary file), installing the temporary file in its unmodified state, + merging the temporary file with the currently installed file, or viewing the &man.diff.1; results again. Choosing to delete the temporary file will tell &man.mergemaster.8; that we - wish to keep our current file unchanged, and to delete the one that is - new. This option is not the most recommended one, unless you see no + wish to keep our current file unchanged, and to delete the new version. + This option is not recommended, unless you see no reason to change the current file. You can get help at any time by - typing at the mergemaster prompt. If the user should - choose to skip a file, it will be presented again after all other files - have been worked with. + typing at the mergemaster prompt. If the user + chooses to skip a file, it will be presented again after all other files + have been dealt with. Choosing to install the unmodified temporary file will replace the current file with the new one. For most unmodified files, this is the best @@ -1133,13 +1133,13 @@ Script done, … installed. This option is customarily used for files where settings have been modified by the user. - Choosing to view the diff results again, will show you the file differences + Choosing to view the diff results again will show you the file differences just like &man.mergemaster.8; did before prompting you for an option. - After &man.mergemaster.8; is complete with the system files you will be - prompted for other options. &man.mergemaster.8; will ask if you want to rebuild - the password file, run MAKEDEV and finishing up with a - removal of the left over temporary files. + After &man.mergemaster.8; is done with the system files you will be + prompted for other options. &man.mergemaster.8; may ask if you want to rebuild + the password file and/or run MAKEDEV, and will finish up with an option to + remove left-over temporary files.