git: 47dc6685eb - main - Porter's Handbook: Tweak conflict instructions
Joseph Mingrone <[email protected]>
| Newsgroups | gmane.os.freebsd.devel.cvs.doc |
|---|---|
| Message-ID | <[email protected]> |
The branch main has been updated by jrm (ports committer): URL: https://cgit.FreeBSD.org/doc/commit/?id=47dc6685eb773349a7c9b6b1f86df7aadfff9e30 commit 47dc6685eb773349a7c9b6b1f86df7aadfff9e30 Author: Joseph Mingrone <[email protected]> AuthorDate: 2021-02-19 15:23:22 +0000 Commit: Joseph Mingrone <[email protected]> CommitDate: 2021-02-19 15:45:54 +0000 Porter's Handbook: Tweak conflict instructions Reviewed by: crees Approved by: doc (ygy) Differential Revision: https://reviews.freebsd.org/D28582 --- documentation/content/en/books/porters-handbook/makefiles/chapter.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/content/en/books/porters-handbook/makefiles/chapter.adoc b/documentation/content/en/books/porters-handbook/makefiles/chapter.adoc index ff5cb2464d..b9ff670d2f 100644 --- a/documentation/content/en/books/porters-handbook/makefiles/chapter.adoc +++ b/documentation/content/en/books/porters-handbook/makefiles/chapter.adoc @@ -4608,7 +4608,7 @@ CONFLICTS_INSTALL= bind99 ==== -Sometime, only some version of another port is incompatible, in this case, use the full package name, with the version, and use shell globs, like `*` and `?` to make sure all possible versions are matched. +Sometimes, only certain versions of another port are incompatible. When this is the case, use the full package name including the version. If necessary, use shell globs like `*` and `?` so that all necessary versions are matched. [[conflicts-ex2]] .Using `CONFLICTS*` With Globs. _______________________________________________ [email protected] mailing list https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all To unsubscribe, send any mail to "[email protected]"