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

Reword bits here and there, in the mergemaster section.

Browse source 
Reviewed by:	trhodes
This commit is contained in:
Giorgos Keramidas 2002-03-29 03:44:53 +00:00
parent 95c69bfe6e
commit fbadd93ace
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=12612
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1076,7 +1076,7 @@ Script done, &hellip;</screen>
in <filename>/etc</filename>, and the configuration files in
the source tree <filename>/usr/src/etc</filename>. This is
the recommended solution for keeping the system configuration files up to date
with ones located in the source tree.</para>
with those located in the source tree.</para>
<para><command>mergemaster</command> was integrated into the FreeBSD base
system between 3.3-RELEASE and 3.4-RELEASE, which means it is
@ -1084,7 +1084,7 @@ Script done, &hellip;</screen>
<para>To begin simply type <command>mergemaster</command> at your prompt, and
watch it start going. <command>mergemaster</command> will then build a
temporary root environment, from <filename>/</filename> down, and then populate
temporary root environment, from <filename>/</filename> down, and populate
it with various system configuration files. Those files are then compared
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
@ -1118,7 +1118,7 @@ Script done, &hellip;</screen>
the <option>l</option> key will select the left contents and the
<option>r</option> key will select contents from your right.
The final output will be a file consisting of both parts, which can then be
installed. This is usual option for files where settings have been
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