D54059.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D54059.diff
View Options

	diff --git a/share/man/man7/freebsd-base.7 b/share/man/man7/freebsd-base.7
	--- a/share/man/man7/freebsd-base.7
	+++ b/share/man/man7/freebsd-base.7
	@@ -50,7 +50,7 @@
	.Dq CURRENT
	.\" re@ will provide their own repository before release, at which
	.\" point this text will need updating.
	-branches are hosted on the Internet at
	+branches are hosted on the Internet at
	.Lk https://pkg.freebsd.org .
	These packages are updated when new errata or security updates are
	released (for supported release versions), or twice daily for
	@@ -92,8 +92,9 @@
	.El
	.Pp
	The exact set of available subpackages differs for each individual
	-package. For example, some packages may not provide any development
	-files, in which case the
	+package.
	+For example, some packages may not provide any development files,
	+in which case the
	.Sy -dev
	subpackage is not present.
	.Sh PACKAGE SETS
	@@ -188,10 +189,22 @@
	pkg -r /ppcdev -oABI=FreeBSD:16:powerpc64le \e
	install -r FreeBSD-set-devel
	.Ed
	+.Sh DIAGNOSTICS
	+.Bl -diag
	+.It <package> [FreeBSD-ports] conflicts with [installed] <package>
	+.Pp
	+The package repos are conflicting.
	+View the current configuration with
	+.Dq Li pkg -vv .
	+Remove the
	+.Dq Li FreeBSD
	+repo from
	+.Xr pkg.conf 5 .
	+.El
	.Sh SEE ALSO
	+.Xr src.conf 5 ,
	.Xr build 7 ,
	-.Xr pkg 8 ,
	-.Xr src.conf 5
	+.Xr pkg 8
	.Sh HISTORY
	Support for installing the base system as packages was introduced in
	.Fx 15.0 .