os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

- Refer to the old, pre-4.0, kernel build procedure as `old' instead

Browse source 
of `standard'.
- Various grammar fixes.

PR:		docs/38398
Submitted by:	Chris Pepper <pepper@rockefeller.edu>
This commit is contained in:
Giorgos Keramidas 2002-05-22 04:37:41 +00:00
parent 2e86ad20cd
commit fa296d78a6
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=13187
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml
View file

@ -1003,7 +1003,7 @@ Script done, &hellip;</screen>
can then build a new kernel based on your normal kernel configuration
file.</para>
<para>If you are upgrading to &os; 4.0 or above then the standard
<para>If you are upgrading to &os; 4.0 or above then the old
kernel build procedure (as described in <xref linkend="kernelconfig">)
is deprecated. Instead, you should run these commands
<emphasis>after</emphasis> you have <link
@ -1015,7 +1015,7 @@ Script done, &hellip;</screen>
&prompt.root; <userinput>make installkernel</userinput></screen>
<para>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.</para>
@ -1101,23 +1101,23 @@ Script done, &hellip;</screen>
to the ones currently installed in your system. At this point, files that
differ will be shown in &man.diff.1; format, with the <option>+</option> sign
representing added or modified lines, and <option>-</option> 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.</para>
<para>&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.</para>
<para>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 <option>?</option> 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.</para>
typing <option>?</option> 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.</para>
<para>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, &hellip;</screen>
installed. This option is customarily used for files where settings have been
modified by the user.</para>
<para>Choosing to view the diff results again, will show you the file differences
<para>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.</para>
<para>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 <filename>MAKEDEV</filename> and finishing up with a
removal of the left over temporary files.</para>
<para>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 <filename>MAKEDEV</filename>, and will finish up with an option to
remove left-over temporary files.</para>
</sect3>
<sect3>