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

(-)book.sgml (-10 / +15 lines)
Lines 323-329 Link Here
323
          <para><ulink
323
          <para><ulink
324
            URL="../handbook/cutting-edge.html#CURRENT">FreeBSD-CURRENT</ulink>
324
            URL="../handbook/cutting-edge.html#CURRENT">FreeBSD-CURRENT</ulink>
325
            is the development version of the operating system, which
325
            is the development version of the operating system, which
326
            will in due course become 5.0-RELEASE.  As such, it is
326
            will in due course, become the new &os.stable; branch.
327
            This is expected to happen around 5.2-RELEASE.  As such, it is
327
            really only of interest to developers working on the
328
            really only of interest to developers working on the
328
            system and die-hard hobbyists.  See the <ulink
329
            system and die-hard hobbyists.  See the <ulink
329
            URL="../handbook/cutting-edge.html#CURRENT">relevant
330
            URL="../handbook/cutting-edge.html#CURRENT">relevant
Lines 412-419 Link Here
412
            experimental features are quite undesirable.  It receives
413
            experimental features are quite undesirable.  It receives
413
            only well-tested bug fixes and other small incremental
414
            only well-tested bug fixes and other small incremental
414
            enhancements.  FreeBSD-CURRENT, on the other hand, has
415
            enhancements.  FreeBSD-CURRENT, on the other hand, has
415
            been one unbroken line leading towards 5.0-RELEASE (and
416
            since 2.0 was released, been one unbroken line leading
416
            beyond) since 2.0 was released. If a little ASCII art
417
            towards 5.2-RELEASE (and beyond), where 5.X-STABLE is
418
            expected to be branched off, and &os.current; becomes
419
            6-CURRENT.  If a little ASCII art
417
            would help, this is how it looks:</para>
420
            would help, this is how it looks:</para>
418
421
419
          <programlisting>                 2.0
422
          <programlisting>                 2.0
Lines 439-447 Link Here
439
                  |                     (May 1999) (Sep 1999) (Dec 1999) (June 2000) (July 2000)
442
                  |                     (May 1999) (Sep 1999) (Dec 1999) (June 2000) (July 2000)
440
                  |
443
                  |
441
                  |  [4.0-STABLE]
444
                  |  [4.0-STABLE]
442
 *BRANCH*        4.0  (Mar 2000) -&gt; 4.1 -&gt; 4.1.1 -&gt; 4.2 -&gt; 4.3 -&gt; 4.4 -&gt; ... future 4.X releases ...
445
 *BRANCH*        4.0  (Mar 2000) -&gt; 4.1 -&gt; 4.1.1 -&gt; 4.2 -&gt; 4.3 -&gt; 4.4 -&gt; 4.5 -&gt; 4.6 -&gt; 4.6.2 -&gt; 4.7 -&gt; 4.8 ... future 4.X releases ...
446
                  |              (Jul 2000) (Sep 2000) (Nov 2000) (Apr 2001) (Sep 2001) (Jan 2002) (Jun 2002) (Aug 2002) (Oct 2002) (Apr 2003)
447
                  |
448
               5.0-RELEASE (Jan 2003)
443
                  |
449
                  |
444
                  |              (July 2000)   (Sep 2000)   (Nov 2000)
445
                 \|/
450
                 \|/
446
                  +
451
                  +
447
          [5.0-CURRENT continues]</programlisting>
452
          [5.0-CURRENT continues]</programlisting>
Lines 454-464 Link Here
454
459
455
          <para>4-STABLE is the actively developed -STABLE branch.
460
          <para>4-STABLE is the actively developed -STABLE branch.
456
            The latest release on the 4-STABLE is
461
            The latest release on the 4-STABLE is
457
            &rel.current;-RELEASE, which was released in
462
            &rel2.current;-RELEASE, which was released in
458
            &rel.current.date;.</para>
463
            &rel2.current.date;.</para>
459
464
460
          <para>The 5-CURRENT branch is slowly progressing toward
465
          <para>The 5-CURRENT branch is slowly progressing toward
461
            5.0-RELEASE and beyond.  See <link linkend="current">What
466
            5.1-RELEASE and beyond.  See <link linkend="current">What
462
            is FreeBSD-CURRENT?</link> for more information on this
467
            is FreeBSD-CURRENT?</link> for more information on this
463
            branch.</para>
468
            branch.</para>
464
        </answer>
469
        </answer>
Lines 2267-2273 Link Here
2267
            lists.  Since hardware changes so quickly, however, we
2272
            lists.  Since hardware changes so quickly, however, we
2268
            expect this.  We <emphasis>still</emphasis> strongly
2273
            expect this.  We <emphasis>still</emphasis> strongly
2269
            recommend that you read through the 
2274
            recommend that you read through the 
2270
	    <ulink URL="&rel.current.hardware;">Hardware Notes</ulink>
2275
	    <ulink URL="&rel2.current.hardware;">Hardware Notes</ulink>
2271
	    and search the mailing list
2276
	    and search the mailing list
2272
            <ulink URL="http://www.FreeBSD.org/search/#mailinglists">
2277
            <ulink URL="http://www.FreeBSD.org/search/#mailinglists">
2273
            archives</ulink> before asking about the latest and
2278
            archives</ulink> before asking about the latest and
Lines 2305-2311 Link Here
2305
2310
2306
        <answer>
2311
        <answer>
2307
          <para>See the complete list in the current <ulink
2312
          <para>See the complete list in the current <ulink
2308
            URL="&rel.current.hardware;">Hardware Notes</ulink>.</para>
2313
            URL="&rel2.current.hardware;">Hardware Notes</ulink>.</para>
2309
        </answer>
2314
        </answer>
2310
      </qandaentry>
2315
      </qandaentry>

Return to bug 52679