pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/doc/guide/files fixes.xml: add a comment about conflic...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/83fa2e522202
branches:  trunk
changeset: 382053:83fa2e522202
user:      gutteridge <gutteridge%pkgsrc.org@localhost>
date:      Tue Jul 19 01:58:04 2022 +0000

description:
fixes.xml: add a comment about conflicting PKGNAME entries

While here, fix some style.

diffstat:

 doc/guide/files/fixes.xml |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (24 lines):

diff -r c95b8e4b0210 -r 83fa2e522202 doc/guide/files/fixes.xml
--- a/doc/guide/files/fixes.xml Tue Jul 19 00:06:01 2022 +0000
+++ b/doc/guide/files/fixes.xml Tue Jul 19 01:58:04 2022 +0000
@@ -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 @@
   <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>



Home | Main Index | Thread Index | Old Index