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

Remove instructions in case the -p option of mergemaster(8) is not present,

Browse source 
it is in all supported releases.

Idea taken from http://wiki.freebsd.org/DocIdeaList

Reviewed by:	bcr
Approved by:	dougb
This commit is contained in:
Rene Ladan 2012-01-22 23:42:59 +00:00
parent 96ab6d2e08
commit 7934914266
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=38287
1 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2122,13 +2122,7 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
pre-buildworld mode by providing the <option>-p</option> option.
This will compare only those files that are essential for the success
of <maketarget>buildworld</maketarget> or
<maketarget>installworld</maketarget>. If your old version of
<command>mergemaster</command> does not support <option>-p</option>,
use the new version in the source tree when running for the first
time:</para>
<screen>&prompt.root; <userinput>cd /usr/src/usr.sbin/mergemaster</userinput>
&prompt.root; <userinput>./mergemaster.sh -p</userinput></screen>
<maketarget>installworld</maketarget>.</para>
<tip>
<para>If you are feeling particularly paranoid, you can check your