- Use FPI and catalog resolution instead of system entities. This change

  fixes build with a non-standard DOC_PREFIX, but it is still a temporal
  measure because some of them should be done by using XInclude,
  not by entity reference.

- Trim old entries and bump version numbers.

6 files changed, 32 insertions, 68 deletions

diff --git a/release/doc/en_US.ISO8859-1/errata/article.xml b/release/doc/en_US.ISO8859-1/errata/article.xml
index fee035f..76c0c44 100644
--- a/release/doc/en_US.ISO8859-1/errata/article.xml
+++ b/release/doc/en_US.ISO8859-1/errata/article.xml
@@ -4,8 +4,10 @@
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN"
   "http://www.FreeBSD.org/release/XML/release.ent">
 %release;
-<!ENTITY security SYSTEM "../../share/xml/security.xml">
-<!ENTITY errata SYSTEM "../../share/xml/errata.xml">
+<!ENTITY security PUBLIC "-//FreeBSD//ENTITIES Security Advisory List//EN"
+	 "http://www.FreeBSD.org/release/XML/share/xml/security.xml">
+<!ENTITY errata PUBLIC "-//FreeBSD//ENTITIES Errata List//EN"
+	 "http://www.FreeBSD.org/release/XML/share/xml/errata.xml">
 ]>
 
 <article xmlns="http://docbook.org/ns/docbook"
diff --git a/release/doc/en_US.ISO8859-1/hardware/article.xml b/release/doc/en_US.ISO8859-1/hardware/article.xml
index 47b2d58..6a14f5c 100644
--- a/release/doc/en_US.ISO8859-1/hardware/article.xml
+++ b/release/doc/en_US.ISO8859-1/hardware/article.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
-  "../../../share/xml/freebsd50.dtd" [
+	  "http://www.FreeBSD.org/XML/share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
 %release;
 <!ENTITY % devauto PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//EN" "nonexistent">
diff --git a/release/doc/en_US.ISO8859-1/readme/article.xml b/release/doc/en_US.ISO8859-1/readme/article.xml
index bdae743..4c3da6a 100644
--- a/release/doc/en_US.ISO8859-1/readme/article.xml
+++ b/release/doc/en_US.ISO8859-1/readme/article.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
-  "../../../share/xml/freebsd50.dtd" [
+	  "http://www.FreeBSD.org/XML/share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 ]>
diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.xml b/release/doc/en_US.ISO8859-1/relnotes/article.xml
index 825fa10..f91671a 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.xml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.xml
@@ -1,14 +1,19 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
-	"../../../share/xml/freebsd50.dtd" [
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+	  "http://www.FreeBSD.org/XML/share/xml/freebsd50.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN"
+	 "http://www.FreeBSD.org/release/XML/share/xml/release.ent">
  %release;
-<!ENTITY % sponsor PUBLIC "-//FreeBSD//ENTITIES Sponsor Specification//EN" "sponsor.ent">
+<!ENTITY % sponsor PUBLIC "-//FreeBSD//ENTITIES Sponsor Specification//EN"
+	 "http://www.FreeBSD.org/release/XML/share/xml/sponsor.ent">
  %sponsor;
-<!ENTITY % vendor PUBLIC "-//FreeBSD//ENTITIES Vendor Specification//EN" "vendor.ent">
+<!ENTITY % vendor PUBLIC "-//FreeBSD//ENTITIES Vendor Specification//EN"
+	 "http://www.FreeBSD.org/release/XML/share/xml/vendor.ent">
  %vendor;
-<!ENTITY security SYSTEM "../../share/xml/security.xml">
-<!ENTITY errata SYSTEM "../../share/xml/errata.xml">
+<!ENTITY security PUBLIC "-//FreeBSD//ENTITIES Security Advisory List//EN"
+	 "http://www.FreeBSD.org/release/XML/share/xml/security.xml">
+<!ENTITY errata PUBLIC "-//FreeBSD//ENTITIES Errata List//EN"
+	 "http://www.FreeBSD.org/release/XML/share/xml/errata.xml">
 ]>
 <article xmlns="http://docbook.org/ns/docbook"
   xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
@@ -26,7 +31,7 @@
     <!-- Last rev: 284813 -->
 
     <copyright>
-      <year>2015</year>
+      <year>2016</year>
       <holder role="mailto:doc@FreeBSD.org">The &os; Documentation
 	Project</holder>
     </copyright>
@@ -166,42 +171,13 @@
     <sect2 xml:id="userland-programs">
       <title>Userland Application Changes</title>
 
-      <para revision="286064">The &man.jail.8; utility has been
-	updated to include a new flag, <literal>-l</literal>, which
-	ensures a clean environment in the target jail when used.
-	Additionally, &man.jail.8; will run a shell within the target
-	jail when run no commands are specified.</para>
-
-      <para revision="287122">The &man.mkimg.1; utility has been
-	updated to include support for <literal>NTFS</literal>
-	filesystems in both <acronym>MBR</acronym> and
-	<acronym>GPT</acronym> partitioning schemes.</para>
-
-      <para revision="288202" contrib="sponsor" sponsor="&ff;">The
-	&man.ar.1; utility now enables deterministic mode
-	(<literal>-D</literal>) by default.  This behavior can be
-	disabled by specifying the <literal>-U</literal> flag.</para>
-
-      <para revision="287746">The &man.pciconf.8; utility has been
-	updated to use the PCI ID database from the <filename
-	  role="package">misc/pciids</filename> package, if present,
-	falling back to the PCI ID database in the &os; base
-	system.</para>
-
-      <para revision="288710" contrib="sponsor" sponsor="&gandi;">A
-	new utility, &man.sesutil.8;, has been added, which is used
-	to manage &man.ses.4; devices.</para>
+      <para>&nbsp;</para>
     </sect2>
 
     <sect2 xml:id="userland-contrib">
       <title>Contributed Software</title>
 
-      <para revision="286082">The &man.libarchive.3; library has been
-	updated to properly skip a sparse file entry in a &man.tar.1;
-	file, which would previously produce errors.</para>
-
-      <para revision="286751">Timezone data files have been updated to
-	version 2015f.</para>
+      <para>&nbsp;</para>
     </sect2>
 
     <sect2 xml:id="userland-installer">
@@ -247,10 +223,7 @@
     <sect2 xml:id="kernel-bugfix">
       <title>Kernel Bug Fixes</title>
 
-      <para revision="288167" contrib="sponsor"
-	sponsor="&multiplay;">The &man.kqueue.2; system call has been
-	updated to handle write events to files larger than 2
-	gigabytes.</para>
+      <para></para>
     </sect2>
 
     <sect2 xml:id="kernel-config">
@@ -262,10 +235,7 @@
     <sect2 xml:id="kernel-sysctl">
       <title>System Tuning and Controls</title>
 
-      <para revision="287037">The &man.uart.4; driver has been
-	updated to allow tuning pulses per second captured in the
-	CTS line during runtime, whereas previously only the DCD line
-	could be used without rebuilding the kernel.</para>
+      <para></para>
     </sect2>
   </sect1>
 
@@ -284,12 +254,7 @@
     <sect2 xml:id="drivers-storage">
       <title>Storage Drivers</title>
 
-      <para revision="288732" contrib="sponsor" sponsor="&ix;">The
-	<acronym>CTL</acronym> High Availability implementation has
-	been rewritten.</para>
-
-      <para revision="288810">The &man.ctl.4; driver has been updated
-	to support CD-ROM and removable devices.</para>
+      <para></para>
     </sect2>
 
     <sect2 xml:id="drivers-network">
@@ -316,9 +281,7 @@
     <sect2 xml:id="hardware-virtualization">
       <title>Virtualization Support</title>
 
-      <para revision="287802">The &man.xen.4; driver has been updated
-	to include support for <literal>blkif</literal> indirect
-	segment I/O.</para>
+      <para></para>
     </sect2>
 
     <sect2 xml:id="hardware-arm">
@@ -349,11 +312,7 @@
     <sect2 xml:id="storage-zfs">
       <title>ZFS</title>
 
-      <para revision="287665" contrib="sponsor"
-	sponsor="&clusterhq;">The &man.zfs.8; <literal>l2arc</literal>
-	code has been updated to take <literal>ashift</literal> into
-	account when gathering buffers to be written to the
-	<literal>l2arc</literal> device.</para>
+      <para></para>
     </sect2>
 
     <sect2 xml:id="storage-geom">
diff --git a/release/doc/share/xml/catalog.xml b/release/doc/share/xml/catalog.xml
index 74f8ccd..51ee552 100644
--- a/release/doc/share/xml/catalog.xml
+++ b/release/doc/share/xml/catalog.xml
@@ -9,5 +9,8 @@
   <public publicId="-//FreeBSD//ENTITIES Release Specification//EN" uri="release.ent"/>
   <public publicId="-//FreeBSD//ENTITIES Sponsor Specification//EN" uri="sponsor.ent"/>
   <public publicId="-//FreeBSD//ENTITIES Vendor Specification//EN" uri="vendor.ent"/>
+  <!-- XXHRS temporarily defined -->
+  <public publicId="-//FreeBSD//ENTITIES Security Advisory List//EN" uri="security.xml"/>
+  <public publicId="-//FreeBSD//ENTITIES Errata List//EN" uri="errata.xml"/>
   <public publicId="-//FreeBSD//ENTITIES Auto Generated Device Lists//EN" uri="dev-auto.ent"/>
 </catalog>
diff --git a/release/doc/share/xml/release.ent b/release/doc/share/xml/release.ent
index 8a14e5b..75ef58d 100644
--- a/release/doc/share/xml/release.ent
+++ b/release/doc/share/xml/release.ent
@@ -6,23 +6,23 @@
 
 <!-- Version of the OS we're describing.  This needs to be updated
      with each new release. -->
-<!ENTITY release.current "10.2-STABLE">
+<!ENTITY release.current "10.3-STABLE">
 
 <!-- The previous version used for comparison in the "What's New"
      section.  For -CURRENT, we might point back to the last
      branchpoint. -->
-<!ENTITY release.prev "10.2-RELEASE">
+<!ENTITY release.prev "10.3-RELEASE">
 
 <!-- The previous stable release, useful for pointing user's at the
      release they SHOULD be running if they don't want the bleeding
      edge. -->
-<!ENTITY release.prev.stable "10.1-RELEASE">
+<!ENTITY release.prev.stable "10.2-RELEASE">
 
 <!-- The next version to be released, usually used for snapshots. -->
 <!ENTITY release.next "10.3-RELEASE">
 
 <!-- The name of this branch. -->
-<!ENTITY release.branch "10.2-STABLE">
+<!ENTITY release.branch "10.3-STABLE">
 
 <!-- The URL for obtaining this version of FreeBSD. -->
 <!ENTITY release.url "https://www.FreeBSD.org/snapshots/">