From 6c3c6ea31cc43961b26d13923313388be7c7d28b Mon Sep 17 00:00:00 2001
From: Mark Linimon <linimon@FreeBSD.org>
Date: Wed, 20 Nov 2019 05:07:46 +0000
Subject: [PATCH] Move the paragraph "the latest release from the <xyz>.stable;
 branch down to where it makes more sense.

Remove two paragraphs that attempted to duplicate the exact same
information but did it incorrectly.
---
 en_US.ISO8859-1/books/faq/book.xml | 27 ++++++++-------------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/en_US.ISO8859-1/books/faq/book.xml b/en_US.ISO8859-1/books/faq/book.xml
index aedf764a75..875c62aba6 100644
--- a/en_US.ISO8859-1/books/faq/book.xml
+++ b/en_US.ISO8859-1/books/faq/book.xml
@@ -333,7 +333,7 @@
 	    from the &rel.stable; branch, and &rel2.relx; releases are
 	    made from the &rel2.stable; branch.</para>
 
-	  <para>Up until the release of 9.0, the &rel2.relx; series
+	  <para>Up until the release of 12.0, the &rel2.relx; series
 	    was the one known as <emphasis>-STABLE</emphasis>.
 	    However, as of &rel.head.relx;, the &rel2.relx; branch
 	    will be designated for an <quote>extended support</quote>
@@ -344,14 +344,6 @@
 	    <quote>legacy</quote> branch and most current work will only
 	    become a part of &rel.stable; and &rel2.stable;.--></para>
 
-	  <para>Version <link
-	      xlink:href="https://download.FreeBSD.org/ftp/releases/amd64/amd64/&rel121.current;-RELEASE/">&rel121.current;</link>
-	    is the latest release from the &rel.stable; branch; it was
-	    released in &rel121.current.date;.  Version <link
-	      xlink:href="https://download.FreeBSD.org/ftp/releases/amd64/amd64/&rel1.current;-RELEASE/">&rel1.current;</link>
-	    is the latest release from the &rel2.stable; branch; it
-	    was released in &rel1.current.date;.</para>
-
 	  <para>Releases are made <link linkend="release-freq">every
 	      few months</link>.  While many people stay more
 	    up-to-date with the &os; sources (see the questions on
@@ -474,17 +466,14 @@
 	      xlink:href="https://www.FreeBSD.org/releng">Release
 	      Engineering Information</link> page.</para>
 
-	  <para>&rel.current;-STABLE is the actively developed
-	    <emphasis>-STABLE</emphasis> branch.  The latest release
-	    on the &rel.current;-STABLE branch is
-	    &rel.current;-RELEASE, which was released in
-	    &rel.current.date;.</para>
+	  <para>Version <link
+	      xlink:href="https://download.FreeBSD.org/ftp/releases/amd64/amd64/&rel121.current;-RELEASE/">&rel121.current;</link>
+	    is the latest release from the &rel.stable; branch; it was
+	    released in &rel121.current.date;.  Version <link
+	      xlink:href="https://download.FreeBSD.org/ftp/releases/amd64/amd64/&rel1.current;-RELEASE/">&rel1.current;</link>
+	    is the latest release from the &rel2.stable; branch; it
+	    was released in &rel1.current.date;.</para>
 
-	  <para>The &rel.head; branch is the actively developed
-	    <emphasis>-CURRENT</emphasis> branch toward the next
-	    generation of &os;.  See <link linkend="current">What is
-	    &os;-CURRENT?</link> for more information on this
-	    branch.</para>
 	</answer>
       </qandaentry>