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

(-)book.sgml (-13 / +16 lines)
Lines 154-162 Link Here
154
154
155
	<answer>
155
	<answer>
156
	  <para>Version <ulink
156
	  <para>Version <ulink
157
	    URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/4.0-RELEASE/">4.0</ulink>
157
	    URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/4.1-RELEASE/">4.0</ulink>
158
	    is the latest <emphasis>stable</emphasis> version; it was
158
	    is the latest <emphasis>stable</emphasis> version; it was
159
	    released in March, 2000. This is also the latest
159
	    released in July, 2000. This is also the latest
160
	    <emphasis>release</emphasis> version.</para>
160
	    <emphasis>release</emphasis> version.</para>
161
161
162
	  <para>Briefly explained, <emphasis>-STABLE</emphasis> is aimed
162
	  <para>Briefly explained, <emphasis>-STABLE</emphasis> is aimed
Lines 300-322 Link Here
300
               3.0-RELEASE (Oct 1998)
300
               3.0-RELEASE (Oct 1998)
301
                  |
301
                  |
302
                  |  [3.0-STABLE]
302
                  |  [3.0-STABLE]
303
 *BRANCH*      3.1-RELESE  (Feb 1999) -&gt; 3.2 -&gt; 3.3 -&gt; 3.4 -&gt; ... future 3.x releases ...
303
 *BRANCH*      3.1-RELEASE  (Feb 1999) -&gt; 3.2 -&gt; 3.3 -&gt; 3.4 -&gt; ... future 3.x releases ...
304
                  |                     (May 1999) (Sep 1999) (Dec 1999)
304
                  |                     (May 1999) (Sep 1999) (Dec 1999)
305
                  |
305
                  |
306
                  |  [4.0-STABLE]
306
                  |  [4.0-STABLE]
307
 *BRANCH*        4.0  (Mar 2000) -&gt; ... future 4.x releases ...
307
 *BRANCH*        4.0  (Mar 2000) -&gt; 4.1 -&gt; ... future 4.x releases ...
308
                  |
308
                  |
309
                  |
309
                  |              (Jul 2000)
310
                 \|/
310
                 \|/
311
                  +
311
                  +
312
          [5.0-CURRENT continues]</literallayout>
312
          [5.0-CURRENT continues]</literallayout>
313
313
314
	  <para>The -CURRENT branch is slowly progressing towards 5.0 and
314
	  <para>The -CURRENT branch is slowly progressing towards 5.0 and
315
	    beyond, the previous 2.2-STABLE branch having been retired
315
	    beyond, the previous 2.2-STABLE branch having been retired
316
	    with the release of 2.2.8.  3.4-STABLE has now replaced it,
316
	    with the release of 2.2.8.  3-STABLE replaced it,
317
	    with 3.4-RELEASE being released in mid-December 1999.
317
	    with 3.4-RELEASE being released in mid-December 1999.
318
	    4.0-RELEASE was released in March 2000. Although 4-STABLE
318
	    In May 2000, the 3-STABLE branch was more or less replaced
319
	    is the actively developed -STABLE branch, bugfixes are
319
	    by the 4-STABLE branch.
320
	    4.1-RELEASE was released in July 2000.  4-STABLE
321
	    is the actively developed -STABLE branch, although some
322
	    bugfixes (mostly security-related) are
320
	    still being committed to 3-STABLE. It is expected that the 
323
	    still being committed to 3-STABLE. It is expected that the 
321
	    3.X branch will be officially obsoleted some time in
324
	    3.X branch will be officially obsoleted some time in
322
	    summer 2000.
325
	    summer 2000.
Lines 408-416 Link Here
408
	    </listitem>
411
	    </listitem>
409
412
410
	    <listitem>
413
	    <listitem>
411
	      <para>The current 4.X-STABLE release, 4.0-RELEASE can be
414
	      <para>The current 4.X-STABLE release, 4.1-RELEASE can be
412
	      found in the <ulink
415
	      found in the <ulink
413
	      URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/4.0-RELEASE/"> the 4.0-RELEASE</ulink> directory.</para>
416
	      URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/4.1-RELEASE/"> the 4.1-RELEASE</ulink> directory.</para>
414
	      </listitem>
417
	      </listitem>
415
418
416
	    <listitem>
419
	    <listitem>
Lines 2458-2464 Link Here
2458
      </literallayout>
2461
      </literallayout>
2459
</para>
2462
</para>
2460
2463
2461
<para>In FreeBSD 4.0-CURRENT or later, the line should be:</para>
2464
<para>In FreeBSD 4.0 or later, the line should be:</para>
2462
2465
2463
<para>
2466
<para>
2464
<literallayout>        device psm0 at atkbdc? irq 12
2467
<literallayout>        device psm0 at atkbdc? irq 12
Lines 3834-3840 Link Here
3834
<link linkend="mailing">mailing list</link> for periodic updates on new
3837
<link linkend="mailing">mailing list</link> for periodic updates on new
3835
entries.</para>
3838
entries.</para>
3836
3839
3837
<para>Most ports should be available for the 2.2, 3.x and 4.0
3840
<para>Most ports should be available for the 2.2, 3.x and 4.x
3838
branches, and many of them should work on 2.1.x systems as
3841
branches, and many of them should work on 2.1.x systems as
3839
well.  Each time a FreeBSD release is made, a snapshot of the
3842
well.  Each time a FreeBSD release is made, a snapshot of the
3840
ports tree at the time of release in also included in the
3843
ports tree at the time of release in also included in the
Lines 3877-3883 Link Here
3877
</listitem>
3880
</listitem>
3878
</varlistentry>
3881
</varlistentry>
3879
3882
3880
<varlistentry><term>for 4.0-RELEASE/4.X-STABLE</term>
3883
<varlistentry><term>for 4.1-RELEASE/4.X-STABLE</term>
3881
3884
3882
<listitem>
3885
<listitem>
3883
<para><ulink URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-4-stable/">ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-4-stable/</ulink></para>
3886
<para><ulink URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-4-stable/">ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-4-stable/</ulink></para>

Return to bug 20209