From b072c419935a911e38d8e27d6fe5d2b3b52cd272 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Tue, 25 Oct 2016 16:28:41 +0000
Subject: [PATCH] Improve wording in the security.html page.

PR:		213525
Submitted by:	linimon
Sponsored by:	The FreeBSD Foundation
---
 en_US.ISO8859-1/htdocs/security/security.xml | 21 +++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/en_US.ISO8859-1/htdocs/security/security.xml b/en_US.ISO8859-1/htdocs/security/security.xml
index f36b92c839..9bec56abd5 100644
--- a/en_US.ISO8859-1/htdocs/security/security.xml
+++ b/en_US.ISO8859-1/htdocs/security/security.xml
@@ -23,11 +23,11 @@
 
   <h2>Reporting FreeBSD security incidents</h2>
 
-  <p>FreeBSD security issues specific to the operating system
-    should be reported to the <a
+  <p>FreeBSD security issues specific to the base system
+    should be reported via email to the <a
       href="mailto:secteam@FreeBSD.org">FreeBSD Security Team</a>
-    or, if a higher level of confidentiality is required, PGP
-    encrypted to the <a
+    or, if a higher level of confidentiality is required, via PGP
+    encrypted email to the <a
       href="mailto:security-officer@FreeBSD.org">Security Officer
       Team</a>
     using the <a href="so_public_key.asc">Security Officer PGP
@@ -52,8 +52,8 @@
   <a name="how"></a>
   <h2>How to update your system</h2>
 
-  <p>For most users, the easiest way to update your supported &os;
-    &rel.current; or &rel2.current; system is to use the following
+  <p>For users that have previously installed a binary version of &os;
+    (e.g. &rel.current; or &rel2.current;),
     commands:</p>
 
   <tt># freebsd-update fetch<br />
@@ -62,11 +62,18 @@
   <p>If that fails, follow the other instructions in the security
     advisory you care about.</p>
 
+  <p>Note that the above procedure is only for users who have
+    previously installed a binary distribution.  Those who have
+    built from source will need to update their source tree to
+    upgrade.</p>
+
   <a name="sup"></a>
   <h2>Supported FreeBSD releases</h2>
 
   <p>The designation and expected lifetime of all currently supported
-    branches are given below.  The <em>Expected EoL (end-of-life)</em>
+    branches
+    and their respective releases
+    are given below.  The <em>Expected EoL (end-of-life)</em>
     column indicates the earliest date on which support for that
     branch or release will end.  Please note that these dates may be
     pushed back if circumstances warrant it.</p>