Page MenuHomeFreeBSD
Files F144793157

D21559.id61775.diff
No OneTemporary
Actions

D21559.id61775.diff
View Options

Index: en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
===================================================================
--- en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
+++ en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
@@ -1546,6 +1632,11 @@
display allows the user to choose which portions of the
files are kept. See &man.mergemaster.8; for more
information.</para>
+
+ <para>If the standard <filename>/usr/src</filename> was not used,
+ another parameter must be passed to &man.mergemaster.8;:</para>
+
+ <screen>&prompt.root; <userinput>mergemaster -Ui <replaceable>PATH_TO_SRC</replaceable></userinput></screen>
</sect3>
<sect3 xml:id="updating-src-completing-check-old">

File Metadata

Mime Type
text/plain
Expires
Fri, Feb 13, 4:21 PM (8 h, 31 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28678429
Default Alt Text
D21559.id61775.diff (739 B)

Event Timeline