From owner-svn-doc-all@freebsd.org Wed Nov 20 05:25:01 2019 Return-Path: Delivered-To: svn-doc-all@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 62CA11A8BB7; Wed, 20 Nov 2019 05:25:01 +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 47Hrjn20cRz4LkG; Wed, 20 Nov 2019 05:25:01 +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 2886B1DF5E; Wed, 20 Nov 2019 05:25:01 +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 xAK5P1FP084807; Wed, 20 Nov 2019 05:25:01 GMT (envelope-from linimon@FreeBSD.org) Received: (from linimon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xAK5P1Fh084806; Wed, 20 Nov 2019 05:25:01 GMT (envelope-from linimon@FreeBSD.org) Message-Id: <201911200525.xAK5P1Fh084806@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:25:01 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r53607 - 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: 53607 X-SVN-Commit-Repository: doc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire doc trees \(except for " user" , " projects" , and " translations" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Nov 2019 05:25:01 -0000 Author: linimon Date: Wed Nov 20 05:25:00 2019 New Revision: 53607 URL: https://svnweb.freebsd.org/changeset/doc/53607 Log: Remove 3 sentences that are about FreeBSD "back in the day" and simply muddle up the flow of the text. 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 Wed Nov 20 05:21:20 2019 (r53606) +++ head/en_US.ISO8859-1/books/faq/book.xml Wed Nov 20 05:25:00 2019 (r53607) @@ -393,11 +393,7 @@ - Back when &os; 2.0.5 was released, &os; - development branched in two. One branch was named -STABLE, - one -CURRENT. + &os;-STABLE is the development branch from which major releases are made. Changes go into this branch at a slower pace and with the general assumption @@ -409,8 +405,9 @@ perform testing should instead run the most recent release of &os;. &os;-CURRENT, on the other hand, has - been one unbroken line since 2.0 was released, leading - towards &rel.current;-RELEASE and beyond. For more + been one unbroken line since 2.0 was released. + + For more detailed information on branches see &os; Release Engineering: Creating the Release