Fix a variety of English style nits and other issues found with igor.

Reviewed by:	gabor
Approved by:	wblock
This commit is contained in:
Eitan Adler 2012-02-13 18:28:50 +00:00
parent 31e8611f47
commit e6a507fa1b
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/head/; revision=38452

View file

@ -289,7 +289,7 @@
<literal>a-h</literal>. A few of the partition labels <literal>a-h</literal>. A few of the partition labels
have special uses. The <literal>a</literal> partition is have special uses. The <literal>a</literal> partition is
used for the root partition (<filename>/</filename>). used for the root partition (<filename>/</filename>).
Thus only your system disk (e.g, the disk you boot from) Thus only your system disk (e.g., the disk you boot from)
should have an <literal>a</literal> partition. The should have an <literal>a</literal> partition. The
<literal>b</literal> partition is used for swap <literal>b</literal> partition is used for swap
partitions, and you may have many disks with swap partitions, and you may have many disks with swap
@ -304,7 +304,7 @@
single file system by pressing <keycap>C</keycap>. When single file system by pressing <keycap>C</keycap>. When
prompted if this will be a FS (file system) or swap, prompted if this will be a FS (file system) or swap,
choose <literal>FS</literal> and type in a mount point choose <literal>FS</literal> and type in a mount point
(e.g, <filename>/mnt</filename>). When adding a disk in (e.g., <filename>/mnt</filename>). When adding a disk in
post-install mode, <application>sysinstall</application> post-install mode, <application>sysinstall</application>
will not create entries in <filename>/etc/fstab</filename> will not create entries in <filename>/etc/fstab</filename>
for you, so the mount point you specify is not for you, so the mount point you specify is not
@ -853,7 +853,7 @@ da0: 126MB (258048 512 byte sectors: 64H 32S/T 126C)</screen>
<warning> <warning>
<para>Allowing untrusted users to mount arbitrary media, <para>Allowing untrusted users to mount arbitrary media,
e.g. by enabling <literal>vfs.usermount</literal> as e.g., by enabling <literal>vfs.usermount</literal> as
described below, should not be considered safe from a described below, should not be considered safe from a
security point of view. Most file systems in &os; were not security point of view. Most file systems in &os; were not
built to safeguard against malicious devices.</para> built to safeguard against malicious devices.</para>
@ -1036,7 +1036,7 @@ umass0: detached</screen>
</sect2> </sect2>
<sect2 id="mkisofs"> <sect2 id="mkisofs">
<title>mkisofs</title> <title><application>mkisofs</application></title>
<para>The &man.mkisofs.8; program, which is part of the <para>The &man.mkisofs.8; program, which is part of the
<filename role="package">sysutils/cdrtools</filename> port, <filename role="package">sysutils/cdrtools</filename> port,
@ -1123,7 +1123,7 @@ umass0: detached</screen>
</sect2> </sect2>
<sect2 id="burncd"> <sect2 id="burncd">
<title>burncd</title> <title><application>burncd</application></title>
<indexterm> <indexterm>
<primary>CDROMs</primary> <primary>CDROMs</primary>
<secondary>burning</secondary> <secondary>burning</secondary>
@ -1145,7 +1145,7 @@ umass0: detached</screen>
</sect2> </sect2>
<sect2 id="cdrecord"> <sect2 id="cdrecord">
<title>cdrecord</title> <title><application>cdrecord</application></title>
<para>If you do not have an ATAPI CD burner, you will have to <para>If you do not have an ATAPI CD burner, you will have to
use <command>cdrecord</command> to burn your CDs. use <command>cdrecord</command> to burn your CDs.
@ -1996,7 +1996,7 @@ cd0: Attempt to query device size failed: NOT READY, Medium not present - tray c
<sect3> <sect3>
<title>Formatting</title> <title>Formatting</title>
<para>A floppy disk needs to be low-level formated before it <para>A floppy disk needs to be low-level formatted before it
can be used. This is usually done by the vendor, but can be used. This is usually done by the vendor, but
formatting is a good way to check media integrity. Although formatting is a good way to check media integrity. Although
it is possible to force larger (or smaller) disk sizes, it is possible to force larger (or smaller) disk sizes,
@ -2043,7 +2043,7 @@ cd0: Attempt to query device size failed: NOT READY, Medium not present - tray c
<sect2> <sect2>
<title>The File System</title> <title>The File System</title>
<para>Now the floppy is ready to be high-level formated. This <para>Now the floppy is ready to be high-level formatted. This
will place a new file system on it, which will let FreeBSD will place a new file system on it, which will let FreeBSD
read and write to the disk. After creating the new file read and write to the disk. After creating the new file
system, the disk label is destroyed, so if you want to system, the disk label is destroyed, so if you want to
@ -2437,7 +2437,7 @@ sa0(ncr1:4:0): Logical unit is in process of becoming ready</screen>
</listitem> </listitem>
<listitem> <listitem>
<para>Complete machine destruction (e.g. fire), including <para>Complete machine destruction (e.g., fire), including
destruction of any on-site backups.</para> destruction of any on-site backups.</para>
</listitem> </listitem>
</itemizedlist> </itemizedlist>
@ -2469,7 +2469,7 @@ sa0(ncr1:4:0): Logical unit is in process of becoming ready</screen>
</listitem> </listitem>
<listitem> <listitem>
<para>Copies of whole filesystems and/or disks (e.g. periodic <para>Copies of whole filesystems and/or disks (e.g., periodic
&man.rsync.1; of the whole machine). This is generally most &man.rsync.1; of the whole machine). This is generally most
useful in networks with unique requirements. For general useful in networks with unique requirements. For general
protection against disk failure, it is usually inferior to protection against disk failure, it is usually inferior to
@ -2795,7 +2795,7 @@ sa0(ncr1:4:0): Logical unit is in process of becoming ready</screen>
<primary><command>bsdlabel</command></primary> <primary><command>bsdlabel</command></primary>
</indexterm> </indexterm>
<para>First, print the bsdlabel from each of your disks (e.g. <para>First, print the bsdlabel from each of your disks (e.g.,
<command>bsdlabel da0 | lpr</command>), your file system <command>bsdlabel da0 | lpr</command>), your file system
table (<filename>/etc/fstab</filename>) and all boot table (<filename>/etc/fstab</filename>) and all boot
messages, two copies of each.</para> messages, two copies of each.</para>
@ -2869,7 +2869,7 @@ sa0(ncr1:4:0): Logical unit is in process of becoming ready</screen>
<primary><command>newfs</command></primary> <primary><command>newfs</command></primary>
</indexterm> </indexterm>
<para>Try to <command>mount</command> (e.g. <para>Try to <command>mount</command> (e.g.,
<command>mount /dev/da0a /mnt</command>) the root partition <command>mount /dev/da0a /mnt</command>) the root partition
of your first disk. If the bsdlabel was damaged, use of your first disk. If the bsdlabel was damaged, use
<command>bsdlabel</command> to re-partition and label the <command>bsdlabel</command> to re-partition and label the
@ -2878,8 +2878,8 @@ sa0(ncr1:4:0): Logical unit is in process of becoming ready</screen>
Re-mount the root partition of the disk read-write Re-mount the root partition of the disk read-write
(<command>mount -u -o rw /mnt</command>). Use your backup (<command>mount -u -o rw /mnt</command>). Use your backup
program and backup tapes to recover the data for this file program and backup tapes to recover the data for this file
system (e.g. <command>restore vrf /dev/sa0</command>). system (e.g., <command>restore vrf /dev/sa0</command>).
Unmount the file system (e.g. Unmount the file system (e.g.,
<command>umount /mnt</command>). Repeat for each file <command>umount /mnt</command>). Repeat for each file
system that was damaged.</para> system that was damaged.</para>
@ -3153,7 +3153,7 @@ Filesystem 1K-blocks Used Avail Capacity Mounted on
<screen>&prompt.root; <userinput>mksnap_ffs /var /var/snapshot/snap</userinput></screen> <screen>&prompt.root; <userinput>mksnap_ffs /var /var/snapshot/snap</userinput></screen>
<para>One can find snapshot files on a file system (e.g. <para>One can find snapshot files on a file system (e.g.,
<filename>/var</filename>) by using the &man.find.1; <filename>/var</filename>) by using the &man.find.1;
command:</para> command:</para>
@ -3874,7 +3874,7 @@ gbde_lockdir="/etc/gbde"</programlisting>
</listitem> </listitem>
<listitem> <listitem>
<para>Allows the use of two independent keys (e.g. a <para>Allows the use of two independent keys (e.g., a
<quote>key</quote> and a <quote>key</quote> and a
<quote>company key</quote>).</para> <quote>company key</quote>).</para>
</listitem> </listitem>
@ -3974,7 +3974,7 @@ Reenter new passphrase:</screen>
</step> </step>
<step> <step>
<title>Attaching the Provider with the generated Key</title> <title>Attaching the Provider with the Generated Key</title>
<screen>&prompt.root; <userinput>geli attach -k /root/da2.key /dev/da2</userinput> <screen>&prompt.root; <userinput>geli attach -k /root/da2.key /dev/da2</userinput>
Enter passphrase:</screen> Enter passphrase:</screen>
@ -3987,7 +3987,7 @@ Enter passphrase:</screen>
</step> </step>
<step> <step>
<title>Creating the new File System</title> <title>Creating the New File System</title>
<screen>&prompt.root; <userinput>dd if=/dev/random of=/dev/da2.eli bs=1m</userinput> <screen>&prompt.root; <userinput>dd if=/dev/random of=/dev/da2.eli bs=1m</userinput>
&prompt.root; <userinput>newfs /dev/da2.eli</userinput> &prompt.root; <userinput>newfs /dev/da2.eli</userinput>
@ -4085,11 +4085,11 @@ geli_da2_flags="-p -k /root/da2.key"</programlisting>
systems.</para> systems.</para>
<sect2> <sect2>
<title>Why should Swap be Encrypted?</title> <title>Why Should Swap be Encrypted?</title>
<para>Like the encryption of disk partitions, encryption of swap <para>Like the encryption of disk partitions, encryption of swap
space is done to protect sensitive information. Imagine an space is done to protect sensitive information. Imagine an
application that e.g. deals with passwords. As long as these application that e.g., deals with passwords. As long as these
passwords stay in physical memory, all is well. However, if passwords stay in physical memory, all is well. However, if
the operating system starts swapping out memory pages to free the operating system starts swapping out memory pages to free
space for other applications, the passwords may be written to space for other applications, the passwords may be written to
@ -4158,7 +4158,7 @@ geli_da2_flags="-p -k /root/da2.key"</programlisting>
</sect2> </sect2>
<sect2> <sect2>
<title>Verifying that it Works</title> <title>Verifying That it Works</title>
<para>Once the system has been rebooted, proper operation of the <para>Once the system has been rebooted, proper operation of the
encrypted swap can be verified using the encrypted swap can be verified using the
@ -4484,7 +4484,7 @@ Device 1K-blocks Used Avail Capacity
<devicename>/dev/<replaceable>ad6</replaceable></devicename> <devicename>/dev/<replaceable>ad6</replaceable></devicename>
of the same size for <acronym>HAST</acronym> operation. The of the same size for <acronym>HAST</acronym> operation. The
<acronym>HAST</acronym> pool (sometimes also referred to as a <acronym>HAST</acronym> pool (sometimes also referred to as a
resource, i.e. the GEOM provider in resource, i.e., the GEOM provider in
<filename class="directory">/dev/hast/</filename>) will be <filename class="directory">/dev/hast/</filename>) will be
called called
<filename><replaceable>test</replaceable></filename>.</para> <filename><replaceable>test</replaceable></filename>.</para>
@ -4511,7 +4511,7 @@ Device 1K-blocks Used Avail Capacity
<tip> <tip>
<para>It is also possible to use host names in the <para>It is also possible to use host names in the
<literal>remote</literal> statements. In such a case, make <literal>remote</literal> statements. In such a case, make
sure that these hosts are resolvable, e.g. they are defined sure that these hosts are resolvable, e.g., they are defined
in the <filename>/etc/hosts</filename> file, or in the <filename>/etc/hosts</filename> file, or
alternatively in the local <acronym>DNS</acronym>.</para> alternatively in the local <acronym>DNS</acronym>.</para>
</tip> </tip>
@ -4526,7 +4526,7 @@ Device 1K-blocks Used Avail Capacity
<note> <note>
<para>It is <emphasis>not</emphasis> possible to use GEOM <para>It is <emphasis>not</emphasis> possible to use GEOM
providers with an existing file system (i.e. convert an providers with an existing file system (i.e., convert an
existing storage to <acronym>HAST</acronym>-managed pool), existing storage to <acronym>HAST</acronym>-managed pool),
because this procedure needs to store some metadata onto the because this procedure needs to store some metadata onto the
provider and there will not be enough required space provider and there will not be enough required space
@ -4657,7 +4657,7 @@ notify 30 {
<screen>&prompt.root; <userinput>/etc/rc.d/devd restart</userinput></screen> <screen>&prompt.root; <userinput>/etc/rc.d/devd restart</userinput></screen>
<para>When the <devicename>carp0</devicename> interface goes <para>When the <devicename>carp0</devicename> interface goes
up or down (i.e. the interface state changes), the system up or down (i.e., the interface state changes), the system
generates a notification, allowing the &man.devd.8; generates a notification, allowing the &man.devd.8;
subsystem to run an arbitrary script, in this case subsystem to run an arbitrary script, in this case
<filename>/usr/local/sbin/carp-hast-switch</filename>. This <filename>/usr/local/sbin/carp-hast-switch</filename>. This