Index: head/en_US.ISO8859-1/htdocs/news/status/report-2017-07-2017-09.xml
===================================================================
--- head/en_US.ISO8859-1/htdocs/news/status/report-2017-07-2017-09.xml	(revision 51317)
+++ head/en_US.ISO8859-1/htdocs/news/status/report-2017-07-2017-09.xml	(revision 51318)
@@ -1,1279 +1,1278 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE report PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for
   Status Report//EN"
   "http://www.FreeBSD.org/XML/share/xml/statusreport.dtd" >
 
 <!-- $FreeBSD$ -->
 
 <report>
   <date>
     <month>July-September</month>
 
     <year>2017</year>
   </date>
 
   <section>
     <title>Introduction</title>
 
     <p><strong>This is a draft of the July&ndash;September 2017
       status report.  Please check back after it is finalized, and
       an announcement email is sent to the &os;-Announce mailing
       list.</strong></p>
 
     <?ignore
     <p>This report covers &os;-related projects between July and
       September 2017.  This is the third of four reports planned for
       2017.</p>
 
     <p>The third quarter of 2017 was another productive quarter for
       the &os; project and community. [...]</p>
 
     <p>Thanks to all the reporters for the excellent work!</p>
 
     <p>The deadline for submissions covering the period from October
       to December 2017 is January 7, 2017.</p>
      ?>
   </section>
 
   <category>
     <name>team</name>
 
     <description>&os; Team Reports</description>
 
     <p>Entries from the various official and semi-official teams,
       as found in the <a href="&enbase;/administration.html">Administration
 	Page</a>.</p>
   </category>
 
   <category>
     <name>proj</name>
 
     <description>Projects</description>
 
     <p>Projects that span multiple categories, from the kernel and userspace
       to the Ports Collection or external projects.</p>
   </category>
 
   <category>
     <name>kern</name>
 
     <description>Kernel</description>
 
     <p>Updates to kernel subsystems/features, driver support,
       filesystems, and more.</p>
   </category>
 
   <category>
     <name>arch</name>
 
     <description>Architectures</description>
 
     <p>Updating platform-specific features and bringing in support
       for new hardware platforms.</p>.
   </category>
 
   <category>
     <name>bin</name>
 
     <description>Userland Programs</description>
 
     <p>Changes affecting the base system and programs in it.</p>
   </category>
 
   <category>
     <name>ports</name>
 
     <description>Ports</description>
 
     <p>Changes affecting the Ports Collection, whether sweeping
       changes that touch most of the tree, or individual ports
       themselves.</p>
   </category>
 
   <category>
     <name>doc</name>
 
     <description>Documentation</description>
 
     <p>Noteworthy changes in the documentation tree or new external
       books/documents.</p>
   </category>
 
   <category>
     <name>misc</name>
 
     <description>Miscellaneous</description>
 
-    <p>Objects that defy categorization.</p>
+    <p>Items that defy categorization.</p>
   </category>
 
   <category>
     <name>third</name>
 
     <description>Third-Party Projects</description>
 
     <p>Many projects build upon &os; or incorporate components of
       &os; into their project.  As these projects may be of interest 
       to the broader &os; community, we sometimes include brief
       updates submitted by these projects in our quarterly report.
       The &os; project makes no representation as to the accuracy or
       veracity of any claims in these submissions.</p>
   </category>
 
   <project cat='team'>
     <title>&os; Release Engineering Team</title>
 
     <contact>
       <person>
 	<name>&os;&nbsp;Release Engineering Team</name>
 	<email>re@FreeBSD.org</email>
       </person>
     </contact>
 
     <links>
       <url href="https://www.FreeBSD.org/releases/11.1R/announce.html">&os;&nbsp;11.1-RELEASE Announcement</url>
       <url href="https://www.FreeBSD.org/releases/10.4R/schedule.html">&os;&nbsp;10.4-RELEASE Schedule</url>
       <url href="https://download.FreeBSD.org/ftp/snapshots/ISO-IMAGES/">&os; Development Snapshots</url>
     </links>
 
     <body>
       <p>The &os; Release Engineering Team is responsible for setting
 	and publishing release schedules for official project releases
 	of &os;, announcing code freezes, and maintaining the
 	respective branches, among other things.</p>
 
       <p>The &os; Release Engineering Team continued finalizing the
 	11.1-RELEASE cycle, with the final release builds starting on
 	July 21 and the official release announcement email sent on
 	July 26.  Thank you to everyone who helped test 11.1-RELEASE,
 	ensuring its quality and stability.&nbsp;[1]</p>
 
       <p>&os;&nbsp;11.1-RELEASE is the second release from the
 	<tt>stable/11</tt> branch.</p>
 
       <p>Additionally, the &os; Release Engineering Team started the
 	10.4-RELEASE cycle, with the code slush starting on July 28.
 	With the final release build expected to start on September 29
 	and the official announcement overlapping the end of the
 	quarter, everything is on schedule as of this
 	writing.&nbsp;[2]</p>
 
       <p>&os;&nbsp;10.4-RELEASE will be the fifth release from the
 	<tt>stable/10</tt> branch, and is planned to be the final release
 	of the 10.x series.</p>
     </body>
 
     <sponsor>The &os; Foundation&nbsp;[1]</sponsor>
 
     <partialsponsor>The &os; Foundation&nbsp;[2]</partialsponsor>
   </project>
 
   <project cat="arch">
     <title>AMD Zen (family 17h) support</title>
 
     <contact>
       <person>
 	<name>
 	  <given>Conrad</given>
 	  <common>Meyer</common>
 	  <email>cem@FreeBSD.org</email>
 	</name>
       </person>
     </contact>
 
     <body>
       <p>This quarter, a bit of work was done to enhance platform
 	support for AMD Zen (Ryzen, Threadripper, Epyc) processors:</p>
 
       <ul>
 	<li>The CPU topology detection code was enhanced to properly
-	  detect Zen dies and CCXes.  This gives the scheduler more
-	  locality information to make scheduling decisions.</li>
+	  detect Zen dies and CPU Complexes.  This gives the scheduler more
+	  locality information to use when making scheduling decisions.</li>
 
 	<li>The x86 topology analysis was enhanced to report dies and
-	  CCXes, in addition to the existing reporting on packages,
-	  cores, and threads.  An example  of the new output is
-	  &quot;FreeBSD/SMP: 1 package(s) x 2 groups x 2 cache groups
-	  x 4 core(s) x 2 hardware threads&quot;.</li>
+	  CPU Complexes, in addition to the existing reporting on packages,
+	  cores, and threads.  An example of the new output is
+	  <tt>FreeBSD/SMP: 1 package(s) x 2 groups x 2 cache groups
+	    x 4 core(s) x 2 hardware threads</tt>.</li>
 
 	<li>The amdsmn(4) driver for accessing SMN (System Management
 	  Network) registers was added.</li>
 
 	<li>CPU temperature monitoring support for Zen was added to
 	  amdtemp(4).</li>
 
 	<li>In cpufreq(4):
 	  <ul>
-	    <li>Added support for decoding Zen P-state info from MSRs
-	      (mostly not necessary due to ACPI P-state information,
-	      but potentially useful)</li>
+	    <li>Added support for decoding Zen P-state information
+	      from Machine State Registers (which is usually not
+	      necessary, since it is largely redundant with ACPI
+	      P-state information, but is potentially useful)</li>
 
 	    <li>Work around the apparent Ryzen inability to achieve
 	      the P1 state by not busying cores waiting to
-	      transition.</li>
+	      transition to it</li>
 	  </ul>
 	</li>
 
-	<li>The intpm(4) smbus driver was fixed to attach to FCH
-	  (Fusion Controller Hub).</li>
+	<li>The intpm(4) smbus driver was fixed to attach to the AMD
+	  FCH (Fusion Controller Hub).</li>
 
 	<li>All MCA banks are now enabled and monitored on Zen
 	  CPUs.</li>
 
-	<li>Feature bit decoding was added for: CLZERO, SVM features,
-	  RAS capabilities.</li>
+	<li>Feature-bit decoding was added for: CLZERO, SVM features,
+	  and RAS capabilities.</li>
 
 	<li>SHA intrinsic support was added to the aesni(4) driver.
 	  Ryzen is currently the only desktop processor to feature
-	  these intrinsics.  Support is also present in Intel's
-	  Goldmont line of low end SoCs.</li>
+	  these intrinsics.  Support for these intrinsics is also
+	  present in Intel's Goldmont line of low-end SoCs.</li>
       </ul>
 
       <p>Overall, Zen is now a very usable platform for x86
 	workstations and servers.</p>
     </body>
 
     <sponsor>Dell EMC Isilon</sponsor>
 
     <help>
-      <task>Add HWPMC support for new performance counters in
-	Zen.</task>
+      <task>Add HWPMC support for the new performance counters
+	avilable on the Zen architecture.</task>
 
       <task>Add support for the CCP (Crypto Co-Processor).</task>
     </help>
   </project>
 
   <project cat='bin'>
     <title>Updates to GDB</title>
 
     <contact>
       <person>
 	<name>
 	  <given>John</given>
 	  <common>Baldwin</common>
 	</name>
 	<email>jhb@FreeBSD.org</email>
       </person>
 
       <person>
 	<name>
 	  <given>Luca</given>
 	  <common>Pizzamiglio</common>
 	</name>
 	<email>pizzamig@FreeBSD.org</email>
       </person>
     </contact>
 
     <body>
       <p>The port has been updated to GDB 8.0.1.</p>
 
       <p>Support for &os;/aarch64 userland binaries has been committed
 	upstream.  These patches, along with support for debugging
 	&os;/aarch64 kernels, have been committed to the port.</p>
 
       <p>Upstream patches adding improved support for &os;/arm userland
 	binaries are currently in review.  &os; 12 has recently grown
 	support for debugging VFP registers via <tt>ptrace()</tt> and
 	core dumps as part of this work.  Support for &os;/arm kernels
 	will be added to the port after the upstream patches are added
 	to the port.</p>
 
        <p>Support for <tt>$_siginfo</tt> has been committed upstream.
 	 This uses the recently added NT_LWPINFO note to extract
 	 signal information from process cores.</p>
 
        <p>Hangs that occured when GDB's <tt>kill</tt> command was used
 	 were fixed in &os; in r313992.</p>
     </body>
 
     <help>
       <task>Figure out why the powerpc <tt>kgdb</tt> targets are not able to
 	unwind the stack past the initial frame.</task>
 
       <task>Test support for sparc64 binaries and kernels.</task>
 
       <task>Add support for debugging powerpc vector registers.</task>
 
       <task>Implement <tt>info proc</tt> commands.</task>
 
       <task>Implement <tt>info os</tt> commands.</task>
     </help>
   </project>
 
   <project cat='doc'>
     <title>Absolute &os;, 3rd Edition</title>
 
     <contact>
       <person>
 	<name>
 	  <given>Michael</given>
 	  <common>Lucas</common>
 	</name>
 	<email>mwlucas@michaelwlucas.com</email>
       </person>
     </contact>
 
     <links>
       <url href="https://blather.michaelwlucas.com/archives/3020">Official Announcement</url>
     </links>
 
     <body>
       <p>The first draft of the third edition of <em>Absolute
 	&os;</em> is finished.  It is 220,200 words, or roughly enough to
 	stun a medium-sized ox.  It's on target to be in print before
 	BSDCan 2018.</p>
     </body>
 
     <help>
       <task>Stare at the wall blankly for a few days.</task>
 
       <task>Fix all the problems pointed out by dozens of community
 	reviewers.</task>
 
       <task>Fix all the problems pointed out by John Baldwin, tech
 	reviewer extraordinaire.</task>
 
       <task>Editing.  Copyediting.  Page layout.  Page editing.
 	Re-editing.  Indexing.  Edits discovered by indexer.</task>
 
       <task>Pre-orders should open some time next year.</task>
 
       <task>Restrain myself from strangling people who ask when the
 	fourth edition is coming.</task>
     </help>
   </project>
 
   <project cat='ports'>
     <title>Puppet</title>
 
     <contact>
       <person>
 	<name>Puppet Team</name>
 	<email>puppet@FreeBSD.org</email>
       </person>
     </contact>
 
     <links>
       <url href="https://puppetcommunity.slack.com/messages/C6CK0UGB1/">Puppetlab's &os; Slack Channel</url>
     </links>
 
     <body>
       <p>This summer has seen the creation of a puppet@ team to help
-	maintain the ~30 Puppet-related ports in the &os; ports tree.
+	maintain the approximately 30 Puppet-related ports in the &os;
+	ports tree.
 	These ports were previously maintained by various committers,
-	and from time to time this introduced some delays when
-	updating a port due to the need to wait for a maintainer's
+	and from time to time the distributed maintainership
+	introduced some delays when
+	updating a port due, to the need to wait for a maintainer's
 	approval for a related change to a different port.</p>
 
       <p>Puppet 5 is now in the ports tree (as
 	<tt>sysutils/puppet5</tt>).  The C++ version of Facter
 	(<tt>sysutils/facter</tt>) got a lot of love and is now a
-	drop-in replacement for the previous Ruby version of Facter
+	drop-in replacement for the previous Ruby version
 	(<tt>sysutils/rubygem-facter</tt>); it is the default facts
 	source for the Puppet 5 port.</p>
 
       <p>Work continues on bringing in Puppetserver 5 to the ports
 	tree, and on keeping all the ports up-to-date.</p>
     </body>
 
     <help>
-      <task>The <tt>pkgng</tt> package provider has some minor issues
+      <task>The <tt>pkg</tt> package provider has some minor issues
 	(it breaks things when no repos are configured, and is not
 	working properly from the context of the MCollective package
 	agent).</task>
 
       <task>The <tt>databases/puppetdb[345]</tt> and
 	<tt>sysutils/puppetserver[45]</tt> ports rely on Clojure and
 	Java, and download compiled jar files instead of building them
 	from source.</task>
     </help>
   </project>
 
   <project cat='kern'>
     <title>Intel iWARP Support</title>
 
     <contact>
       <person>
 	<name>
 	  <given>Bartosz</given>
 	  <common>Sobczak</common>
 	</name>
 	<email>bartosz.sobczak@intel.com</email>
       </person>
     </contact>
 
     <links>
       <url href="https://reviews.FreeBSD.org/D11378">iWARP for
       <tt>ixl</tt></url>
     </links>
 
     <body>
       <p>iWARP is a protocol suite that enables efficient movement
 	of data across the network, building on Remote Direct Memory
 	Access, Direct Data Placement, and Marker PDU Aligned Framing.
-	It endeavors to avoid unnecessary (local) data copies and
+	It endeavors to avoid unnecessary (local) data copies and to
 	offload work from the main CPU to dedicated hardware.</p>
 
       <p>An initial commit adding iWARP support for the Intel X722
 	family of network adapters is under review.  This is an
 	important step towards introducing full iWARP support on
 	systems equipped with Intel C620 Series Chipsets.  Currently,
 	with the <tt>iw_ixl</tt> driver, only the kVerbs API is
 	supported.</p>
     </body>
 
     <help>
       <task>Additional testing.</task>
     </help>
   </project>
 
   <project cat='kern'>
     <title>Intel 10G <tt>iflib</tt> Driver Update</title>
 
     <contact>
       <person>
 	<name>
 	  <given>Chris</given>
 	  <common>Galazka</common>
 	</name>
 	<email>krzysztof.galazka@intel.com</email>
       </person>
 
       <person>
 	<name>
 	  <given>Piotr</given>
 	  <common>Pietruszewski</common>
 	</name>
 	<email>piotr.pietruszewski@intel.com</email>
       </person>
     </contact>
 
     <links>
       <url href="https://reviews.FreeBSD.org/D11727"><tt>ixgbe</tt> <tt>iflib</tt> Conversion</url>
     </links>
 
     <body>
       <p>The <tt>ix</tt> and <tt>ixv</tt> network interface drivers
 	support a variety of Intel network interfaces, with line
 	speeds at 10 Gbit/second.</p>
 
       <p>This quarter, with the help of Matt Macy and Sean Bruno (among
 	others), we've submitted a review in Phabricator for the
 	conversion of the <tt>ixgbe</tt> driver to use the new (and evolving)
-	<tt>iflib</tt> interface.</p>
+	<tt>iflib</tt> framework.</p>
 
       <p>Stay tuned for the conversion of the 40G driver
-	(<tt>ixl</tt>) as it is currently being ported to use
+	(<tt>ixl</tt>), as it is currently being ported to use
 	<tt>iflib</tt>.</p>
     </body>
 
     <help>
       <task>Additional testing.</task>
     </help>
   </project>
 
   <project cat='ports'>
     <title>FreeBSDDesktop</title>
 
     <contact>
       <person>
 	<name>
 	  <given>Johannes</given>
 	  <common>Dieterich</common>
 	</name>
 	<email>jmd@freebsd.org</email>
       </person>
 
       <person>
 	<name>
 	  <given>Mark</given>
 	  <common>Johnston</common>
 	</name>
 	<email>markj@freebsd.org</email>
       </person>
 
       <person>
 	<name>
 	  <given>Hans Petter</given>
 	  <common>Selasky</common>
 	</name>
 	<email>hselasky@freebsd.org</email>
       </person>
 
       <person>
 	<name>
 	  <given>Matthew</given>
 	  <common>Macy</common>
 	</name>
 	<email>mmacy@nextbsd.org</email>
       </person>
     </contact>
 
     <links>
-      <url href="https://github.com/FreeBSDDesktop/">FreeBSDDesktop GitHub</url>
+      <url href="https://github.com/FreeBSDDesktop/">FreeBSDDesktop on GitHub</url>
     </links>
 
     <body>
       <p>The FreeBSDDesktop team is happy to announce the availability of
-	<tt>graphics/drm-next-kmod</tt>. This port for &os; CURRENT
+	<tt>graphics/drm-next-kmod</tt>.  This port for &os;-CURRENT
 	(amd64) provides support for the <tt>amdgpu</tt>,
 	<tt>i915</tt>, and <tt>radeon</tt> DRM
 	modules using the <tt>linuxkpi</tt> compatibility framework.
-	The port currently corresponds to DRM from Linux 4.9 and is in
-	an experimental state. It works reliably for a lot of testers
+	The port currently corresponds to the DRM from Linux 4.9 and is in
+	an experimental state.  It works reliably for many testers
 	with modern GPU hardware (AMD HD7000 series/Tahiti to Polaris
-	and Intel HD3000/Sandy Bridge to Skylake). Broader testing and
+	and Intel HD3000/Sandy Bridge to Skylake).  Broader testing and
 	reporting/fixing of bugs is appreciated.</p> </body>
 
     <help>
       <task>Resolve issues that cause <tt>radeonkms</tt> and
 	<tt>amdgpu</tt> to fail with EFI boot (though there is a
 	workaround available).</task>
 
       <task>Upgrade to Linux 4.10 and higher DRM versions.</task>
 
       <task>Get feedback from broader testing.</task>
     </help>
   </project>
 
   <project cat="ports">
     <title>OpenJFX 8</title>
 
     <contact>
       <person>
 	<name>
 	  <given>Tobias</given>
 	  <common>Kortkamp</common>
 	</name>
 	<email>tobik@FreeBSD.org</email>
       </person>
     </contact>
 
     <links>
       <url href="https://wiki.openjdk.java.net/display/OpenJFX/Main">OpenJFX Wiki</url>
       <url href="https://www.freshports.org/java/openjfx8-devel"><tt>java/openjfx8-devel</tt></url>
       <url href="https://www.freshports.org/java/openjfx8-scenebuilder"><tt>java/openjfx8-scenebuilder</tt></url>
       <url href="https://github.com/asciidocfx/AsciidocFX">AsciidocFX</url>
     </links>
 
     <body>
-	<p>OpenJFX is an open source, next generation client
-	  application platform for desktop and embedded systems
+	<p>OpenJFX is an open source, next generation, client
+	  application platform for desktop and embedded systems,
 	  based on JavaSE.  This quarter, the OpenJFX port was
-	  reworked and has some significant improvements.</p>
+	  reworked and has received some significant improvements.</p>
 
 	<p>More modules are being built.  With the new web module we
 	  gain support for applications that have their own builtin
-	  web browser like e.g.  AsciidocFX.  The new media module
-	  allows JavaFX applications to playback audio and video
+	  web browser such as AsciidocFX.  The new media module
+	  allows JavaFX applications to play audio and video
 	  files.</p>
 
 	<p>A port of the JavaFX scenebuilder, a RAD tool for
 	  building JavaFX scenes, was added to the ports tree.</p>
 
 	<p>The OpenGL Prism backend for GPU acceleration was enabled
 	  by default.</p>
 
 	<p>From a mainainer's and contributor's perspective, the
 	  port was simplified by moving all &os;-local patches to
 	  the ports tree and fetching the upstream sources directly
 	  instead of using a separate repository for them.</p>
     </body>
 
     <help>
-      <task>Upstream some of the patches</task>
+      <task>Upstream some of the patches in the ports tree.</task>
     </help>
   </project>
 
   <project cat='team'>
     <title>Ports Collection</title>
 
     <contact>
       <person>
 	<name>
 	  <given>René</given>
 	  <common>Ladan</common>
 	</name>
 	<email>portmgr-secretary@FreeBSD.org</email>
       </person>
 
       <person>
 	<name>&os; Ports Management Team</name>
 	<email>portmgr@FreeBSD.org</email>
       </person>
     </contact>
 
     <links>
       <url href="https://www.FreeBSD.org/ports/">About &os; Ports</url>
       <url href="https://www.freebsd.org/doc/en_US.ISO8859-1/articles/contributing/ports-contributing.html">Contributing to Ports</url>
       <url href="http://portsmon.freebsd.org/index.html">&os; Ports Monitoring</url>
       <url href="https://www.freebsd.org/portmgr/index.html">Ports Management Team Website</url>
       <url href="https://twitter.com/freebsd_portmgr/">&os; portmgr on Twitter (@freebsd_portmgr)</url>
       <url href="https://www.facebook.com/portmgr">&os; Ports Management Team on Facebook</url>
       <url href="https://plus.google.com/communities/108335846196454338383">&os; Ports Management Team on Google+</url>
     </links>
 
     <body>
-      <p>The Ports Collection now features over 31,600 ports. There are currently
-	2671 problem reports, of which 718 are unassigned. This quarter saw
-	almost 5,900 commits from 175 committers. The number of open PRs grew
+      <p>The Ports Collection now features over 31,600 ports.  There are currently
+	2671 problem reports, of which 718 are unassigned.  This quarter saw
+	almost 5,900 commits from 175 committers.  The number of open PRs grew
 	compared to last quarter, and outpaced the number of changes.</p>
 
       <p>This quarter, we welcomed Zach Leslie (zleslie@), Luca Pizzamiglio
 	(pizzamig@), Craig Leres (leres@), Adriaan de Groot (adridg@), and Dave
-	Cottlehuber (dch@) as new committers. The commit bits of the following
+	Cottlehuber (dch@) as new committers.  The commit bits of the following
 	committers were taken in for safekeeping: alonso@ after 19 months of
 	inactivity, rpaulo@ per his request, and ache@ after he passed away.
 	Despite several tries and changing mentors, kami@ lacked interest in
 	completing his mentorship, so his commit bit was also taken in for
 	safekeeping.</p>
 
       <p>On the infrastructure side, two <tt>USES</tt> values were
 	removed because they outlived their usefulness:</p>
 
       <ul>
 	<li><tt>execinfo</tt>: <tt>libexecinfo</tt> is now available in the
 	  base system of all supported &os; versions</li>
 
 	<li><tt>twisted</tt>: there is only one Twisted port left</li>
       </ul>
 
-      <p>The default version of GCC was bumped from 5 to 6. Firefox was updated
-	to version 56.0 and Chromium to version 61.0.3163.100. The version of
+      <p>The default version of GCC was bumped from 5 to 6.  Firefox was updated
+	to version 56.0 and Chromium to version 61.0.3163.100.  The version of
 	<tt>pkg</tt> itself was updated to 1.10.1.</p>
 
       <p>During this quarter, antoine@ performed 28 exp-runs to test version
 	updates of major ports, improving <tt>USE_GITHUB</tt> and
 	<tt>SHEBANG_FILES</tt>, and API changes to the base system.
-	This quarter, the foundations for ports &quot;flavors&quot; were
+	This quarter, the foundation for ports &quot;flavors&quot; was
 	committed, though more development and testing will be
 	performed in the coming quarter before it goes live.</p>
     </body>
 
     <help>
       <task>The PR load needs more attention, as the number of open PRs
 	has started to increase again.</task>
     </help>
   </project>
 
   <project cat='proj'>
     <title>&os; CI</title>
 
     <contact>
       <person>
 	<name>Jenkins Admins</name>
 	<email>jenkins-admin@FreeBSD.org</email>
       </person>
     </contact>
 
     <links>
       <url href="https://github.com/freebsd/freebsd-ci"><tt>freebsd-ci</tt> Repository</url>
       <url href="https://lists.FreeBSD.org/mailman/listinfo/freebsd-testing">freebsd-testing Mailing List</url>
       <url href="http://ci.FreeBSD.org">&os; Jenkins Instance</url>
     </links>
 
     <body>
       <p>The &os; CI team runs various continuous integration
 	solutions for &os;, regularly checking that the current state
 	of the Subversion repository can successfully build, and
 	performing various tests and analysis upon the build
 	results.</p>
 
       <p>We have introduced a DTrace test pipeline, with the results
 	and artifacts available at:</p>
 
       <ul>
 	<li><a href="https://ci.FreeBSD.org/job/&os;-head-amd64-dtrace_test/">https://ci.FreeBSD.org/job/&os;-head-amd64-dtrace_test/</a></li>
 
 	<li><a href="https://artifact.ci.FreeBSD.org/dtrace-test/">https://artifact.ci.FreeBSD.org/dtrace-test/</a></li>
       </ul>
 
-      <p>We had 2 developer summits in Q3:</p>
+      <p>We had a team meeting at two developer summits during Q3:</p>
 
       <ul>
 	<li><a href="https://wiki.FreeBSD.org/DevSummit/201708/Testing">BSDcam</a></li>
 	<li><a href="https://wiki.FreeBSD.org/DevSummit/201709">EuroBSDCon</a></li>
       </ul>
     </body>
 
     <help>
-      <task>Fix the failing cases and builds.</task>
+      <task>Fix the failing test cases and builds.</task>
 
       <task>Create builds for additional architectures.</task>
 
       <task>Add more tests.</task>
 
       <task>The additional TODO items listed at <a
 	href="https://wiki.FreeBSD.org/Jenkins/TODO">https://wiki.FreeBSD.org/Jenkins/TODO</a>.</task>
     </help>
   </project>
 
   <project cat='team'>
     <title>The &os; Core Team</title>
 
     <contact>
       <person>
 	<name>&os; Core Team</name>
 	<email>core@FreeBSD.org</email>
       </person>
     </contact>
 
     <body>
       <p>The new &quot;&os; Community Process&quot; was drafted during BSDCan
 	earlier this year.  The first such document, FCP 0, defines how
 	the whole process works.  After some time for discussion and
 	revision, FCP 0 was voted on and accepted by core, following the
 	procedure laid down within that document.  Currently the use of FCPs
 	is entirely optional; we shall see how the community begins to
 	adopt their usage and evolve the process based on experience.</p>
 
       <p>A draft update to the Code of Conduct has been prepared by the
 	advisory committee.  Core is currently reviewing the text, and
 	will soon vote on accepting it.  Core is keen to avoid the trap of
 	&quot;rules lawyering&quot;.  At the moment, the feeling is
 	that we need to add a preamble to the CoC to articulate the
 	goals of the project and to act as a general guide to the
 	exercise of the code.</p>
 
       <p>This quarter has been quite a busy one concerning changes to
 	the roster of committers and project members.  We have elected our
 	first new Project Member &mdash; John Hixson, who will be familiar from
 	many conferences where he has given presentations and ably
 	represented iXsystems.  A second proposed Project Member was not
 	accepted by core, but only because core felt that Fedor Uporov
 	really deserved a commit bit instead.</p>
 
       <p>In addition to Fedor Uporov, please also welcome (in no
 	particular order) Matt Joras, Marcin Wojtas, Chuck Tuffli, Ilya
-	Bakulin and Alex Richardson as brand new committers.  We have also
+	Bakulin and Alex Richardson as brand-new committers.  We have also
 	awarded Steven Hurd and Eugene Grosbein src commit bits to go with
 	their existing ports bits.  Welcome back Gordon Tetlow as a src
 	committer, essential for his new role within secteam.  Eric Davis
 	and Rui Paulo have both decided to hang up their commit bits: we
 	wish them well in their future endeavours.  Finally, we must
 	report the sad death of Andrey Chernov, who will be sorely missed
 	by his colleagues and collaborators.</p>
 
       <p>Andrey's death has highlighted another question which is only
 	going to become more complex over time.  Keeping track of
 	copyrights is already hard enough within a mature source tree with
 	many contributors, such as the &os; sources.  Now we need to
 	consider trying to keep track of the heirs and beneficiaries of
 	contributors who have sadly passed away.  Core will consult with
 	the Foundation legal team to discuss possible approaches to
 	alleviate this.</p>
 
       <p>There have been complaints that the workings of Core are being
 	kept overly confidential, and that consequently the majority of
 	the project has too little idea of what is going on.  This is
 	certainly not intentional by Core, and we are keen to open up
 	Core's business to more general community scrutiny as far as seems
 	reasonable.</p>
 
       <p>Core dealt with a number of licensing questions:</p>
 
       <ul>
 	<li>When upstreaming patches and other original works to
 	  VirtualBox or other Oracle properties, pragmatically it works
 	  best to provide them under the terms of the MIT license (one
 	  of two opensource licenses accepted by Oracle).  Of course,
 	  this only applies to work upstreamed by or with the permission
 	  of the original author.</li>
 
 	<li>The Viking software license is sufficiently BSD-like that
 	  magic constants from their drivers can be used in &os;
 	  code.</li>
 
 	<li>There is no separate register of deviations from the allowed
 	  BSD-like licenses in the source tree: any code in the tree
 	  under other than BSD-like license terms can be assumed to have
 	  been approved by core.</li>
 
 	<li>At the moment the &os; copyright requirement to include
 	  the copyright notice in redistributions in binary form is
 	  satisfied by making the &os; sources, with all of the
 	  detailed copyright information included in the different source
 	  code files, available alongside pre-compiled system images.
 	  However, this does not necessarily meet the needs of downstream
 	  projects based on &os;, and given the new "packaged base",
 	  adding per-package licensing metadata in a way similar to how
-	  the Ports Collectionworks is under consideration as an alternative
+	  the Ports Collection works is under consideration as an alternative
 	  mechanism.</li>
       </ul>
 
       <p>Concerns were raised regarding the pending HardenedBSD entry in the
 	previous quarterly report prior to publication.  The &os;
 	project welcomes reports from separate (but derived) projects in
 	quarterly reports and has included similar reports in the past
 	from other projects (such as TrueOS and pfSense).  The HardenedBSD
 	report was edited for length and to concentrate on activities
 	during the quarter in question.</p>
 
-      <p>Amazon is proposing to set up mirrors of the FreeBSD-update and
+      <p>Amazon is proposing to set up mirrors of the <tt>freebsd-update</tt> and
 	<tt>pkg</tt> servers within AWS in order to provide faster
 	access for EC2 users.  These mirrors will be publicly
 	accessible, but the expectation is that use will primarily be
 	from within EC2.  &os; AMIs will have a preset configuration
 	that references the Amazon servers.</p>
 
-      <p>The old, long deprecated and insecure &quot;r-commands&quot; (rsh,
-	rlogin, rcp) are being removed from the base system for
+      <p>The old, long-deprecated, and insecure &quot;r-commands&quot;
+        (<tt>rsh</tt>, <tt>rlogin</tt>, <tt>rcp</tt>) are being removed
+	from the base system for
 	12.0-RELEASE.  Notice of this was added to the man pages and
 	release notes in time for 11.1-RELEASE and 10.4-RELEASE.  Anyone
 	requiring these commands for backwards compatibility can use the
 	new <tt>net/bsdrcmds</tt> port.</p>
 
       <p>Work to replace Heimdal Kerberos in base with the more widely
 	compatible MIT Kerberos has begun in a new
 	<tt>projects/krb5</tt> branch.  This should not fall foul of
 	any US cryptography export regulations: the project is
 	required to notify the US government that cryptographic
 	software can be downloaded from &os; servers, and this already
 	covers MIT Kerberos, already available within ports.</p>
 
       <p>A number of Bay Area &os; User Group-related domain names
 	are being given up by their original owner.  The current BAFUG
 	organisers have been made aware.</p>
 
       <p>Core has voted on a change to the Doceng voting rules to
 	provide for a &quot;did not vote&quot; status during doceng
 	voting similar to how portmgr and core voting operates.  The
 	current requirement for all five members of doceng to register
 	a vote on issues was proving to be a significant
 	bottleneck.</p>
     </body>
   </project>
 
   <project cat='team'>
     <title>The FreeBSD Foundation</title>
 
       <contact>
 	<person>
 	  <name>
 	    <given>Deb</given>
 	    <common>Goodkin</common>
 	  </name>
 	  <email>deb@FreeBSDFoundation.org</email>
 	</person>
       </contact>
 
       <links>
 	<url href="https://www.FreeBSDFoundation.org/">FreeBSD Foundation Website</url>
-	<url href="https://www.FreeBSDfoundation.org/wp-content/uploads/2017/08/&os;-Foundation-July-August-2017-Update.pdf">FreeBSD Foundation Quarterly Newsletter</url>
+	<url href="https://www.FreeBSDfoundation.org/wp-content/uploads/2017/08/FreeBSD-Foundation-July-August-2017-Update.pdf">FreeBSD Foundation Quarterly Newsletter</url>
       </links>
 
       <body>
 	<p>The FreeBSD Foundation is a 501(c)(3) non-profit
 	  organization dedicated to supporting and promoting the
 	  &os; Project and community worldwide.  Funding comes from
 	  individual and corporate donations and is used to fund and
 	  manage software development projects, conferences and
 	  developer summits, and provide travel grants to &os;
 	  contributors.  The Foundation purchases and supports hardware
 	  to improve and maintain &os; infrastructure and provides
 	  full-time Release Engineering support; publishes marketing
 	  material to promote, educate, and advocate for the &os;
 	  Project; facilitates collaboration between commercial
 	  vendors and &os; developers; and finally, represents the
 	  &os; Project in executing contracts, license agreements,
 	  and other legal arrangements that require a recognized legal
 	  entity.</p>
 
       <p>Here are some highlights of what we did to help &os; last
 	quarter:</p>
 
       <p>Fundraising Efforts</p>
 
       <p>Our work is 100% funded by your donations.  This year we've
-	raised over $860,000 from 500+ donors.  Our 2017 fundraising
+	raised over $860,000 from over 500 donors.  Our 2017 fundraising
 	goal is $1,250,00 and we are continuing to work hard to meet
 	and exceed this goal!  Please consider making a donation to
-	help us continue and increase our support for &os;.  <a
+	help us continue and increase our support for &os;: <a
 	  href="https://www.FreeBSDfoundation.org/donate/">https://www.&os;foundation.org/donate/</a>.</p>
 
       <p>We also have a new Partnership Program, to provide more benefits
 	for our larger commercial donors.  Find out more information at
 	<a
 	  href="https://www.FreeBSDfoundation.org/FreeBSD-foundation-partnership-program/">https://www.FreeBSDfoundation.org/FreeBSD-foundation-partnership-program/</a>
 	and share with your companies!</p>
 
       <p>OS Improvements</p>
 
       <p>The Foundation improves the &os; operating system by
 	employing our technical staff to maintain and improve critical
 	kernel subsystems, add features and functionality, and fix
 	problems.  This also includes funding separate project grants
 	like the arm64 port, <tt>blacklistd</tt> access control
 	daemon, and the integration of VIMAGE support, to make sure
 	that &os; remains a viable solution for research,
 	education, computing, products and more.</p>
 
       <p>We kicked off or continued the following projects last
 	quarter:</p>
 
       <ul>
 	<li>OpenZFS RAID-Z Expansion project</li>
 
 	<li>Broadcom Wi-Fi infrastructural improvements
 	  (<tt>bhnd(4)</tt> driver)</li>
 
-	<li>Headless mode out of the box &mdash; Beaglebone Black</li>
+	<li>Headless mode out-of-the-box for the Beaglebone Black</li>
 
-	<li>Extending bhyve-ARMv7 features</li>
+	<li>Extending <tt>bhyve</tt>/ARMv7 features</li>
 
-	<li>Porting <tt>bhyve-arm</tt> to an ARMv8 platform</li>
+	<li>Porting <tt>bhyve</tt>ARM to an ARMv8 platform</li>
       </ul>
 
       <p>Having software developers on staff has allowed us to jump in
 	and work directly on projects to improve &os; like:</p>
 
       <ul>
 	<li>ZFS improvements</li>
 
 	<li>New Intel server support</li>
 
 	<li><tt>kqueue(2)</tt> updates</li>
 
 	<li>64-bit inode support</li>
 
 	<li>Stack guard</li>
 
-	<li>Kernel Undefined Behavior sanitizer</li>
+	<li>Kernel Undefined Behavior Sanitizer</li>
 
 	<li>Toolchain projects</li>
 
 	<li><tt>i915</tt> driver investigation</li>
 
 	<li>NVDIMM support in <tt>acpiconf(8)</tt></li>
 
 	<li>Continuous integration dashboard (web page and physical
 	  hardware)</li>
 
 	<li>FAT filesystem support in makefs(8)</li>
       </ul>
 
       <p>Staff and board members continued hosting bi-weekly
 	conference calls to facilitate efforts for individuals to
 	collaborate on different technologies.</p>
 
-      <p>You can find out more about the support we provided by
-	reading individual updates from Ed Maste, Konstatin Belousov,
-	Landon Fuller, Matt Ahrens, and Edward Napierala in this
-	report.</p>
-
       <p>Release Engineering</p>
 
       <p>The Foundation provides a full-time staff member to lead the
 	release engineering efforts.  This has provided timely and
 	reliable releases over the last few years.</p>
 
       <p>Last quarter, our full-time staff member worked with the
 	&os; Release Engineering and Security Teams to finalize
 	11.1-RELEASE.  He also supported the 10.4 release effort, and
 	has continued producing 10-STABLE, 11-STABLE, and 12-CURRENT
 	development snapshot builds throughout the quarter.  At the
 	vBSDCon Developer Summit, he gave a presentation on the state
 	of the release engineering team.</p>
 
       <p>You can find out more about the support we provided to the
 	Release Engineering Team by reading their status update in
 	this report.</p>
 
       <p>Supporting &os; Infrastructure</p>
 
       <p>The Foundation provides hardware and support to improve the
 	&os; infrastructure.  Last quarter, we continued supporting
 	&os; hardware located around the world.</p>
 
       <p>&os; Advocacy and Education</p>
 
       <p>A large part of our efforts are dedicated to advocating for
 	the Project.  This includes promoting work being done by
 	others with &os;; producing advocacy literature to teach
 	people about &os; and help make the path to starting using
 	&os; or contributing to the Project easier; and attending
 	and getting other &os; contributors to volunteer to run
 	&os; events, staff &os; tables, and give &os;
 	presentations.</p>
 
       <p>The FreeBSD Foundation sponsors many conferences, events, and
 	summits around the globe.  These events can be BSD-related,
 	open source, or technology events geared towards
 	underrepresented groups.</p>
 
       <p>We support the &os;-focused events to help provide a venue
 	for sharing knowledge, to work together on projects, and to
 	facilitate collaboration between developers and commercial
 	users.  This all helps provide a healthy ecosystem.  We support
 	the non-&os; events to promote and raise awareness of
 	&os;, to increase the use of &os; in different
 	applications, and to recruit more contributors to the
 	Project.</p>
 
       <p>Here is a list highlighting some of the advocacy and
 	education work we did last quarter:</p>
 
       <ul>
 	<li>Organized and ran the Essen &os; Hackathon in Essen
 	  Germany</li>
 
 	<li>Sponsored and participated in the &os; Developer Summit
 	  BSDCam, in Cambridge, England</li>
 
 	<li>Represented &os; at the ARM Partner Meeting</li>
 
 	<li>Presented and taught about &os; at SdNOG 4 in Khartoum,
 	  Sudan</li>
 
 	<li>Sponsored and gave presentations and tutorials at
 	  EuroBSDCon in Paris, France</li>
 
 	<li>Organized and ran the Paris &os; Developer Summit</li>
 
 	<li>Organized and ran the &os; Developer Summit at vBSDCon</li>
 
 	<li>Sponsored and attended vBSDCon</li>
 
 	<li>Proved travel grants to &os; contributors to attend the
 	  above events.</li>
 
-	<li>Industry Partner for 2017 USENIX Security Symposium in
-	  Vancouver BC</li>
+	<li>Sponsored the 2017 USENIX Security Symposium in Vancouver
+	  BC as an Industry Partner</li>
 
 	<li>Provided &os; advocacy material</li>
 
-	<li>Industry Partner for 2017 USENIX Annual Technical
-	Conference in Santa Clara, CA</li>
+	<li>Supported the 2017 USENIX Annual Technical Conference in
+	  Santa Clara, CA as an Industry Partner</li>
       </ul>
 
       <p>We continued producing &os; advocacy material to help
 	people promote &os; around the world.</p>
 
       <p>We help educate the world about &os; by publishing the
 	professionally produced &os; Journal.  Last quarter we
 	published the July/August issue that you can find at <a
 	  href="https://www.FreeBSDfoundation.org/journal/">https://www.&os;foundation.org/journal/</a>.</p>
 
-      <p>You can find out more about events we were at and upcoming
+      <p>You can find out more about events we attended and upcoming
 	events at <a
 	  href="https://www.FreeBSDfoundation.org/news-and-events/">https://www.FreeBSDfoundation.org/news-and-events/</a>.</p>
 
       <p>Legal/&os; IP</p>
 
       <p>The Foundation owns the &os; trademarks, and it is our
 	responsibility to protect them.  We also provide legal support
 	for the core team to investigate questions that arise.</p>
 
       <p>Go to <a
 	  href="https://www.FreeBSDfoundation.org/">http://www.&os;foundation.org</a>
 	to find out how we support &os; and how we can help you!</p>
     </body>
   </project>
 
   <project cat="kern">
     <title>pNFS Server Plan B</title>
 
     <contact>
       <person>
 	<name>
 	  <given>Rick</given>
 	  <common>Macklem</common>
 	</name>
 	<email>rmacklem@FreeBSD.org</email>
       </person>
     </contact>
 
     <links>
       <url href="http://people.FreeBSD.org/~rmacklem/pnfs-planb-setup.txt">Instructions for Testing</url>
     </links>
 
     <body>
       <p>A pNFS server allows an NFS service to be spread over
 	multiple servers, separating the MetaData operations from the
-	Data operations (Read/Write).  This project will add the
-	capability of using &os; systems to create a pNFS service
-	consisting of a single MetaData Server, plus a set of Data
+	Data operations (Read and Write).  This project will add the
+	ability to use &os; systems to create a pNFS service
+	consisting of a single MetaData Server plus a set of Data
 	Servers.  The Data Servers can be mirrored, so that redundant
 	copies of the file data are maintained.</p>
 
       <p>The support for non-mirrored Data Servers is now believed
 	to be complete.  Support for mirrored Data Servers using the
 	Flexible File Layout, which will soon be published as an RFC,
 	is implemented.  However, there is still significant work to
 	be done, since the current implementation of mirrored Data
 	Servers does not handle failed Data Servers or their
 	resilvering/recovery.  It is hoped that support for
 	failure/recovery of Data Servers will be implemented in the
 	next six months.</p>
 
       <p>The patched &os; sources may now be accessed for testing
-	via either Subversion or download of a gzipped tarball.
-	They consist of a patched kernel plus nfsd daemon and can be
+	via either Subversion or downloading a gzipped tarball.
+	They consist of a patched kernel and <tt>nfsd</tt> and can be
 	used on any &os; 11 or later system.  The installation
 	procedure is covered in the linked document.</p>
     </body>
 
     <help>
       <task>Testing by others will be needed, now that the
 	implementation is available.</task>
 
       <task>Implementation and testing of mirror failure/recovery.</task>
     </help>
   </project>
 
-  <project cat="proj">
+  <project cat="third">
     <title>The <tt>nosh</tt> Project</title>
 
     <contact>
       <person>
 	<name>
 	  <given>Jonathan</given>
 	  <common>de Boyne Pollard</common>
 	</name>
 	<email>J.deBoynePollard-newsgroups@NTLWorld.COM</email>
       </person>
     </contact>
 
     <links>
       <url href="http://jdebp.eu./Softwares/nosh.html">Introduction</url>
       <url href="http://jdebp.eu./Softwares/nosh/FreeBSD-binary-packages.html">&os; Binary Packages</url>
       <url href="http://jdebp.eu./Softwares/nosh/timorous-admin-installation-how-to.html">Installation How-To</url>
       <url href="http://jdebp.eu./Softwares/nosh/roadmap.html">Roadmap</url>
       <url href="http://jdebp.eu./Softwares/nosh/guide/index.html">A Slightly Outdated User Guide</url>
       <url href="http://framagit.org/taca/archnosh">Archnosh</url>
     </links>
 
     <body>
-      <p>The nosh project is a suite of system-level utilities for
+      <p>The <tt>nosh</tt> project is a suite of system-level utilities for
 	initializing, running, and shutting down BSD systems; and for
 	managing daemons, terminals, and logging.  It attempts to
 	supersede BSD <tt>init</tt>, the Mewburn <tt>rc.d</tt> system,
 	and OpenRC as used on &os; and TrueOS, drawing inspiration
 	from Solaris SMF for named milestones, daemontools-encore for
 	service control/status mechanisms, UCSPI, and IBM AIX for
-	separated service and system management.  It comprises a range
+	separated service and system management.  It includes a range
 	of compatibility mechanisms, including shims for familiar
 	commands from other systems, and an automatic import mechanism
 	that takes existing configuration data from
 	<tt>/etc/fstab</tt>, <tt>/etc/rc.conf{,.local}</tt>,
 	<tt>/etc/ttys</tt>, and elsewhere, applying them to its native
 	service definitions and creating additional native services.
 	It is portable (including to Linux) and composable, it
 	provides a migration path from the world of systemd Linux, and
 	it does not require new kernel APIs.  It provides clean
 	service environments, orderings and dependencies between
 	services, parallelized startup and shutdown (including
 	<tt>fsck</tt>), strictly size-capped and autorotated logging,
 	the service manager as a &quot;subreaper&quot;, and uses
 	<tt>kevent(2)</tt> for event-driven parallelism.</p>
 
       <p>Since the last status report, in December 2015, the project
 	has seen: restructured and finer-grained packaging that has
 	fewer conflicts with other toolsets; the addition of
-	<tt>zsh</tt> completion files; improvements to the vertual
+	<tt>zsh</tt> completion files; improvements to the virtual
 	terminal subsystem, keyboard map, mouse support, and ugen and
 	DECSCUSR support; RFC 5424/5426 remote logging support;
-	replacement of the libkqueue and the C library's environment
+	replacement of libkqueue and the C library's environment
 	handling functions; several new helper commands; support for
 	Java VM autolocation; improved socket-passing code; an
 	extended status API and &quot;one-shot&quot; service support;
 	additional pre-supplied service bundles; support for service
 	aliases; improved handling of per-user D-Bus services;
 	improved import of MySQL, MariaDB, Percona, and OpenVPN
 	services; improved configuration import support; and extensive
 	additions to the <tt>nosh</tt> Guide.</p>
 
       <p>On the recently updated roadmap you can see plans for even
 	more documentation, continuing the work to extend the
 	capabilities of the networking subsystem, and the scant
 	handful of <tt>rc.d</tt>-related items remaining.  There are
 	also some ideas still in the speculative or planning phases,
 	including work that may depend on incorporating <tt>nosh</tt>
 	support into other software.</p>
     </body>
 
     <help>
       <task>Improve Ansible and SaltStack integration (the maintainer
 	of the Arch Linux <tt>nosh</tt> integration has some
 	ideas).</task>
 
       <task>Command-line completions are still needed for
 	<tt>bash</tt>, <tt>csh</tt>, and <tt>fish</tt>.</task>
 
       <task>Document <tt>convert-systemd-units</tt> for use by port
 	maintainers in making packaged service bundles from
 	<tt>systemd</tt> unit files.</task>
 
       <task><tt>nosh</tt> could take advantage of several proposed
 	features for the base system:
 
 	<ul>
 	  <li>the boot loader signaling &quot;emergency&quot; and
 	    &quot;rescue&quot;modes of operation</li>
 
 	  <li>adding machine-readable status output to
 	    <tt>fsck</tt></li>
 
 	  <li>adding runtime support for more
 	    <tt>clang</tt>-compilable languages in the early bootstrap
 	    stage</li>
 
 	  <li>adding hooks for invoking external configuration import
 	    mechanisms</li>
 	</ul>
       </task>
     </help>
   </project>
 
   <project cat='doc'>
     <title>Manual Pages</title>
 
     <contact>
       <person>
 	<name>
 	  <given>Warren</given>
 	  <common>Block</common>
 	  <email>wblock@FreeBSD.org</email>
 	</name>
       </person>
     </contact>
 
     <links>
       <url href="https://www.freebsd.org/doc/en_US.ISO8859-1/books/fdp-primer/">&os; Documentation Project Primer</url>
     </links>
 
     <body>
       <p>Over the last year, interest has increased in manual pages, in
 	large part due to excellent infrastructure work by Baptiste
 	Daroussin and others, and promotion by George Neville-Neil and
 	others.  This increased interest has been both gratifying and
 	problematic.  Our man pages are underappreciated gems, but we
 	have sadly lacked any substantial documentation on how to write
 	new ones.</p>
 
       <p>In September, I added a new chapter to the
-	<a href="https://www.freebsd.org/doc/en_US.ISO8859-1/books/fdp-primer/">&os;Documentation
-	Project Primer</a> describing the basics of creating a man
-	page.  It includes descriptions of the markup, section
-	structure, recommended optional material such as examples,
-	and sample templates for the most common types of man pages.
-	The Resources section includes links to several external
-	resources, including the excellent <a
+	<a href="https://www.freebsd.org/doc/en_US.ISO8859-1/books/fdp-primer/">&os;
+	  Documentation Project Primer</a> describing the basics of
+	creating a man page.  It includes descriptions of the
+	markup, section structure, recommended optional material
+	such as examples, and sample templates for the most common
+	types of man pages.  The Resources section includes links to
+	several external resources, including the excellent <a
 	href="http://manpages.bsd.lv/mdoc.html">Practical UNIX
 	Manuals: mdoc</a>.</p>
 
       <p>While this chapter is not a full tutorial, it does begin to fill
 	in a large gap in our documentation resources and provide a
 	starting point from which to grow.</p>
     </body>
 
     <help>
-      <task>Add more explanation and examples of markup.</task>
+      <task>Add more explanation and examples of markup usage.</task>
 
       <task>Expand the sample templates with additional desired standard
 	features, like an EXAMPLES section.</task>
 
       <task>Add more sample templates.</task>
     </help>
   </project>
 </report>