View | Details | Raw Unified | Return to bug 92829
Collapse All | Expand All

(-)book.sgml (-31 / +28 lines)
Lines 24-29 Link Here
24
      <year>2003</year>
24
      <year>2003</year>
25
      <year>2004</year>
25
      <year>2004</year>
26
      <year>2005</year>
26
      <year>2005</year>
27
      <year>2006</year>
27
      <holder>The FreeBSD Documentation Project</holder>
28
      <holder>The FreeBSD Documentation Project</holder>
28
    </copyright>
29
    </copyright>
29
30
Lines 286-317 Link Here
286
        <answer>
287
        <answer>
287
	  <para>At this point in FreeBSD's development, there are three
288
	  <para>At this point in FreeBSD's development, there are three
288
	    parallel development branches; releases are being made from
289
	    parallel development branches; releases are being made from
289
	    two of the three branches.  The 4.X series of releases
290
	    two of the three branches.  The 5.X series of releases
290
	    is being made from the <emphasis>4-STABLE</emphasis> branch
291
	    is being made from the <emphasis>5-STABLE</emphasis> branch
291
	    and the 5.X series of releases is being made from
292
	    and the 6.X series of releases from <emphasis>6-STABLE</emphasis>.
292
	    <emphasis>5-STABLE</emphasis>.  It will be some time in
293
	    mid-to-late 2005 before the first release will be made from the
294
	    <emphasis>6-CURRENT</emphasis> branch; that release (6.0)
295
	    will be aimed at early adopters.</para>
296
293
297
	  <para>Up until the release of 5.3, the 4.X series was the
294
	  <para>Up until the release of 5.3, the 4.X series was the
298
	    one known as <emphasis>-STABLE</emphasis>.  However,
295
	    one known as <emphasis>-STABLE</emphasis>.  However,
299
	    as of 5.3, 5.X has been designated the new
296
	    as of 5.3, the 4.X branch will be designated for
300
	    <emphasis>-STABLE</emphasis> and 4.X will no longer see
297
	    an <quote>extended support</quote> status and receive
301
	    much new development.  Instead, it will be designated
298
	    only fixes for major problems, such as security-related
302
	    for an &quot;extended support&quot; status and receive
299
	    fixes.  There will be more releases made from the
303
	    only fixes for major problems (such as security-related
300
	    <emphasis>5-STABLE</emphasis> branch, but it is considered
304
	    fixes.)</para>
301
	    a <quote>legacy</quote> branch and most current work will
302
	    only become a part of <emphasis>6-STABLE</emphasis>.
305
303
306
<!-- note: the entity definitions are out of date -->
307
          <para>Version <ulink
304
          <para>Version <ulink
308
            url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/&rel.current;-RELEASE/">&rel.current;</ulink>
305
            url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/&rel.current;-RELEASE/">&rel.current;</ulink>
309
            is the latest release from the
306
            is the latest release from the
310
            <emphasis>5-STABLE</emphasis> branch; it was released in
307
            <emphasis>&rel.current;-STABLE</emphasis> branch; it was released in
311
            &rel.current.date;.  Version <ulink
308
            &rel.current.date;.  Version <ulink
312
            url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/&rel2.current;-RELEASE/">&rel2.current;</ulink>
309
            url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/&rel2.current;-RELEASE/">&rel2.current;</ulink>
313
            is the latest release from the
310
            is the latest release from the
314
            <emphasis>4-STABLE</emphasis> branch; it was released in
311
            <emphasis>&rel2.current;-STABLE</emphasis> branch; it was released in
315
            &rel2.current.date;.</para>
312
            &rel2.current.date;.</para>
316
313
317
          <para>Briefly, <emphasis>-STABLE</emphasis> is aimed at the
314
          <para>Briefly, <emphasis>-STABLE</emphasis> is aimed at the
Lines 327-334 Link Here
327
          <para>Releases are made <link linkend="release-freq">every
324
          <para>Releases are made <link linkend="release-freq">every
328
            few months</link>. While many people stay more up-to-date with
325
            few months</link>. While many people stay more up-to-date with
329
            the FreeBSD sources (see the questions on <link
326
            the FreeBSD sources (see the questions on <link
330
            linkend="current">FreeBSD-CURRENT</link> and <link
327
            linkend="current">&os.current;</link> and <link
331
            linkend="stable">FreeBSD-STABLE</link>) than that, doing so
328
            linkend="stable">&os.stable;</link>) than that, doing so
332
            is more of a commitment, as the sources are a moving
329
            is more of a commitment, as the sources are a moving
333
            target.</para>
330
            target.</para>
334
331
Lines 346-352 Link Here
346
343
347
        <answer>
344
        <answer>
348
          <para><ulink
345
          <para><ulink
349
            url="&url.books.handbook;/cutting-edge.html#CURRENT">FreeBSD-CURRENT</ulink>
346
            url="&url.books.handbook;/cutting-edge.html#CURRENT">&os.current;</ulink>
350
            is the development version of the operating system, which
347
            is the development version of the operating system, which
351
            will in due course become the new &os.stable; branch.
348
            will in due course become the new &os.stable; branch.
352
            As such, it is
349
            As such, it is
Lines 360-368 Link Here
360
          <para>If you are not familiar with the operating system or are
357
          <para>If you are not familiar with the operating system or are
361
            not capable of identifying the difference between a real
358
            not capable of identifying the difference between a real
362
            problem and a temporary problem, you should not use
359
            problem and a temporary problem, you should not use
363
            FreeBSD-CURRENT.  This branch sometimes evolves quite quickly
360
            &os.current;.  This branch sometimes evolves quite quickly
364
            and can be un-buildable for a number of days at a time.
361
            and can be un-buildable for a number of days at a time.
365
            People that use FreeBSD-CURRENT are expected to be able to
362
            People that use &os.current; are expected to be able to
366
            analyze any problems and only report them if they are deemed
363
            analyze any problems and only report them if they are deemed
367
            to be mistakes rather than <quote>glitches</quote>. Questions
364
            to be mistakes rather than <quote>glitches</quote>. Questions
368
            such as <quote>make world produces some error about
365
            such as <quote>make world produces some error about
Lines 435-443 Link Here
435
            only well-tested bug fixes and other small incremental
432
            only well-tested bug fixes and other small incremental
436
            enhancements.  FreeBSD-CURRENT, on the other hand, has
433
            enhancements.  FreeBSD-CURRENT, on the other hand, has
437
            been one unbroken line since 2.0 was released, leading
434
            been one unbroken line since 2.0 was released, leading
438
            towards 5.3-RELEASE (and beyond).  Just before 5.3-RELEASE, the
435
            towards 6.0-RELEASE and beyond.  Just before 6.0-RELEASE, the
439
            5-STABLE branch was created, and
436
            6-STABLE branch was created, and
440
            &os.current; became 6-CURRENT.  For more detailed information,
437
            &os.current; became 7-CURRENT.  For more detailed information,
441
            see <quote><ulink url="&url.articles.releng;/release-proc.html#REL-BRANCH">
438
            see <quote><ulink url="&url.articles.releng;/release-proc.html#REL-BRANCH">
442
		FreeBSD Release Engineering:
439
		FreeBSD Release Engineering:
443
		Creating the Release Branch</ulink></quote>.</para>
440
		Creating the Release Branch</ulink></quote>.</para>
Lines 446-462 Link Here
446
            The 3-STABLE branch has ended with the release of 3.5.1, the
443
            The 3-STABLE branch has ended with the release of 3.5.1, the
447
            final 3.X release.  The only changes made to either of these
444
            final 3.X release.  The only changes made to either of these
448
            branches will be, for the most part, security-related bug
445
            branches will be, for the most part, security-related bug
449
            fixes.  Support for the 4-STABLE branch will continue
446
            fixes.  Support for the 4-STABLE and 5-STABLE branches will
450
	    for some time but focus primarily on security-related bug
447
            continue for some time but focus primarily on security-related
451
	    fixes and other serious issues.</para>
448
            bug fixes and other serious issues.</para>
452
449
453
          <para>5-STABLE is the actively developed -STABLE branch.
450
          <para>&rel.current;-STABLE is the actively developed -STABLE branch.
454
            The latest release on the 5-STABLE branch is
451
            The latest release on the &rel.current;-STABLE branch is
455
            &rel.current;-RELEASE, which was released in
452
            &rel.current;-RELEASE, which was released in
456
            &rel.current.date;.</para>
453
            &rel.current.date;.</para>
457
454
458
          <para>The 6-CURRENT branch is the actively developed
455
          <para>The 7-CURRENT branch is the actively developed
459
	    -CURRENT branch toward the next generation of &os;.
456
            -CURRENT branch toward the next generation of &os;.
460
	    See <link linkend="current">What is &os;-CURRENT?</link> for more
457
	    See <link linkend="current">What is &os;-CURRENT?</link> for more
461
            information on this branch.</para>
458
            information on this branch.</para>
462
        </answer>
459
        </answer>

Return to bug 92829