Attachment 9994 Details for Bug 20209 – file.diff

[patch] file.diff

file.diff (text/plain), 3.83 KB, created by eogren on 2000-07-27 07:30:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: eogren

Created: 2000-07-27 07:30:00 UTC

Size: 3.83 KB

patch

obsolete

>Index: book.sgml
>===================================================================
>RCS file: /usr/local/doctree/doc/en_US.ISO_8859-1/books/faq/book.sgml,v
>retrieving revision 1.80
>diff -u -r1.80 book.sgml
>--- book.sgml	2000/07/25 18:24:48	1.80
>+++ book.sgml	2000/07/27 06:19:25
>@@ -154,9 +154,9 @@
> 
> 	<answer>
> 	  <para>Version <ulink
>-	    URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/4.0-RELEASE/">4.0</ulink>
>+	    URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/4.1-RELEASE/">4.0</ulink>
> 	    is the latest <emphasis>stable</emphasis> version; it was
>-	    released in March, 2000. This is also the latest
>+	    released in July, 2000. This is also the latest
> 	    <emphasis>release</emphasis> version.</para>
> 
> 	  <para>Briefly explained, <emphasis>-STABLE</emphasis> is aimed
>@@ -300,23 +300,26 @@
>                3.0-RELEASE (Oct 1998)
>                   |
>                   |  [3.0-STABLE]
>- *BRANCH*      3.1-RELESE  (Feb 1999) -&gt; 3.2 -&gt; 3.3 -&gt; 3.4 -&gt; ... future 3.x releases ...
>+ *BRANCH*      3.1-RELEASE  (Feb 1999) -&gt; 3.2 -&gt; 3.3 -&gt; 3.4 -&gt; ... future 3.x releases ...
>                   |                     (May 1999) (Sep 1999) (Dec 1999)
>                   |
>                   |  [4.0-STABLE]
>- *BRANCH*        4.0  (Mar 2000) -&gt; ... future 4.x releases ...
>+ *BRANCH*        4.0  (Mar 2000) -&gt; 4.1 -&gt; ... future 4.x releases ...
>                   |
>-                  |
>+                  |              (Jul 2000)
>                  \|/
>                   +
>           [5.0-CURRENT continues]</literallayout>
> 
> 	  <para>The -CURRENT branch is slowly progressing towards 5.0 and
> 	    beyond, the previous 2.2-STABLE branch having been retired
>-	    with the release of 2.2.8.  3.4-STABLE has now replaced it,
>+	    with the release of 2.2.8.  3-STABLE replaced it,
> 	    with 3.4-RELEASE being released in mid-December 1999.
>-	    4.0-RELEASE was released in March 2000. Although 4-STABLE
>-	    is the actively developed -STABLE branch, bugfixes are
>+	    In May 2000, the 3-STABLE branch was more or less replaced
>+	    by the 4-STABLE branch.
>+	    4.1-RELEASE was released in July 2000.  4-STABLE
>+	    is the actively developed -STABLE branch, although some
>+	    bugfixes (mostly security-related) are
> 	    still being committed to 3-STABLE. It is expected that the 
> 	    3.X branch will be officially obsoleted some time in
> 	    summer 2000.
>@@ -408,9 +411,9 @@
> 	    </listitem>
> 
> 	    <listitem>
>-	      <para>The current 4.X-STABLE release, 4.0-RELEASE can be
>+	      <para>The current 4.X-STABLE release, 4.1-RELEASE can be
> 	      found in the <ulink
>-	      URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/4.0-RELEASE/"> the 4.0-RELEASE</ulink> directory.</para>
>+	      URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/4.1-RELEASE/"> the 4.1-RELEASE</ulink> directory.</para>
> 	      </listitem>
> 
> 	    <listitem>
>@@ -2458,7 +2461,7 @@
>       </literallayout>
> </para>
> 
>-<para>In FreeBSD 4.0-CURRENT or later, the line should be:</para>
>+<para>In FreeBSD 4.0 or later, the line should be:</para>
> 
> <para>
> <literallayout>        device psm0 at atkbdc? irq 12
>@@ -3834,7 +3837,7 @@
> <link linkend="mailing">mailing list</link> for periodic updates on new
> entries.</para>
> 
>-<para>Most ports should be available for the 2.2, 3.x and 4.0
>+<para>Most ports should be available for the 2.2, 3.x and 4.x
> branches, and many of them should work on 2.1.x systems as
> well.  Each time a FreeBSD release is made, a snapshot of the
> ports tree at the time of release in also included in the
>@@ -3877,7 +3880,7 @@
> </listitem>
> </varlistentry>
> 
>-<varlistentry><term>for 4.0-RELEASE/4.X-STABLE</term>
>+<varlistentry><term>for 4.1-RELEASE/4.X-STABLE</term>
> 
> <listitem>
> <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>

Actions: View | Diff

Attachments on bug 20209: 9994