8 files changed, 19 insertions, 19 deletions

diff --git a/en_US.ISO8859-1/articles/problem-reports/article.sgml b/en_US.ISO8859-1/articles/problem-reports/article.sgml
index a0959db5c4..7e27cee79f 100644
--- a/en_US.ISO8859-1/articles/problem-reports/article.sgml
+++ b/en_US.ISO8859-1/articles/problem-reports/article.sgml
@@ -328,7 +328,7 @@
 	    problem while installing, or while running?  To
 	    illustrate, instead of <literal>Synopsis: portupgrade is
 	    broken</literal>, see how much more informative this
-	    seems: <literal>Synopsis: port sysutils/portupgrade
+	    seems: <literal>Synopsis: port ports-mgmt/portupgrade
 	    coredumps on -current</literal>.  (In the case of ports,
 	    it is especially helpful to have both the category and
 	    portname in the <quote>Synopsis</quote> line.)</para>
diff --git a/en_US.ISO8859-1/articles/relaydelay/article.sgml b/en_US.ISO8859-1/articles/relaydelay/article.sgml
index 3ed75ec5f6..4cd61078a7 100644
--- a/en_US.ISO8859-1/articles/relaydelay/article.sgml
+++ b/en_US.ISO8859-1/articles/relaydelay/article.sgml
@@ -72,7 +72,7 @@
     <note>
       <para>This will require all ports which require
         <command>perl</command> to be rebuilt and reinstalled;
-	<filename role="port">sysutils/portupgrade</filename>
+	<filename role="port">ports-mgmt/portupgrade</filename>
 	is perfect for this.  At least it will point out which
 	ports have been removed and which will need to be
 	reinstalled.</para>
diff --git a/en_US.ISO8859-1/books/faq/book.sgml b/en_US.ISO8859-1/books/faq/book.sgml
index 6b01991e01..c70f30dff2 100644
--- a/en_US.ISO8859-1/books/faq/book.sgml
+++ b/en_US.ISO8859-1/books/faq/book.sgml
@@ -4640,7 +4640,7 @@ kern.timecounter.hardware: TSC -&gt; i8254</screen>
             <command>portupgrade</command> tool to automate all of
             this.  <command>portupgrade</command> includes various
             tools to simplify package handling.  It is available under
-            <filename role="package">sysutils/portupgrade</filename>.
+            <filename role="package">ports-mgmt/portupgrade</filename>.
             Since it is written in Ruby,
             <command>portupgrade</command> is an unlikely candidate for
             integration with the main FreeBSD tree.  That should not
diff --git a/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.sgml b/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.sgml
index f1f5ab7a7d..4caa2ef8d4 100644
--- a/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.sgml
+++ b/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.sgml
@@ -89,7 +89,7 @@
 	  the &man.make.1; <maketarget>all</maketarget> target, to create
 	  the web pages.</para>
 	
-	<screen>&prompt.root; <userinput>cd en</userinput>
+	<screen>&prompt.root; <userinput>cd www/en</userinput>
 &prompt.root; <userinput>make all</userinput></screen>
       </step>
     </procedure>
diff --git a/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml b/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
index 47c5466ba1..2f143b441e 100644
--- a/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
@@ -2380,7 +2380,7 @@ doc/zh_*</screen>
       <para>On &os; 6.0 and more recent versions,
 	<application>Portsnap</application> is contained in the &os;
 	base system.  On older versions of &os;, it can be installed
-	using the <filename role="package">sysutils/portsnap</filename>
+	using the <filename role="package">ports-mgmt/portsnap</filename>
 	port.</para>
     </sect2>
 
diff --git a/en_US.ISO8859-1/books/handbook/ports/chapter.sgml b/en_US.ISO8859-1/books/handbook/ports/chapter.sgml
index 7137ae6125..df2f689174 100644
--- a/en_US.ISO8859-1/books/handbook/ports/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/ports/chapter.sgml
@@ -229,7 +229,7 @@
 	related to your application.</para>
 
       <para>You can also install <filename
-	role="package">security/portaudit</filename> which will
+	role="package">ports-mgmt/portaudit</filename> which will
 	automatically check all installed applications for known
 	vulnerabilities; a check will be also performed before any port
 	build.  Meanwhile, you can use the command <command>portaudit
@@ -676,7 +676,7 @@ docbook                     =
 	<para><application>Portsnap</application> is an alternative system for distributing the
 	  Ports Collection.  It was first included in &os;&nbsp;6.0.  On older
 	  systems, you can install it from <filename
-	  role="package">sysutils/portsnap</filename> package:</para>
+	  role="package">ports-mgmt/portsnap</filename> package:</para>
 
 	<screen>&prompt.root; <userinput>pkg_add -r portsnap</userinput></screen>
 
@@ -869,7 +869,7 @@ docbook                     =
 	  done by <application>portaudit</application> before any new
 	  application installation.  This tool can be found in the
 	  Ports Collection (<filename
-	  role="package">security/portaudit</filename>).  Consider
+	  role="package">ports-mgmt/portaudit</filename>).  Consider
 	  running <command>portaudit -F</command> before installing a
 	  new port, to fetch the current vulnerabilities database.  A
 	  security audit and an update of the database will be
@@ -1151,11 +1151,11 @@ ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/ fetch</userinput></screen>
 
       <para>The <application>portupgrade</application> utility is designed
 	to easily upgrade installed ports.  It is available from the <filename
-	role="package">sysutils/portupgrade</filename> port.  Install it like
+	role="package">ports-mgmt/portupgrade</filename> port.  Install it like
 	any other port, using the <command>make <makevar>install
 	clean</makevar></command> command:</para>
 
-      <screen>&prompt.root; <userinput>cd /usr/ports/sysutils/portupgrade</userinput>
+      <screen>&prompt.root; <userinput>cd /usr/ports/ports-mgmt/portupgrade</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
 
       <para>Scan the list of installed ports with the <command>pkgdb
@@ -1205,9 +1205,9 @@ ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/ fetch</userinput></screen>
 
 	<para><application>Portmanager</application> is another utility for
 	  easy upgrading of installed ports.  It is available from the
-	  <filename role="package">sysutils/portmanager</filename> port:</para>
+	  <filename role="package">ports-mgmt/portmanager</filename> port:</para>
 
-	<screen>&prompt.root; <userinput>cd <filename role="directory">/usr/ports/sysutils/portmanager</filename></userinput>
+	<screen>&prompt.root; <userinput>cd <filename role="directory">/usr/ports/ports-mgmt/portmanager</filename></userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
 
 	<para>All the installed ports can be upgraded using this simple
@@ -1273,7 +1273,7 @@ ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/ fetch</userinput></screen>
 
       <para>Do not forget to remove the installed ports once you no longer need
 	them.  A nice tool to help automate this task is available from the
-	<filename role="package">sysutils/pkg_cutleaves</filename> port.</para>
+	<filename role="package">ports-mgmt/pkg_cutleaves</filename> port.</para>
     </sect2>
 
   </sect1>
diff --git a/en_US.ISO8859-1/books/handbook/security/chapter.sgml b/en_US.ISO8859-1/books/handbook/security/chapter.sgml
index d052b5e094..90ab630ed4 100644
--- a/en_US.ISO8859-1/books/handbook/security/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/security/chapter.sgml
@@ -4651,14 +4651,14 @@ drwxr-xr-x  2 robert  robert  512 Nov 10 11:54 public_html</programlisting>
       <application>Portaudit</application> exists solely for this
       purpose.</para>
 
-    <para>The <filename role="port">security/portaudit</filename> port
+    <para>The <filename role="port">ports-mgmt/portaudit</filename> port
       polls a database, updated and maintained by the &os; Security
       Team and ports developers, for known security issues.</para>
 
     <para>To begin using <application>Portaudit</application>, one
       must install it from the Ports Collection:</para>
 
-    <screen>&prompt.root; <userinput>cd /usr/ports/security/portaudit &amp;&amp; make install clean</userinput></screen>
+    <screen>&prompt.root; <userinput>cd /usr/ports/ports-mgmt/portaudit &amp;&amp; make install clean</userinput></screen>
 
     <para>During the install process, the configuration files for
       &man.periodic.8; will be updated, permitting
diff --git a/en_US.ISO8859-1/books/porters-handbook/book.sgml b/en_US.ISO8859-1/books/porters-handbook/book.sgml
index 323966bab9..b2552eeb9a 100644
--- a/en_US.ISO8859-1/books/porters-handbook/book.sgml
+++ b/en_US.ISO8859-1/books/porters-handbook/book.sgml
@@ -343,7 +343,7 @@ PLIST_DIRS=     lib/X11/oneko</programlisting>
 	<title>Checking your port with <command>portlint</command></title>
 
 	<para>Please use <command>portlint</command> to see if your port
-	  conforms to our guidelines.  The <filename role="package">devel/portlint</filename>
+	  conforms to our guidelines.  The <filename role="package">ports-mgmt/portlint</filename>
 	  program is part of the ports collection.
 	  In particular, you may want to check if the
 	  <link linkend="porting-samplem">Makefile</link> is in the right
@@ -8261,7 +8261,7 @@ post-install:
           system for building and testing ports based on the scripts used on
           <link linkend="build-cluster">Pointyhat</link>.  You can install
           <application>Tinderbox</application> using
-          <filename role="package">misc/tinderbox</filename> port.  Be sure
+          <filename role="package">ports-mgmt/tinderbox</filename> port.  Be sure
           to read supplied documentation since the configuration is not
           trivial.</para>
 
@@ -8800,8 +8800,8 @@ post-install:
 	    that has been fixed in version <literal>0.65_7</literal>.</para>
 
 	  <para>As a prerequisite, you need to install fresh versions of the
-	    ports <filename role="package">security/portaudit</filename> and
-	    <filename role="package">security/portaudit-db</filename>.</para>
+	    ports <filename role="package">ports-mgmt/portaudit</filename> and
+	    <filename role="package">ports-mgmt/portaudit-db</filename>.</para>
 
 	  <para>First, check whether there already is an entry for this
 	    vulnerability.  If there were such entry, it would match the