From nobody@FreeBSD.org  Sat Jul 31 15:33:44 2010
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C95371065675
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 31 Jul 2010 15:33:44 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id B8BE68FC08
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 31 Jul 2010 15:33:44 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o6VFXi95023617
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 31 Jul 2010 15:33:44 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o6VFXiMd023616;
	Sat, 31 Jul 2010 15:33:44 GMT
	(envelope-from nobody)
Message-Id: <201007311533.o6VFXiMd023616@www.freebsd.org>
Date: Sat, 31 Jul 2010 15:33:44 GMT
From: Glen Barber <glen.j.barber@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch][handbook] Table 2.4: Update ISO Image Names and Meanings
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         149154
>Category:       docs
>Synopsis:       [patch][handbook] Table 2.4: Update ISO Image Names and Meanings
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    jkois
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          doc-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jul 31 15:40:01 UTC 2010
>Closed-Date:    Tue Aug 17 08:51:24 UTC 2010
>Last-Modified:  Tue Aug 17 08:51:24 UTC 2010
>Originator:     Glen Barber
>Release:        8.1-PRERELEASE
>Organization:
>Environment:
FreeBSD orion 8.1-PRERELEASE FreeBSD 8.1-PRERELEASE #3 r210428: Sat Jul 24 13:37:37 EDT 2010     root@orion:/usr/obj/usr/src/sys/ORION  amd64
>Description:
The attached patch:
  - adds the "FreeBSD-" prefix to installation images
  - notes the "FreeBSD-" prefix does not apply to 6.x and earlier
  - adds livefs.iso, dvd1.iso.gz, and memstick.img
  - removes various instances of ^[TAB][EOL]


>How-To-Repeat:

>Fix:


Patch attached with submission follows:

--- install/chapter.sgml.orig	2010-07-31 10:43:00.417863608 -0400
+++ install/chapter.sgml	2010-07-31 11:16:11.872834841 -0400
@@ -624,7 +624,7 @@
 
       <itemizedlist>
 	<title>Local Media</title>
-	
+
 	<listitem>
 	  <para>A CDROM or DVD</para>
 	</listitem>
@@ -923,10 +923,10 @@
 Loading /boot/defaults/loader.conf
 /boot/kernel/kernel text=0x64daa0 data=0xa4e80+0xa9e40 syms=[0x4+0x6cac0+0x4+0x88e9d]
 \</screen>
-	
+
 	  <para>If you are booting from floppy disc, you will see a display
 	    similar to this (version information omitted):</para>
-	
+
 	  <screen>Booting from Floppy...
 Uncompressing ... done
 
@@ -2067,7 +2067,7 @@
 
       <figure id="sysinstall-label-type">
 	<title>Choose the Root Partition Type</title>
-	
+
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="install/disklabel-fs" format="PNG">
@@ -2106,7 +2106,7 @@
 
       <figure id="sysinstall-label4">
 	<title>Sysinstall Disklabel Editor</title>
-	
+
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="install/disklabel-ed2" format="PNG">
@@ -2284,7 +2284,7 @@
 	      mode (the default), try active!</para>
 	  </listitem>
 	</varlistentry>
-	
+
 	<varlistentry>
 	  <term>FTP Passive: <guimenuitem>Install from an FTP server through a
 	      firewall</guimenuitem></term>
@@ -2302,7 +2302,7 @@
 	    </para>
 	  </listitem>
 	</varlistentry>
-	
+
 	<varlistentry>
 	  <term>FTP via a HTTP proxy: <guimenuitem>Install from an FTP server
 	      through a http proxy</guimenuitem></term>
@@ -3376,7 +3376,7 @@
 
 	<varlistentry>
 	  <term>UID</term>
-	
+
 	  <listitem>
 	    <para>The numerical ID for this user (leave blank for
 	      automatic choice).</para>
@@ -4505,8 +4505,8 @@
 	  <para>That directory will normally contain the following images:</para>
 
 	  <table frame="none">
-	    <title>FreeBSD 6.<replaceable>X</replaceable> and 7.<replaceable>X</replaceable>
-	      ISO Image Names and Meanings</title>
+	    <title>&os; 6.<replaceable>X</replaceable>, 7.<replaceable>X</replaceable>,
+	      and 8.<replaceable>X</replaceable> ISO Image Names and Meanings</title>
 
 	    <tgroup cols="2">
 	      <thead>
@@ -4519,16 +4519,16 @@
 
 	      <tbody>
 		<row>
-		  <entry><filename><replaceable>version</replaceable>-RELEASE-<replaceable>arch</replaceable>-bootonly.iso</filename></entry>
+		  <entry><filename>&os;-<replaceable>version</replaceable>-RELEASE-<replaceable>arch</replaceable>-bootonly.iso</filename></entry>
 
-		  <entry>Everything you need to boot into a FreeBSD
+		  <entry>Everything you need to boot into a &os;
 		    kernel and start the installation interface.
 		    The installable files have to be pulled over FTP
 		    or some other supported source.</entry>
 		</row>
 
 		<row>
-		  <entry><filename><replaceable>version</replaceable>-RELEASE-<replaceable>arch</replaceable>-disc1.iso</filename></entry>
+		  <entry><filename>&os;-<replaceable>version</replaceable>-RELEASE-<replaceable>arch</replaceable>-disc1.iso</filename></entry>
 
 		  <entry>Everything you need to install &os; and a
 		    <quote>live filesystem</quote>, which is used in
@@ -4537,21 +4537,50 @@
 		</row>
 
 		<row>
-		  <entry><filename><replaceable>version</replaceable>-RELEASE-<replaceable>arch</replaceable>-disc2.iso</filename></entry>
+		  <entry><filename>&os;-<replaceable>version</replaceable>-RELEASE-<replaceable>arch</replaceable>-disc2.iso</filename></entry>
+
+		  <entry>As many third-party packages that would fit on the disc.
+		    This ISO is not available for &os; 8.0-RELEASE and
+		    later.</entry>
+		</row>
+
+		<row>
+		  <entry><filename>&os;-<replaceable>version</replaceable>-RELEASE-<replaceable>arch</replaceable>-dvd1.iso.gz</filename></entry>
 
-		  <entry>As many 
-		    third-party packages as would fit on the disc.</entry>
+		  <entry>Everything you need to install &os; and as
+		    many third-party packages that would fit on the
+		    dvd.</entry>
 		</row>
 
 		<row>
-		  <entry><filename><replaceable>version</replaceable>-RELEASE-<replaceable>arch</replaceable>-docs.iso</filename></entry>
+		  <entry><filename>&os;-<replaceable>version</replaceable>-RELEASE-<replaceable>arch</replaceable>-memstick.img</filename></entry>
+
+		  <entry>USB memory stick installer image.  This image
+		    is not available for &os; version 7 and earlier.</entry>
+		</row>
+
+		<row>
+		  <entry><filename>&os;-<replaceable>version</replaceable>-RELEASE-<replaceable>arch</replaceable>-docs.iso</filename></entry>
 
 		  <entry>&os; documentation.</entry>
 		</row>
+
+		<row>
+		  <entry><filename>&os;-<replaceable>version</replaceable>-RELEASE-<replaceable>arch</replaceable>-livefs.iso</filename></entry>
+
+		  <entry>A <quote>live filesystem</quote>, which is
+		    used in conjunction with the <quote>Repair</quote>
+		    facility in <application>sysinstall</application>.
+		    This ISO contains additional utilities, in
+		    comparison with disc1.iso.</entry>
+		</row>
 	      </tbody>
 	    </tgroup>
 	  </table>
 
+          <para>Note that ISO images for &os; version 6.<replaceable>X</replaceable>
+	    and earlier are not prefixed with <quote>&os;-</quote>.</para>
+
 	  <para>You <emphasis>must</emphasis> download one of either the bootonly
 	    ISO image (if available), or the image of disc one.  Do not download
 	    both of them, since the disc one image contains everything that the
@@ -4596,7 +4625,7 @@
 
     <sect2 id="install-ftp">
       <title>Creating a Local FTP Site with a FreeBSD Disc</title>
-	
+
       <indexterm>
 	<primary>installation</primary>
 	<secondary>network</secondary>
@@ -4747,7 +4776,7 @@
 	<para>Assuming that <devicename>C:</devicename> is where you have
 	  free space and <devicename>E:</devicename> is where your CDROM
 	  is mounted.</para>
-	
+
 	<para>If you do not have a CDROM drive, you can download the
 	  distribution from <ulink
 	  url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/&rel.current;-RELEASE/">ftp.FreeBSD.org</ulink>.


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-doc->jkois 
Responsible-Changed-By: jkois 
Responsible-Changed-When: Mon Aug 9 10:51:06 UTC 2010 
Responsible-Changed-Why:  
take. 


http://www.freebsd.org/cgi/query-pr.cgi?pr=149154 

From: Johann Kois <jkois@FreeBSD.org>
To: bug-followup@FreeBSD.org, glen.j.barber@gmail.com
Cc:  
Subject: Re: docs/149154: [patch][handbook] Table 2.4: Update ISO Image Names
 and Meanings
Date: Tue, 10 Aug 2010 23:45:57 +0000

 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
 The information in the patch is not 100% correct:
 
 - - Up to 7.2-RELEASE there is no "FreeBSD-" at the beginning of the ISO
 names
 - - Up to 7.2-RELEASE there are 2 other images:  "disc2" and "disc3".
 According to the release announcement "disc2" and "disc3" contain
 additional packages.
 
 Things changed with 7.3-RELEASE.  Now we have
 - - a dvd image
 - - "FreeBSD-" at the beginning of the ISO name.
 
 But I will use the provided patch as a starting point.
 
 
 
 - -- 
  Johann Kois
  jkois(at)FreeBSD.org
  FreeBSD Documentation Project
  FreeBSD German Documentation Project - https://doc.bsdgroup.de
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (FreeBSD)
 Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
 
 iEYEARECAAYFAkxh5LUACgkQ/rDr791hwtgi2QCdGQ9uR/lfBgw+Q9+Lkjz9xj6F
 ddUAnAh6MtcyZ7FYKjE1xapJEfv40qt+
 =+m3M
 -----END PGP SIGNATURE-----

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: docs/149154: commit references a PR
Date: Mon, 16 Aug 2010 21:32:36 +0000 (UTC)

 jkois       2010-08-16 21:32:23 UTC
 
   FreeBSD doc repository
 
   Modified files:
     en_US.ISO8859-1/books/handbook/install chapter.sgml 
   Log:
   PR:     docs/149154
   
   - Update the list of available install ISO images.
   - Remove 6.X information as the handbook says "I cover 7.3 and 8.1".
   - Sync the description with the information we provide in the release announcements.
   
   Original patch provided by:     Glen Barber (glen dott j dott barber ett gmail dott com)
   
   Revision  Changes    Path
   1.401     +63 -16    doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed  
State-Changed-By: jkois 
State-Changed-When: Tue Aug 17 08:50:37 UTC 2010 
State-Changed-Why:  
The proposed update of the handbook is online.  Close this PR. 

Thanks for the contribution.  


http://www.freebsd.org/cgi/query-pr.cgi?pr=149154 
>Unformatted:
