Merge remote-tracking branch 'origin/releng/10.3' into RELENG_2_3

9 files changed, 285 insertions, 55 deletions

diff --git a/release/doc/en_US.ISO8859-1/Makefile b/release/doc/en_US.ISO8859-1/Makefile
index 82e5f33..d27704e 100644
--- a/release/doc/en_US.ISO8859-1/Makefile
+++ b/release/doc/en_US.ISO8859-1/Makefile
@@ -4,6 +4,7 @@ RELN_ROOT?= ${.CURDIR}/..
 
 SUBDIR = relnotes
 SUBDIR+= hardware
+SUBDIR+= installation
 SUBDIR+= readme
 SUBDIR+= errata
 
diff --git a/release/doc/en_US.ISO8859-1/errata/article.xml b/release/doc/en_US.ISO8859-1/errata/article.xml
index fee035f..9e968ea 100644
--- a/release/doc/en_US.ISO8859-1/errata/article.xml
+++ b/release/doc/en_US.ISO8859-1/errata/article.xml
@@ -9,7 +9,8 @@
 ]>
 
 <article xmlns="http://docbook.org/ns/docbook"
-  xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
+  xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
+  xml:id="top">
 
   <info>
     <title>&os; &release.prev; Errata </title>
diff --git a/release/doc/en_US.ISO8859-1/hardware/article.xml b/release/doc/en_US.ISO8859-1/hardware/article.xml
index 47b2d58..0857e12 100644
--- a/release/doc/en_US.ISO8859-1/hardware/article.xml
+++ b/release/doc/en_US.ISO8859-1/hardware/article.xml
@@ -7,7 +7,8 @@
 %devauto;
 ]>
 <article xmlns="http://docbook.org/ns/docbook"
-  xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
+  xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
+  xml:id="top">
   <info>
     <title>&os; &release.current; Hardware Notes</title>
 
@@ -16,21 +17,7 @@
     <pubdate>$FreeBSD$</pubdate>
 
     <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <year>2002</year>
-      <year>2003</year>
-      <year>2004</year>
-      <year>2005</year>
-      <year>2006</year>
-      <year>2007</year>
-      <year>2008</year>
-      <year>2009</year>
-      <year>2010</year>
-      <year>2011</year>
-      <year>2012</year>
-      <year>2013</year>
-      <year>2014</year>
+      <year>2016</year>
       <holder role="mailto:doc@FreeBSD.org">The &os; Documentation
 	Project</holder>
     </copyright>
diff --git a/release/doc/en_US.ISO8859-1/installation/Makefile b/release/doc/en_US.ISO8859-1/installation/Makefile
new file mode 100644
index 0000000..53ec9837
--- /dev/null
+++ b/release/doc/en_US.ISO8859-1/installation/Makefile
@@ -0,0 +1,19 @@
+# $FreeBSD$
+
+RELN_ROOT?= ${.CURDIR}/../..
+.ifdef NO_LANGCODE_IN_DESTDIR
+DESTDIR?= ${DOCDIR}/installation
+.else
+DESTDIR?= ${DOCDIR}/en_US.ISO8859-1/installation
+.endif
+
+DOC?= article
+FORMATS?= html
+INSTALL_COMPRESSED?= gz
+INSTALL_ONLY_COMPRESSED?=
+
+# SGML content
+SRCS+=	article.xml
+
+.include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
+.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/en_US.ISO8859-1/installation/article.xml b/release/doc/en_US.ISO8859-1/installation/article.xml
new file mode 100644
index 0000000..22283b7
--- /dev/null
+++ b/release/doc/en_US.ISO8859-1/installation/article.xml
@@ -0,0 +1,151 @@
+<?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">
+%release;
+<!ENTITY local.rel "10.3">
+]>
+
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
+  xml:id="top">
+  <info><title>&os; &release.current; Installation Instructions</title>
+
+    <author><orgname>The &os; Project</orgname></author>
+
+    <pubdate>$FreeBSD$</pubdate>
+
+    <copyright>
+      <year>2016</year>
+      <holder role="mailto:doc@FreeBSD.org">The &os; Documentation Project</holder>
+    </copyright>
+
+    <legalnotice xml:id="trademarks" role="trademarks">
+      &tm-attrib.freebsd;
+      &tm-attrib.intel;
+      &tm-attrib.sparc;
+      &tm-attrib.general;
+    </legalnotice>
+
+  <abstract>
+    <para>This article gives some brief instructions on installing
+      &os; &release.current; and upgrading the systems running earlier
+      releases.</para>
+  </abstract>
+</info>
+
+  <sect1 xml:id="install">
+    <title>Installing &os;</title>
+
+    <para>The <uri
+	xlink:href="&url.books.handbook;/bsdinstall.html">Installing
+	  &os;</uri>
+      chapter of the <uri
+	xlink:href="&url.books.handbook;/">&os;
+	Handbook</uri> provides more in-depth information about the
+      installation program itself, including a guided walk-through with
+      screenshots.</para>
+  </sect1>
+
+  <sect1 xml:id="upgrade">
+    <title>Upgrading &os;</title>
+
+    <para>If you are upgrading from a previous release of &os;, please
+      read <uri
+      xlink:href="http://www.FreeBSD.org/releases/&local.rel;R/relnotes.html#upgrade">upgrading
+      section in the Release Notes</uri> for notable
+      incompatibilities carefully.</para>
+
+    <sect2 xml:id="upgrade-source">
+      <title>Upgrading from Source</title>
+
+      <para>The procedure for doing a source code based update is
+	described in
+	<uri xlink:href="&url.books.handbook;/synching.html"></uri> and
+	<uri xlink:href="&url.books.handbook;/makeworld.html"></uri>.</para>
+
+      <para>For SVN use the <filename>releng/&local.rel;</filename> branch
+	which will be where any upcoming Security Advisories or Errata
+	Notices will be applied.</para>
+    </sect2>
+
+    <sect2 xml:id="upgrade-binary">
+      <title>Upgrading Using <quote>&os; Update</quote></title>
+
+      <para>The &man.freebsd-update.8; utility supports binary
+	upgrades of &arch.i386; and &arch.amd64; systems running
+	earlier FreeBSD releases. Systems running
+	<literal>9.3-RELEASE</literal>,
+	<literal>10.3-RC[12]</literal> can upgrade as follows:</para>
+
+      <screen>&prompt.root; freebsd-update fetch
+&prompt.root; freebsd-update install</screen>
+
+      <para>Now the &man.freebsd-update.8; utility can fetch bits
+	belonging to &release.current;.  During this process
+	&man.freebsd-update.8; will ask for help in merging
+	configuration files.</para>
+
+      <screen>&prompt.root; freebsd-update upgrade -r &local.rel;-RELEASE</screen>
+
+      <para>Due to changes in the way that &os; is packaged on the
+	release media, two complications may arise in this process if
+	upgrading from FreeBSD 9.3:</para>
+
+      <orderedlist>
+	<listitem>
+	  <para>The &os;, which previously could appear in either
+	    <filename>/boot/kernel</filename> or
+	    <filename>/boot/GENERIC</filename>, now only appears as
+	    <filename>/boot/kernel</filename>.  As a result, any
+	    kernel appearing in <filename>/boot/GENERIC</filename>
+	    will be deleted.  Please carefully read the output printed
+	    by &man.freebsd-update.8; and confirm that an updated
+	    kernel will be placed into
+	    <filename>/boot/kernel</filename> before proceeding beyond
+	    this point.</para>
+	</listitem>
+
+	<listitem>
+	  <para>The &os; source tree in <filename>/usr/src</filename>
+	    (if present) will be deleted.  (Normally the
+	    &man.freebsd-update.8; utility will update a source tree,
+	    but in this case the changes in release packaging result
+	    in the &man.freebsd-update.8; utility not recognizing that
+	    the source tree from the old release and the source tree
+	    from the new release correspond to the same part of
+	    &os;.)</para>
+	</listitem>
+      </orderedlist>
+
+      <screen>&prompt.root; freebsd-update install</screen>
+
+      <para>The system must now be rebooted with the newly installed
+	kernel before the non-kernel components are updated.</para>
+
+      <screen>&prompt.root; shutdown -r now</screen>
+
+      <para>After rebooting, &man.freebsd-update.8; needs to be run
+	again to install the new userland components:</para>
+
+      <screen>&prompt.root; freebsd-update install</screen>
+
+      <para>At this point, users of systems being upgraded from &os;
+	9.3-RELEASE or earlier will be prompted by
+	&man.freebsd-update.8; to rebuild all third-party applications
+	(e.g., ports installed from the ports tree) due to updates in
+	system libraries.</para>
+
+      <para>After updating installed third-party applications (and
+	again, only if &man.freebsd-update.8; printed a message
+	indicating that this was necessary), run
+	&man.freebsd-update.8; again so that it can delete the old (no
+	longer used) system libraries:</para>
+
+      <screen>&prompt.root; freebsd-update install</screen>
+
+      <para>Finally, reboot into &release.current;</para>
+
+      <screen>&prompt.root; shutdown -r now</screen>
+    </sect2>
+  </sect1>
+</article>
diff --git a/release/doc/en_US.ISO8859-1/readme/article.xml b/release/doc/en_US.ISO8859-1/readme/article.xml
index bdae743..ee3ee82 100644
--- a/release/doc/en_US.ISO8859-1/readme/article.xml
+++ b/release/doc/en_US.ISO8859-1/readme/article.xml
@@ -13,7 +13,8 @@
      End:
 -->
 <article xmlns="http://docbook.org/ns/docbook"
-  xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
+  xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
+  xml:id="top">
   <info>
     <title>&os; &release.current; README</title>
 
@@ -22,21 +23,7 @@
     <pubdate>$FreeBSD$</pubdate>
 
     <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <year>2002</year>
-      <year>2003</year>
-      <year>2004</year>
-      <year>2005</year>
-      <year>2006</year>
-      <year>2007</year>
-      <year>2008</year>
-      <year>2009</year>
-      <year>2010</year>
-      <year>2011</year>
-      <year>2012</year>
-      <year>2013</year>
-      <year>2014</year>
+      <year>2016</year>
       <holder role="mailto:doc@FreeBSD.org">The &os; Documentation
 	Project</holder>
     </copyright>
@@ -65,7 +52,7 @@
       &release.current;, the latest point along the &release.branch;
       branch.</para>
 
-    <sect2>
+    <sect2 xml:id="about">
       <title>About &os;</title>
 
       <para>&os; is an operating system based on 4.4 BSD Lite for
@@ -103,7 +90,7 @@
 	be quickly installed from the installation program.</para>
     </sect2>
 
-    <sect2>
+    <sect2 xml:id="audience">
       <title>Target Audience</title>
 
       <para releasetype="current">This &release.type; is aimed
@@ -159,7 +146,7 @@
       complete &os; distribution, rather than updating an existing
       installation.</para>
 
-    <sect2>
+    <sect2 xml:id="obtain-cd-dvd">
       <title>CDROM and DVD</title>
 
       <para>&os; -RELEASE distributions may be ordered on CDROM or DVD
@@ -176,7 +163,7 @@
 	    &os;</quote></link> appendix to the Handbook.</para>
     </sect2>
 
-    <sect2>
+    <sect2 xml:id="obtain-ftp">
       <title>FTP</title>
 
       <para>You can use FTP to retrieve &os; and any or all of its
@@ -210,7 +197,7 @@
   <sect1 xml:id="contacting">
     <title>Contacting the &os; Project</title>
 
-    <sect2>
+    <sect2 xml:id="contacting-mailing-list">
       <title>Email and Mailing Lists</title>
 
       <para>For any questions or general technical support issues,
@@ -252,7 +239,7 @@
       </important>
     </sect2>
 
-    <sect2>
+    <sect2 xml:id="contacting-problem-reports">
       <title>Submitting Problem Reports</title>
 
       <para>Suggestions, bug reports and contributions of code are
@@ -356,7 +343,7 @@
       </note>
     </sect2>
 
-    <sect2>
+    <sect2 xml:id="manual-pages">
       <title>Manual Pages</title>
 
       <para>As with almost all &unix; like operating systems, &os;
@@ -374,7 +361,7 @@
 	and &man.style.9; (a style guide to kernel coding).</para>
     </sect2>
 
-    <sect2>
+    <sect2 xml:id="books-articles">
       <title>Books and Articles</title>
 
       <para>Two highly-useful collections of &os;-related information,
diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.xml b/release/doc/en_US.ISO8859-1/relnotes/article.xml
index 825fa10..057e45d 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.xml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.xml
@@ -11,7 +11,8 @@
 <!ENTITY errata SYSTEM "../../share/xml/errata.xml">
 ]>
 <article xmlns="http://docbook.org/ns/docbook"
-  xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
+  xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
+  xml:id="top">
 
   <info>
     <title>&os; &release.current; Release Notes</title>
@@ -26,7 +27,7 @@
     <!-- Last rev: 284813 -->
 
     <copyright>
-      <year>2015</year>
+      <year>2016</year>
       <holder role="mailto:doc@FreeBSD.org">The &os; Documentation
 	Project</holder>
     </copyright>
@@ -191,6 +192,27 @@
       <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 revision="291774">The &man.cp.1; utility has been updated
+	to include a new flag, <literal>-s</literal>, which creates
+	a symbolic link to the specified source.</para>
+
+      <para revision="292231">Support for the
+	<literal>-manage-gids</literal> has been added to
+	&man.nfsd.8;.  This option can be enabled at boot time by
+	adding <literal>nfs_server_managegids="YES"</literal> to
+	&man.rc.conf.5;.</para>
+
+      <para revision="292462" contrib="sponsor"
+	sponsor="&dellinc;">The resolver library has been updated to
+	reload <filename>/etc/resolv.conf</filename> if the
+	modification time has changed.</para>
+
+      <para revision="293744" contrib="sponsor" sponsor="&ff;">The
+	initial implementation of <quote>reroot</quote> support has
+	been added to the &man.reboot.8; utility, allowing the root
+	filesystem to be mounted from a temporary source filesystem
+	without requiring a full system reboot.</para>
     </sect2>
 
     <sect2 xml:id="userland-contrib">
@@ -202,19 +224,56 @@
 
       <para revision="286751">Timezone data files have been updated to
 	version 2015f.</para>
+
+      <para revision="290152">The &man.file.1; utility has been
+	updated to version 5.25.</para>
+
+      <para revision="292588">The &man.xz.1; utility has been updated
+	to version 5.2.2, which provides support for multi-threaded
+	compression.</para>
+
+      <para revision="293650">The &man.ntpd.8; utility has been
+	updated to version 4.2.8p5.</para>
+
+      <para revision="294190">The &man.unbound.8; utility has been
+	updated to version 1.5.7.</para>
+
+      <para revision="294286">The &man.less.1; utility has been
+	updated to version v481.</para>
+
+      <para revision="295690">The
+	<literal>unbound-control-setup</literal> script has been
+	removed from the base system.</para>
+
+      <para revision="295691">The &man.unbound.8; utility has been
+	updated to enable the <literal>insecure-lan-zones</literal>
+	option in preference of listing each <acronym>AS112</acronym>
+	zone individually.</para>
+
+      <para revision="296317">The <application>OpenSSL</application>
+	suite has been updated to version 1.0.1s.</para>
+
+      <para revision="296853">The <application>OpenSSH</application>
+	suite has been updated to version 7.2p2.</para>
     </sect2>
 
     <sect2 xml:id="userland-installer">
       <title>Installation and Configuration Tools</title>
 
-      <para>&nbsp;</para>
+      <para revision="295264" contrib="sponsor"
+	sponsor="&scaleengine;">The &man.bsdinstall.8; utility has
+	been updated to support <acronym>ZFS</acronym> installation
+	on <acronym>EFI</acronym>-based systems.</para>
     </sect2>
 
     <sect2 xml:id="userland-rc">
       <title><filename class="directory">/etc/rc.d</filename>
 	Scripts</title>
 
-      <para>&nbsp;</para>
+      <para revision="294680">The <literal>netwait</literal>
+	&man.rc.8; script has been updated to wait for network
+	interfaces that attach late in the boot process, such as some
+	<acronym>USB</acronym> network cards.</para>
     </sect2>
 
     <sect2 xml:id="userland-periodic">
@@ -290,12 +349,19 @@
 
       <para revision="288810">The &man.ctl.4; driver has been updated
 	to support CD-ROM and removable devices.</para>
+
+      <para contrib="sponsor" sponsor="&ix;">The &man.isp.4; driver has
+	been updated and improved: added support for 16Gbps FC cards,
+	improved target mode support, completed Multi-ID (NPIV)
+	functionality.</para>
     </sect2>
 
     <sect2 xml:id="drivers-network">
       <title>Network Drivers</title>
 
-      <para>&nbsp;</para>
+      <para revision="295524" contrib="sponsor"
+	sponsor="&limelight;, &intelcorp;">The &man.ixgbe.4; driver
+	has been updated to version 3.1.13-k.</para>
     </sect2>
   </sect1>
 
@@ -310,7 +376,9 @@
     <sect2 xml:id="hardware-support">
       <title>Hardware Support</title>
 
-      <para>&nbsp;</para>
+      <para revision="293675">The &man.ismt.4; driver has been added,
+	providing support for recent &intel; SMBus 2.0
+	controllers.</para>
     </sect2>
 
     <sect2 xml:id="hardware-virtualization">
@@ -372,13 +440,28 @@
     <sect2 xml:id="boot-loader">
       <title>Boot Loader Changes</title>
 
-      <para>&nbsp;</para>
+      <para revision="294445">Initial terminal emulation support has
+	been added to <filename>loader.efi</filename> for
+	<acronym>UEFI</acronym>-based systems.</para>
+
+      <para revision="294999" contrib="sponsor"
+	sponsor="&multiplay;">Initial <acronym>ZFS</acronym> boot
+	support has been added to the <acronym>EFI</acronym>
+	implementation.</para>
+
+      <para revision="295475" contrib="sponsor"
+	sponsor="&scaleengine;">The <acronym>UEFI</acronym> loader has
+	been updated to support multiple <acronym>ZFS</acronym> boot
+	environments, such as those provided by <filename
+	  role="package">sysutils/beadm</filename>.</para>
     </sect2>
 
     <sect2 xml:id="boot-menu">
       <title>Boot Menu Changes</title>
 
-      <para>&nbsp;</para>
+      <para revision="294446">The <acronym>UEFI</acronym> boot menu
+	has been updated to enable the <quote>Beastie</quote> menu,
+	similiar to the traditional &man.sc.4; boot menu.</para>
     </sect2>
   </sect1>
 
diff --git a/release/doc/share/xml/release.ent b/release/doc/share/xml/release.ent
index 8a14e5b..4d4f691 100644
--- a/release/doc/share/xml/release.ent
+++ b/release/doc/share/xml/release.ent
@@ -6,7 +6,7 @@
 
 <!-- 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-RELEASE">
 
 <!-- The previous version used for comparison in the "What's New"
      section.  For -CURRENT, we might point back to the last
@@ -19,13 +19,13 @@
 <!ENTITY release.prev.stable "10.1-RELEASE">
 
 <!-- The next version to be released, usually used for snapshots. -->
-<!ENTITY release.next "10.3-RELEASE">
+<!ENTITY release.next "10.4-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/">
+<!ENTITY release.url "https://www.FreeBSD.org/releases/">
 
 <!-- The URL for Security Advisories and Errata Notices. -->
 <!ENTITY security.url "https://www.FreeBSD.org/security/advisories">
@@ -38,9 +38,9 @@
 <!-- WARNING: Do not forget to also change the release type in
      doc.relnotes.mk when updating this -->
 <!ENTITY release.type "snapshot">
-<!ENTITY % release.type.current  "INCLUDE">
+<!ENTITY % release.type.current  "IGNORE">
 <!ENTITY % release.type.snapshot "IGNORE">
-<!ENTITY % release.type.release "IGNORE">
+<!ENTITY % release.type.release "INCLUDE">
 
 <![%release.type.current;[
 <!ENTITY release '&release.current;'>
diff --git a/release/doc/share/xml/sponsor.ent b/release/doc/share/xml/sponsor.ent
index fa8c866..1b454f1 100644
--- a/release/doc/share/xml/sponsor.ent
+++ b/release/doc/share/xml/sponsor.ent
@@ -17,6 +17,7 @@
 
 <!ENTITY darpa		"DARPA">
 <!ENTITY darpa_afrl	"DARPA, AFRL">
+<!ENTITY dellinc	"Dell, Inc.">
 
 <!ENTITY ff		"The&nbsp;&os;&nbsp;Foundation">
 <!ENTITY ff.url		"https://www.FreeBSDFoundation.org/">