Attachment 108335 Details for Bug 149154 – file.diff

[patch] file.diff

file.diff (text/plain), 5.83 KB, created by Glen Barber on 2010-07-31 16:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Glen Barber

Created: 2010-07-31 16:40:01 UTC

Size: 5.83 KB

patch

obsolete

>--- 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>.

Actions: View | Diff

Attachments on bug 149154: 108335