Attachment 9973 Details for Bug 20183 – file.diff

[patch] file.diff

file.diff (text/plain), 8.34 KB, created by ue on 2000-07-25 23:50:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: ue

Created: 2000-07-25 23:50:01 UTC

Size: 8.34 KB

patch

obsolete

>Index: article.sgml
>===================================================================
>RCS file: /home/ncvs/doc/en_US.ISO_8859-1/articles/multi-os/article.sgml,v
>retrieving revision 1.12
>diff -u -r1.12 article.sgml
>--- article.sgml	2000/05/30 22:48:47	1.12
>+++ article.sgml	2000/07/25 21:51:18
>@@ -144,11 +144,11 @@
> 
>     <itemizedlist>
>       <listitem>
>-	<para><filename>/dev/wd0</> (first physical hard disk)</para>
>+	<para><filename>/dev/wd0</filename> (first physical hard disk)</para>
>       </listitem>
> 
>       <listitem>
>-	<para><filename>/dev/wd1</> (second hard disk)</para>
>+	<para><filename>/dev/wd1</filename> (second hard disk)</para>
>       </listitem>
>     </itemizedlist>
> 
>@@ -157,7 +157,7 @@
>     <procedure>
>       <step>
> 	<para>I boot from a MS-DOS or Windows 95 boot disk that
>-	  contains the <filename>FDISK.EXE</> utility and make a small
>+	  contains the <filename>FDISK.EXE</filename> utility and make a small
> 	  50 meg primary partition (35-40 for Windows 95, plus a
> 	  little breathing room) on the first disk.  Also create a
> 	  larger partition on the second hard disk for my Windows
>@@ -166,7 +166,7 @@
> 
>       <step>
> 	<para>I reboot and install Windows 95 (easier said than done)
>-	  on the <filename>C:</> partition.</para>
>+	  on the <filename>C:</filename> partition.</para>
>       </step>
> 
>       <step>
>@@ -191,15 +191,15 @@
> 	  1024th cylinder.  (The 1024th cylinder is 528 megs into the
> 	  disk with our hypothetical 720MB disks).  I will use the
> 	  rest of the hard drive (about 270 megs) for the
>-	  <filename>/usr</> and <filename>/</> slices if I wish.  The
>+	  <filename>/usr</filename> and <filename>/</filename> slices if I wish.  The
> 	  rest of the second hard disk (size depends on the amount of
> 	  my Windows application/data partition that I created in step
>-	  1 can go to the <filename>/usr/src</> slice and swap
>+	  1 can go to the <filename>/usr/src</filename> slice and swap
> 	  space.</para>
>       </step>
> 
>       <step>
>-	<para>When viewed with the Windows 95 <command>fdisk</>
>+	<para>When viewed with the Windows 95 <command>fdisk</command>
> 	  utility, my hard drives should now look something like this:
> 
> 	  <screen>
>@@ -238,14 +238,14 @@
> 
>       <step>
> 	<para>Install FreeBSD.  I make sure to boot with my first hard
>-	  disk set at <quote>NORMAL</> in the BIOS.  If it is not,
>+	  disk set at <quote>NORMAL</quote> in the BIOS.  If it is not,
> 	  I'll have the enter my true disk geometry at boot time (to
> 	  get this, boot Windows 95 and consult Microsoft Diagnostics
>-	  (<filename>MSD.EXE</>), or check your BIOS) with the
>-	  parameter <literal>hd0=1416,16,63</> where
>-	  <replaceable>1416</> is the number of cylinders on my hard
>-	  disk, <replaceable>16</> is the number of heads per track,
>-	  and <replaceable>63</> is the number of sectors per track on
>+	  (<filename>MSD.EXE</filename>), or check your BIOS) with the
>+	  parameter <literal>hd0=1416,16,63</literal> where
>+	  <replaceable>1416</replaceable> is the number of cylinders on my hard
>+	  disk, <replaceable>16</replaceable> is the number of heads per track,
>+	  and <replaceable>63</replaceable> is the number of sectors per track on
> 	  the drive.</para>
>       </step>
> 
>@@ -275,7 +275,7 @@
>       cylinder.</para>
> 
>     <para>If you install Windows 95 on an existing BSD system, it will
>-      <quote>destroy</> the MBR, and you will have to reinstall your
>+      <quote>destroy</quote> the MBR, and you will have to reinstall your
>       previous boot manager.  Boot Easy can be reinstalled by using
>       the BOOTINST.EXE utility included in the \TOOLS directory on the
>       CD-ROM, and via <ulink
>@@ -305,19 +305,19 @@
> 	<email>jayrich@sysc.com</email>)</emphasis>.</para>
> 
>     <para>FreeBSD+Win95:  If you installed FreeBSD after Windows 95,
>-      you should see <literal>DOS</> on the Boot Easy menu.  This is
>+      you should see <literal>DOS</literal> on the Boot Easy menu.  This is
>       Windows 95.  If you installed Windows 95 after FreeBSD, read
>       <xref linkend="ch4"> above.  As long as your hard disk does not
>       have 1024 cylinders you should not have a problem booting.  If
>       one of your partitions goes beyond the 1024th cylinder however,
>-      and you get messages like <errorname>invalid system disk</>
>+      and you get messages like <errorname>invalid system disk</errorname>
>       under DOS (Windows 95) and FreeBSD will not boot, try looking
>       for a setting in your BIOS called <quote>&gt; 1024 cylinder
>-	support</> or <quote>NORMAL/LBA</> mode.  DOS may need LBA
>+	support</quote> or <quote>NORMAL/LBA</quote> mode.  DOS may need LBA
>       (Logical Block Addressing) in order to boot correctly.  If the
>       idea of switching BIOS settings every time you boot up doesn't
>       appeal to you, you can boot FreeBSD through DOS via the
>-      <filename>FBSDBOOT.EXE</> utility on the CD (It should find your
>+      <filename>FBSDBOOT.EXE</filename> utility on the CD (It should find your
>       FreeBSD partition and boot it.)</para>
> 
>     <para>FreeBSD+OS/2+Win95:  Nothing new here.  OS/2's boot manger
>@@ -399,7 +399,7 @@
> 
> 	<informalexample>
> 	  <para>(# of cylinders) &times; (# heads) &times; (63
>-	    sectors/track) &times; (512 bytes/sect)</>
>+	    sectors/track) &times; (512 bytes/sect)</para>
> 	</informalexample>
> 
>       <para>For example, on my 1.6 Gig Western Digital AC31600 EIDE hard
>@@ -419,9 +419,9 @@
> 	though: if you're using BIOS LBA (see <xref
> 	  linkend="limits">), you can't use just any program to get
> 	the physical geometry.  This is because many programs (e.g.
>-	<filename>MSD.EXE</> or FreeBSD fdisk) don't identify the
>+	<filename>MSD.EXE</filename> or FreeBSD fdisk) don't identify the
> 	physical disk geometry; they instead report the
>-	<firstterm>translated geometry</> (virtual numbers from using
>+	<firstterm>translated geometry</firstterm> (virtual numbers from using
> 	LBA).  Stay tuned for what that means.</para>
> 
>       <para>One other useful thing about these terms.  Given 3
>@@ -434,9 +434,9 @@
>       <para>For those that are interested in more technical details,
> 	information on disk geometry, boot sectors, BIOSes, etc. can
> 	be found all over the net.  Query Lycos, Yahoo, etc. for
>-	<literal>boot sector</> or <literal>master boot record</>.
>+	<literal>boot sector</literal> or <literal>master boot record</literal>.
> 	Among the useful info you'll find are Hale Landis's
>-	<citetitle>How It Works</> document pack.  See the <xref
>+	<citetitle>How It Works</citetitle> document pack.  See the <xref
> 	  linkend="sources"> section for a few pointers to this
> 	pack.</para>
> 
>@@ -449,21 +449,21 @@
> 
>       <para>On the first sector of your disk (Cyl 0, Head 0, Sector 1)
> 	lives the Master Boot Record (MBR).  It contains a map of your
>-	disk.  It identifies up to 4 <firstterm>partitions</>, each of
>+	disk.  It identifies up to 4 <firstterm>partitions</firstterm>, each of
> 	which is a contiguous chunk of that disk.  FreeBSD calls
>-	partitions <firstterm>slices</> to avoid confusion with it's
>+	partitions <firstterm>slices</firstterm> to avoid confusion with it's
> 	own partitions, but we won't do that here.  Each partition can
> 	contain its own operating system.</para>
> 
>       <para>Each partition entry in the MBR has a <firstterm>Partition
>-	  ID</>, a <firstterm>Start Cylinder/Head/Sector</>, and an
>-	<firstterm>End Cylinder/Head/Sector</>.  The Partition ID
>+	  ID</firstterm>, a <firstterm>Start Cylinder/Head/Sector</firstterm>, and an
>+	<firstterm>End Cylinder/Head/Sector</firstterm>.  The Partition ID
> 	tells what type of partition it is (what OS) and the Start/End
> 	tells where it is.  <xref linkend="tbl-pid"> lists a
> 	smattering of some common Partition IDs.</para>
> 
>       <table id="tbl-pid">
>-	<title>Partition IDs</>
>+	<title>Partition IDs</title>
> 
> 	<tgroup cols="2">
> 	  <thead>
>@@ -515,7 +515,7 @@
>       <para>Note that not all partitions are bootable (e.g. Extended
> 	DOS).  Some are&mdash;some aren't.  What makes a partition
> 	bootable is the configuration of the <firstterm>Partition Boot
>-	  Sector</> that exists at the beginning of each
>+	  Sector</firstterm> that exists at the beginning of each
> 	partition.</para>
> 
>       <para>When you configure your favorite boot manager, it looks up
>@@ -577,7 +577,7 @@
> 	</listitem>
> 
> 	<listitem>
>-	  <para>64 sectors/track, max (actually 63, <literal>0</>
>+	  <para>64 sectors/track, max (actually 63, <literal>0</literal>
> 	    isn't available)</para>
> 	</listitem>
>       </itemizedlist>

Actions: View | Diff

Attachments on bug 20183: 9970 | 9971 | 9972 | 9973 | 9974 | 9975