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

Clarify the mergemaster(8) section I originally contributed.

Browse source 
PR:		37925
Submitted by:	Martin Heinen <martin@sumuk.de>
This commit is contained in:
Tom Rhodes 2002-05-10 16:12:14 +00:00
parent 4f253fdb9b
commit 8c9e766ac4
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=13032
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1060,16 +1060,16 @@ Script done, &hellip;</screen>
<para>Remaking the world will not update certain directories (in
particular, <filename>/etc</filename>, <filename>/var</filename> and
<filename>/usr</filename>) with new or changed configuration files.</para>
<indexterm><primary><command>mergemaster</command></primary></indexterm>
<para>The simplest way to update these files is to use
&man.mergemaster.8;, though it is possible to do it manually
if you would prefer to do that. We strongly recommend you
use &man.mergemaster.8;, however, and if you do then you
can skip forward to the <link linkend="update-dev">next
section</link>, since &man.mergemaster.8; is described below.
Be sure to make a backup of
<filename>/etc</filename> in case anything goes wrong.</para>
if you would prefer to do that. Regardless of which way you
choose, be sure to make a backup of <filename>/etc</filename> in
case anything goes wrong.</para>
<sect3>
<title><command>mergemaster</command></title>
<indexterm><primary><command>mergemaster</command></primary></indexterm>
<para>The &man.mergemaster.8; utility is a Bourne script that will
aid you in determining the differences between your configuration files
@ -1128,6 +1128,10 @@ Script done, &hellip;</screen>
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>
</sect3>
<sect3>
<title>Manual Update</title>
<para>If you wish to do the update manually, however,
you cannot just copy over the files from
@ -1139,6 +1143,10 @@ Script done, &hellip;</screen>
there are files that should be in <filename>/etc</filename> that are
not in <filename>/usr/src/etc</filename>.</para>
<para>If you are using &man.mergemaster.8; (as recommended),
you can skip forward to the <link linkend="update-dev">next
section</link>.</para>
<para>The simplest way to do this by hand is to install the
files into a new directory, and then work through them looking
for differences.</para>
@ -1281,6 +1289,7 @@ Script done, &hellip;</screen>
<screen>&prompt.root; <userinput>mkdir /var/tmp/root-`date "+%Y%m%d"`</userinput></screen>
</tip>
</sect3>
</sect2>
<sect2 id="update-dev">