aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Mingrone <jrm@FreeBSD.org>2021-02-19 15:23:22 +0000
committerJoseph Mingrone <jrm@FreeBSD.org>2021-02-19 15:45:54 +0000
commit47dc6685eb773349a7c9b6b1f86df7aadfff9e30 (patch)
tree7bd0b7343f7282be80ad2b663fb608f1cdb150d9
parent722d082fbe912d8cf34c7932c5447359cab652e4 (diff)
downloaddoc-47dc6685eb773349a7c9b6b1f86df7aadfff9e30.tar.gz
doc-47dc6685eb773349a7c9b6b1f86df7aadfff9e30.zip
Porter's Handbook: Tweak conflict instructions
Reviewed by: crees Approved by: doc (ygy) Differential Revision: https://reviews.freebsd.org/D28582
-rw-r--r--documentation/content/en/books/porters-handbook/makefiles/chapter.adoc2
1 files changed, 1 insertions, 1 deletions
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.