Date: Wed, 20 Nov 2019 05:25:01 +0000 (UTC) From: Mark Linimon <linimon@FreeBSD.org> 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 Message-ID: <201911200525.xAK5P1Fh084806@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 @@ </question> <answer> - <para>Back when &os; 2.0.5 was released, &os; - development branched in two. One branch was named <link - xlink:href="&url.books.handbook;/current-stable.html#stable">-STABLE</link>, - one <link - xlink:href="&url.books.handbook;/current-stable.html#current">-CURRENT</link>. + <para> <emphasis>&os;-STABLE</emphasis> 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;. <emphasis>&os;-CURRENT</emphasis>, 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.</para> + + <para>For more detailed information on branches see <quote><link xlink:href="&url.articles.releng;/release-proc.html#rel-branch">&os; Release Engineering: Creating the Release
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201911200525.xAK5P1Fh084806>