os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

CD-ROM -> CDROM

Browse source 
O'Reilly has standardized on 'CD-ROM' as have several other
publishers, however 'CDROM' outnumbers 'CD-ROM' 2 to 1 in our
documentation and it has always appeared this way on FreeBSD CDs from
Walnut Creek/BSDi/WRS.  I don't have a preference either way as long
as it stays consistent.
This commit is contained in:
Murray Stokely 2001-07-14 00:57:56 +00:00
parent 0cd5b44fec
commit 1853b9bcf6
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=9890
4 changed files with 30 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

10
en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
View file

@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
$FreeBSD: doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.51 2001/07/06 13:02:58 dd Exp $
$FreeBSD: doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.52 2001/07/13 22:44:03 murray Exp $
-->
<chapter id="advanced-networking">
@ -540,7 +540,7 @@ Local1 (10.20.30.1, 10.9.9.30) --&gt; T1-GW (10.9.9.1)
</listitem>
<listitem>
<para>Storage devices such as floppies and CD-ROM drives can be
<para>Storage devices such as floppies and CDROM drives can be
used by other machines on the network eliminating the need for
extra hardware.</para>
</listitem>
@ -738,7 +738,7 @@ nfs_client_flags="-n 4"</programlisting>
</indexterm>
<itemizedlist>
<listitem>
<para>Have several machines on a network and share a CD-ROM or
<para>Have several machines on a network and share a CDROM or
floppy drive among them. This is cheaper and often more
convenient.</para>
</listitem>
@ -755,7 +755,7 @@ nfs_client_flags="-n 4"</programlisting>
<listitem>
<para>When you get to reinstalling FreeBSD on one of your
machines, NFS is the way to go! Just pop your distribution
CD-ROM into your file server and away you go!</para>
CDROM into your file server and away you go!</para>
</listitem>
<listitem>
@ -3095,7 +3095,7 @@ dhcp_flags=""</programlisting>
<sect3>
<title><filename>/etc/namedb/named.conf</filename></title>
<programlisting>// $FreeBSD: doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.51 2001/07/06 13:02:58 dd Exp $
<programlisting>// $FreeBSD: doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.52 2001/07/13 22:44:03 murray Exp $
//
// Refer to the named(8) man page for details. If you are ever going
// to setup a primary server, make sure you've understood the hairy

30
en_US.ISO8859-1/books/handbook/install/chapter.sgml
View file

@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
$FreeBSD: doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml,v 1.70 2001/06/24 11:30:31 murray Exp $
$FreeBSD: doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml,v 1.71 2001/07/12 00:39:09 dd Exp $
-->
<chapter id="install">
@ -79,21 +79,21 @@
<para>You may need to prepare some floppy disks. These disks will
be used to boot your computer in to the FreeBSD install process.
This step is not necessary <emphasis>if</emphasis> you are
installing from CD-ROM, <emphasis>and</emphasis> your computer
supports booting from the CD-ROM. If you do not meet these
installing from CDROM, <emphasis>and</emphasis> your computer
supports booting from the CDROM. If you do not meet these
requirements then you will need to create some floppies to boot
from.</para>
<note>
<para>If you are not sure whether your computer can boot from the
CD-ROM it does not hurt to try. Just insert the CD-ROM as
CDROM it does not hurt to try. Just insert the CDROM as
normal and restart your computer. You might need to adjust some
options in your BIOS so that your computer will try and boot
from the CD-ROM drive before the hard disk.</para>
from the CDROM drive before the hard disk.</para>
</note>
<tip>
<para>Even if you have the CD-ROM it might make sense for you to
<para>Even if you have the CDROM it might make sense for you to
download the files. There have been occasions where bugs in the
FreeBSD installer have been discovered after the CDs have been
released. When this happens the copies of the images on the FTP
@ -106,7 +106,7 @@
<title>Acquire the boot floppy images</title>
<para>These are files with a <filename>.flp</filename>
extension. If you have a CD-ROM release of FreeBSD then you
extension. If you have a CDROM release of FreeBSD then you
will find the files in the <filename>floppies</filename>
subdirectory. Alternatively, you can download the images from
the <ulink
@ -156,8 +156,8 @@
then we provide a tool to do this called
<command>fdimage</command>.</para>
<para>If you are using the floppies from the CD-ROM, and your
CD-ROM is the <devicename>E:</devicename> drive then you would
<para>If you are using the floppies from the CDROM, and your
CDROM is the <devicename>E:</devicename> drive then you would
run this:</para>
<screen><prompt>E:\&gt;</prompt> <userinput>tools\fdimage floppies\kern.flp A:</userinput></screen>
@ -166,7 +166,7 @@
file, replacing the floppy disk each time. Adjust the command
line as necessary, depending on where you have placed the
<filename>.flp</filename> files. If you do not have the
CD-ROM then <command>fdimage</command> can be downloaded from
CDROM then <command>fdimage</command> can be downloaded from
the <ulink
url="ftp://ftp.FreeBSD.org/pub/FreeBSD/tools/"><filename>tools</filename> directory</ulink> on the FreeBSD FTP site.</para>
@ -856,7 +856,7 @@
access by the CDROM driver. WORM/CD-R/CD-RW writing support is
provided by cdrecord, which is in the ports tree.</para>
<para>The following CD-ROM type systems are supported at this
<para>The following CDROM type systems are supported at this
time:</para>
<itemizedlist>
@ -923,7 +923,7 @@
</listitem>
<listitem>
<para><devicename>mcd</devicename> - Mitsumi proprietary CD-ROM
<para><devicename>mcd</devicename> - Mitsumi proprietary CDROM
interface (all models)</para>
</listitem>
</itemizedlist>
@ -1919,8 +1919,8 @@
DOS then we provide a tool to do this called
<command>fdimage</command>.</para>
<para>If you are using the floppies from the CD-ROM, and
your CD-ROM is the <devicename>E:</devicename> drive then
<para>If you are using the floppies from the CDROM, and
your CDROM is the <devicename>E:</devicename> drive then
you would run this:</para>
<screen><prompt>E:\&gt;</prompt> <userinput>tools\fdimage floppies\kern.flp A:</userinput></screen>
@ -1929,7 +1929,7 @@
file, replacing the floppy disk each time. Adjust the
command line as necessary, depending on where you have
placed the <filename>.flp</filename> files. If you do not
have the CD-ROM then <command>fdimage</command> can be
have the CDROM then <command>fdimage</command> can be
downloaded from the <ulink
url="ftp://ftp.FreeBSD.org/pub/FreeBSD/tools/"><filename>tools</filename>
directory</ulink> on the FreeBSD FTP site.</para>

14
en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml
View file

@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
$FreeBSD: doc/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml,v 1.40 2001/06/29 18:35:30 murray Exp $
$FreeBSD: doc/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml,v 1.41 2001/07/06 13:03:02 dd Exp $
-->
<chapter id="linuxemu">
@ -717,7 +717,7 @@ export PATH</programlisting>
<sect2 id="software">
<title>Software</title>
<para>The following CD-ROMs have been used for
<para>The following CDROMs have been used for
SAP-installation:</para>
<informaltable>
<tgroup cols=3>
@ -864,7 +864,7 @@ export PATH</programlisting>
<para>I used a dual processor board with 2 800MHz Pentium III
processors, Adaptec 29160 Ultra160 SCSI adapter (for accessing
a 40/80 GB DLT tape drive and CD-ROM), Mylex AcelleRAID (2
a 40/80 GB DLT tape drive and CDROM), Mylex AcelleRAID (2
channels, firmware 6.00-1-00 with 32MB RAM). To the Mylex
Raid-controller are attached two 17GB hard discs (mirrored)
and four 36GB hard discs (RAID level 5).</para>
@ -1392,11 +1392,11 @@ options SEMUME=100 #number of UNDO keys</programlisting></para>
<title>Installing SAP R/3</title>
<sect3 id="preparingsapcdroms">
<title>Preparing SAP CD-ROMs</title>
<title>Preparing SAP CDROMs</title>
<para>There are lots of CD-ROMs to mount and unmount during
installation. Assuming you have enough CD-ROM-drives, you
can just mount them all. I decided to copy the CD-ROM
<para>There are lots of CDROMs to mount and unmount during
installation. Assuming you have enough CDROM-drives, you
can just mount them all. I decided to copy the CDROM
contents to corresponding directories:</para>
<programlisting>/oracle/IDS/sapreorg/&lt;cd-name&gt;</programlisting>

6
en_US.ISO8859-1/books/handbook/ports/chapter.sgml
View file

@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
$FreeBSD: doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml,v 1.119 2001/07/06 13:03:04 dd Exp $
$FreeBSD: doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml,v 1.120 2001/07/11 13:16:24 nik Exp $
-->
<chapter id="ports">
@ -259,7 +259,7 @@ ftp> <userinput>exit</userinput>
</example>
<para>If you don't have a source of local packages (such as a
FreeBSD CD-ROM set) then it will probably be easier to use the
FreeBSD CDROM set) then it will probably be easier to use the
-r option to &man.pkg.add.1;. This will cause the utility to
automatically determine the correct object format and release
and then to fetch and install the package from an FTP site.
@ -273,7 +273,7 @@ ftp> <userinput>exit</userinput>
<para>Package files are distributed in .tgz format. You can
find them at <ulink
url="ftp://ftp.freebsd.org/ports/packages">ftp://ftp.freebsd.org/ports/packages</ulink>,
or on the FreeBSD CD-ROM distribution. Every CD on the
or on the FreeBSD CDROM distribution. Every CD on the
FreeBSD 4-CD set (and PowerPak, etc) contains packages in
the <filename>/packages</filename> directory. The layout of
the packages is similar to that of the