Date: Wed, 17 Apr 2024 17:18:49 +0000 From: bugzilla-noreply@freebsd.org To: doc@FreeBSD.org Subject: [Bug 278412] Duplicated mergemaster content Message-ID: <bug-278412-9@https.bugs.freebsd.org/bugzilla/>
next in thread | raw e-mail | index | archive | help
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D278412 Bug ID: 278412 Summary: Duplicated mergemaster content Product: Documentation Version: Latest Hardware: Any OS: Any Status: New Severity: Affects Only Me Priority: --- Component: Books & Articles Assignee: doc@FreeBSD.org Reporter: emaste@freebsd.org The "When switching from mergemaster(8) to etcupdate(8)" text appears twice= in https://docs.freebsd.org/en/books/handbook/cutting-edge/ $ grep -B3 -A2 'When switching from man:mergemaster' documentation/content/en/books/handbook/cutting-edge/_index.adoc [WARNING] =3D=3D=3D=3D When switching from man:mergemaster[8] to man:etcupdate[8], the first run m= ight merge changes incorrectly generating spurious conflicts. To prevent this, perform the following steps *before* updating sources and building the new world: -- [WARNING] =3D=3D=3D=3D When switching from man:mergemaster[8] to man:etcupdate[8], the first run m= ight merge changes incorrectly generating spurious conflicts. To prevent this, perform the following steps *before* updating sources and building the new world: --=20 You are receiving this mail because: You are the assignee for the bug.=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-278412-9>