Attachment 45768 Details for Bug 70485 – file.diff

[patch] file.diff

file.diff (text/plain), 21.46 KB, created by Gavin Atkinson on 2004-08-15 16:00:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gavin Atkinson

Created: 2004-08-15 16:00:27 UTC

Size: 21.46 KB

patch

obsolete

>Index: release/doc/en_US.ISO8859-1/installation/common/install.sgml
>===================================================================
>RCS file: /usr/cvs/src/release/doc/en_US.ISO8859-1/installation/common/install.sgml,v
>retrieving revision 1.26
>diff -u -r1.26 install.sgml
>--- release/doc/en_US.ISO8859-1/installation/common/install.sgml	7 Jul 2004 13:11:59 -0000	1.26
>+++ release/doc/en_US.ISO8859-1/installation/common/install.sgml	15 Aug 2004 14:32:14 -0000
>@@ -77,10 +77,10 @@
> 
> 
> 
>-    <para arch="i386,pc98">&os; for the &arch.print; requires a 386 or better
>-    processor to run (sorry, there is no support for 286 processors)
>-    and at least 5 megs of RAM to install and 4 megs of RAM to
>-    run. You will need at least 100MB of free hard drive space for the
>+    <para arch="i386,pc98">&os; for the &arch.print; requires a 486 or better
>+    processor to install and run (although &os; can run on 386 processors with
>+    a custom kernel) and at least 8 megs of RAM to install and 7 megs to
>+    run. You will need at least 150MB of free hard drive space for the
>     most minimal installation.  See below for ways of shrinking
>     existing DOS partitions in order to install &os;.</para>
> 
>@@ -139,7 +139,7 @@
>   <title>Floppy Disk Image Instructions</title>
> 
>   <para arch="i386,alpha,pc98">Depending on how you choose to install &os;, you may need to
>-  create a set of floppy disks (usually two) to begin the installation
>+  create a set of floppy disks (usually three) to begin the installation
>   process.  This section briefly describes how to create these disks,
>   either from a CDROM installation or from the Internet.  Note that in
>   the common case of installing &os; from CDROM, on a machine that
>@@ -148,23 +148,20 @@
> 
>   <para arch="i386,alpha">For most CDROM or network installations, all you need to
>   copy onto actual floppies from the <filename>floppies/</filename> directory are the
>-  <filename>kern.flp</filename> and <filename>mfsroot.flp</filename>
>-  images (for 1.44MB floppies).  Depending on your hardware, you may
>-  also need to make the third <filename>drivers.flp</filename> image
>-  to provide necessary device drivers.</para>
>+  <filename>boot.flp</filename> and <filename>kernX.flp</filename>
>+  images (for 1.44MB floppies).</para>
> 
>   <para arch="pc98">For a normal CDROM or network installation, all you need
>   to copy onto actual floppies from the <filename>floppies/</filename>
>-  directory are the <filename>kern.flp</filename> and <filename>mfsroot.flp</filename>
>-  images (for 1.44MB floppies) or <filename>kern-small.flp</filename> and
>-  <filename>mfsroot-small.flp</filename> images (for 1.2MB floppies).</para>
>+  directory are the <filename>boot.flp</filename> and <filename>kernX.flp</filename>
>+  images (for 1.44MB floppies) or <filename>boot-small.flp</filename> and
>+  <filename>kern-small.flp</filename> images (for 1.2MB floppies).</para>
> 
>   <para arch="i386,alpha,pc98">Getting these images over the network is easy.  Simply fetch
>   the
>-  <replaceable>release</replaceable><filename>/floppies/kern.flp</filename>,
>-  <replaceable>release</replaceable><filename>/floppies/mfsroot.flp</filename>,
>-  and
>-  <replaceable>release</replaceable><filename>/floppies/drivers.flp</filename>
>+  <replaceable>release</replaceable><filename>/floppies/boot.flp</filename>,
>+  and all of the
>+  <replaceable>release</replaceable><filename>/floppies/kernX.flp</filename>
>   files from <ulink
>   url="&release.url;"></ulink>
>   or one of the many mirrors listed at <ulink
>@@ -173,16 +170,18 @@
>     <ulink url="http://mirrorlist.FreeBSD.org/"></ulink> Web pages.
>   </para>
> 
>-  <para arch="i386,alpha">Get two blank, freshly formatted floppies and image copy
>-  <filename>kern.flp</filename> onto one and <filename>mfsroot.flp</filename> onto the other.  These images are
>+  <para arch="i386,alpha">Get approximately three blank, freshly formatted floppies and image copy
>+  <filename>boot.flp</filename> onto one and the <filename>kernX.flp</filename> files 
>+  onto the others.  These images are
>   <emphasis>not</emphasis> DOS files.  You cannot simply copy them to a DOS or UFS floppy
>   as regular files, you need to <quote>image</quote> copy them to the floppy with
>   <filename>fdimage.exe</filename> under DOS (see the
>   <filename>tools</filename> directory on your CDROM or &os; FTP
>   mirror) or the &man.dd.1; command in UNIX.</para>
> 
>-  <para arch="pc98">Get two blank, freshly formatted floppies and image copy
>-  <filename>kern.flp</filename> onto one and <filename>mfsroot.flp</filename> onto the other.  These images are
>+  <para arch="pc98">Get approximately three blank, freshly formatted floppies and image copy
>+  <filename>boot.flp</filename> onto one and the <filename>kernX.flp</filename> files
>+  onto the others.  These images are
>   <emphasis>not</emphasis> DOS files.  You cannot simply copy them to a DOS or UFS floppy
>   as regular files, you need to <quote>image</quote> copy them to the floppy with
>   <filename>rawrite.exe</filename> under DOS (see the
>@@ -192,39 +191,34 @@
>   <para arch="i386,alpha,pc98">For example, to create the kernel floppy image from DOS, you'd
>   do something like this:</para>
> 
>-  <screen arch="i386,alpha"><prompt>C></prompt> <userinput>fdimage kern.flp a:</userinput></screen>
>+  <screen arch="i386,alpha"><prompt>C></prompt> <userinput>fdimage boot.flp a:</userinput></screen>
>   <screen arch="pc98"><prompt>A></prompt> <userinput>rawrite</userinput></screen>
> 
>-  <para arch="i386,alpha">Assuming that you'd copied <filename>fdimage.exe</filename> and <filename>kern.flp</filename> into a directory
>-  somewhere.  You would do the same for <filename>mfsroot.flp</filename>, of course.</para>
>+  <para arch="i386,alpha">Assuming that you'd copied <filename>fdimage.exe</filename> and <filename>boot.flp</filename> into a directory
>+  somewhere.  You would do the same for the <filename>kernX.flp</filename> files, of course.</para>
> 
>-  <para arch="pc98">Assuming that you'd copied <filename>rawrite.exe</filename> and <filename>kern.flp</filename> into a directory
>-  somewhere.  You would do the same for <filename>mfsroot.flp</filename>, of course.</para>
>+  <para arch="pc98">Assuming that you'd copied <filename>rawrite.exe</filename> and <filename>boot.flp</filename> into a directory
>+  somewhere.  You would do the same for the <filename>kernX.flp</filename> files, of course.</para>
> 
>   <para arch="i386,alpha,pc98">If you're creating the boot floppy from a UNIX machine, you
>   may find that:</para>
> 
>-  <screen arch="i386,alpha">&prompt.root; <userinput>dd if=floppies/kern.flp of=/dev/rfd0</userinput></screen>
>-  <screen arch="pc98">&prompt.root; <userinput>dd if=floppies/kern.flp of=/dev/rfd0.1440</userinput></screen>
>+  <screen arch="i386,alpha">&prompt.root; <userinput>dd if=floppies/boot.flp of=/dev/rfd0</userinput></screen>
>+  <screen arch="pc98">&prompt.root; <userinput>dd if=floppies/boot.flp of=/dev/rfd0.1440</userinput></screen>
>+
>+  <para arch="i386,alpha">or</para>
>+
>+  <screen arch="i386,alpha">&prompt.root; <userinput>dd if=floppies/boot.flp of=/dev/fd0</userinput></screen>
> 
>   <para arch="i386,alpha,pc98">or</para>
> 
>-  <screen arch="i386,alpha">&prompt.root; <userinput>dd if=floppies/kern.flp of=/dev/floppy</userinput></screen>
>-  <screen arch="pc98">&prompt.root; <userinput>dd if=floppies/kern-small.flp of=/dev/rfd0.1200</userinput></screen>
>+  <screen arch="i386,alpha">&prompt.root; <userinput>dd if=floppies/boot.flp of=/dev/floppy</userinput></screen>
>+  <screen arch="pc98">&prompt.root; <userinput>dd if=floppies/boot-small.flp of=/dev/rfd0.1200</userinput></screen>
> 
>   <para arch="i386,alpha,pc98">work well, depending on your hardware and operating system
>   environment (different versions of UNIX have different names
>   for the floppy drive).</para>
> 
>-  <para arch="alpha">If you're on an alpha machine that can network-boot its
>-  floppy images or you have a 2.88MB or LS-120 floppy capable of
>-  taking a 2.88MB image on an x86 machine, you may wish to use
>-  the single (but twice as large) <filename>boot.flp</filename> image.
>-  It contains the contents of <filename>kern.flp</filename> and <filename>mfsroot.flp</filename> on
>-  a single floppy.  This file should also be used as the
>-  boot file for those mastering <quote>El Torito</quote> bootable CD images.  See
>-  the &man.mkisofs.8; command for more information.</para>
>-
>   <para arch="amd64">Floppy disk based install is not supported
>   on &os;/&arch;.</para>
>   </sect2>
>@@ -240,19 +234,15 @@
>       installation from it:
>         <itemizedlist>
>           <listitem>
>-            <para>If your system supports bootable CDROM media
>-            (usually an option which can be selectively enabled in the
>-            controller's setup menu or in the PC BIOS for some
>-            systems) and you have it enabled, &os; supports the
>-            <quote>El Torito</quote> bootable CD standard.  Simply
>-            put the installation CD in your CDROM drive and boot the
>-            system to begin installation.</para>
>+            <para>If your system supports the <quote>CDBOOT</quote> standard for
>+            bootable CDROM media and you have booting from CD enabled,
>+            simply put the &os; installation CD in your CDROM drive and
>+            boot the system to begin installation.</para>
> 	  </listitem>
> 	  <listitem>
> 	    <para>Build a set of &os; boot floppies from the
>             <filename>floppies/</filename> directory in every &os;
>-            distribution.  Either simply use the
>-            <filename>makeflp.bat</filename> script from DOS or read
>+            distribution.  Read
>             <xref linkend="floppies"> for more information on creating
>             the bootable floppies under different operating systems.
>             Then you simply boot from the first floppy and you should
>@@ -280,26 +270,26 @@
> 
>       <para arch="i386">If you don't have a CDROM (or your computer does not
>       support booting from CDROM) and would like to simply install
>-      over the net using PPP, SLIP or a dedicated connection.
>-      You should start the installation by building
>+      over the net using PPP, SLIP or a dedicated connection,
>+      you should start the installation by building
>       a set of &os; boot floppies from the files
>-      <filename>floppies/kern.flp</filename> and
>-      <filename>floppies/mfsroot.flp</filename> using the instructions
>+      <filename>floppies/boot.flp</filename> and
>+      <filename>floppies/kernX.flp</filename> using the instructions
>       found in <xref linkend="floppies">.  Restart your computer using
>-      the <filename>kern.flp</filename> disk; when prompted, insert
>-      the <filename>mfsroot.flp</filename> disk.  Then, please go to
>+      the <filename>boot.flp</filename> disk; when prompted, insert
>+      the other disks as required.  Then, please go to
>       <xref linkend="ftpnfs"> for additional tips on installing
>       via FTP or NFS.</para>
> 
>       <para arch="pc98">If you don't have a CDROM and would like to
>-      simply install over the net using PPP, SLIP or a dedicated connection.
>-      You should start the installation by building
>+      simply install over the net using PPP, SLIP or a dedicated connection,
>+      you should start the installation by building
>       a set of &os; boot floppies from the files
>-      <filename>floppies/kern.flp</filename> and
>-      <filename>floppies/mfsroot.flp</filename> using the instructions
>+      <filename>floppies/boot.flp</filename> and
>+      <filename>floppies/kernX.flp</filename> using the instructions
>       found in <xref linkend="floppies">.  Restart your computer using
>-      the <filename>kern.flp</filename> disk; when prompted, insert
>-      the <filename>mfsroot.flp</filename> disk.  Then, please go to
>+      the <filename>boot.flp</filename> disk; when prompted, insert
>+      the other disks as required.  Then, please go to
>       <xref linkend="ftpnfs"> for additional tips on installing
>       via FTP or NFS.</para>
> 
>@@ -316,18 +306,18 @@
> 
>       <para arch="alpha">Alternatively you can boot the installation
>       from floppy disk. You should start the installation by building
>-      a set of &os; boot floppies from the files
>-      <filename>floppies/kern.flp</filename> and
>-      <filename>floppies/mfsroot.flp</filename> using the instructions
>+      a set of &os; boot floppies from the
>+      <filename>floppies/boot.flp</filename> and
>+      <filename>floppies/kernX.flp</filename> files using the instructions
>       found in <xref linkend="floppies">. From the SRM console prompt
>       (<literal>&gt;&gt;&gt;</literal>), just insert the
>-      <filename>kern.flp</filename> floppy and type the following
>+      <filename>boot.flp</filename> floppy and type the following
>       command to start the installation:</para>
> 
>       <screen arch="alpha">&gt;&gt;&gt;<userinput>boot dva0</userinput></screen>
> 
>-      <para arch="alpha">Insert the <filename>mfsroot.flp</filename>
>-      floppy when prompted and you will end up at the first screen of
>+      <para arch="alpha">Insert the other floppies when prompted and
>+      you will end up at the first screen of
>       the install program.</para>
> 
> 
>@@ -462,7 +452,8 @@
>         <listitem>
>           <para>If you would be able to FTP install &os; directly
>           from the CDROM drive in some &os; machine, it's quite
>-          easy: You simply add the following line to the password file
>+          easy: You ensure an FTP server is running and then
>+          simply add the following line to the password file
>           (using the &man.vipw.8; command):</para>
> 
>           <screen>ftp:*:99:99::0:0:FTP:/cdrom:/sbin/nologin</screen>
>@@ -545,17 +536,15 @@
>       floppy, as the following sequence of commands
>       illustrates:</para>
> 
>-      <screen>&prompt.root; <userinput>fdformat -f 1440 fd0.1440</userinput>
>-&prompt.root; <userinput>disklabel -w -r fd0.1440 floppy3</userinput>
>-&prompt.root; <userinput>newfs -t 2 -u 18 -l 1 -i 65536 /dev/fd0</userinput></screen>
>+      <screen>&prompt.root; <userinput>fdformat -f 1440 fd0</userinput>
>+&prompt.root; <userinput>disklabel -w fd0 floppy3</userinput>
>+&prompt.root; <userinput>newfs -i 65536 /dev/fd0</userinput></screen>
> 
>       <para>After you've formatted the floppies for DOS or UFS, you'll
>-      need to copy the files onto them.  The distribution files are
>-      split into chunks conveniently sized so that 5 of them will fit
>-      on a conventional 1.44MB floppy.  Go through all your floppies,
>-      packing as many files as will fit on each one, until you've got
>-      all the distributions you want packed up in this fashion.  Each
>-      distribution should go into its own subdirectory on the floppy,
>+      need to copy the files onto them.
>+      The distribution files are sized so that a floppy disk will hold
>+      a single file.
>+      Each distribution should go into its own subdirectory on the floppy,
>       e.g.: <filename>a:\bin\bin.inf</filename>, <filename>a:\bin\bin.aa</filename>, <filename>a:\bin\bin.ab</filename>, ...</para>
> 
>       <important>
>@@ -565,8 +554,7 @@
>         when fetching and concatenating the distribution.  When
>         putting distributions onto floppies, the
>         <filename>distname.inf</filename> file <emphasis>must</emphasis> occupy the first
>-        floppy of each distribution set.  This is also covered in
>-        <filename>README.TXT</filename>.</para>
>+        floppy of each distribution set.</para>
>       </important>
> 
>       <para>Once you come to the Media screen of the install, select
>@@ -618,7 +606,7 @@
>       this:</para>
> 
>       <screen>&prompt.root; <userinput>cd <replaceable>/where/you/have/your/dists</replaceable></userinput>
>-&prompt.root; <userinput>tar cvf /dev/rsa0 <replaceable>dist1</replaceable> .. <replaceable>dist2</replaceable></userinput></screen>
>+&prompt.root; <userinput>tar cvf /dev/sa0 <replaceable>dist1</replaceable> .. <replaceable>dist2</replaceable></userinput></screen>
> 
>       <para>When you go to do the installation, you should also make
>       sure that you leave enough room in some temporary directory
>@@ -654,8 +642,8 @@
>         between two computers.  The link must be hard-wired because
>         the SLIP installation doesn't currently offer a dialing
>         capability.  If you need to dial out with a modem or otherwise
>-        dialog with the link before connecting to it, then I recommend
>-        that the PPP utility be used instead.</para>
>+        dialog with the link before connecting to it, then the PPP
>+        utility should be used instead.</para>
> 
>         <para>If you're using PPP, make sure that you have your
>         Internet Service Provider's IP address and DNS information
>@@ -699,7 +687,7 @@
>       <sect4>
>         <title>Ethernet</title>
> 
>-	<para>&os; supports many common Ethernet cards; a table
>+	<para>&os; supports most common Ethernet cards; a table
>         of supported cards is
>         provided as part of the &os; Hardware Notes (see
>         <filename>HARDWARE.TXT</filename> in
>@@ -741,7 +729,7 @@
> 
>         <para>If this server supports only <quote>privileged port</quote> access (this is
>         generally the default for Sun and Linux workstations), you
>-        will need to set this option in the Options menu before
>+        may need to set this option in the Options menu before
>         installation can proceed.</para>
> 
>         <para>If you have a poor quality Ethernet card which suffers from very
>@@ -842,19 +830,21 @@
> 	</step>
> 	<step>
> 	  <para>If you don't get any output on your serial console,
>-	  plug the keyboard in again and wait for some beeps.  If you
>-	  are booting from the CDROM, proceed to <xref
>-	  linkend="hitspace"> as soon as you
>+	  plug the keyboard in again.  If you are booting from the
>+	  CDROM, proceed to <xref linkend="hitspace"> as soon as you
> 	  hear the beep.</para>
> 	</step>
> 	<step>
>-	  <para>For a floppy boot, the first beep means to remove the
>-	  <filename>kern.flp</filename> floppy and insert the
>-	  <filename>mfsroot.flp</filename> floppy, after
>-	  which you should press <keycap>Enter</keycap> and wait for another beep.</para>
>+	  <para>If booting from floppies, when access to the disk stops, insert
>+	  the first of the <filename>kernX.flp</filename> disks and press
>+	  <keycap>Enter</keycap>.  When access to this disk finishes, insert
>+	  the next <filename>kernX.flp</filename> disk and press <keycap>Enter</keycap>,
>+	  and repeat until all <filename>kernX.flp</filename> disks have been
>+	  inserted.  When disk activity finishes, reinsert the <filename>boot.flp</filename>
>+	  floppy disk and press <keycap>Enter</keycap>.</para>
> 	</step>
> 	<step id="hitspace">
>-	  <para>Hit the space bar, then enter</para>
>+	  <para>Once a beep is heard, hit the number <keycap>6</keycap>, then enter</para>
> 
> 	  <screen><userinput>boot -h</userinput></screen>
> 
>@@ -965,7 +955,10 @@
> 	<answer>
> 	  <para>Ongoing work with BSDI's &man.doscmd.1; utility will
> 	  suffice in many cases, though
>-	  it still has some rough edges.  If you're interested in
>+	  it still has some rough edges.  The
>+	  <filename role="package">emulators/doscmd</filename> port/package
>+	  can be found in the &os; Ports Collection.
>+          If you're interested in
> 	  working on this, please send mail to the &a.emulation;
> 	  and indicate that you're interested in joining this ongoing
> 	  effort!</para>
>@@ -976,6 +969,38 @@
> 	  X Window System (XFree86) to operate.</para>
> 	</answer>
>       </qandaentry>
>+
>+      <qandaentry>
>+        <question>
>+	  <para>Can I run &microsoft.windows; applications under &os;?</para>
>+	</question>
>+
>+	<answer>
>+	  <para>There are several ports/packages in the &os; Ports Collection
>+	  which can enable the use of many &windows; applications.
>+	  The <filename role="package">emulators/wine</filename> port/package
>+	  provides a compatibility layer on top of &os; which allow many
>+	  &windows; applications to be run within X Windows (XFree86).
>+	</answer>
>+      </qandaentry>
>+
>+      <qandaentry>
>+        <question>
>+	  <para>Can I run other Operating Systems under &os;?</para>
>+	</question>
>+
>+	<answer>
>+	  <para>Again, there are several ports/packages in the &os; Ports Collection
>+	  which simulate "virtual machines" and allow other operating systems to run
>+	  on top of &os;.
>+	  The <filename role="package">emulators/bochs</filename> port/package
>+	  allows &microsoft.windows;, Linux and even other copies of &os; to be run within a
>+	  window on the &os; desktop.
>+	  The <filename role="package">emulators/vmware2</filename> and
>+	  <filename role="package">emulators/vmware3</filename> ports/packages
>+	  allow the commercial VMware virtual machine software to be run on &os;.</para>
>+	</answer>
>+      </qandaentry>
>     </qandaset>
> 
>     <qandaset arch="alpha">
>Index: release/doc/en_US.ISO8859-1/installation/common/layout.sgml
>===================================================================
>RCS file: /usr/cvs/src/release/doc/en_US.ISO8859-1/installation/common/layout.sgml,v
>retrieving revision 1.7
>diff -u -r1.7 layout.sgml
>--- release/doc/en_US.ISO8859-1/installation/common/layout.sgml	7 Jul 2004 13:11:59 -0000	1.7
>+++ release/doc/en_US.ISO8859-1/installation/common/layout.sgml	15 Aug 2004 14:32:14 -0000
>@@ -93,7 +93,7 @@
> 	filenames in <filename>packages</filename>/ to the &man.pkg.add.1; command.</para>
> 
> 	<para>The Ports Collection may be installed like any other
>-	distribution and requires about 100MB unpacked.  More
>+	distribution and requires about 190MB unpacked.  More
> 	information on the ports collection may be obtained from
> 	<ulink url="http://www.FreeBSD.org/ports/">http://www.FreeBSD.org/ports/</ulink> or locally from
> 	<filename>/usr/share/doc/handbook</filename> if you've installed the <filename>doc</filename>

Actions: View | Diff

Attachments on bug 70485: 45768