diff --git a/share/sgml/urls.ent b/share/sgml/urls.ent
index a1f1aacc00..e0a1557be7 100644
--- a/share/sgml/urls.ent
+++ b/share/sgml/urls.ent
@@ -1,174 +1,196 @@
 <!-- $FreeBSD$ -->
 
 <!ENTITY % freebsd.urls.absolute "IGNORE">
 <!ENTITY % freebsd.urls.relprefix.1 "IGNORE">
 <!ENTITY % freebsd.urls.relprefix.2 "IGNORE">
 <!ENTITY % freebsd.urls.relprefix.3 "IGNORE">
 <!ENTITY % freebsd.urls.relprefix.4 "IGNORE">
 <!ENTITY % freebsd.urls.relprefix.5 "IGNORE">
 <!ENTITY % freebsd.urls.relprefix.6 "IGNORE">
 <!ENTITY % freebsd.urls.relprefix.7 "IGNORE">
 <!ENTITY % freebsd.urls.relprefix.8 "IGNORE">
 
 <!-- Do not edit: start here -->
 
 <![%freebsd.urls.relprefix.1;[
 	<!ENTITY url.relprefix "..">
 ]]>
 <![%freebsd.urls.relprefix.2;[
 	<!ENTITY url.relprefix "../..">
 ]]>
 <![%freebsd.urls.relprefix.3;[
 	<!ENTITY url.relprefix "../../..">
 ]]>
 <![%freebsd.urls.relprefix.4;[
 	<!ENTITY url.relprefix "../../../..">
 ]]>
 <![%freebsd.urls.relprefix.5;[
 	<!ENTITY url.relprefix "../../../../..">
 ]]>
 <![%freebsd.urls.relprefix.6;[
 	<!ENTITY url.relprefix "../../../../../..">
 ]]>
 <![%freebsd.urls.relprefix.7;[
 	<!ENTITY url.relprefix "../../../../../../..">
 ]]>
 <![%freebsd.urls.relprefix.8;[
 	<!ENTITY url.relprefix "../../../../../../../..">
 ]]>
 
 <![ %freebsd.urls.absolute; [
 <!ENTITY url.base "http://www.FreeBSD.org">
 ]]>
 <!ENTITY url.base "&url.relprefix;">
 
 <!-- XXX: This will be removed soon -->
 <!ENTITY url.main "&url.base;">
 
 <!ENTITY doc.langcode.en      "en_US.ISO8859-1">
 <!ENTITY doc.langcode.default "en_US.ISO8859-1">
 <!ENTITY doc.langcode         "&doc.langcode.default;">
 
 <!ENTITY url.doc.base	     "&url.base;/doc">
 <!ENTITY url.doc.langbase    "&url.doc.base;/&doc.langcode;">
 <!ENTITY url.doc.langbase.en "&url.doc.base;/&doc.langcode.en;">
 
 <!-- Do not edit: end here -->
 
 <!-- for doc//langcode//books -->
 
 <!ENTITY url.books.arch-handbook	"&url.doc.langbase;/books/arch-handbook">
 <!ENTITY url.books.arch-handbook.en	"&url.doc.langbase.en;/books/arch-handbook">
 <!ENTITY url.books.bibliography		"&url.doc.langbase;/books/bibliography">
 <!ENTITY url.books.bibliography.en	"&url.doc.langbase.en;/books/bibliography">
 <!ENTITY url.books.corp-net-guide	"&url.doc.langbase;/books/corp-net-guide">
 <!ENTITY url.books.corp-net-guide.en	"&url.doc.langbase.en;/books/corp-net-guide">
 <!ENTITY url.books.design-44bsd		"&url.doc.langbase;/books/design-44bsd">
 <!ENTITY url.books.design-44bsd.en	"&url.doc.langbase.en;/books/design-44bsd">
 <!ENTITY url.books.dev-model		"&url.doc.langbase;/books/dev-model">
 <!ENTITY url.books.dev-model.en		"&url.doc.langbase.en;/books/dev-model">
 <!ENTITY url.books.developers-handbook	"&url.doc.langbase;/books/developers-handbook">
 <!ENTITY url.books.developers-handbook.en "&url.doc.langbase.en;/books/developers-handbook">
 <!ENTITY url.books.faq			"&url.doc.langbase;/books/faq">
 <!ENTITY url.books.faq.en		"&url.doc.langbase.en;/books/faq">
 <!ENTITY url.books.fdp-primer		"&url.doc.langbase;/books/fdp-primer">
 <!ENTITY url.books.fdp-primer.en	"&url.doc.langbase.en;/books/fdp-primer">
 <!ENTITY url.books.handbook		"&url.doc.langbase;/books/handbook">
 <!ENTITY url.books.handbook.en		"&url.doc.langbase.en;/books/handbook">
 <!ENTITY url.books.porters-handbook	"&url.doc.langbase;/books/porters-handbook">
 <!ENTITY url.books.porters-handbook.en	"&url.doc.langbase.en;/books/porters-handbook">
 
 <!-- for doc//langcode//articles -->
 
 <!ENTITY url.articles.5-roadmap		"&url.doc.langbase;/articles/5-roadmap">
 <!ENTITY url.articles.5-roadmap.en	"&url.doc.langbase.en;/articles/5-roadmap">
 <!ENTITY url.articles.bsdl-gpl		"&url.doc.langbase;/articles/bsdl-gpl">
 <!ENTITY url.articles.bsdl-gpl.en	"&url.doc.langbase.en;/articles/bsdl-gpl">
 <!ENTITY url.articles.building-products	"&url.doc.langbase;/articles/building-products">
 <!ENTITY url.articles.building-products.en	"&url.doc.langbase.en;/articles/building-products">
+<!ENTITY url.articles.casestudy-argentina.com	"&url.doc.langbase;/articles/casestudy-argentina.com">
+<!ENTITY url.articles.casestudy-argentina.com.en.en	"&url.doc.langbase.en;/articles/casestudy-argentina.com">
 <!ENTITY url.articles.checkpoint	"&url.doc.langbase;/articles/checkpoint">
 <!ENTITY url.articles.checkpoint.en	"&url.doc.langbase.en;/articles/checkpoint">
 <!ENTITY url.articles.committers-guide	"&url.doc.langbase;/articles/committers-guide">
 <!ENTITY url.articles.committers-guide.en	"&url.doc.langbase.en;/articles/committers-guide">
+<!ENTITY url.articles.compiz-fusion	"&url.doc.langbase;/articles/compiz-fusion">
+<!ENTITY url.articles.compiz-fusion.en	"&url.doc.langbase.en;/articles/compiz-fusion">
 <!ENTITY url.articles.console-server	"&url.doc.langbase;/articles/console-server">
 <!ENTITY url.articles.console-server.en	"&url.doc.langbase.en;/articles/console-server">
 <!ENTITY url.articles.contributing	"&url.doc.langbase;/articles/contributing">
 <!ENTITY url.articles.contributing.en	"&url.doc.langbase.en;/articles/contributing">
 <!ENTITY url.articles.contributing-ports	"&url.doc.langbase;/articles/contributing-ports">
 <!ENTITY url.articles.contributing-ports.en	"&url.doc.langbase.en;/articles/contributing-ports">
 <!ENTITY url.articles.contributors	"&url.doc.langbase;/articles/contributors">
 <!ENTITY url.articles.contributors.en	"&url.doc.langbase.en;/articles/contributors">
+<!ENTITY url.articles.cups		"&url.doc.langbase;/articles/cups">
+<!ENTITY url.articles.cups.en		"&url.doc.langbase.en;/articles/cups">
 <!ENTITY url.articles.cvs-freebsd	"&url.doc.langbase;/articles/cvs-freebsd">
 <!ENTITY url.articles.cvs-freebsd.en	"&url.doc.langbase.en;/articles/cvs-freebsd">
 <!ENTITY url.articles.cvsup-advanced	"&url.doc.langbase;/articles/cvsup-advanced">
 <!ENTITY url.articles.cvsup-advanced.en	"&url.doc.langbase.en;/articles/cvsup-advanced">
 <!ENTITY url.articles.dialup-firewall	"&url.doc.langbase;/articles/dialup-firewall">
 <!ENTITY url.articles.dialup-firewall.en	"&url.doc.langbase.en;/articles/dialup-firewall">
 <!ENTITY url.articles.diskless-x	"&url.doc.langbase;/articles/diskless-x">
 <!ENTITY url.articles.diskless-x.en	"&url.doc.langbase.en;/articles/diskless-x">
 <!ENTITY url.articles.euro		"&url.doc.langbase;/articles/euro">
 <!ENTITY url.articles.euro.en		"&url.doc.langbase.en;/articles/euro">
 <!ENTITY url.articles.explaining-bsd	"&url.doc.langbase;/articles/explaining-bsd">
 <!ENTITY url.articles.explaining-bsd.en	"&url.doc.langbase.en;/articles/explaining-bsd">
 <!ENTITY url.articles.fbsd-from-scratch	"&url.doc.langbase;/articles/fbsd-from-scratch">
 <!ENTITY url.articles.fbsd-from-scratch.en	"&url.doc.langbase.en;/articles/fbsd-from-scratch">
 <!ENTITY url.articles.filtering-bridges	"&url.doc.langbase;/articles/filtering-bridges">
 <!ENTITY url.articles.filtering-bridges.en	"&url.doc.langbase.en;/articles/filtering-bridges">
 <!ENTITY url.articles.fonts		"&url.doc.langbase;/articles/fonts">
 <!ENTITY url.articles.fonts.en		"&url.doc.langbase.en;/articles/fonts">
 <!ENTITY url.articles.formatting-media	"&url.doc.langbase;/articles/formatting-media">
 <!ENTITY url.articles.formatting-media.en	"&url.doc.langbase.en;/articles/formatting-media">
 <!ENTITY url.articles.freebsd-questions	"&url.doc.langbase;/articles/freebsd-questions">
 <!ENTITY url.articles.freebsd-questions.en	"&url.doc.langbase.en;/articles/freebsd-questions">
+<!ENTITY url.articles.geom-class	"&url.doc.langbase;/articles/geom-class">
+<!ENTITY url.articles.geom-class.en	"&url.doc.langbase.en;/articles/geom-class">
+<!ENTITY url.articles.gjournal-desktop	"&url.doc.langbase;/articles/gjournal-desktop">
+<!ENTITY url.articles.gjournal-desktop.en	"&url.doc.langbase.en;/articles/gjournal-desktop">
 <!ENTITY url.articles.hats		"&url.doc.langbase;/articles/hats">
 <!ENTITY url.articles.hats.en		"&url.doc.langbase.en;/articles/hats">
 <!ENTITY url.articles.hubs		"&url.doc.langbase;/articles/hubs">
 <!ENTITY url.articles.hubs.en		"&url.doc.langbase.en;/articles/hubs">
 <!ENTITY url.articles.ipsec-must	"&url.doc.langbase;/articles/ipsec-must">
 <!ENTITY url.articles.ipsec-must.en	"&url.doc.langbase.en;/articles/ipsec-must">
-<!ENTITY url.articles.java-tomcat	"&url.doc.langbase;/articles/java-tomcat">
-<!ENTITY url.articles.java-tomcat.en	"&url.doc.langbase.en;/articles/java-tomcat">
 <!ENTITY url.articles.laptop		"&url.doc.langbase;/articles/laptop">
 <!ENTITY url.articles.laptop.en		"&url.doc.langbase.en;/articles/laptop">
+<!ENTITY url.articles.ldap-auth		"&url.doc.langbase;/articles/ldap-auth">
+<!ENTITY url.articles.ldap-auth.en	"&url.doc.langbase.en;/articles/ldap-auth">
+<!ENTITY url.articles.linux-comparison	"&url.doc.langbase;/articles/linux-comparison">
+<!ENTITY url.articles.linux-comparison.en	"&url.doc.langbase.en;/articles/linux-comparison">
+<!ENTITY url.articles.linux-emulation	"&url.doc.langbase;/articles/linux-emulation">
+<!ENTITY url.articles.linux-emulation.en	"&url.doc.langbase.en;/articles/linux-emulation">
+<!ENTITY url.articles.linux-users	"&url.doc.langbase;/articles/linux-users">
+<!ENTITY url.articles.linux-users.en	"&url.doc.langbase.en;/articles/linux-users">
 <!ENTITY url.articles.mailing-list-faq	"&url.doc.langbase;/articles/mailing-list-faq">
 <!ENTITY url.articles.mailing-list-faq.en	"&url.doc.langbase.en;/articles/mailing-list-faq">
 <!ENTITY url.articles.mh		"&url.doc.langbase;/articles/mh">
 <!ENTITY url.articles.mh.en		"&url.doc.langbase.en;/articles/mh">
 <!ENTITY url.articles.multi-os		"&url.doc.langbase;/articles/multi-os">
 <!ENTITY url.articles.multi-os.en	"&url.doc.langbase.en;/articles/multi-os">
 <!ENTITY url.articles.nanobsd		"&url.doc.langbase;/articles/nanobsd">
 <!ENTITY url.articles.nanobsd.en	"&url.doc.langbase.en;/articles/nanobsd">
 <!ENTITY url.articles.new-users		"&url.doc.langbase;/articles/new-users">
 <!ENTITY url.articles.new-users.en	"&url.doc.langbase.en;/articles/new-users">
+<!ENTITY url.articles.p4-primer		"&url.doc.langbase;/articles/p4-primer">
+<!ENTITY url.articles.p4-primer.en	"&url.doc.langbase.en;/articles/p4-primer">
 <!ENTITY url.articles.pam		"&url.doc.langbase;/articles/pam">
 <!ENTITY url.articles.pam.en		"&url.doc.langbase.en;/articles/pam">
 <!ENTITY url.articles.portbuild		"&url.doc.langbase;/articles/portbuild">
 <!ENTITY url.articles.portbuild.en	"&url.doc.langbase.en;/articles/portbuild">
 <!ENTITY url.articles.pr-guidelines	"&url.doc.langbase;/articles/pr-guidelines">
 <!ENTITY url.articles.pr-guidelines.en	"&url.doc.langbase.en;/articles/pr-guidelines">
 <!ENTITY url.articles.problem-reports	"&url.doc.langbase;/articles/problem-reports">
 <!ENTITY url.articles.problem-reports.en	"&url.doc.langbase.en;/articles/problem-reports">
 <!ENTITY url.articles.pxe		"&url.doc.langbase;/articles/pxe">
 <!ENTITY url.articles.pxe.en		"&url.doc.langbase.en;/articles/pxe">
 <!ENTITY url.articles.rc-scripting	"&url.doc.langbase;/articles/rc-scripting">
 <!ENTITY url.articles.rc-scripting.en	"&url.doc.langbase.en;/articles/rc-scripting">
 <!ENTITY url.articles.relaydelay	"&url.doc.langbase;/articles/relaydelay">
 <!ENTITY url.articles.relaydelay.en	"&url.doc.langbase.en;/articles/relaydelay">
 <!ENTITY url.articles.releng		"&url.doc.langbase;/articles/releng">
 <!ENTITY url.articles.releng.en		"&url.doc.langbase.en;/articles/releng">
 <!ENTITY url.articles.releng-packages	"&url.doc.langbase;/articles/releng-packages">
 <!ENTITY url.articles.releng-packages.en	"&url.doc.langbase.en;/articles/releng-packages">
+<!ENTITY url.articles.remote-install	"&url.doc.langbase;/articles/remote-install">
+<!ENTITY url.articles.remote-install.en	"&url.doc.langbase.en;/articles/remote-install">
 <!ENTITY url.articles.serial-uart	"&url.doc.langbase;/articles/serial-uart">
 <!ENTITY url.articles.serial-uart.en	"&url.doc.langbase.en;/articles/serial-uart">
 <!ENTITY url.articles.solid-state	"&url.doc.langbase;/articles/solid-state">
 <!ENTITY url.articles.solid-state.en	"&url.doc.langbase.en;/articles/solid-state">
 <!ENTITY url.articles.storage-devices	"&url.doc.langbase;/articles/storage-devices">
 <!ENTITY url.articles.storage-devices.en	"&url.doc.langbase.en;/articles/storage-devices">
 <!ENTITY url.articles.version-guide		"&url.doc.langbase;/articles/version-guide">
 <!ENTITY url.articles.version-guide.en		"&url.doc.langbase.en;/articles/version-guide">
 <!ENTITY url.articles.vinum		"&url.doc.langbase;/articles/vinum">
 <!ENTITY url.articles.vinum.en		"&url.doc.langbase.en;/articles/vinum">
 <!ENTITY url.articles.vm-design		"&url.doc.langbase;/articles/vm-design">
 <!ENTITY url.articles.vm-design.en	"&url.doc.langbase.en;/articles/vm-design">
+<!ENTITY url.articles.wp-toolbox	"&url.doc.langbase;/articles/wp-toolbox">
+<!ENTITY url.articles.wp-toolbox.en	"&url.doc.langbase.en;/articles/wp-toolbox">
 <!ENTITY url.articles.zip-drive		"&url.doc.langbase;/articles/zip-drive">
 <!ENTITY url.articles.zip-drive.en	"&url.doc.langbase.en;/articles/zip-drive">