Date: Tue, 03 Aug 2010 20:19:38 -0400 From: Glen Barber <glen.j.barber@gmail.com> To: doc@FreeBSD.org Subject: [handbook] PRs 147347, 149154, and 149230 Message-ID: <4C58B21A.9030508@gmail.com>
next in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --------------030208040105030702090809 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Hi, I've recently submitted a patch to the handbook[1] to update the ISO image names and meanings table to reflect what is currently listed on the FTP server. I inadvertently submitted the patch to add content as well as whitespace fixes. I have two patches attached, which split these changes. The patches apply cleanly in either order, but more cleanly applying the whitespace fix first, as patch(1) doesn't display two sections where the offset differs. I'm following up to that PR as well as two others mentioned as they all affect the same section of the Handbook. There was a recent request[2] submitted to mention memory stick installations. I've submitted a followup to that PR with an attached patch, but after a few fixes, have a new patch available which applies cleanly after the two aforementioned patches. However, a recent PR[3] suggests the floppy install section should be removed, as floppy install images are not provided for 8.0-RELEASE and later. What is the general consensus on the floppy install section? It can be easily noted that floppy images are only available for FreeBSD 7.3-RELEASE and earlier, just as much as removal of the section. Thoughts? Thanks, and regards. [1] - http://www.freebsd.org/cgi/query-pr.cgi?pr=149154 [2] - http://www.freebsd.org/cgi/query-pr.cgi?pr=147347 [3] - http://www.freebsd.org/cgi/query-pr.cgi?pr=149230 -- Glen Barber --------------030208040105030702090809 Content-Type: text/plain; name="install.chapter_iso.txt" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="install.chapter_iso.txt" --- install/chapter.sgml.orig 2010-07-31 10:43:00.417863608 -0400 +++ install/chapter.sgml 2010-07-31 11:16:11.872834841 -0400 @@ -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 --------------030208040105030702090809 Content-Type: text/plain; name="install.chapter_whitespace.txt" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="install.chapter_whitespace.txt" --- 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> @@ -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>. --------------030208040105030702090809--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4C58B21A.9030508>