summaryrefslogtreecommitdiff
path: root/doc/guide
diff options
context:
space:
mode:
authorgutteridge <gutteridge@pkgsrc.org>2022-07-19 01:58:04 +0000
committergutteridge <gutteridge@pkgsrc.org>2022-07-19 01:58:04 +0000
commit5c6118009838d7c1d931fe5214d7727bd58e2072 (patch)
tree6bd72e529ca487649594d33f5860d8ce6468291d /doc/guide
parentb80073f596d7b0411bf179d7c2b52c1b5bb99a6a (diff)
downloadpkgsrc-5c6118009838d7c1d931fe5214d7727bd58e2072.tar.gz
fixes.xml: add a comment about conflicting PKGNAME entries
While here, fix some style.
Diffstat (limited to 'doc/guide')
-rw-r--r--doc/guide/files/fixes.xml9
1 files changed, 5 insertions, 4 deletions
diff --git a/doc/guide/files/fixes.xml b/doc/guide/files/fixes.xml
index c0aa1a2ebb4..ce931be7291 100644
--- a/doc/guide/files/fixes.xml
+++ b/doc/guide/files/fixes.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: fixes.xml,v 1.179 2022/06/02 21:20:32 gutteridge Exp $ -->
+<!-- $NetBSD: fixes.xml,v 1.180 2022/07/19 01:58:04 gutteridge Exp $ -->
<chapter id="fixes"> <?dbhtml filename="fixes.html"?>
<title>Making your package work</title>
@@ -470,10 +470,11 @@ BUILDLINK_API_DEPENDS.jpeg+= jpeg>=9.0
<sect2 id="conflicts">
<title>Handling conflicts with other packages</title>
- <para>Your package may conflict with other packages a user might
- already have installed on his system, e.g. if your package
+ <para>Your package may conflict with other packages users might
+ already have installed on their system, e.g., if your package
installs the same set of files as another package in the pkgsrc
- tree or has the same <varname>PKGNAME</varname>.</para>
+ tree or has the same <varname>PKGNAME</varname> (though, the latter
+ would arguably be a bug in itself).</para>
<para>For example, <filename role="pkg">x11/libXaw3d</filename>
and <filename role="pkg">x11/Xaw-Xpm</filename>