Attachment 8563 Details for Bug 17861 – file.diff

[patch] file.diff

file.diff (text/plain), 11.08 KB, created by eogren on 2000-04-08 15:10:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: eogren

Created: 2000-04-08 15:10:01 UTC

Size: 11.08 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.49
>diff -u -r1.49 book.sgml
>--- book.sgml	2000/04/03 12:01:33	1.49
>+++ book.sgml	2000/04/08 13:59:40
>@@ -5,7 +5,7 @@
> 
> <book>
>   <bookinfo>
>-    <title>Frequently Asked Questions for FreeBSD 2.X and 3.X</title>
>+    <title>Frequently Asked Questions for FreeBSD 2.X, 3.X and 4.X</title>
> 
>     <authorgroup>
>       <author>
>@@ -16,7 +16,7 @@
>     <pubdate>$FreeBSD: doc/en_US.ISO_8859-1/books/faq/book.sgml,v 1.49 2000/04/03 12:01:33 phantom Exp $</pubdate>
> 
>     <abstract>
>-      <para>This is the FAQ for FreeBSD versions 2.X and 3.X.  All entries
>+      <para>This is the FAQ for FreeBSD versions 2.X, 3.X, and 4.X.  All entries
>         are assumed to be relevant to FreeBSD 2.0.5 and later, unless
> 	otherwise noted.  Any entries with a &lt;XXX&gt; are under
> 	construction.  If you are interested in helping with this project,
>@@ -37,7 +37,7 @@
>   <preface id="preface">
>     <title>Preface</title>
> 
>-    <para>Welcome to the FreeBSD 2.X-3.X FAQ!</para>
>+    <para>Welcome to the FreeBSD 2.X-4.X FAQ!</para>
> 
>     <para>As is usual with Usenet FAQs, this document aims to cover the
>       most frequently asked questions concerning the FreeBSD operating
>@@ -58,7 +58,7 @@
> 	</question>
> 
> 	<answer>
>-	  <para>Briefly, FreeBSD 2.X is a UN*X-like operating system based
>+	  <para>Briefly, FreeBSD is a UN*X-like operating system based
> 	    on U.C. Berkeley's 4.4BSD-lite release for the i386 platform.
> 	    It is also based indirectly on William Jolitz's port of U.C.
> 	    Berkeley's Net/2 to the i386, known as 386BSD, though very
>@@ -152,16 +152,16 @@
> 
> 	<answer>
> 	  <para>Version <ulink
>-	    URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/3.4-RELEASE/">3.4</ulink>
>+	    URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/4.0-RELEASE/">4.0</ulink>
> 	    is the latest <emphasis>stable</emphasis> version; it was
>-	    released in December, 1999. This is also the latest
>+	    released in March, 2000. This is also the latest
> 	    <emphasis>release</emphasis> version.</para>
> 
> 	  <para>Briefly explained, <emphasis>-STABLE</emphasis> is aimed
> 	    at the ISP or other corporate user who wants stability and a
> 	    low change count over the wizzy new features of the latest
> 	    <emphasis>-CURRENT</emphasis> snapshot.  Releases can come
>-	    from either "branch," but you should only use
>+	    from either branch, but you should only use
> 	    <emphasis>-CURRENT</emphasis> if you're sure that you're
> 	    prepared for its increased volatility (relative to
> 	    <emphasis>-STABLE</emphasis>, that is).</para>
>@@ -244,9 +244,16 @@
> 	    releases.</para>
>   
> 	  <para>Snapshot releases are directly available from <ulink
>-	    URL="ftp://current.FreeBSD.org/pub/FreeBSD/">ftp://current.FreeBSD.org/pub/FreeBSD/</ulink>
>-	    and are generated, on the average, once a day for the
>-	    5.0-CURRENT, 4.X-STABLE and 3.X-STABLE branches.</para>
>+	    URL="ftp://current.FreeBSD.org/pub/FreeBSD/">
>+	    ftp://current.FreeBSD.org/pub/FreeBSD/</ulink> 
>+	    for 5.0-CURRENT and 
>+	    <ulink url="ftp://releng4.FreeBSD.org/pub/FreeBSD">
>+	    releng4.FreeBSD.org</ulink> for 4-STABLE snapshots. 
>+	    3-STABLE snapshots can be found at 
>+	    <ulink url="releng3.FreeBSD.org/pub/FreeBSD">
>+	    releng3.FreeBSD.org.</ulink> 
>+	    Snapshots are generated, on the average, once a day for 
>+	    all actively developed branches.</para>
> 	</answer>
>       </qandaentry>
> 
>@@ -339,7 +346,7 @@
> 	</question>
> 
> 	<answer>
>-	  <para>FreeBSD 3.x currently runs on the <ulink
>+	  <para>Since 3.x, FreeBSD has run on the <ulink
> 	    URL="../alpha/alpha.html">DEC Alpha</ulink> as well as the
> 	    x86 architecture.  Some interest has also been expressed in a
> 	    SPARC port, but details on this project are not yet
>@@ -397,26 +404,26 @@
> 		URL="ftp://current.FreeBSD.org/pub/FreeBSD/releases/i386/3.4-RELEASE/">3.4-RELEASE</ulink>
> 		directory.</para>
> 	    </listitem>
>-
> 	    <listitem>
>-	      <para><ulink
>-	      URL="ftp://releng22.FreeBSD.org/pub/FreeBSD/">2.2 Snapshot</ulink>
>-	      releases are made once a day along the RELENG_2_2 branch (post
>-	      2.2.8) as it slowly winds down in maintenance mode.  The
>-	      RELENG_2_2 branch is currently being carefully maintained by
>-	      the legacy support folks and no changes other than those
>-	      strictly necessary for security or reliability enhancements
>-	      are now made.</para>
>-	    </listitem>
>-
>+	      <para>The current 4.X-STABLE release, 4.0-RELEASE can be
>+	      found in <ulink
>+	      url="ftp://current.FreeBSD.org/pub/FreeBSD/releases/i386/4.0-RELEASE"> the 4.0-RELEASE</ulink> directory.</para>
>+	      </listitem>
>+	
> 	    <listitem>
> 	      <para><ulink
> 	      URL="ftp://releng3.FreeBSD.org/pub/FreeBSD/">3.X Snapshot</ulink>
> 	      releases are also made once a day along the RELENG_3 branch
> 	      (post 3.0-RELEASE) as it continues on its way towards
>-	      3.4-RELEASE.</para>
>+	      3.5-RELEASE.</para>
> 	    </listitem>
>-
>+            
>+	    <listitem>
>+	      <para><ulink
>+	      url="ftp://releng4.FreeBSD.org/pub/FreeBSD/">4.X
>+	      snapshots</ulink> are made once a day as well.</para>
>+	     </listitem>
>+	    
> 	    <listitem>
> 	      <para><ulink
> 	      URL="ftp://current.FreeBSD.org/pub/FreeBSD/">5.0 Snapshot</ulink>
>@@ -1630,7 +1637,28 @@
> <orderedlist>
> 
> <listitem>
>-<para>At the Boot: prompt, enter
>+<para>For FreeBSD 3.3 and later, reboot the system and hit
>+&quot;Enter&quot; at the &quot;Booting kernel in 10 seconds; hit
>+[Enter] to interrupt&quot; prompt. This will drop you into the boot
>+loader.</para>
>+<para>Then type set
>+root_disk_unit="&lt;disk_number&gt;". <literal>disk_number</literal>
>+will be <emphasis>0</emphasis> if FreeBSD is installed on the master drive
>+on the first IDE controller, <emphasis>1</emphasis> if it is installed
>+on the slave on the first IDE controller, <emphasis>2</emphasis> if it
>+is installed on the master of the second IDE controller, and
>+<emphasis>3</emphasis> if it is installed on the slave of the second
>+IDE controller.</para>
>+<para>Then type &quot;boot&quot;, and your system should boot
>+correctly.</para>
>+<para>To make this change permanent (ie so you don't have to do this
>+everytime you reboot or turn on your FreeBSD machine), put the line
>+&quot;root_disk_unit="&lt;disk_number&gt;" in
>+<filename>/boot/loader.conf.local</filename>.</para>
>+</listitem>
>+
>+<listitem>
>+<para>If using FreeBSD 3.2 or earlier, at the Boot: prompt, enter
> <emphasis remap=tt>1:wd(2,a)kernel</emphasis> and press Enter. If the system starts, then
> run the command 
> <literallayout>echo "1:wd(2,a)kernel" &gt; /boot.config</literallayout>
>@@ -1771,7 +1799,24 @@
> kernel, and installed a new kernel builtin from them <emphasis>without making
> world</emphasis>. This is not supported. Make world.</para>
>   
>-</answer></qandaentry></qandaset>
>+</answer></qandaentry>
>+
>+<qandaentry>
>+<question><para>How do I upgrade from 3.X -> 4.X?</para></question>
>+
>+<answer><para>We <emphasis>strongly</emphasis> recommend that you use
>+binary snapshots to do this. 4.X-STABLE snapshots are available at
>+<ulink
>+url="ftp://releng4.FreeBSD.org">releng4.FreeBSD.org</ulink>.</para>
>+<para>If you wish to upgrade using source, please see the <ulink
>+url="http://www.FreeBSD.org/handbook/cutting-edge.html">FreeBSD
>+Handbook</ulink> for more information.</para>
>+<para><emphasis>Upgrading via source is never recommended for new
>+users, and upgading from 3.X -> 4.X is even less so; make sure you
>+have read the instructions carefully before attempting to uprade via
>+source this!</emphasis></para> 
>+</answer></qandaentry>
>+</qandaset>
> </chapter>
> 
> <chapter
>@@ -3430,13 +3475,22 @@
> </listitem>
> </varlistentry>
> 
>-<varlistentry><term>for 4.0-CURRENT</term>
>+<varlistentry><term>for 4.0-RELEASE/4.X-STABLE</term>
> 
> <listitem>
>-<para><ulink URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-4-current/">ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-4-current/</ulink></para>
>+<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>
>   
> </listitem>
> </varlistentry>
>+
>+<varlistentry>
>+<term>for 5.X-CURRENT</term>
>+
>+<listitem>
>+<para><ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-5-current/">ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-5-current</ulink></para>
>+</listitem>
>+</varlistentry>
>+
> </variablelist>
> </para>
>   
>@@ -3484,11 +3538,21 @@
> <qandaentry><question>
> <para>Where do I find libc.so.3.0?</para></question><answer>
> 
>-<para>You are trying to run a package for 2.2/3.x/4.0 on a 2.1.x
>+<para>You are trying to run a package built on 2.2 and later on a 2.1.x
> system.  Please take a look at the previous section and get
> the correct port/package for your system.</para>
>   
> </answer></qandaentry>
>+<qandaentry><question>
>+<para>I get a message &quot;Error: can't find
>+libc.so.4.0&quot;</para></question>
>+<answer>
>+
>+<para>You accidently downloaded packages meant for 4.X and 5.X
>+systems and attempted to install them on your 2.X or 3.X FreeBSD system. 
>+Please download the correct version of the
>+packages.</para></answer>
>+</qandaentry>
> 
> <qandaentry><question
> id="emul">
>@@ -8382,17 +8446,21 @@
> <itemizedlist>
> 
> <listitem>
>-<para><symbol>RELENG_2_2</symbol>   AKA <emphasis remap=bf>2.2-STABLE</emphasis> AKA <emphasis remap=bf>"2.2 branch"</emphasis></para>
>+<para><symbol>RELENG_2_2</symbol>   AKA <emphasis remap=bf>2.2-STABLE</emphasis></para>
> </listitem>
> 
> <listitem>
>-<para><symbol>RELENG_3</symbol>     AKA <emphasis remap=bf>3.X-STABLE</emphasis> AKA <emphasis remap=bf>"3.0 branch"</emphasis></para>
>+<para><symbol>RELENG_3</symbol>     AKA <emphasis remap=bf>3.X-STABLE</emphasis></para>
> </listitem>
> 
> <listitem>
>-<para><acronym>HEAD</acronym>         AKA <option>-CURRENT</option> AKA <emphasis remap=bf>4.0-CURRENT</emphasis></para>
>+<para><symbol>RELENG_4</symbol>      AKA <emphasis>4.X-STABLE</emphasis></para>
> </listitem>
> 
>+<listitem>
>+<para><acronym>HEAD</acronym>         AKA <option>-CURRENT</option> AKA <emphasis remap=bf>5.0-CURRENT</emphasis></para>
>+</listitem>
>+
> </itemizedlist>
> </para>
>   
>@@ -8401,15 +8469,12 @@
> <emphasis>"the current, non-branched development stream"</emphasis> which we simply
> refer to as <option>-CURRENT</option>.</para>
>   
>-<para>Right now, <option>-CURRENT</option> is the 4.0 development stream and the
>-<emphasis remap=bf>3.0-STABLE</emphasis> branch, <symbol>RELENG_3</symbol>, forked off from
>-<option>-CURRENT</option> in Jan 1999.</para>
>+<para>Right now, <option>-CURRENT</option> is the 5.0 development stream and the
>+<emphasis remap=bf>4-STABLE</emphasis> branch, <symbol>RELENG_4</symbol>, forked off from
>+<option>-CURRENT</option> in Mar 2000.</para>
>   
> <para>The <emphasis remap=bf>2.2-STABLE</emphasis> branch, <symbol>RELENG_2_2</symbol>, departed -CURRENT in
>-November 1996.</para>
>-  
>-<para>The <emphasis remap=bf>2.1-STABLE</emphasis> branch, <symbol>RELENG_2_1_0</symbol>, departed -CURRENT in
>-September of 1994.  This branch has been fully retired.</para>
>+November 1996, and has pretty much been retired.</para>
>   
> </answer></qandaentry>

Actions: View | Diff

Attachments on bug 17861: 8563