From owner-svn-doc-head@freebsd.org Wed Nov 20 05:07:47 2019 Return-Path: Delivered-To: svn-doc-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2D8DB1A85C9; Wed, 20 Nov 2019 05:07:47 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47HrKv0Tggz4L5f; Wed, 20 Nov 2019 05:07:47 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E835F1DBDF; Wed, 20 Nov 2019 05:07:46 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xAK57kAm073022; Wed, 20 Nov 2019 05:07:46 GMT (envelope-from linimon@FreeBSD.org) Received: (from linimon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xAK57kvU073021; Wed, 20 Nov 2019 05:07:46 GMT (envelope-from linimon@FreeBSD.org) Message-Id: <201911200507.xAK57kvU073021@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: linimon set sender to linimon@FreeBSD.org using -f From: Mark Linimon Date: Wed, 20 Nov 2019 05:07:46 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r53605 - head/en_US.ISO8859-1/books/faq X-SVN-Group: doc-head X-SVN-Commit-Author: linimon X-SVN-Commit-Paths: head/en_US.ISO8859-1/books/faq X-SVN-Commit-Revision: 53605 X-SVN-Commit-Repository: doc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Nov 2019 05:07:47 -0000 Author: linimon Date: Wed Nov 20 05:07:46 2019 New Revision: 53605 URL: https://svnweb.freebsd.org/changeset/doc/53605 Log: Move the paragraph "the latest release from the .stable; branch down to where it makes more sense. Remove two paragraphs that attempted to duplicate the exact same information but did it incorrectly. Modified: head/en_US.ISO8859-1/books/faq/book.xml Modified: head/en_US.ISO8859-1/books/faq/book.xml ============================================================================== --- head/en_US.ISO8859-1/books/faq/book.xml Tue Nov 19 18:43:47 2019 (r53604) +++ head/en_US.ISO8859-1/books/faq/book.xml Wed Nov 20 05:07:46 2019 (r53605) @@ -333,7 +333,7 @@ from the &rel.stable; branch, and &rel2.relx; releases are made from the &rel2.stable; branch. - Up until the release of 9.0, the &rel2.relx; series + Up until the release of 12.0, the &rel2.relx; series was the one known as -STABLE. However, as of &rel.head.relx;, the &rel2.relx; branch will be designated for an extended support @@ -344,14 +344,6 @@ legacy branch and most current work will only become a part of &rel.stable; and &rel2.stable;.--> - Version &rel121.current; - is the latest release from the &rel.stable; branch; it was - released in &rel121.current.date;. Version &rel1.current; - is the latest release from the &rel2.stable; branch; it - was released in &rel1.current.date;. - Releases are made every few months. 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 page. - &rel.current;-STABLE is the actively developed - -STABLE branch. The latest release - on the &rel.current;-STABLE branch is - &rel.current;-RELEASE, which was released in - &rel.current.date;. + Version &rel121.current; + is the latest release from the &rel.stable; branch; it was + released in &rel121.current.date;. Version &rel1.current; + is the latest release from the &rel2.stable; branch; it + was released in &rel1.current.date;. - The &rel.head; branch is the actively developed - -CURRENT branch toward the next - generation of &os;. See What is - &os;-CURRENT? for more information on this - branch.