Date: Wed, 9 Apr 2014 14:32:07 +0000 (UTC) From: Dru Lavigne <dru@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r44504 - head/en_US.ISO8859-1/books/handbook/cutting-edge Message-ID: <201404091432.s39EW7cT075279@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dru Date: Wed Apr 9 14:32:06 2014 New Revision: 44504 URL: http://svnweb.freebsd.org/changeset/doc/44504 Log: As per discussion on freebsd-doc, add -iF to second instance of mergemaster. Sponsored by: iXsystems Modified: head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml Wed Apr 9 14:28:58 2014 (r44503) +++ head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml Wed Apr 9 14:32:06 2014 (r44504) @@ -1641,7 +1641,7 @@ before running "/usr/sbin/freebsd-update <step> <para>Update any remaining configuration files.</para> - <screen>&prompt.root; <userinput>mergemaster</userinput></screen> + <screen>&prompt.root; <userinput>mergemaster -iF</userinput></screen> </step> <step>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404091432.s39EW7cT075279>