aboutsummaryrefslogtreecommitdiff
path: root/en_US.ISO8859-1/books/handbook
diff options
context:
space:
mode:
authorGabor Kovesdan <gabor@FreeBSD.org>2012-08-21 19:16:02 +0000
committerGabor Kovesdan <gabor@FreeBSD.org>2012-08-21 19:16:02 +0000
commit2e51ec7022b39b6fb3524de08669b20d0d436285 (patch)
tree79fbae1d36dfb1cf1c634282cd893ef6532e3abb /en_US.ISO8859-1/books/handbook
parentb2153405c50aa7276c3b5ad07d50eec1f0b45449 (diff)
downloaddoc-2e51ec7022b39b6fb3524de08669b20d0d436285.tar.gz
doc-2e51ec7022b39b6fb3524de08669b20d0d436285.zip
- Strip unnecessary trailing spaces
Approved by: doceng (implicit)
Notes
Notes: svn path=/projects/sgml2xml/; revision=39416
Diffstat (limited to 'en_US.ISO8859-1/books/handbook')
-rw-r--r--en_US.ISO8859-1/books/handbook/Makefile8
-rw-r--r--en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml10
-rw-r--r--en_US.ISO8859-1/books/handbook/basics/chapter.sgml212
-rw-r--r--en_US.ISO8859-1/books/handbook/book.sgml2
-rw-r--r--en_US.ISO8859-1/books/handbook/chapters.ent6
-rw-r--r--en_US.ISO8859-1/books/handbook/filesystems/chapter.sgml14
-rw-r--r--en_US.ISO8859-1/books/handbook/jails/chapter.sgml4
-rw-r--r--en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml12
-rw-r--r--en_US.ISO8859-1/books/handbook/l10n/chapter.sgml18
-rw-r--r--en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml4
-rw-r--r--en_US.ISO8859-1/books/handbook/mac/chapter.sgml6
-rw-r--r--en_US.ISO8859-1/books/handbook/mail/chapter.sgml4
-rw-r--r--en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml256
-rw-r--r--en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml24
-rw-r--r--en_US.ISO8859-1/books/handbook/ports/chapter.sgml2
-rw-r--r--en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml78
-rw-r--r--en_US.ISO8859-1/books/handbook/preface/preface.sgml6
-rw-r--r--en_US.ISO8859-1/books/handbook/txtfiles.ent8
-rw-r--r--en_US.ISO8859-1/books/handbook/users/chapter.sgml26
-rw-r--r--en_US.ISO8859-1/books/handbook/vinum/chapter.sgml58
-rw-r--r--en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml6
-rw-r--r--en_US.ISO8859-1/books/handbook/x11/chapter.sgml8
22 files changed, 386 insertions, 386 deletions
diff --git a/en_US.ISO8859-1/books/handbook/Makefile b/en_US.ISO8859-1/books/handbook/Makefile
index 9107db6d1e..1babfa56b1 100644
--- a/en_US.ISO8859-1/books/handbook/Makefile
+++ b/en_US.ISO8859-1/books/handbook/Makefile
@@ -12,13 +12,13 @@
# fingerprints by default. If you would like for the
# entire key to be displayed, then set this variable.
# This option has no affect on the HTML formats.
-#
+#
# Handbook-specific targets
#
# pgpkeyring This target will read the contents of
# pgpkeys/chapter.sgml and will extract all of
# the pgpkeys to standard out. This output can then
-# be redirected into a file and distributed as a
+# be redirected into a file and distributed as a
# public keyring of FreeBSD developers that can
# easily be imported into PGP/GPG.
#
@@ -242,7 +242,7 @@ IMAGES_LIB+= callouts/13.png
IMAGES_LIB+= callouts/14.png
IMAGES_LIB+= callouts/15.png
-#
+#
# SRCS lists the individual SGML files that make up the document. Changes
# to any of these files will force a rebuild
#
@@ -289,7 +289,7 @@ SRCS+= virtualization/chapter.sgml
SRCS+= x11/chapter.sgml
# Entities
-SRCS+= chapters.ent
+SRCS+= chapters.ent
SYMLINKS= ${DESTDIR} index.html handbook.html
diff --git a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
index c43896a855..3636631328 100644
--- a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
@@ -3507,10 +3507,10 @@ BEGEMOT-BRIDGE-MIB::begemotBridgeDefaultBridgeIf.0 s bridge2</screen>
<para>To see the port status on the switch, use
<userinput>show lacp neighbor</userinput>:</para>
- <screen>switch# show lacp neighbor
-Flags: S - Device is requesting Slow LACPDUs
+ <screen>switch# show lacp neighbor
+Flags: S - Device is requesting Slow LACPDUs
F - Device is requesting Fast LACPDUs
- A - Device is in Active mode P - Device is in Passive mode
+ A - Device is in Active mode P - Device is in Passive mode
Channel group 1 neighbors
@@ -3518,7 +3518,7 @@ Partner's information:
LACP port Oper Port Port
Port Flags Priority Dev ID Age Key Number State
-Fa0/1 SA 32768 0005.5d71.8db8 29s 0x146 0x3 0x3D
+Fa0/1 SA 32768 0005.5d71.8db8 29s 0x146 0x3 0x3D
Fa0/2 SA 32768 0005.5d71.8db8 29s 0x146 0x4 0x3D</screen>
<para>For more detail use the <userinput>show lacp neighbor
@@ -3614,7 +3614,7 @@ ifconfig_<literal>lagg<replaceable>0</replaceable></literal>="laggproto failover
bge0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; metric 0 mtu 1500
options=19b&lt;RXCSUM,TXCSUM,VLAN_MTU,VLAN_HWTAGGING,VLAN_HWCSUM,TSO4&gt;
ether 00:21:70:da:ae:37
- inet6 fe80::221:70ff:feda:ae37%bge0 prefixlen 64 scopeid 0x2
+ inet6 fe80::221:70ff:feda:ae37%bge0 prefixlen 64 scopeid 0x2
nd6 options=29&lt;PERFORMNUD,IFDISABLED,AUTO_LINKLOCAL&gt;
media: Ethernet autoselect (1000baseT &lt;full-duplex&gt;)
status: active</screen>
diff --git a/en_US.ISO8859-1/books/handbook/basics/chapter.sgml b/en_US.ISO8859-1/books/handbook/basics/chapter.sgml
index 6486844996..f1de10ee82 100644
--- a/en_US.ISO8859-1/books/handbook/basics/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/basics/chapter.sgml
@@ -18,7 +18,7 @@
</chapterinfo>
<title>UNIX Basics</title>
-
+
<sect1 id="basics-synopsis">
<title>Synopsis</title>
@@ -794,7 +794,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
end of the set.</para>
</sect2>
</sect1>
-
+
<sect1 id="dirstructure">
<title>Directory Structure</title>
<indexterm><primary>directory hierarchy</primary></indexterm>
@@ -841,70 +841,70 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<entry><filename class="directory">/</filename></entry>
<entry>Root directory of the file system.</entry>
</row>
-
+
<row>
<entry><filename class="directory">/bin/</filename></entry>
<entry>User utilities fundamental to both single-user
and multi-user environments.</entry>
</row>
-
+
<row>
<entry><filename class="directory">/boot/</filename></entry>
<entry>Programs and configuration files used during
operating system bootstrap.</entry>
</row>
-
+
<row>
<entry><filename class="directory">/boot/defaults/</filename></entry>
<entry>Default bootstrapping configuration files; see
&man.loader.conf.5;.</entry>
</row>
-
+
<row>
<entry><filename class="directory">/dev/</filename></entry>
<entry>Device nodes; see &man.intro.4;.</entry>
</row>
-
+
<row>
<entry><filename class="directory">/etc/</filename></entry>
<entry>System configuration files and scripts.</entry>
</row>
-
+
<row>
<entry><filename class="directory">/etc/defaults/</filename></entry>
<entry>Default system configuration files; see &man.rc.8;.</entry>
</row>
-
+
<row>
<entry><filename class="directory">/etc/mail/</filename></entry>
<entry>Configuration files for mail transport agents such
as &man.sendmail.8;.</entry>
</row>
-
+
<row>
<entry><filename class="directory">/etc/namedb/</filename></entry>
<entry><command>named</command> configuration files; see
&man.named.8;.</entry>
</row>
-
+
<row>
<entry><filename class="directory">/etc/periodic/</filename></entry>
<entry>Scripts that are run daily, weekly, and monthly,
via &man.cron.8;; see &man.periodic.8;.</entry>
</row>
-
+
<row>
<entry><filename class="directory">/etc/ppp/</filename></entry>
<entry><command>ppp</command> configuration files; see
&man.ppp.8;.</entry>
</row>
-
+
<row>
<entry><filename class="directory">/mnt/</filename></entry>
- <entry>Empty directory commonly used by system administrators as a
+ <entry>Empty directory commonly used by system administrators as a
temporary mount point.</entry>
</row>
-
+
<row>
<entry><filename class="directory">/proc/</filename></entry>
<entry>Process file system; see &man.procfs.5;,
@@ -928,8 +928,8 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<entry>System programs and administration utilities fundamental to
both single-user and multi-user environments.</entry>
</row>
-
-
+
+
<row>
<entry><filename class="directory">/tmp/</filename></entry>
<entry>Temporary files. The contents of
@@ -941,40 +941,40 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
&man.rc.conf.5; (or with an entry in
<filename>/etc/fstab</filename>; see &man.mdmfs.8;).</entry>
</row>
-
-
+
+
<row>
<entry><filename class="directory">/usr/</filename></entry>
<entry>The majority of user utilities and applications.</entry>
</row>
-
+
<row>
<entry><filename class="directory">/usr/bin/</filename></entry>
<entry>Common utilities, programming tools, and applications.</entry>
</row>
-
+
<row>
<entry><filename class="directory">/usr/include/</filename></entry>
<entry>Standard C include files.</entry>
</row>
-
+
<row>
<entry><filename class="directory">/usr/lib/</filename></entry>
<entry>Archive libraries.</entry>
</row>
-
-
+
+
<row>
<entry><filename class="directory">/usr/libdata/</filename></entry>
<entry>Miscellaneous utility data files.</entry>
</row>
-
+
<row>
<entry><filename class="directory">/usr/libexec/</filename></entry>
<entry>System daemons &amp; system utilities (executed by other
programs).</entry>
</row>
-
+
<row>
<entry><filename
class="directory">/usr/local/</filename></entry>
@@ -991,40 +991,40 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<filename>share/doc/<replaceable>port</replaceable></filename>.
</entry>
</row>
-
+
<row>
<entry><filename class="directory">/usr/obj/</filename></entry>
<entry>Architecture-specific target tree produced by building
the <filename>/usr/src</filename> tree.</entry>
</row>
-
+
<row>
<entry><filename class="directory">/usr/ports/</filename></entry>
<entry>The FreeBSD Ports Collection (optional).</entry>
</row>
-
+
<row>
<entry><filename class="directory">/usr/sbin/</filename></entry>
<entry>System daemons &amp; system utilities (executed by users).</entry>
</row>
-
+
<row>
<entry><filename class="directory">/usr/share/</filename></entry>
<entry>Architecture-independent files.</entry>
</row>
-
+
<row>
<entry><filename class="directory">/usr/src/</filename></entry>
<entry>BSD and/or local source files.</entry>
</row>
-
+
<row>
<entry><filename
class="directory">/usr/X11R6/</filename></entry>
<entry>X11R6 distribution executables, libraries, etc
(optional).</entry>
</row>
-
+
<row>
<entry><filename class="directory">/var/</filename></entry>
<entry>Multi-purpose log, temporary, transient, and spool files.
@@ -1034,24 +1034,24 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
&man.rc.conf.5; (or with an entry in
<filename>/etc/fstab</filename>; see &man.mdmfs.8;).</entry>
</row>
-
-
+
+
<row>
<entry><filename class="directory">/var/log/</filename></entry>
<entry>Miscellaneous system log files.</entry>
</row>
-
+
<row>
<entry><filename class="directory">/var/mail/</filename></entry>
<entry>User mailbox files.</entry>
</row>
-
+
<row>
<entry><filename class="directory">/var/spool/</filename></entry>
<entry>Miscellaneous printer and mail system spooling directories.
</entry>
</row>
-
+
<row>
<entry><filename class="directory">/var/tmp/</filename></entry>
<entry>Temporary files.
@@ -1059,7 +1059,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
unless <filename class="directory">/var</filename>
is a memory-based file system.</entry>
</row>
-
+
<row>
<entry><filename class="directory">/var/yp/</filename></entry>
<entry>NIS maps.</entry>
@@ -1157,7 +1157,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<textobject>
<literallayout class="monospaced"> /
- |
+ |
+--- A1
| |
| +--- B1
@@ -1208,7 +1208,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<imageobject>
<imagedata fileref="install/example-dir4" format="EPS"/>
</imageobject>
-
+
<textobject>
<literallayout class="monospaced"> /
|
@@ -1266,7 +1266,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<itemizedlist>
<title>Benefits of Multiple File Systems</title>
-
+
<listitem>
<para>Different file systems can have different <firstterm>mount
options</firstterm>. For example, with careful planning, the
@@ -1288,7 +1288,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
fewer, larger files. By having one big file system this
optimization breaks down.</para>
</listitem>
-
+
<listitem>
<para>FreeBSD's file systems are very robust should you lose power.
However, a power loss at a critical point could still damage the
@@ -1310,12 +1310,12 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<important>
<para>FreeBSD features the &man.growfs.8;
- command, which makes it possible to increase the size of
+ command, which makes it possible to increase the size of
file system on the fly, removing this limitation.</para>
</important>
</listitem>
</itemizedlist>
-
+
<para>File systems are contained in partitions. This does not have the
same meaning as the common usage of the term partition (for example, &ms-dos;
partition), because of &os;'s &unix; heritage. Each partition is
@@ -1402,7 +1402,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
extended slices are numbered starting at 5, so
<quote>ad0<emphasis>s5</emphasis></quote> is the first
extended slice on the first IDE disk. These devices are used by file
- systems that expect to occupy a slice.</para>
+ systems that expect to occupy a slice.</para>
<para>Slices, <quote>dangerously dedicated</quote> physical
drives, and other drives contain
@@ -1413,11 +1413,11 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
the first da drive, which is <quote>dangerously dedicated</quote>.
<quote>ad1s3<emphasis>e</emphasis></quote> is the fifth partition
in the third slice of the second IDE disk drive.</para>
-
+
<para>Finally, each disk on the system is identified. A disk name
starts with a code that indicates the type of disk, and then a number,
indicating which disk it is. Unlike slices, disk numbering starts at
- 0. Common codes that you will see are listed in
+ 0. Common codes that you will see are listed in
<xref linkend="basics-dev-codes"/>.</para>
<para>When referring to a partition FreeBSD requires that you also name
@@ -1425,7 +1425,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
a slice you must also refer to the disk name.
Thus, you refer to a partition by listing
the disk name, <literal>s</literal>, the slice number, and then the
- partition letter. Examples are shown in
+ partition letter. Examples are shown in
<xref linkend="basics-disk-slice-part"/>.</para>
<para><xref linkend="basics-concept-disk-model"/> shows a conceptual
@@ -1446,7 +1446,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<thead>
<row>
<entry>Code</entry>
-
+
<entry>Meaning</entry>
</row>
</thead>
@@ -1460,34 +1460,34 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<row>
<entry><devicename>da</devicename></entry>
-
+
<entry>SCSI direct access disk</entry>
</row>
-
+
<row>
<entry><devicename>acd</devicename></entry>
-
+
<entry>ATAPI (IDE) CDROM</entry>
</row>
-
+
<row>
<entry><devicename>cd</devicename></entry>
-
+
<entry>SCSI CDROM</entry>
</row>
-
+
<row>
<entry><devicename>fd</devicename></entry>
-
+
<entry>Floppy disk</entry>
</row>
</tbody>
</tgroup>
</table>
-
+
<example id="basics-disk-slice-part">
<title>Sample Disk, Slice, and Partition Names</title>
-
+
<informaltable frame="none" pgwide="1">
<tgroup cols="2">
<colspec colwidth="1*"/>
@@ -1496,15 +1496,15 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<thead>
<row>
<entry>Name</entry>
-
+
<entry>Meaning</entry>
</row>
</thead>
-
+
<tbody>
<row>
<entry><literal>ad0s1a</literal></entry>
-
+
<entry>The first partition (<literal>a</literal>) on the first
slice (<literal>s1</literal>) on the first IDE disk
(<literal>ad0</literal>).</entry>
@@ -1512,7 +1512,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<row>
<entry><literal>da1s2e</literal></entry>
-
+
<entry>The fifth partition (<literal>e</literal>) on the
second slice (<literal>s2</literal>) on the second SCSI disk
(<literal>da1</literal>).</entry>
@@ -1542,7 +1542,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<imageobject>
<imagedata fileref="install/disk-layout" format="EPS"/>
</imageobject>
-
+
<textobject>
<literallayout class="monospaced">.-----------------. --.
| | |
@@ -1559,7 +1559,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
| | &gt; referred to as ad0s2b |
| | | |
:-----------------: ==: | Partition c, no
-| | | Partition e, used as /var &gt; file system, all
+| | | Partition e, used as /var &gt; file system, all
| | &gt; referred to as ad0s2e | of FreeBSD slice,
| | | | ad0s2c
:-----------------: ==: |
@@ -1631,24 +1631,24 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<varlistentry>
<term><literal>mount-point</literal></term>
-
+
<listitem><para>A directory (which should exist), on which
to mount the file system.</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><literal>fstype</literal></term>
-
+
<listitem><para>The file system type to pass to
&man.mount.8;. The default FreeBSD file system is
<literal>ufs</literal>.</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><literal>options</literal></term>
-
+
<listitem><para>Either <option>rw</option> for read-write
file systems, or <option>ro</option> for read-only
file systems, followed by any other options that may be
@@ -1657,10 +1657,10 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
Other options are listed in the &man.mount.8; manual page.</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><literal>dumpfreq</literal></term>
-
+
<listitem><para>This is used by &man.dump.8; to determine which
file systems require dumping. If the field is missing,
a value of zero is assumed.</para>
@@ -1696,10 +1696,10 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<primary>file systems</primary>
<secondary>mounting</secondary>
</indexterm>
-
+
<para>The &man.mount.8; command is what is ultimately used to
mount file systems.</para>
-
+
<para>In its most basic form, you use:</para>
<informalexample>
@@ -1714,7 +1714,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<varlistentry>
<term><option>-a</option></term>
-
+
<listitem>
<para>Mount all the file systems listed in
<filename>/etc/fstab</filename>. Except those
@@ -1723,10 +1723,10 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
mounted.</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><option>-d</option></term>
-
+
<listitem>
<para>Do everything except for the actual mount system call.
This option is useful in conjunction with the
@@ -1734,7 +1734,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
&man.mount.8; is actually trying to do.</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><option>-f</option></term>
@@ -1745,10 +1745,10 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
read-write to read-only.</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><option>-r</option></term>
-
+
<listitem>
<para>Mount the file system read-only. This is identical
to using the <option>ro</option>
@@ -1756,7 +1756,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<option>-o</option> option.</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><option>-t</option>
<replaceable>fstype</replaceable></term>
@@ -1765,53 +1765,53 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<para>Mount the given file system as the given file system
type, or mount only file systems of the given type, if
given the <option>-a</option> option.</para>
-
+
<para><quote>ufs</quote> is the default file system
type.</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><option>-u</option></term>
-
+
<listitem>
<para>Update mount options on the file system.</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><option>-v</option></term>
-
+
<listitem>
<para>Be verbose.</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><option>-w</option></term>
-
+
<listitem>
<para>Mount the file system read-write.</para>
</listitem>
</varlistentry>
</variablelist>
-
+
<para>The <option>-o</option> option takes a comma-separated list of
the options, including the following:</para>
-
+
<variablelist>
<varlistentry>
<term>noexec</term>
-
+
<listitem>
<para>Do not allow execution of binaries on this
file system. This is also a useful security option.</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term>nosuid</term>
-
+
<listitem>
<para>Do not interpret setuid or setgid flags on the
file system. This is also a useful security option.</para>
@@ -1826,17 +1826,17 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
<primary>file systems</primary>
<secondary>unmounting</secondary>
</indexterm>
-
+
<para>The &man.umount.8; command takes, as a parameter, one of a
mountpoint, a device name, or the <option>-a</option> or
<option>-A</option> option.</para>
-
+
<para>All forms take <option>-f</option> to force unmounting,
and <option>-v</option> for verbosity. Be warned that
<option>-f</option> is not generally a good idea. Forcibly
unmounting file systems might crash the computer or damage data
on the file system.</para>
-
+
<para><option>-a</option> and <option>-A</option> are used to
unmount all mounted file systems, possibly modified by the
file system types listed after <option>-t</option>.
@@ -2059,7 +2059,7 @@ Swap: 256M Total, 38M Used, 217M Free, 15% Inuse
standard way to respond to these signals, different daemons will have
different behavior, so be sure and read the documentation for the
daemon in question.</para>
-
+
<para>Signals are sent using the &man.kill.1; command, as this example
shows.</para>
@@ -2147,16 +2147,16 @@ Swap: 256M Total, 38M Used, 217M Free, 15% Inuse
from the input channel and execute them. A lot of shells also have
built in functions to help with everyday tasks such as file management,
file globbing, command line editing, command macros, and environment
- variables. FreeBSD comes with a set of shells, such as
- <command>sh</command>, the Bourne Shell, and <command>tcsh</command>,
+ variables. FreeBSD comes with a set of shells, such as
+ <command>sh</command>, the Bourne Shell, and <command>tcsh</command>,
the improved C-shell. Many other shells are available
from the FreeBSD Ports Collection, such as
<command>zsh</command> and <command>bash</command>.</para>
<para>Which shell do you use? It is really a matter of taste. If you
are a C programmer you might feel more comfortable with a C-like shell
- such as <command>tcsh</command>. If you have come from Linux or are new
- to a &unix; command line interface you might try <command>bash</command>.
+ such as <command>tcsh</command>. If you have come from Linux or are new
+ to a &unix; command line interface you might try <command>bash</command>.
The point is that each
shell has unique properties that may or may not work with your
preferred working environment, and that you have a choice of what
@@ -2273,7 +2273,7 @@ Swap: 256M Total, 38M Used, 217M Free, 15% Inuse
<command>bash</command>, you would use
<command>export</command> to set your current environment
variables. For example, to set or modify the
- <envar>EDITOR</envar> environment variable, under <command>csh</command> or
+ <envar>EDITOR</envar> environment variable, under <command>csh</command> or
<command>tcsh</command> a
command like this would set <envar>EDITOR</envar> to
<filename>/usr/local/bin/emacs</filename>:</para>
@@ -2319,11 +2319,11 @@ Swap: 256M Total, 38M Used, 217M Free, 15% Inuse
<para>You can also give <command>chsh</command> the
<option>-s</option> option; this will set your shell for you,
- without requiring you to enter an editor.
+ without requiring you to enter an editor.
For example, if you wanted to
change your shell to <command>bash</command>, the following should do the
trick:</para>
-
+
<screen>&prompt.user; <userinput>chsh -s /usr/local/bin/bash</userinput></screen>
<note>
@@ -2333,7 +2333,7 @@ Swap: 256M Total, 38M Used, 217M Free, 15% Inuse
collection</link>, then this should have been done for you
already. If you installed the shell by hand, you must do
this.</para>
-
+
<para>For example, if you installed <command>bash</command> by hand
and placed it into <filename>/usr/local/bin</filename>, you would
want to:</para>
@@ -2368,7 +2368,7 @@ Swap: 256M Total, 38M Used, 217M Free, 15% Inuse
line <command>ee <replaceable>filename</replaceable></command> where
<replaceable>filename</replaceable> is the name of the file to be edited.
For example, to edit <filename>/etc/rc.conf</filename>, type in
- <command>ee /etc/rc.conf</command>. Once inside of
+ <command>ee /etc/rc.conf</command>. Once inside of
<command>ee</command>, all of the
commands for manipulating the editor's functions are listed at the
top of the display. The caret <literal>^</literal> character represents
diff --git a/en_US.ISO8859-1/books/handbook/book.sgml b/en_US.ISO8859-1/books/handbook/book.sgml
index 1fea20521a..6e6c853e23 100644
--- a/en_US.ISO8859-1/books/handbook/book.sgml
+++ b/en_US.ISO8859-1/books/handbook/book.sgml
@@ -300,7 +300,7 @@
<part id="appendices">
<title>Appendices</title>
-
+
&chap.mirrors;
&chap.bibliography;
&chap.eresources;
diff --git a/en_US.ISO8859-1/books/handbook/chapters.ent b/en_US.ISO8859-1/books/handbook/chapters.ent
index 42b4024070..eecc4a2281 100644
--- a/en_US.ISO8859-1/books/handbook/chapters.ent
+++ b/en_US.ISO8859-1/books/handbook/chapters.ent
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
+<!--
Creates entities for each chapter in the FreeBSD Handbook. Each entity
is named chap.foo, where foo is the value of the id attribute on that
chapter, and corresponds to the name of the directory in which that
chapter's .sgml file is stored.
-
+
Chapters should be listed in the order in which they are referenced.
-
+
$FreeBSD$
-->
diff --git a/en_US.ISO8859-1/books/handbook/filesystems/chapter.sgml b/en_US.ISO8859-1/books/handbook/filesystems/chapter.sgml
index 12e186855f..2e5ad728e4 100644
--- a/en_US.ISO8859-1/books/handbook/filesystems/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/filesystems/chapter.sgml
@@ -715,7 +715,7 @@ errors: No known data errors</screen>
<para>Reservations of any sort are useful in many situations,
for example planning and testing the suitability of disk space
- allocation in a new system, or ensuring that enough space is
+ allocation in a new system, or ensuring that enough space is
available on file systems for system recovery procedures and
files.</para>
@@ -750,7 +750,7 @@ errors: No known data errors</screen>
<sect1 id="filesystems-linux">
<title>&linux; Filesystems</title>
-
+
<para>This section will describe some of the &linux; filesystems
supported by &os;.</para>
@@ -758,13 +758,13 @@ errors: No known data errors</screen>
<title>Ext2FS</title>
<para>The &man.ext2fs.5; file system kernel implementation was
- written by Godmar Back, and the driver first appeared in
+ written by Godmar Back, and the driver first appeared in
&os; 2.2. In &os; 8 and earlier, the code is licensed under
the <acronym>GNU</acronym> Public License, however under &os; 9,
the code has been rewritten and it is now licensed under the
<acronym>BSD</acronym> license.</para>
- <para>The &man.ext2fs.5; driver will allow the &os; kernel
+ <para>The &man.ext2fs.5; driver will allow the &os; kernel
to both read and write to <acronym>ext2</acronym> file systems.</para>
<para>First, load the kernel loadable module:</para>
@@ -783,8 +783,8 @@ errors: No known data errors</screen>
written by <acronym>SGI</acronym> for the
<acronym>IRIX</acronym> operating system, and they ported it
to &linux;. The source code has been released under the
- <acronym>GNU</acronym> Public License. See
- <ulink url="http://oss.sgi.com/projects/xfs">this page</ulink>
+ <acronym>GNU</acronym> Public License. See
+ <ulink url="http://oss.sgi.com/projects/xfs">this page</ulink>
for more details. The &os; port was started by Russel
Cattelan, &a.kan;, and &a.rodrigc;.</para>
@@ -803,7 +803,7 @@ errors: No known data errors</screen>
<screen>&prompt.root; <userinput>mount -t xfs /dev/as1s1 /mnt</userinput></screen>
- <para>Also useful to note is that the
+ <para>Also useful to note is that the
<filename role="package">sysutils/xfsprogs</filename> port
contains the <command>mkfs.xfs</command> utility which enables
creation of <acronym>XFS</acronym> filesystems, plus utilities
diff --git a/en_US.ISO8859-1/books/handbook/jails/chapter.sgml b/en_US.ISO8859-1/books/handbook/jails/chapter.sgml
index 3ca4a23e2e..9909ba93d2 100644
--- a/en_US.ISO8859-1/books/handbook/jails/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/jails/chapter.sgml
@@ -559,7 +559,7 @@ jail_<replaceable>www</replaceable>_devfs_ruleset="<replaceable>www_ruleset</rep
server, a <acronym>SMTP</acronym> server, and so forth.</para>
</note>
- <para>The goals of the setup described in this section
+ <para>The goals of the setup described in this section
are:</para>
<itemizedlist>
@@ -763,7 +763,7 @@ jail_<replaceable>www</replaceable>_devfs_ruleset="<replaceable>www_ruleset</rep
/home/js/ns /home/j/ns/s nullfs rw 0 0
/home/js/mail /home/j/mail/s nullfs rw 0 0
/home/js/www /home/j/www/s nullfs rw 0 0</programlisting>
-
+
<note>
<para>Partitions marked with a 0 pass number are not
checked by &man.fsck.8; during boot, and partitions
diff --git a/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml b/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml
index 59336ff9fc..4f263bd1ff 100644
--- a/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml
@@ -141,7 +141,7 @@
</authorgroup>
</sect1info>
<title>Finding the System Hardware</title>
-
+
<para>Before venturing into kernel configuration, it would be wise
to get an inventory of the machine's hardware. In cases where
&os; is not the primary operating system, the inventory list may
@@ -343,7 +343,7 @@ following line in &man.loader.conf.5;:
<screen>&prompt.root; <userinput>cd /usr/src/sys/<replaceable>i386</replaceable>/conf</userinput>
&prompt.root; <userinput>mkdir /root/kernels</userinput>
-&prompt.root; <userinput>cp GENERIC /root/kernels/<replaceable>MYKERNEL</replaceable></userinput>
+&prompt.root; <userinput>cp GENERIC /root/kernels/<replaceable>MYKERNEL</replaceable></userinput>
&prompt.root; <userinput>ln -s /root/kernels/<replaceable>MYKERNEL</replaceable></userinput></screen>
</tip>
@@ -432,7 +432,7 @@ following line in &man.loader.conf.5;:
<indexterm>
<primary><filename class="directory">/boot/kernel.old</filename></primary>
- </indexterm>
+ </indexterm>
<para>The new kernel will be copied to the <filename
class="directory">/boot/kernel</filename> directory as
@@ -1368,7 +1368,7 @@ device fwe # Ethernet over FireWire (non-standard!)</programl
Address (<acronym>KVA</acronym>) space. Due to this
limitation, Intel added support for 36-bit physical address
space access in the &pentium; Pro and later line of CPUs.</para>
-
+
<para>The Physical Address Extension (<acronym>PAE</acronym>)
capability of the &intel; &pentium; Pro and later CPUs
allows memory configurations of up to 64 gigabytes.
@@ -1383,7 +1383,7 @@ device fwe # Ethernet over FireWire (non-standard!)</programl
<para>To enable <acronym>PAE</acronym> support in the kernel,
simply add the following line to your kernel configuration
file:</para>
-
+
<programlisting>options PAE</programlisting>
<note>
@@ -1395,7 +1395,7 @@ device fwe # Ethernet over FireWire (non-standard!)</programl
</note>
<para><acronym>PAE</acronym> support in &os; has a few limitations:</para>
-
+
<itemizedlist>
<listitem>
<para>A process is not able to access more than 4
diff --git a/en_US.ISO8859-1/books/handbook/l10n/chapter.sgml b/en_US.ISO8859-1/books/handbook/l10n/chapter.sgml
index 38cbbd2c93..637cecaeb3 100644
--- a/en_US.ISO8859-1/books/handbook/l10n/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/l10n/chapter.sgml
@@ -68,7 +68,7 @@
<primary>internationalization</primary>
<see>localization</see>
</indexterm>
- <indexterm><primary>localization</primary></indexterm>
+ <indexterm><primary>localization</primary></indexterm>
<para>Developers shortened internationalization into the term I18N,
counting the number of letters between the first and the last
@@ -169,7 +169,7 @@
usually do recognize 8-bit characters. Depending on the
implementation, users may be required to compile an application
with wide or multibyte characters support, or configure it correctly.
- To be able to input and process wide or multibyte characters, the <ulink
+ To be able to input and process wide or multibyte characters, the <ulink
url="&url.base;/ports/index.html">FreeBSD Ports Collection</ulink> has provided
each language with different programs. Refer to the I18N
documentation in the respective FreeBSD Port.</para>
@@ -281,7 +281,7 @@
:lang=de_DE.ISO8859-1:</programlisting>
<indexterm><primary>Traditional Chinese</primary><secondary>BIG-5 encoding</secondary></indexterm>
- <para>Here is an example of a
+ <para>Here is an example of a
<filename>.login_conf</filename> that sets the variables
for Traditional Chinese in BIG-5 encoding. Notice the many
more variables set because some software does not respect
@@ -292,14 +292,14 @@
me:\
:lang=zh_TW.Big5:\
:setenv=LC_ALL=zh_TW.Big5:\
- :setenv=LC_COLLATE=zh_TW.Big5:\
+ :setenv=LC_COLLATE=zh_TW.Big5:\
:setenv=LC_CTYPE=zh_TW.Big5:\
:setenv=LC_MESSAGES=zh_TW.Big5:\
:setenv=LC_MONETARY=zh_TW.Big5:\
:setenv=LC_NUMERIC=zh_TW.Big5:\
:setenv=LC_TIME=zh_TW.Big5:\
:charset=big5:\
- :xmodifiers="@im=gcin": #Set gcin as the XIM Input Server</programlisting>
+ :xmodifiers="@im=gcin": #Set gcin as the XIM Input Server</programlisting>
<para>See <link linkend="adm-setup">Administrator Level
Setup</link> and &man.login.conf.5; for more details.</para>
@@ -364,7 +364,7 @@ me:\
<listitem>
<para>An alternative variant is answering the specified
- language each time that
+ language each time that
<screen><prompt>Enter login class: default []: </prompt></screen>
appears from &man.adduser.8;.</para>
</listitem>
@@ -470,7 +470,7 @@ font8x8=<replaceable>font_name</replaceable></programlisting>
<programlisting>scrnmap=<replaceable>screenmap_name</replaceable>
keymap=<replaceable>keymap_name</replaceable>
keychange="<replaceable>fkey_number sequence</replaceable>"</programlisting>
-
+
<para>The <replaceable>screenmap_name</replaceable> here is taken
from the <filename>/usr/share/syscons/scrnmaps</filename>
directory, without the <filename>.scm</filename> suffix. A
@@ -678,7 +678,7 @@ keychange="<replaceable>fkey_number sequence</replaceable>"</programlisting>
<indexterm>
<primary><application>MySQL</application></primary>
</indexterm>
- <para>However, some applications such as
+ <para>However, some applications such as
<application>MySQL</application> need to have their
<filename>Makefile</filename> configured with the specific
charset. This is usually done in the
@@ -686,7 +686,7 @@ keychange="<replaceable>fkey_number sequence</replaceable>"</programlisting>
<application>configure</application> in the source.</para>
</sect1>
- <sect1 id="lang-setup">
+ <sect1 id="lang-setup">
<title>Localizing FreeBSD to Specific Languages</title>
<sect2 id="ru-localize">
diff --git a/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml b/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml
index 41203925f4..c6fb8c9571 100644
--- a/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml
@@ -731,7 +731,7 @@ FEATURE Maple maplelmg 2000.0831 permanent 1 XXXXXXXXXXXX \
<sect2>
<title>Installing &matlab;</title>
- <para>To install <application>&matlab;</application>, do the
+ <para>To install <application>&matlab;</application>, do the
following:</para>
<procedure>
@@ -796,7 +796,7 @@ FEATURE Maple maplelmg 2000.0831 permanent 1 XXXXXXXXXXXX \
<screen>&prompt.root; <userinput>ln -s $MATLAB/etc/lmboot /usr/local/etc/lmboot_TMW</userinput>
&prompt.root; <userinput>ln -s $MATLAB/etc/lmdown /usr/local/etc/lmdown_TMW</userinput></screen>
</step>
-
+
<step>
<para>Create a startup file at
<filename>/usr/local/etc/rc.d/flexlm.sh</filename>. The
diff --git a/en_US.ISO8859-1/books/handbook/mac/chapter.sgml b/en_US.ISO8859-1/books/handbook/mac/chapter.sgml
index 8deaa34875..efa55e49b4 100644
--- a/en_US.ISO8859-1/books/handbook/mac/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/mac/chapter.sgml
@@ -697,7 +697,7 @@ test: biba/high</screen>
implement the labeling feature, including the Biba, Lomac,
<acronym>MLS</acronym> and <acronym>SEBSD</acronym>
policies.</para>
-
+
<para>In many cases, the <option>multilabel</option> may not need
to be set at all. Consider the following situation and
security model:</para>
@@ -1562,7 +1562,7 @@ test: biba/low</screen>
utilities. While other users would be grouped into other
categories such as testers, designers, or just ordinary
users and would only be permitted read access.</para>
-
+
<para>With its natural security control, a lower integrity subject
is unable to write to a higher integrity subject; a higher
integrity subject cannot observe or read a lower integrity
@@ -1725,7 +1725,7 @@ mac_seeotheruids_load="YES"</programlisting>
<username>www</username> users into the insecure class:</para>
<screen>&prompt.root; <userinput>pw usermod nagios -L insecure</userinput></screen>
- <screen>&prompt.root; <userinput>pw usermod www -L insecure</userinput></screen>
+ <screen>&prompt.root; <userinput>pw usermod www -L insecure</userinput></screen>
</sect2>
<sect2>
diff --git a/en_US.ISO8859-1/books/handbook/mail/chapter.sgml b/en_US.ISO8859-1/books/handbook/mail/chapter.sgml
index 094b8e2a0f..989b9761f2 100644
--- a/en_US.ISO8859-1/books/handbook/mail/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/mail/chapter.sgml
@@ -254,7 +254,7 @@ FreeBSD.org mail is handled (pri=10) by mx1.FreeBSD.org</screen>
Once mail has been stored, it may either be read locally using
applications such as &man.mail.1; or
<application>mutt</application>, or remotely accessed and
- collected using protocols such as
+ collected using protocols such as
<acronym>POP</acronym> or <acronym>IMAP</acronym>.
This means that should you only
wish to read mail locally, you are not required to install a
@@ -322,7 +322,7 @@ FreeBSD.org mail is handled (pri=10) by mx1.FreeBSD.org</screen>
<listitem>
<para><application>courier-imap</application>;</para>
</listitem>
-
+
<listitem>
<para><application>dovecot</application>;</para>
</listitem>
diff --git a/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml b/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
index c458ffe084..0f866c57b7 100644
--- a/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
@@ -322,7 +322,7 @@
<programlisting>SSH2 HostKey: 1024 02:ed:1b:17:d6:97:2b:58:5e:5c:e2:da:3b:89:88:26 /etc/ssh/ssh_host_rsa_key.pub
SSH2 HostKey: 1024 e8:3b:29:7b:ca:9f:ac:e9:45:cb:c8:17:ae:9b:eb:55 /etc/ssh/ssh_host_dsa_key.pub</programlisting>
-
+
</listitem>
<!--
<listitem>
@@ -433,8 +433,8 @@ Warning: Permanently added 'anoncvs1.freebsd.org' (DSA) to the list of known hos
<itemizedlist>
<listitem>
- <para><ulink
- url="http://users.csc.calpoly.edu/~gfisher/classes/308/handouts/cvs-basics.html">CVS Tutorial</ulink> from California
+ <para><ulink
+ url="http://users.csc.calpoly.edu/~gfisher/classes/308/handouts/cvs-basics.html">CVS Tutorial</ulink> from California
Polytechnic State University.</para>
</listitem>
@@ -451,8 +451,8 @@ Warning: Permanently added 'anoncvs1.freebsd.org' (DSA) to the list of known hos
</itemizedlist>
</sect2>
</sect1>
-
-
+
+
<sect1 id="ctm">
<title>Using CTM</title>
@@ -503,7 +503,7 @@ Warning: Permanently added 'anoncvs1.freebsd.org' (DSA) to the list of known hos
<para>You will need two things: The <application>CTM</application>
program, and the initial deltas to feed it (to get up to
<quote>current</quote> levels).</para>
-
+
<para>The <application>CTM</application> program has been part of
&os; ever since version 2.0 was released, and lives in
<filename>/usr/src/usr.sbin/ctm</filename> if you have a copy
@@ -733,7 +733,7 @@ Warning: Permanently added 'anoncvs1.freebsd.org' (DSA) to the list of known hos
<sect2 id="mirrors-ctm">
<title>CTM Mirrors</title>
-
+
<para><link linkend="ctm">CTM</link>/&os; is available via anonymous
FTP from the following mirror sites. If you choose to obtain <application>CTM</application> via
anonymous FTP, please try to use a site near you.</para>
@@ -794,17 +794,17 @@ Warning: Permanently added 'anoncvs1.freebsd.org' (DSA) to the list of known hos
<sect1 id="cvsup">
<title>Using CVSup</title>
-
+
<sect2 id="cvsup-intro">
<title>Introduction</title>
-
+
<para><application>CVSup</application> is a software package for
distributing and updating source trees from a master CVS
repository on a remote server host. The &os; sources are
maintained in a CVS repository on a central development machine
in California. With <application>CVSup</application>, &os;
users can easily keep their own source trees up to date.</para>
-
+
<para><application>CVSup</application> uses the so-called
<emphasis>pull</emphasis> model of updating. Under the pull
model, each client asks the server for updates, if and when they
@@ -814,7 +814,7 @@ Warning: Permanently added 'anoncvs1.freebsd.org' (DSA) to the list of known hos
run the <application>CVSup</application> client manually to get
an update, or they must set up a <command>cron</command> job to
run it automatically on a regular basis.</para>
-
+
<para>The term <application>CVSup</application>, capitalized just
so, refers to the entire software package. Its main components
are the client <command>cvsup</command> which runs on each
@@ -851,7 +851,7 @@ Warning: Permanently added 'anoncvs1.freebsd.org' (DSA) to the list of known hos
<sect2 id="cvsup-install">
<title>Installation</title>
-
+
<para>The easiest way to install <application>CVSup</application>
is to use the precompiled <filename role="package">net/cvsup</filename> package
from the &os; <link linkend="ports">packages collection</link>.
@@ -874,37 +874,37 @@ Warning: Permanently added 'anoncvs1.freebsd.org' (DSA) to the list of known hos
<sect2 id="cvsup-config">
<title>CVSup Configuration</title>
-
+
<para><application>CVSup</application>'s operation is controlled
by a configuration file called the <filename>supfile</filename>.
There are some sample <filename>supfiles</filename> in the
directory <ulink type="html"
url="file://localhost/usr/share/examples/cvsup/"><filename>/usr/share/examples/cvsup/</filename></ulink>.</para>
-
+
<para>The information in a <filename>supfile</filename> answers
the following questions for <application>CVSup</application>:</para>
-
+
<itemizedlist>
<listitem>
<para><link linkend="cvsup-config-files">Which files do you
want to receive?</link></para>
</listitem>
-
+
<listitem>
<para><link linkend="cvsup-config-vers">Which versions of them
do you want?</link></para>
</listitem>
-
+
<listitem>
<para><link linkend="cvsup-config-where">Where do you want to
get them from?</link></para>
</listitem>
-
+
<listitem>
<para><link linkend="cvsup-config-dest">Where do you want to
put them on your own machine?</link></para>
</listitem>
-
+
<listitem>
<para><link linkend="cvsup-config-status">Where do you want to
put your status files?</link></para>
@@ -920,7 +920,7 @@ Warning: Permanently added 'anoncvs1.freebsd.org' (DSA) to the list of known hos
begin with <literal>#</literal> and extend to the end of the
line. Lines that are blank and lines that contain only
comments are ignored.</para>
-
+
<para>Each remaining line describes a set of files that the user
wishes to receive. The line begins with the name of a
<quote>collection</quote>, a logical grouping of files defined by
@@ -934,7 +934,7 @@ Warning: Permanently added 'anoncvs1.freebsd.org' (DSA) to the list of known hos
keyword, but the keyword is followed without intervening white
space by <literal>=</literal> and a second word. For example,
<literal>release=cvs</literal> is a value field.</para>
-
+
<para>A <filename>supfile</filename> typically specifies more than
one collection to receive. One way to structure a
<filename>supfile</filename> is to specify all of the relevant
@@ -961,7 +961,7 @@ Warning: Permanently added 'anoncvs1.freebsd.org' (DSA) to the list of known hos
<listitem>
<para><anchor id="cvsup-config-files"/>Which files do you want
to receive?</para>
-
+
<para>The files available via <application>CVSup</application>
are organized into named groups called
<quote>collections</quote>. The collections that are
@@ -991,7 +991,7 @@ Warning: Permanently added 'anoncvs1.freebsd.org' (DSA) to the list of known hos
specify which one of them you want using the
<literal>tag=</literal> and <option>date=</option> value
fields.</para>
-
+
<warning>
<para>Be very careful to specify any <literal>tag=</literal>
fields correctly. Some tags are valid only for certain
@@ -1012,7 +1012,7 @@ Warning: Permanently added 'anoncvs1.freebsd.org' (DSA) to the list of known hos
a branch tag does not refer to a specific revision, it may
mean something different tomorrow than it means
today.</para>
-
+
<para><xref linkend="cvs-tags"/> contains branch tags that
users might be interested in. When specifying a tag in
<application>CVSup</application>'s configuration file, it
@@ -1042,7 +1042,7 @@ Warning: Permanently added 'anoncvs1.freebsd.org' (DSA) to the list of known hos
<para>For our example, we wish to receive &os;-CURRENT. We
add this line at the beginning of our
<filename>supfile</filename>:</para>
-
+
<programlisting>*default tag=.</programlisting>
<para>There is an important special case that comes into play
@@ -1061,7 +1061,7 @@ Warning: Permanently added 'anoncvs1.freebsd.org' (DSA) to the list of known hos
<listitem>
<para><anchor id="cvsup-config-where"/>Where do you want to get
them from?</para>
-
+
<para>We use the <literal>host=</literal> field to tell
<command>cvsup</command> where to obtain its updates. Any
of the <link linkend="cvsup-mirrors">CVSup mirror
@@ -1071,7 +1071,7 @@ Warning: Permanently added 'anoncvs1.freebsd.org' (DSA) to the list of known hos
<hostid role="fqdn">cvsup99.FreeBSD.org</hostid>:</para>
<programlisting>*default host=cvsup99.FreeBSD.org</programlisting>
-
+
<para>You will need to change the host to one that actually
exists before running <application>CVSup</application>.
On any particular run of
@@ -1079,11 +1079,11 @@ Warning: Permanently added 'anoncvs1.freebsd.org' (DSA) to the list of known hos
on the command line, with <option>-h
<replaceable>hostname</replaceable></option>.</para>
</listitem>
-
+
<listitem>
<para><anchor id="cvsup-config-dest"/>Where do you want to put
them on your own machine?</para>
-
+
<para>The <literal>prefix=</literal> field tells
<command>cvsup</command> where to put the files it receives.
In this example, we will put the source files directly into
@@ -1091,7 +1091,7 @@ Warning: Permanently added 'anoncvs1.freebsd.org' (DSA) to the list of known hos
<filename>src</filename> directory is already implicit in
the collections we have chosen to receive, so this is the
correct specification:</para>
-
+
<programlisting>*default prefix=/usr</programlisting>
</listitem>
@@ -1118,7 +1118,7 @@ Warning: Permanently added 'anoncvs1.freebsd.org' (DSA) to the list of known hos
<listitem>
<para>Miscellaneous <filename>supfile</filename>
settings:</para>
-
+
<para>There is one more line of boiler plate that normally
needs to be present in the
<filename>supfile</filename>:</para>
@@ -1130,7 +1130,7 @@ Warning: Permanently added 'anoncvs1.freebsd.org' (DSA) to the list of known hos
repository. This is virtually always the case, but there
are other possibilities which are beyond the scope of this
discussion.</para>
-
+
<para><literal>delete</literal> gives
<application>CVSup</application> permission to delete files.
You should always specify this, so that
@@ -1139,7 +1139,7 @@ Warning: Permanently added 'anoncvs1.freebsd.org' (DSA) to the list of known hos
careful to delete only those files for which it is
responsible. Any extra files you happen to have will be
left strictly alone.</para>
-
+
<para><literal>use-rel-suffix</literal> is ... arcane. If you
really want to know about it, see the &man.cvsup.1; manual
page. Otherwise, just specify it and do not worry about
@@ -1201,7 +1201,7 @@ src-all</programlisting>
<filename><replaceable>base</replaceable>/sup/</filename>.
<replaceable>base</replaceable> is defined in your <filename>supfile</filename>;
our defined <replaceable>base</replaceable> is
- <filename>/var/db</filename>,
+ <filename>/var/db</filename>,
which means that by default the <filename>refuse</filename> file is
<filename>/var/db/sup/refuse</filename>.</para>
@@ -1242,25 +1242,25 @@ doc/zh_*</screen>
to download files that they will never use. For more
information on <filename>refuse</filename> files and other neat
features of <application>CVSup</application>, please view its
- manual page.</para>
+ manual page.</para>
</sect3>
</sect2>
-
+
<sect2>
<title>Running <application>CVSup</application></title>
-
+
<para>You are now ready to try an update. The command line for
doing this is quite simple:</para>
<screen>&prompt.root; <userinput>cvsup <replaceable>supfile</replaceable></userinput></screen>
<para>where <filename><replaceable>supfile</replaceable></filename>
- is of course the name of the <filename>supfile</filename> you have just created.
+ is of course the name of the <filename>supfile</filename> you have just created.
Assuming you are running under X11, <command>cvsup</command>
will display a GUI window with some buttons to do the usual
things. Press the <guibutton>go</guibutton> button, and watch it
run.</para>
-
+
<para>Since you are updating your actual
<filename>/usr/src</filename> tree in this example, you will
need to run the program as <username>root</username> so that
@@ -1274,7 +1274,7 @@ doc/zh_*</screen>
<screen>&prompt.root; <userinput>mkdir /var/tmp/dest</userinput>
&prompt.root; <userinput>cvsup supfile /var/tmp/dest</userinput></screen>
-
+
<para>The directory you specify will be used as the destination
directory for all file updates.
<application>CVSup</application> will examine your usual files
@@ -1287,25 +1287,25 @@ doc/zh_*</screen>
directory. As long as you have read access to
<filename>/usr/src</filename>, you do not even need to be
<username>root</username> to perform this kind of trial run.</para>
-
+
<para>If you are not running X11 or if you just do not like GUIs,
you should add a couple of options to the command line when you
run <command>cvsup</command>:</para>
-
+
<screen>&prompt.root; <userinput>cvsup -g -L 2 <replaceable>supfile</replaceable></userinput></screen>
-
+
<para>The <option>-g</option> tells
<application>CVSup</application> not to use its GUI. This is
automatic if you are not running X11, but otherwise you have to
specify it.</para>
-
- <para>The <option>-L 2</option> tells
+
+ <para>The <option>-L 2</option> tells
<application>CVSup</application> to print out the
details of all the file updates it is doing. There are three
levels of verbosity, from <option>-L 0</option> to
<option>-L 2</option>. The default is 0, which means total
silence except for error messages.</para>
-
+
<para>There are plenty of other options available. For a brief
list of them, type <command>cvsup -H</command>. For more
detailed descriptions, see the manual page.</para>
@@ -1319,7 +1319,7 @@ doc/zh_*</screen>
<sect2 id="cvsup-collec">
<title><application>CVSup</application> File Collections</title>
-
+
<para>The file collections available via
<application>CVSup</application> are organized hierarchically.
There are a few large collections, and they are divided into
@@ -1327,31 +1327,31 @@ doc/zh_*</screen>
equivalent to receiving each of its sub-collections. The
hierarchical relationships among collections are reflected by
the use of indentation in the list below.</para>
-
+
<para>The most commonly used collections are
<literal>src-all</literal>, and
<literal>ports-all</literal>. The other collections are used
only by small groups of people for specialized purposes, and
some mirror sites may not carry all of them.</para>
-
+
<variablelist>
<varlistentry>
<term><literal>cvs-all release=cvs</literal></term>
-
+
<listitem>
<para>The main &os; CVS repository, including the
cryptography code.</para>
-
+
<variablelist>
<varlistentry>
<term><literal>distrib release=cvs</literal></term>
-
+
<listitem>
<para>Files related to the distribution and mirroring
of &os;.</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><literal>doc-all release=cvs</literal></term>
<listitem>
@@ -1390,7 +1390,7 @@ doc/zh_*</screen>
<important id="cvsup-collec-index-warn">
<para>If you are going to be building your own local
copy of <filename>ports/INDEX</filename>, you
- <emphasis>must</emphasis> accept
+ <emphasis>must</emphasis> accept
<literal>ports-all</literal> (the whole ports tree).
Building <filename>ports/INDEX</filename> with
a partial tree is not supported. See the
@@ -1420,7 +1420,7 @@ doc/zh_*</screen>
<varlistentry>
<term><literal>ports-archivers
release=cvs</literal></term>
-
+
<listitem>
<para>Archiving tools.</para>
</listitem>
@@ -1429,7 +1429,7 @@ doc/zh_*</screen>
<varlistentry>
<term><literal>ports-astro
release=cvs</literal></term>
-
+
<listitem>
<para>Astronomical ports.</para>
</listitem>
@@ -1438,7 +1438,7 @@ doc/zh_*</screen>
<varlistentry>
<term><literal>ports-audio
release=cvs</literal></term>
-
+
<listitem>
<para>Sound support.</para>
</listitem>
@@ -1447,7 +1447,7 @@ doc/zh_*</screen>
<varlistentry>
<term><literal>ports-base
release=cvs</literal></term>
-
+
<listitem>
<para>The Ports Collection build infrastructure -
various files located in the
@@ -1469,7 +1469,7 @@ doc/zh_*</screen>
<varlistentry>
<term><literal>ports-benchmarks
release=cvs</literal></term>
-
+
<listitem>
<para>Benchmarks.</para>
</listitem>
@@ -1487,7 +1487,7 @@ doc/zh_*</screen>
<varlistentry>
<term><literal>ports-cad
release=cvs</literal></term>
-
+
<listitem>
<para>Computer aided design tools.</para>
</listitem>
@@ -1496,7 +1496,7 @@ doc/zh_*</screen>
<varlistentry>
<term><literal>ports-chinese
release=cvs</literal></term>
-
+
<listitem>
<para>Chinese language support.</para>
</listitem>
@@ -1505,7 +1505,7 @@ doc/zh_*</screen>
<varlistentry>
<term><literal>ports-comms
release=cvs</literal></term>
-
+
<listitem>
<para>Communication software.</para>
</listitem>
@@ -1514,7 +1514,7 @@ doc/zh_*</screen>
<varlistentry>
<term><literal>ports-converters
release=cvs</literal></term>
-
+
<listitem>
<para>character code converters.</para>
</listitem>
@@ -1523,16 +1523,16 @@ doc/zh_*</screen>
<varlistentry>
<term><literal>ports-databases
release=cvs</literal></term>
-
+
<listitem>
<para>Databases.</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><literal>ports-deskutils
release=cvs</literal></term>
-
+
<listitem>
<para>Things that used to be on the desktop
before computers were invented.</para>
@@ -1556,7 +1556,7 @@ doc/zh_*</screen>
<para>DNS related software.</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><literal>ports-editors
release=cvs</literal></term>
@@ -1569,7 +1569,7 @@ doc/zh_*</screen>
<varlistentry>
<term><literal>ports-emulators
release=cvs</literal></term>
-
+
<listitem>
<para>Emulators for other operating
systems.</para>
@@ -1579,7 +1579,7 @@ doc/zh_*</screen>
<varlistentry>
<term><literal>ports-finance
release=cvs</literal></term>
-
+
<listitem>
<para>Monetary, financial and related applications.</para>
</listitem>
@@ -1588,7 +1588,7 @@ doc/zh_*</screen>
<varlistentry>
<term><literal>ports-ftp
release=cvs</literal></term>
-
+
<listitem>
<para>FTP client and server utilities.</para>
</listitem>
@@ -1597,16 +1597,16 @@ doc/zh_*</screen>
<varlistentry>
<term><literal>ports-games
release=cvs</literal></term>
-
+
<listitem>
<para>Games.</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><literal>ports-german
release=cvs</literal></term>
-
+
<listitem>
<para>German language support.</para>
</listitem>
@@ -1633,7 +1633,7 @@ doc/zh_*</screen>
<varlistentry>
<term><literal>ports-hungarian
release=cvs</literal></term>
-
+
<listitem>
<para>Hungarian language support.</para>
</listitem>
@@ -1656,7 +1656,7 @@ doc/zh_*</screen>
<para>Japanese language support.</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><literal>ports-java
release=cvs</literal></term>
@@ -1723,7 +1723,7 @@ doc/zh_*</screen>
<varlistentry>
<term><literal>ports-net
release=cvs</literal></term>
-
+
<listitem>
<para>Networking software.</para>
</listitem>
@@ -1759,16 +1759,16 @@ doc/zh_*</screen>
<varlistentry>
<term><literal>ports-news
release=cvs</literal></term>
-
+
<listitem>
<para>USENET news software.</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><literal>ports-palm
release=cvs</literal></term>
-
+
<listitem>
<para>Software support for <trademark class="trade">Palm</trademark>
series.</para>
@@ -1778,7 +1778,7 @@ doc/zh_*</screen>
<varlistentry>
<term><literal>ports-polish
release=cvs</literal></term>
-
+
<listitem>
<para>Polish language support.</para>
</listitem>
@@ -1796,7 +1796,7 @@ doc/zh_*</screen>
<varlistentry>
<term><literal>ports-portuguese
release=cvs</literal></term>
-
+
<listitem>
<para>Portuguese language support.</para>
</listitem>
@@ -1805,7 +1805,7 @@ doc/zh_*</screen>
<varlistentry>
<term><literal>ports-print
release=cvs</literal></term>
-
+
<listitem>
<para>Printing software.</para>
</listitem>
@@ -1814,7 +1814,7 @@ doc/zh_*</screen>
<varlistentry>
<term><literal>ports-russian
release=cvs</literal></term>
-
+
<listitem>
<para>Russian language support.</para>
</listitem>
@@ -1832,7 +1832,7 @@ doc/zh_*</screen>
<varlistentry>
<term><literal>ports-security
release=cvs</literal></term>
-
+
<listitem>
<para>Security utilities.</para>
</listitem>
@@ -1841,7 +1841,7 @@ doc/zh_*</screen>
<varlistentry>
<term><literal>ports-shells
release=cvs</literal></term>
-
+
<listitem>
<para>Command line shells.</para>
</listitem>
@@ -1850,7 +1850,7 @@ doc/zh_*</screen>
<varlistentry>
<term><literal>ports-sysutils
release=cvs</literal></term>
-
+
<listitem>
<para>System utilities.</para>
</listitem>
@@ -1859,7 +1859,7 @@ doc/zh_*</screen>
<varlistentry>
<term><literal>ports-textproc
release=cvs</literal></term>
-
+
<listitem>
<para>text processing utilities (does not
include desktop publishing).</para>
@@ -1878,7 +1878,7 @@ doc/zh_*</screen>
<varlistentry>
<term><literal>ports-vietnamese
release=cvs</literal></term>
-
+
<listitem>
<para>Vietnamese language support.</para>
</listitem>
@@ -1887,7 +1887,7 @@ doc/zh_*</screen>
<varlistentry>
<term><literal>ports-www
release=cvs</literal></term>
-
+
<listitem>
<para>Software related to the World Wide
Web.</para>
@@ -1897,7 +1897,7 @@ doc/zh_*</screen>
<varlistentry>
<term><literal>ports-x11
release=cvs</literal></term>
-
+
<listitem>
<para>Ports to support the X window
system.</para>
@@ -1907,7 +1907,7 @@ doc/zh_*</screen>
<varlistentry>
<term><literal>ports-x11-clocks
release=cvs</literal></term>
-
+
<listitem>
<para>X11 clocks.</para>
</listitem>
@@ -1934,7 +1934,7 @@ doc/zh_*</screen>
<varlistentry>
<term><literal>ports-x11-fonts
release=cvs</literal></term>
-
+
<listitem>
<para>X11 fonts and font utilities.</para>
</listitem>
@@ -1952,7 +1952,7 @@ doc/zh_*</screen>
<varlistentry>
<term><literal>ports-x11-servers
release=cvs</literal></term>
-
+
<listitem>
<para>X11 servers.</para>
</listitem>
@@ -1970,7 +1970,7 @@ doc/zh_*</screen>
<varlistentry>
<term><literal>ports-x11-wm
release=cvs</literal></term>
-
+
<listitem>
<para>X11 window managers.</para>
</listitem>
@@ -1988,7 +1988,7 @@ doc/zh_*</screen>
<varlistentry>
<term><literal>src-all release=cvs</literal></term>
-
+
<listitem>
<para>The main &os; sources, including the
cryptography code.</para>
@@ -2050,7 +2050,7 @@ doc/zh_*</screen>
<varlistentry>
<term><literal>src-eBones release=cvs</literal></term>
-
+
<listitem>
<para>Kerberos and DES
(<filename>/usr/src/eBones</filename>). Not
@@ -2071,7 +2071,7 @@ doc/zh_*</screen>
<varlistentry>
<term><literal>src-games
release=cvs</literal></term>
-
+
<listitem>
<para>Games
(<filename>/usr/src/games</filename>).</para>
@@ -2091,7 +2091,7 @@ doc/zh_*</screen>
<varlistentry>
<term><literal>src-include
release=cvs</literal></term>
-
+
<listitem>
<para>Header files
(<filename>/usr/src/include</filename>).</para>
@@ -2101,7 +2101,7 @@ doc/zh_*</screen>
<varlistentry>
<term><literal>src-kerberos5
release=cvs</literal></term>
-
+
<listitem>
<para>Kerberos5 security package
(<filename>/usr/src/kerberos5</filename>).</para>
@@ -2111,7 +2111,7 @@ doc/zh_*</screen>
<varlistentry>
<term><literal>src-kerberosIV
release=cvs</literal></term>
-
+
<listitem>
<para>KerberosIV security package
(<filename>/usr/src/kerberosIV</filename>).</para>
@@ -2138,22 +2138,22 @@ doc/zh_*</screen>
(<filename>/usr/src/libexec</filename>).</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><literal>src-release
release=cvs</literal></term>
-
+
<listitem>
<para>Files required to produce a &os;
release
(<filename>/usr/src/release</filename>).</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><literal>src-rescue
release=cvs</literal></term>
-
+
<listitem>
<para>Statically linked programs for emergency
recovery; see &man.rescue.8;
@@ -2169,7 +2169,7 @@ doc/zh_*</screen>
(<filename>/usr/src/sbin</filename>).</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><literal>src-secure
release=cvs</literal></term>
@@ -2204,7 +2204,7 @@ doc/zh_*</screen>
<varlistentry>
<term><literal>src-sys-crypto
release=cvs</literal></term>
-
+
<listitem>
<para>Kernel cryptography code
(<filename>/usr/src/sys/crypto</filename>).</para>
@@ -2235,7 +2235,7 @@ doc/zh_*</screen>
<varlistentry>
<term><literal>src-usrsbin
release=cvs</literal></term>
-
+
<listitem>
<para>System utilities
(<filename>/usr/src/usr.sbin</filename>).</para>
@@ -2244,10 +2244,10 @@ doc/zh_*</screen>
</variablelist>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><literal>www release=cvs</literal></term>
-
+
<listitem>
<para>The sources for the &os; WWW site.</para>
</listitem>
@@ -2255,12 +2255,12 @@ doc/zh_*</screen>
</variablelist>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><literal>distrib release=self</literal></term>
<listitem>
- <para>The <application>CVSup</application> server's own
+ <para>The <application>CVSup</application> server's own
configuration files. Used by <application>CVSup</application>
mirror sites.</para>
</listitem>
@@ -2276,7 +2276,7 @@ doc/zh_*</screen>
<varlistentry>
<term><literal>mail-archive release=current</literal></term>
-
+
<listitem>
<para>&os; mailing list archive.</para>
</listitem>
@@ -2296,7 +2296,7 @@ doc/zh_*</screen>
<sect2>
<title>For More Information</title>
- <para>For the <application>CVSup</application> FAQ and other
+ <para>For the <application>CVSup</application> FAQ and other
information about <application>CVSup</application>, see
<ulink url="http://www.cvsup.org">The
CVSup Home Page</ulink>.</para>
@@ -2321,7 +2321,7 @@ doc/zh_*</screen>
&chap.mirrors.cvsup.inc;
</sect2>
</sect1>
-
+
<sect1 id="cvs-tags">
<title>CVS Tags</title>
@@ -2546,7 +2546,7 @@ doc/zh_*</screen>
<term>RELENG_5_5</term>
<listitem>
- <para>The release branch for &os;-5.5, used only
+ <para>The release branch for &os;-5.5, used only
for security advisories and other critical fixes.</para>
</listitem>
</varlistentry>
@@ -2555,7 +2555,7 @@ doc/zh_*</screen>
<term>RELENG_5_4</term>
<listitem>
- <para>The release branch for &os;-5.4, used only
+ <para>The release branch for &os;-5.4, used only
for security advisories and other critical fixes.</para>
</listitem>
</varlistentry>
@@ -2564,7 +2564,7 @@ doc/zh_*</screen>
<term>RELENG_5_3</term>
<listitem>
- <para>The release branch for &os;-5.3, used only
+ <para>The release branch for &os;-5.3, used only
for security advisories and other critical fixes.</para>
</listitem>
</varlistentry>
@@ -2573,7 +2573,7 @@ doc/zh_*</screen>
<term>RELENG_5_2</term>
<listitem>
- <para>The release branch for &os;-5.2 and &os;-5.2.1, used only
+ <para>The release branch for &os;-5.2 and &os;-5.2.1, used only
for security advisories and other critical fixes.</para>
</listitem>
</varlistentry>
@@ -2582,7 +2582,7 @@ doc/zh_*</screen>
<term>RELENG_5_1</term>
<listitem>
- <para>The release branch for &os;-5.1, used only
+ <para>The release branch for &os;-5.1, used only
for security advisories and other critical fixes.</para>
</listitem>
</varlistentry>
@@ -2591,7 +2591,7 @@ doc/zh_*</screen>
<term>RELENG_5_0</term>
<listitem>
- <para>The release branch for &os;-5.0, used only
+ <para>The release branch for &os;-5.0, used only
for security advisories and other critical fixes.</para>
</listitem>
</varlistentry>
@@ -2618,7 +2618,7 @@ doc/zh_*</screen>
<term>RELENG_4_10</term>
<listitem>
- <para>The release branch for &os;-4.10, used only
+ <para>The release branch for &os;-4.10, used only
for security advisories and other critical fixes.</para>
</listitem>
</varlistentry>
@@ -2627,7 +2627,7 @@ doc/zh_*</screen>
<term>RELENG_4_9</term>
<listitem>
- <para>The release branch for &os;-4.9, used only
+ <para>The release branch for &os;-4.9, used only
for security advisories and other critical fixes.</para>
</listitem>
</varlistentry>
@@ -2636,7 +2636,7 @@ doc/zh_*</screen>
<term>RELENG_4_8</term>
<listitem>
- <para>The release branch for &os;-4.8, used only
+ <para>The release branch for &os;-4.8, used only
for security advisories and other critical fixes.</para>
</listitem>
</varlistentry>
@@ -2645,7 +2645,7 @@ doc/zh_*</screen>
<term>RELENG_4_7</term>
<listitem>
- <para>The release branch for &os;-4.7, used only
+ <para>The release branch for &os;-4.7, used only
for security advisories and other critical fixes.</para>
</listitem>
</varlistentry>
@@ -3021,7 +3021,7 @@ doc/zh_*</screen>
<para>&os; 4.0</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term>RELENG_3_5_0_RELEASE</term>
@@ -3161,7 +3161,7 @@ doc/zh_*</screen>
much the same way as the &man.rcp.1; command,
but has more options and uses the rsync remote-update protocol
which transfers only the differences between two sets of files,
- thus greatly speeding up the synchronization over the network.
+ thus greatly speeding up the synchronization over the network.
This is most useful if you are a mirror site for the
&os; FTP server, or the CVS repository. The
<application>rsync</application> suite is available for many
@@ -3275,7 +3275,7 @@ doc/zh_*</screen>
<listitem><para>&os;: The master archive of the &os;
FTP server.</para></listitem>
<listitem><para>acl: The &os; master ACL
- list.</para></listitem>
+ list.</para></listitem>
</itemizedlist>
<para>rsync://ftp13.FreeBSD.org/</para>
@@ -3288,5 +3288,5 @@ doc/zh_*</screen>
</listitem>
</varlistentry>
</variablelist>
- </sect1>
+ </sect1>
</appendix>
diff --git a/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml b/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml
index 9842ba4bb4..c99a958816 100644
--- a/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml
@@ -128,7 +128,7 @@
</sect1info>
<title>Setting Up the Sound Card</title>
-
+
<sect2 id="sound-device">
<title>Configuring the System</title>
@@ -362,7 +362,7 @@ kld snd_ich (1p/2r/0v channels duplex default)</screen>
default playback device. To check if this is the case, run
<application>dmesg</application> and look for <literal>pcm</literal>.
The output looks something like this:</para>
-
+
<programlisting>...
hdac0: HDA Driver Revision: 20100226_0142
hdac1: HDA Driver Revision: 20100226_0142
@@ -393,7 +393,7 @@ pcm7: &lt;HDA Realtek ALC889 PCM #3 Digital&gt; at cad 2 nid 1 on hdac1
use, in this example <literal>4</literal>. You can make this change
permanent by adding the following line to
<filename>/etc/sysctl.conf</filename>:</para>
-
+
<programlisting>hw.snd.default_unit=<replaceable>4</replaceable></programlisting>
</sect3>
</sect2>
@@ -505,10 +505,10 @@ pcm7: &lt;HDA Realtek ALC889 PCM #3 Digital&gt; at cad 2 nid 1 on hdac1
<title>MP3 Players</title>
<para>By far, the most popular X11 MP3 player is
- <application>XMMS</application> (X Multimedia System).
+ <application>XMMS</application> (X Multimedia System).
<application>Winamp</application>
skins can be used with <application>XMMS</application> since the
- GUI is almost identical to that of Nullsoft's
+ GUI is almost identical to that of Nullsoft's
<application>Winamp</application>.
<application>XMMS</application> also has native plug-in
support.</para>
@@ -823,7 +823,7 @@ screen #0
Adaptor #0: "Savage Streams Engine"
number of ports: 1
port base: 43
- operations supported: PutImage
+ operations supported: PutImage
supported visuals:
depth 16, visualID 0x22
depth 16, visualID 0x23
@@ -963,7 +963,7 @@ no adaptors present</screen>
<listitem>
<para>An application cannot playback a file which another
application produced.</para>
- </listitem>
+ </listitem>
<listitem>
<para>An application cannot playback a file which the
@@ -1002,7 +1002,7 @@ no adaptors present</screen>
applications. These issues are not always noticed and worked around
by the port maintainers, which can lead to problems like
these:</para>
-
+
<orderedlist>
<listitem>
@@ -1238,7 +1238,7 @@ zoom=yes</programlisting>
same time, takes some of the more fine-grained control away from
the user. The <application>xine</application> video player
performs best on XVideo interfaces.</para>
-
+
<para>By default, <application>xine</application> player will
start up in a graphical user interface. The menus can then be
used to open a specific file:</para>
@@ -1307,7 +1307,7 @@ WITH_MJPEG=yes -DWITH_XVID=yes</userinput></screen>
and use a few different applications. This section exists to
give the reader pointers to such additional information.</para>
- <para>The
+ <para>The
<ulink url="http://www.mplayerhq.hu/DOCS/">MPlayer documentation</ulink>
is very technically informative.
These documents should probably be consulted by anyone wishing
@@ -1407,7 +1407,7 @@ WITH_MJPEG=yes -DWITH_XVID=yes</userinput></screen>
<para>Alternatively, you may statically compile the support for
the TV card in your kernel, in that case add the following
lines to your kernel configuration:</para>
-
+
<programlisting>device bktr
device iicbus
device iicbb
@@ -1533,7 +1533,7 @@ bktr0: Pinnacle/Miro TV, Philips SECAM tuner.</programlisting>
contains a list of all available <acronym
role="Digital Video Broadcasting">DVB</acronym> drivers.</para>
</sect2>
-
+
<sect2>
<title>Dependencies</title>
diff --git a/en_US.ISO8859-1/books/handbook/ports/chapter.sgml b/en_US.ISO8859-1/books/handbook/ports/chapter.sgml
index 1738a2d6af..2d382a5131 100644
--- a/en_US.ISO8859-1/books/handbook/ports/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/ports/chapter.sgml
@@ -332,7 +332,7 @@ Path: /usr/ports/sysutils/lsof
Info: Lists information about open files (similar to fstat(1))
Maint: obrien@FreeBSD.org
Index: sysutils
-B-deps:
+B-deps:
R-deps: </screen>
<para>The part of the output you want to pay particular
diff --git a/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml b/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml
index 962ffe9190..1e7c78671e 100644
--- a/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml
@@ -60,11 +60,11 @@
<indexterm id="ppp-ppp-user">
<primary>PPP</primary>
<secondary>user PPP</secondary>
- </indexterm>
+ </indexterm>
<indexterm id="ppp-ppp-kernel">
<primary>PPP</primary>
<secondary>kernel PPP</secondary>
- </indexterm>
+ </indexterm>
<indexterm id="ppp-ppp-ethernet">
<primary>PPP</primary>
<secondary>over Ethernet</secondary>
@@ -247,7 +247,7 @@
peer assign whatever IP address it sees fit.</para>
</listitem>
</itemizedlist>
-
+
<para>If you do not have any of the required information, contact
your ISP.</para>
@@ -455,7 +455,7 @@
first number first and only use the other numbers if the
first number fails, use the pipe character. Always
quote the entire set of phone numbers as shown.</para>
-
+
<para>You must enclose the phone number in quotation marks
(<literal>"</literal>) if there is any intention on using
spaces in the phone number. This can cause a simple, yet
@@ -827,10 +827,10 @@ exec /usr/sbin/ppp -direct $IDENT</programlisting>
<sect4>
<title>Setting Up <filename>ppp.conf</filename> for Dynamic-IP
Users</title>
-
+
<para>The <filename>/etc/ppp/ppp.conf</filename> file should
contain something along the lines of:</para>
-
+
<programlisting>default:
set debug phase lcp chat
set timeout 0
@@ -945,7 +945,7 @@ exec /usr/sbin/ppp -direct pap$IDENT</programlisting>
above.</para>
<programlisting>pap:
- enable pap
+ enable pap
set ifaddr 203.14.100.1 203.14.100.20-203.14.100.40
enable proxy</programlisting>
@@ -1007,8 +1007,8 @@ set nbns 203.14.100.5</programlisting>
<sect4 id="userppp-PAPnCHAP">
<title>PAP and CHAP Authentication</title>
- <indexterm><primary>PAP</primary></indexterm>
- <indexterm><primary>CHAP</primary></indexterm>
+ <indexterm><primary>PAP</primary></indexterm>
+ <indexterm><primary>CHAP</primary></indexterm>
<para>Some ISPs set their system up so that the authentication
part of your connection is done using either of the PAP or
CHAP authentication mechanisms. If this is the case, your ISP
@@ -1050,7 +1050,7 @@ set nbns 203.14.100.5</programlisting>
will need to insert the correct value for
<replaceable>MyPassword</replaceable>. You may want to
add an additional line, such as:</para>
-
+
<programlisting>16 accept PAP</programlisting>
<para>or</para>
@@ -1107,14 +1107,14 @@ set nbns 203.14.100.5</programlisting>
</indexterm>
<para>PPP has ability to use internal NAT without kernel diverting
- capabilities. This functionality may be enabled by the following
+ capabilities. This functionality may be enabled by the following
line in <filename>/etc/ppp/ppp.conf</filename>:</para>
<programlisting>nat enable yes</programlisting>
<para>Alternatively, PPP NAT may be enabled by command-line
- option <literal>-nat</literal>. There is also
- <filename>/etc/rc.conf</filename> knob named
+ option <literal>-nat</literal>. There is also
+ <filename>/etc/rc.conf</filename> knob named
<literal>ppp_nat</literal>, which is enabled by default.</para>
<para>If you use this feature, you may also find useful
@@ -1403,7 +1403,7 @@ ifconfig_tun0=</programlisting>
</author>
</authorgroup>
</sect2info>
-
+
<title>Using <command>pppd</command> as a Client</title>
<indexterm>
@@ -1464,7 +1464,7 @@ defaultroute # put this if you want that PPP server will be your
fails, you can add the <option>debug</option> option to the
<filename>/etc/ppp/options</filename> file, and check console messages
to track the problem.</para>
-
+
<para>Following <filename>/etc/ppp/pppup</filename> script will make
all 3 stages automatic:</para>
@@ -1560,7 +1560,7 @@ exit</programlisting>
<para>Here is an alternate method using <command>chat</command>
instead of <command>kermit</command>:</para>
- <para>The following two files are sufficient to accomplish a
+ <para>The following two files are sufficient to accomplish a
<command>pppd</command> connection.</para>
<para><filename>/etc/ppp/options</filename>:</para>
@@ -1612,7 +1612,7 @@ netmask 255.255.255.0 # netmask (not required)
# local ip must be different from one
# you assigned to the Ethernet (or other)
# interface on your machine.
- # remote IP is IP address that will be
+ # remote IP is IP address that will be
# assigned to the remote machine
domain ppp.foo.com # your domain
passive # wait for LCP
@@ -1622,7 +1622,7 @@ modem # modem line</programlisting>
will tell <application>pppd</application> to behave as a
server:</para>
- <programlisting>#!/bin/sh
+ <programlisting>#!/bin/sh
pgrep -l pppd
pid=`pgrep pppd`
if [ "X${pid}" != "X" ] ; then
@@ -1649,7 +1649,7 @@ pppd /dev/tty01 19200</programlisting>
<para>Use this <filename>/etc/ppp/pppservdown</filename> script to
stop the server:</para>
- <programlisting>#!/bin/sh
+ <programlisting>#!/bin/sh
pgrep -l pppd
pid=`pgrep pppd`
if [ "X${pid}" != "X" ] ; then
@@ -2320,7 +2320,7 @@ ppp_profile="adsl"</programlisting>
<para>For this to work correctly you will need to have used the
sample <filename>ppp.conf</filename> which is supplied with the
<filename role="package">net/pppoa</filename> port.</para>
-
+
</sect2>
<sect2>
@@ -2365,15 +2365,15 @@ adsl:
set bundle password <replaceable>password</replaceable> <co
id="co-mpd-ex-pass"/>
set bundle disable multilink
-
+
set link no pap acfcomp protocomp
set link disable chap
set link accept chap
set link keep-alive 30 10
-
+
set ipcp no vjcomp
set ipcp ranges 0.0.0.0/0 0.0.0.0/0
-
+
set iface route default
set iface disable on-demand
set iface enable proxy-arp
@@ -2427,19 +2427,19 @@ adsl:
<screen>&prompt.user; <userinput>ifconfig <replaceable>ng0</replaceable></userinput>
ng0: flags=88d1&lt;UP,POINTOPOINT,RUNNING,NOARP,SIMPLEX,MULTICAST&gt; mtu 1500
inet 216.136.204.117 --> 204.152.186.171 netmask 0xffffffff</screen>
-
+
<para>Using <application>mpd</application> is the recommended way to
connect to an ADSL service with &os;.</para>
-
+
</sect2>
<sect2>
<title>Using pptpclient</title>
-
+
<para>It is also possible to use FreeBSD to connect to other PPPoA
services using
<filename role="package">net/pptpclient</filename>.</para>
-
+
<para>To use <filename role="package">net/pptpclient</filename> to
connect to a DSL service, install the port or package and edit your
<filename>/etc/ppp/ppp.conf</filename>. You will need to be
@@ -2494,7 +2494,7 @@ ng0: flags=88d1&lt;UP,POINTOPOINT,RUNNING,NOARP,SIMPLEX,MULTICAST&gt; mtu 1500
end of the previous command because <application>pptp</application>
will not return your prompt to you otherwise.</para>
</tip>
-
+
<para>A <devicename>tun</devicename> virtual tunnel device will be
created for interaction between the <application>pptp</application>
and <application>ppp</application> processes. Once you have been
@@ -2504,7 +2504,7 @@ ng0: flags=88d1&lt;UP,POINTOPOINT,RUNNING,NOARP,SIMPLEX,MULTICAST&gt; mtu 1500
<screen>&prompt.user; <userinput>ifconfig <replaceable>tun0</replaceable></userinput>
tun0: flags=8051&lt;UP,POINTOPOINT,RUNNING,MULTICAST&gt; mtu 1500
- inet 216.136.204.21 --> 204.152.186.171 netmask 0xffffff00
+ inet 216.136.204.21 --> 204.152.186.171 netmask 0xffffff00
Opened by PID 918</screen>
<para>If you are unable to connect, check the configuration of
@@ -2580,7 +2580,7 @@ tun0: flags=8051&lt;UP,POINTOPOINT,RUNNING,MULTICAST&gt; mtu 1500
<para>Make sure you have the following in your kernel configuration
file:</para>
-
+
<programlisting>device sl</programlisting>
<para>It is included in the <filename>GENERIC</filename> kernel, so
@@ -2617,7 +2617,7 @@ tun0: flags=8051&lt;UP,POINTOPOINT,RUNNING,MULTICAST&gt; mtu 1500
<listitem>
<para>Set your hostname by editing the line that
says:</para>
-
+
<programlisting>hostname="myname.my.domain"</programlisting>
<para>Your machine's full Internet hostname should be
@@ -2655,7 +2655,7 @@ nameserver 128.32.136.12</programlisting>
</step>
<step>
- <para>Set the password for <username>root</username> and
+ <para>Set the password for <username>root</username> and
<username>toor</username> (and any other
accounts that do not have a password).</para>
</step>
@@ -2722,7 +2722,7 @@ output ***\x0d, echo \x0aCONNECTED\x0a</programlisting>
<para>If you are able to <command>ping</command> hosts on the
other side of the router, you are connected! If it does not
work, you might want to try <option>-a</option> instead of
- <option>-c</option> as an argument to
+ <option>-c</option> as an argument to
<command>slattach</command>.</para>
</step>
</procedure>
@@ -2740,8 +2740,8 @@ output ***\x0d, echo \x0aCONNECTED\x0a</programlisting>
<command>kermit</command> (by running <command>fg</command> if you
suspended it) and exit from it (<keycap>q</keycap>).</para>
- <para>The &man.slattach.8; manual page says you have
- to use <command>ifconfig sl0 down</command>
+ <para>The &man.slattach.8; manual page says you have
+ to use <command>ifconfig sl0 down</command>
to mark the interface down, but this does not
seem to make any difference.
(<command>ifconfig sl0</command> reports the same thing.)</para>
@@ -2949,7 +2949,7 @@ water.CS.Example localhost.Example. UGH 34 47641234 lo0 - 0.438
change the setting of the <literal>gateway_enable</literal> variable
to <option>YES</option>. This will make sure that setting the
routing option will be persistent after a reboot.</para>
-
+
<para>To apply the settings immediately you can execute the
following command as <username>root</username>:</para>
@@ -3012,7 +3012,7 @@ water.CS.Example localhost.Example. UGH 34 47641234 lo0 - 0.438
this:</para>
<programlisting>#
-# login local-addr remote-addr mask opt1 opt2
+# login local-addr remote-addr mask opt1 opt2
# (normal,compress,noicmp)
#
Shelmerg dc-slip sl-helmerg 0xfffffc00 autocomp</programlisting>
@@ -3111,7 +3111,7 @@ Shelmerg dc-slip sl-helmerg 0xfffffc00 autocomp</programlisting
# 1 2 3 4 5 6 7-n
# slipunit ttyspeed loginname local-addr remote-addr mask opt-args
#
-/sbin/ifconfig sl$1 inet $4 $5 netmask $6
+/sbin/ifconfig sl$1 inet $4 $5 netmask $6
# Answer ARP requests for the SLIP client with our Ethernet addr
/usr/sbin/arp -s $5 00:11:22:33:44:55 pub</programlisting>
@@ -3218,7 +3218,7 @@ Shelmerg dc-slip sl-helmerg 0xfffffc00 autocomp</programlisting
</indexterm>
<para>If you are not using the <quote>proxy ARP</quote> method for
routing packets between your SLIP clients and the rest of your
- network (and perhaps the Internet), you will probably
+ network (and perhaps the Internet), you will probably
have to add static routes to your closest default router(s) to
route your SLIP clients subnet via your SLIP server.</para>
diff --git a/en_US.ISO8859-1/books/handbook/preface/preface.sgml b/en_US.ISO8859-1/books/handbook/preface/preface.sgml
index ec02ab3256..ef19a8b1fa 100644
--- a/en_US.ISO8859-1/books/handbook/preface/preface.sgml
+++ b/en_US.ISO8859-1/books/handbook/preface/preface.sgml
@@ -5,7 +5,7 @@
<preface id="book-preface">
<title>Preface</title>
-
+
<bridgehead id="preface-audience" renderas="sect1">Intended
Audience</bridgehead>
@@ -95,7 +95,7 @@
<listitem>
<para><xref linkend="mac"/>, Mandatory Access Control (MAC), is
a new chapter with this edition. It explains what MAC is
- and how this mechanism can be used to secure a &os;
+ and how this mechanism can be used to secure a &os;
system.</para>
</listitem>
@@ -346,7 +346,7 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><emphasis><xref linkend="kernelconfig"/>, Configuring the &os;
+ <term><emphasis><xref linkend="kernelconfig"/>, Configuring the &os;
Kernel</emphasis></term>
<listitem>
<para>Explains why you might need to configure a new kernel
diff --git a/en_US.ISO8859-1/books/handbook/txtfiles.ent b/en_US.ISO8859-1/books/handbook/txtfiles.ent
index 0ad1fecbd6..c3111a11fc 100644
--- a/en_US.ISO8859-1/books/handbook/txtfiles.ent
+++ b/en_US.ISO8859-1/books/handbook/txtfiles.ent
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
- Creates entities for each .txt screenshot that is included in the
+<!--
+ Creates entities for each .txt screenshot that is included in the
Handbook.
Each entity is named txt.dir.foo, where dir is the directory in
- which it is stored, and foo is its filename, without the '.txt'
+ which it is stored, and foo is its filename, without the '.txt'
extension.
Entities should be listed in alphabetical order.
-
+
$FreeBSD$
-->
diff --git a/en_US.ISO8859-1/books/handbook/users/chapter.sgml b/en_US.ISO8859-1/books/handbook/users/chapter.sgml
index 3b0f588d73..4315ba4dec 100644
--- a/en_US.ISO8859-1/books/handbook/users/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/users/chapter.sgml
@@ -18,10 +18,10 @@
</chapterinfo>
<title>Users and Basic Account Management</title>
-
+
<sect1 id="users-synopsis">
<title>Synopsis</title>
-
+
<para>FreeBSD allows multiple users to use the computer at the same time.
Obviously, only one of those users can be sitting in front of the screen and
keyboard at any one time
@@ -31,7 +31,7 @@
</footnote>, but any number of users can log in through the
network to get their work done. To use the system every user must have
an account.</para>
-
+
<para>After reading this chapter, you will know:</para>
<itemizedlist>
@@ -224,10 +224,10 @@
users run services. Finally, user accounts are used by real
people, who log on, read mail, and so forth.</para>
</sect1>
-
+
<sect1 id="users-superuser">
<title>The Superuser Account</title>
-
+
<indexterm>
<primary>accounts</primary>
<secondary>superuser (root)</secondary>
@@ -237,7 +237,7 @@
system administration, and should not be used for day-to-day
tasks like sending and receiving mail, general exploration of
the system, or programming.</para>
-
+
<para>This is because the superuser, unlike normal user accounts,
can operate without limits, and misuse of the superuser account
may result in spectacular disasters. User accounts are unable
@@ -257,7 +257,7 @@
accounts, and how to change between the normal user and
superuser.</para>
</sect1>
-
+
<sect1 id="users-system">
<title>System Accounts</title>
@@ -479,7 +479,7 @@ Goodbye!
<step>
<para>Finally, removes the username from all groups to which
it belongs in <filename>/etc/group</filename>.</para>
-
+
<note>
<para>If a group becomes empty and the group name is the
same as the username, the group is removed; this
@@ -523,7 +523,7 @@ Removing files belonging to jru from /var/tmp/vi.recover: done.
information.</para>
<para>Only system administrators, as the superuser, may change
- other users' information and passwords with
+ other users' information and passwords with
&man.chpass.1;.</para>
<para>When passed no options, aside from an optional username,
@@ -574,7 +574,7 @@ Other information:</screen>
<note>
<para>&man.chfn.1; and &man.chsh.1; are
- just links to &man.chpass.1;, as
+ just links to &man.chpass.1;, as
are &man.ypchpass.1;,
&man.ypchfn.1;, and
&man.ypchsh.1;. NIS support is automatic, so
@@ -695,7 +695,7 @@ passwd: done</screen>
string processed accordingly depending on the name. Setting up login
classes and capabilities is rather straight-forward and is also
described in &man.login.conf.5;.</para>
-
+
<note>
<para>The system does not normally read the configuration in
<filename>/etc/login.conf</filename> directly, but reads the database
@@ -797,7 +797,7 @@ passwd: done</screen>
running. This includes foreground and background processes
alike. For obvious reasons, this may not be larger than the
system limit specified by the <varname>kern.maxproc</varname>
- &man.sysctl.8;. Also note that setting this
+ &man.sysctl.8;. Also note that setting this
too small may hinder a
user's productivity: it is often useful to be logged in
multiple times or execute pipelines. Some tasks, such as
@@ -920,7 +920,7 @@ passwd: done</screen>
<listitem>
<para>Remember that many limits apply to individual processes, not
- the user as a whole. For example, setting
+ the user as a whole. For example, setting
<varname>openfiles</varname> to 50 means
that each process the user runs may open up to 50 files. Thus,
the gross amount of files a user may open is the value of
diff --git a/en_US.ISO8859-1/books/handbook/vinum/chapter.sgml b/en_US.ISO8859-1/books/handbook/vinum/chapter.sgml
index 88158545ad..b5f9cec39e 100644
--- a/en_US.ISO8859-1/books/handbook/vinum/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/vinum/chapter.sgml
@@ -239,7 +239,7 @@
<indexterm>
<primary>RAID-1</primary>
</indexterm>
-
+
<para>The traditional way to approach this problem has been
<emphasis>mirroring</emphasis>, keeping two copies of the data
on different physical hardware. Since the advent of the
@@ -249,9 +249,9 @@
both locations; a read can be satisfied from either, so if one
drive fails, the data is still available on the other
drive.</para>
-
+
<para>Mirroring has two problems:</para>
-
+
<itemizedlist>
<listitem>
<para>The price. It requires twice as much disk storage as
@@ -333,7 +333,7 @@
<emphasis>subdisks</emphasis>, which it uses as building
blocks for plexes.</para>
</listitem>
-
+
<listitem>
<para>Subdisks reside on Vinum <emphasis>drives</emphasis>,
currently &unix; partitions. Vinum drives can
@@ -355,7 +355,7 @@
an individual drive does not limit the size of a plex, and
thus of a volume.</para>
</sect2>
-
+
<sect2>
<title>Redundant Data Storage</title>
<para>Vinum implements mirroring by attaching multiple plexes to
@@ -371,7 +371,7 @@
provide the data for the complete address range of the volume,
the volume is fully functional.</para>
</sect2>
-
+
<sect2>
<title>Performance Issues</title>
@@ -397,7 +397,7 @@
<title>Which Plex Organization?</title>
<para>The version of Vinum supplied with &os;&nbsp;&rel.current; implements
two kinds of plex:</para>
-
+
<itemizedlist>
<listitem>
<para>Concatenated plexes are the most flexible: they can
@@ -426,10 +426,10 @@
indistinguishable from a concatenated plex.</para>
</listitem>
</itemizedlist>
-
+
<para><xref linkend="vinum-comparison"/> summarizes the advantages
and disadvantages of each plex organization.</para>
-
+
<table id="vinum-comparison" frame="none">
<title>Vinum Plex Organizations</title>
<tgroup cols="5">
@@ -452,7 +452,7 @@
<entry>Large data storage with maximum placement flexibility
and moderate performance</entry>
</row>
-
+
<row>
<entry>striped</entry>
<entry>2</entry>
@@ -466,7 +466,7 @@
</table>
</sect2>
</sect1>
-
+
<sect1 id="vinum-examples">
<title>Some Examples</title>
@@ -479,7 +479,7 @@
Vinum calls a <emphasis>device</emphasis>) under its control.
This database is updated on each state change, so that a restart
accurately restores the state of each Vinum object.</para>
-
+
<sect2>
<title>The Configuration File</title>
<para>The configuration file describes individual Vinum objects. The
@@ -545,13 +545,13 @@
Volumes: 1 (4 configured)
Plexes: 1 (8 configured)
Subdisks: 1 (16 configured)
-
+
D a State: up Device /dev/da3h Avail: 2061/2573 MB (80%)
-
+
V myvol State: up Plexes: 1 Size: 512 MB
-
+
P myvol.p0 C State: up Subdisks: 1 Size: 512 MB
-
+
S myvol.p0.s0 State: up PO: 0 B Size: 512 MB</programlisting>
<para>This output shows the brief listing format of &man.gvinum.8;. It
@@ -607,21 +607,21 @@
Volumes: 2 (4 configured)
Plexes: 3 (8 configured)
Subdisks: 3 (16 configured)
-
+
D a State: up Device /dev/da3h Avail: 1549/2573 MB (60%)
D b State: up Device /dev/da4h Avail: 2061/2573 MB (80%)
V myvol State: up Plexes: 1 Size: 512 MB
V mirror State: up Plexes: 2 Size: 512 MB
-
+
P myvol.p0 C State: up Subdisks: 1 Size: 512 MB
P mirror.p0 C State: up Subdisks: 1 Size: 512 MB
P mirror.p1 C State: initializing Subdisks: 1 Size: 512 MB
-
+
S myvol.p0.s0 State: up PO: 0 B Size: 512 MB
S mirror.p0.s0 State: up PO: 0 B Size: 512 MB
S mirror.p1.s0 State: empty PO: 0 B Size: 512 MB</programlisting>
-
+
<para><xref linkend="vinum-mirrored-vol"/> shows the structure
graphically.</para>
@@ -669,21 +669,21 @@
Volumes: 3 (4 configured)
Plexes: 4 (8 configured)
Subdisks: 7 (16 configured)
-
+
D a State: up Device /dev/da3h Avail: 1421/2573 MB (55%)
D b State: up Device /dev/da4h Avail: 1933/2573 MB (75%)
D c State: up Device /dev/da5h Avail: 2445/2573 MB (95%)
D d State: up Device /dev/da6h Avail: 2445/2573 MB (95%)
-
+
V myvol State: up Plexes: 1 Size: 512 MB
V mirror State: up Plexes: 2 Size: 512 MB
V striped State: up Plexes: 1 Size: 512 MB
-
+
P myvol.p0 C State: up Subdisks: 1 Size: 512 MB
P mirror.p0 C State: up Subdisks: 1 Size: 512 MB
P mirror.p1 C State: initializing Subdisks: 1 Size: 512 MB
P striped.p1 State: up Subdisks: 1 Size: 512 MB
-
+
S myvol.p0.s0 State: up PO: 0 B Size: 512 MB
S mirror.p0.s0 State: up PO: 0 B Size: 512 MB
S mirror.p1.s0 State: empty PO: 0 B Size: 512 MB
@@ -744,7 +744,7 @@
</para>
</sect2>
</sect1>
-
+
<sect1 id="vinum-object-naming">
<title>Object Naming</title>
@@ -815,7 +815,7 @@
/dev/vinum/plex:
total 0
crwxr-xr-- 1 root wheel 25, 0x10000002 Apr 13 16:46 s64.p0
-
+
/dev/vinum/sd:
total 0
crwxr-xr-- 1 root wheel 91, 0x20000002 Apr 13 16:46 s64.p0.s0
@@ -855,7 +855,7 @@
<screen>&prompt.root; <userinput>newfs /dev/gvinum/concat</userinput></screen>
</sect2>
</sect1>
-
+
<sect1 id="vinum-config">
<title>Configuring Vinum</title>
@@ -897,7 +897,7 @@ sd name bigraid.p0.s1 drive b plex bigraid.p0 state initializing len 4194304b dr
sd name bigraid.p0.s2 drive c plex bigraid.p0 state initializing len 4194304b driveoff set 1573129b plexoffset 8388608b
sd name bigraid.p0.s3 drive d plex bigraid.p0 state initializing len 4194304b driveoff set 1573129b plexoffset 12582912b
sd name bigraid.p0.s4 drive e plex bigraid.p0 state initializing len 4194304b driveoff set 1573129b plexoffset 16777216b</programlisting>
-
+
<para>The obvious differences here are the presence of
explicit location information and naming (both of which are
also allowed, but discouraged, for use by the user) and the
@@ -908,7 +908,7 @@ sd name bigraid.p0.s4 drive e plex bigraid.p0 state initializing len 4194304b dr
label. This enables Vinum to identify drives correctly even
if they have been assigned different &unix; drive
IDs.</para>
-
+
<sect3 id="vinum-rc-startup">
<title>Automatic Startup</title>
diff --git a/en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml b/en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml
index 6a904673cf..f3e6f10933 100644
--- a/en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml
@@ -520,7 +520,7 @@ FreeBSD demo.freebsd.org 7.0-CURRENT FreeBSD 7.0-CURRENT #113: Wed Jan 4 06:25:
kmacy@freebsd7.gateway.2wire.net:/usr/home/kmacy/p4/freebsd7_xen3/src/sys/i386-xen/compile/XENCONF i386</screen>
<para>The network can now be configured on the domU. The
- &os; domU will use a specific interface called
+ &os; domU will use a specific interface called
<devicename>xn0</devicename>:</para>
<screen>&prompt.root; <userinput>ifconfig xn0 10.10.10.200 netmask 255.0.0.0</userinput>
@@ -534,7 +534,7 @@ lo0: flags=8049&lt;UP,LOOPBACK,RUNNING,MULTICAST&gt; mtu 16384
inet 127.0.0.1 netmask 0xff000000 </screen>
<para>On dom0 Slackware, some
- <application>&xen;</application> dependant network
+ <application>&xen;</application> dependant network
interfaces should show up:</para>
<screen>&prompt.root; <userinput>ifconfig</userinput>
@@ -1124,7 +1124,7 @@ EndSection</programlisting>
for most operating systems including &windows;, &macos;, &linux;
and &os;. It is equally capable at running &windows; or &unix;
like guests. It is released as open source software, but with
- closed-source components available in a separate extension pack.
+ closed-source components available in a separate extension pack.
These components include support for USB 2.0 devices, among others.
More information may be found on the <quote>Downloads</quote> page
of the <application>&virtualbox;</application> wiki, at
diff --git a/en_US.ISO8859-1/books/handbook/x11/chapter.sgml b/en_US.ISO8859-1/books/handbook/x11/chapter.sgml
index ba9cf67779..c644981a23 100644
--- a/en_US.ISO8859-1/books/handbook/x11/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/x11/chapter.sgml
@@ -928,7 +928,7 @@ EndSection</programlisting>
<para>All fonts in X11 that are found
in <filename>/usr/local/lib/X11/fonts/</filename> and
- <filename>~/.fonts/</filename> are automatically
+ <filename>~/.fonts/</filename> are automatically
made available for anti-aliasing to Xft-aware applications.
Most recent applications are Xft-aware, including
<application>KDE</application>, <application>GNOME</application>, and
@@ -1054,9 +1054,9 @@ EndSection</programlisting>
with the <literal>&lt;/fontconfig&gt;</literal> tag. Not doing this will cause
your changes to be ignored.</para>
- <para>Finally, users can add their own settings via their personal
- <filename>.fonts.conf</filename> files. To do this, each user should
- simply create a <filename>~/.fonts.conf</filename>. This file must
+ <para>Finally, users can add their own settings via their personal
+ <filename>.fonts.conf</filename> files. To do this, each user should
+ simply create a <filename>~/.fonts.conf</filename>. This file must
also be in XML format.</para>
<indexterm><primary>LCD screen</primary></indexterm>