From owner-svn-doc-all@FreeBSD.ORG  Wed Oct 31 21:24:48 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 028BC1A2;
 Wed, 31 Oct 2012 21:24:48 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id D48418FC1B;
 Wed, 31 Oct 2012 21:24:47 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9VLOl22034213;
 Wed, 31 Oct 2012 21:24:47 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9VLOlUn034210;
 Wed, 31 Oct 2012 21:24:47 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201210312124.q9VLOlUn034210@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Wed, 31 Oct 2012 21:24:47 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39885 - head/en_US.ISO8859-1/books/faq
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 31 Oct 2012 21:24:48 -0000

Author: eadler
Date: Wed Oct 31 21:24:47 2012
New Revision: 39885
URL: http://svn.freebsd.org/changeset/doc/39885

Log:
  Rewrite the answer to "which file should I download" - the only versions
  still talks about floppies as if they matter.
  
  Reviewed by:	gjb
  Approved by:	bcr (mentor)

Modified:
  head/en_US.ISO8859-1/books/faq/book.xml

Modified: head/en_US.ISO8859-1/books/faq/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/faq/book.xml	Wed Oct 31 21:24:44 2012	(r39884)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Wed Oct 31 21:24:47 2012	(r39885)
@@ -1189,38 +1189,58 @@
 	</question>
 
 	<answer>
-	  <para>You need three floppy images:
-	    <filename>floppies/boot.flp</filename>,
-	    <filename>floppies/kern1.flp</filename>, and
-	    <filename>floppies/kern2.flp</filename>.  These images need
-	    to be copied onto floppies by tools like
-	    <command>fdimage</command> or &man.dd.1;.</para>
+	  <para>On the
+	    <ulink url="http://www.freebsd.org/where.html">Get &os; page</ulink>
+	    select <literal>[iso]</literal> next to the
+	    architecture you want to use.</para>
 
-	  <para>If you need to download the distributions yourself (for
-	    a DOS file system install, for instance), below are some
-	    recommendations for distributions to grab:</para>
+	  <para>Any of the following can be used:</para>
 
-	  <itemizedlist>
-	    <listitem>
-	      <para>base/</para>
-	    </listitem>
+	  <informaltable frame="none" pgwide="1">
+	    <tgroup cols="2">
+	      <thead>
+		<row>
+		  <entry>file</entry>
+		  <entry>description</entry>
+		</row>
+	      </thead>
 
-	    <listitem>
-	      <para>manpages/</para>
-	    </listitem>
+	      <tbody>
+		<row>
+		  <entry><filename>disc1.iso</filename></entry>
+		  <entry>Contains enough to install &os; and
+		    a minimal set of packages.</entry>
+		</row>
 
-	    <listitem>
-	      <para>compat*/</para>
-	    </listitem>
+		<row>
+		  <entry><filename>dvd1.iso</filename></entry>
+		  <entry>Similar to <filename>disc1.iso</filename>
+		    but with addtional packages.</entry>
+		</row>
 
-	    <listitem>
-	      <para>doc/</para>
-	    </listitem>
+		<row>
+		  <entry><filename>memstick.iso</filename></entry>
+		  <entry>A bootable image sufficient for copying to a
+		    USB stick.</entry>
+		</row>
 
-	    <listitem>
-	      <para>src/ssys.*</para>
-	    </listitem>
-	  </itemizedlist>
+		<row>
+		  <entry><filename>bootonly.iso</filename></entry>
+		  <entry>A minimal image that requires network
+		    access during installation to completely
+		    install &os;.</entry>
+		</row>
+	      </tbody>
+	    </tgroup>
+	  </informaltable>
+
+	  <para>&arch.pc98; users require three floppy images:
+	    <filename>floppies/boot.flp</filename>,
+	    <filename>floppies/kern1.flp</filename>, and
+	    <filename>floppies/kern2.flp</filename>.  These images
+	    need
+	    to be copied onto floppies by tools like
+	    &man.dd.1;.</para>
 
 	  <para>Full instructions on this procedure and a little bit
 	    more about installation issues in general can be found in