audit-packages is now part of pkg_install, so update docs accordingly

2 files changed, 10 insertions, 13 deletions

diff --git a/doc/guide/files/faq.xml b/doc/guide/files/faq.xml
index a683e532d48..757ec735e96 100644
--- a/doc/guide/files/faq.xml
+++ b/doc/guide/files/faq.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: faq.xml,v 1.39 2008/01/04 15:53:41 rillig Exp $ -->
+<!-- $NetBSD: faq.xml,v 1.40 2008/03/04 02:39:37 jschauma Exp $ -->
 
 <chapter id="faq"> <?dbhtml filename="faq.html"?>
 <title>Frequently Asked Questions</title>
@@ -509,9 +509,8 @@ attackers.  In an effort to lessen the exposure, the NetBSD packages team
 maintains a database of known-exploits to packages which have at one time
 been included in pkgsrc.  The database can be downloaded automatically, and
 a security audit of all packages installed on a system can take place.  To
-do this, install the <filename
-  role="pkg">security/audit-packages</filename> package.  It has two
-components:</para>
+do this, refer to the following two tools (installed as part of the
+<filename role="pkg">pkgtools/pkg_install</filename> package):</para>
 
 <orderedlist>
 
@@ -535,11 +534,10 @@ components:</para>
 
 </orderedlist>
 
-<para>Use of the <filename role="pkg">security/audit-packages</filename>
-package is strongly recommended!  After
-<quote>audit-packages</quote> is installed, please read
+<para>Use of these tools is strongly recommended!  After
+<quote>pkg_install</quote> is installed, please read
 the package's message, which you can get by running <userinput>pkg_info -D
-audit-packages</userinput>.</para>
+pkg_install</userinput>.</para>
 
 <para>If this package is installed, pkgsrc builds will use it to
 perform a security check before building any package.  See <xref
diff --git a/doc/guide/files/using.xml b/doc/guide/files/using.xml
index 3088a9767ac..887afafc68e 100644
--- a/doc/guide/files/using.xml
+++ b/doc/guide/files/using.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: using.xml,v 1.34 2008/01/04 15:53:41 rillig Exp $ -->
+<!-- $NetBSD: using.xml,v 1.35 2008/03/04 02:39:37 jschauma Exp $ -->
 
 <chapter id="using"> <?dbhtml filename="using.html"?>
 <title>Using pkgsrc</title>
@@ -99,10 +99,9 @@ and you can still use binary packages from someone else.</para>
     other packages depend on it. Instead, they are moved to the
     <filename>vulnerable</filename> subdirectory. So you may need to add
     this directory to the <varname>PKG_PATH</varname> variable. 
-    However, you should run <filename
-    role="pkg">security/audit-packages</filename> regularly, especially
-    after installing new packages, and verify that the vulnerabilities
-    are acceptable for your configuration.</para>
+    However, you should run <command>audit-packages</command>
+    regularly, especially after installing new packages, and verify
+    that the vulnerabilities are acceptable for your configuration.</para>
 
     <para>After you've installed packages, be sure to have
     <filename>/usr/pkg/bin</filename> and <filename>/usr/pkg/sbin</filename> in your