aboutsummaryrefslogtreecommitdiff
path: root/en_US.ISO8859-1/books/handbook
diff options
context:
space:
mode:
authorGabor Kovesdan <gabor@FreeBSD.org>2012-08-19 23:05:52 +0000
committerGabor Kovesdan <gabor@FreeBSD.org>2012-08-19 23:05:52 +0000
commit7ba98a21ad60d519a113cdca26d39d1a5b25e75d (patch)
treeb19c87af81f785c40bb5001157e321746bb99db2 /en_US.ISO8859-1/books/handbook
parentacb8333ccd5233d73bf3b9dc204b3900b94187a3 (diff)
parent421beffdb74571114cfece54aeaf5a7927e3bde5 (diff)
downloaddoc-7ba98a21ad60d519a113cdca26d39d1a5b25e75d.tar.gz
doc-7ba98a21ad60d519a113cdca26d39d1a5b25e75d.zip
MFH
Approved by: doceng (implicit)
Notes
Notes: svn path=/projects/sgml2xml/; revision=39398
Diffstat (limited to 'en_US.ISO8859-1/books/handbook')
-rw-r--r--en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml35
-rw-r--r--en_US.ISO8859-1/books/handbook/bsdinstall/chapter.sgml5
-rw-r--r--en_US.ISO8859-1/books/handbook/config/chapter.sgml6
-rw-r--r--en_US.ISO8859-1/books/handbook/desktop/chapter.sgml12
-rw-r--r--en_US.ISO8859-1/books/handbook/eresources/chapter.sgml62
-rw-r--r--en_US.ISO8859-1/books/handbook/filesystems/chapter.sgml12
-rw-r--r--en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml8
-rw-r--r--en_US.ISO8859-1/books/handbook/introduction/chapter.sgml22
-rw-r--r--en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml7
-rw-r--r--en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml42
-rw-r--r--en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml2
-rw-r--r--en_US.ISO8859-1/books/handbook/ports/chapter.sgml6
-rw-r--r--en_US.ISO8859-1/books/handbook/users/chapter.sgml2
-rw-r--r--en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml18
-rw-r--r--en_US.ISO8859-1/books/handbook/x11/chapter.sgml90
15 files changed, 183 insertions, 146 deletions
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 b69ec5bc75..c43896a855 100644
--- a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
@@ -5968,14 +5968,34 @@ round-trip min/avg/max/stddev = 2.530/2.643/2.774/0.103 ms</screen>
<para>These settings will help you configure a machine that
will be on your LAN and act as a client, not a router. To
- have &man.rtsol.8; autoconfigure your interface on boot all
- you need to add is:</para>
+ have &man.rtsol.8; autoconfigure your interface on boot on
+ &os;&nbsp;9.<replaceable>x</replaceable> and later,
+ add:</para>
+
+ <programlisting>ipv6_prefer="YES"</programlisting>
+
+ <para>to <filename>rc.conf</filename>.</para>
+
+ <para>For &os;&nbsp;8.<replaceable>x</replaceable> and
+ earlier, add:</para>
<programlisting>ipv6_enable="YES"</programlisting>
<para>To statically assign an IP address such as <hostid
role="ip6addr">2001:471:1f11:251:290:27ff:fee0:2093</hostid>,
- to your <devicename>fxp0</devicename> interface, add:</para>
+ to your <devicename>fxp0</devicename> interface, add the
+ following for &os;&nbsp;9.<replaceable>x</replaceable>:</para>
+
+ <programlisting>ifconfig_fxp0_ipv6="inet6 2001:471:1f11:251:290:27ff:fee0:2093 prefixlen <replaceable>64</replaceable>"</programlisting>
+
+ <note>
+ <para>Be sure to change <replaceable>prefixlen
+ 64</replaceable> to the appropriate value for the subnet
+ within which the computer is networked.</para>
+ </note>
+
+ <para>For &os;&nbsp;8<replaceable>x</replaceable> and earlier,
+ add:</para>
<programlisting>ipv6_ifconfig_fxp0="2001:471:1f11:251:290:27ff:fee0:2093"</programlisting>
@@ -6008,10 +6028,15 @@ round-trip min/avg/max/stddev = 2.530/2.643/2.774/0.103 ms</screen>
<programlisting>gifconfig_gif0="<replaceable>MY_IPv4_ADDR REMOTE_IPv4_ADDR</replaceable>"</programlisting>
<para>To apply the IPv6 address you have been assigned for use
- as your IPv6 tunnel endpoint, add:</para>
+ as your IPv6 tunnel endpoint, add the following for
+ &os;&nbsp;9.<replaceable>x</replaceable> and later:</para>
- <programlisting>ipv6_ifconfig_gif0="<replaceable>MY_ASSIGNED_IPv6_TUNNEL_ENDPOINT_ADDR</replaceable>"</programlisting>
+ <programlisting>ifconfig_gif0_ipv6="inet6 <replaceable>MY_ASSIGNED_IPv6_TUNNEL_ENDPOINT_ADDR</replaceable>"</programlisting>
+ <para>For &os;&nbsp;8.<replaceable>x</replaceable> and
+ earlier, add:</para>
+
+ <programlisting>ipv6_ifconfig_gif0="<replaceable>MY_ASSIGNED_IPv6_TUNNEL_ENDPOINT_ADDR</replaceable>"</programlisting>
<para>Then all you have to do is set the default route for
IPv6. This is the other side of the IPv6 tunnel:</para>
diff --git a/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.sgml b/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.sgml
index c673feab89..22726b5503 100644
--- a/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.sgml
@@ -1401,6 +1401,11 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
</listitem>
<listitem>
+ <para><literal>freebsd-zfs</literal> - A &os; ZFS
+ filesystem. See <xref linkend="filesystems-zfs"/>.</para>
+ </listitem>
+
+ <listitem>
<para><literal>freebsd-swap</literal> - &os; swap
space.</para>
</listitem>
diff --git a/en_US.ISO8859-1/books/handbook/config/chapter.sgml b/en_US.ISO8859-1/books/handbook/config/chapter.sgml
index c9f70de077..10ce0668c9 100644
--- a/en_US.ISO8859-1/books/handbook/config/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/config/chapter.sgml
@@ -2694,7 +2694,7 @@ kern.maxvnodes: 100000</screen>
<para>Use &man.swapon.8; to add a swap partition to the system.
For example:</para>
- <screen>&prompt.root; <userinput>swapon<replaceable> /dev/ada1s1p2</replaceable></userinput></screen>
+ <screen>&prompt.root; <userinput>swapon<replaceable> /dev/ada1s1b</replaceable></userinput></screen>
<warning>
@@ -2710,9 +2710,9 @@ kern.maxvnodes: 100000</screen>
entry to <filename>/etc/fstab</filename> for the
partition:</para>
- <programlisting><replaceable>/dev/ada1s1p2</replaceable> none swap sw 0 0</programlisting>
+ <programlisting><replaceable>/dev/ada1s1b</replaceable> none swap sw 0 0</programlisting>
- <para>See &man.fstab.5; for an explaination of the entries in
+ <para>See &man.fstab.5; for an explanation of the entries in
<filename>/etc/fstab</filename>.</para>
</sect2>
diff --git a/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml b/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml
index dd153bdb1a..570755fd12 100644
--- a/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml
@@ -409,6 +409,18 @@
<application>Konqueror</application>,
available in <filename role="package">misc/konq-plugins</filename>.</para>
+ <para><application>Konqueror</application> supports WebKit as
+ well as its own KHTML. WebKit is used by many modern browsers
+ including Chromium. To use WebKit with
+ <application>Konqueror</application> on &os;:</para>
+
+ <screen>&prompt.root; <userinput>cd /usr/ports/www/kwebkitpart</userinput>
+&prompt.root; <userinput>make install clean</userinput></screen>
+
+ <para>Then in <application>Konqueror</application>, click
+ <quote>Settings</quote>, <quote>Configure Konqueror</quote>,
+ then <quote>Change KHTML to WebKit</quote>.</para>
+
<para><application>Konqueror</application> also supports <application>&flash;</application>; a <quote>How To</quote> guide
for getting <application>&flash;</application> support on
<application>Konqueror</application>
diff --git a/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml b/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml
index 4b78c81663..20ca42d10b 100644
--- a/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml
@@ -395,6 +395,11 @@
</row>
<row>
+ <entry>&a.numerics.name;</entry>
+ <entry>Discussions of high quality implementation of libm functions</entry>
+ </row>
+
+ <row>
<entry>&a.office.name;</entry>
<entry>Office applications on &os;</entry>
</row>
@@ -616,7 +621,7 @@
you can change your digest options in your account options
section.</para>
- <para><emphasis>CVS &amp; SVN lists:</emphasis> The following lists
+ <para><emphasis>SVN lists:</emphasis> The following lists
are for people interested in seeing the log messages for changes to
various areas of the source tree. They are
<emphasis>Read-Only</emphasis> lists and should not have mail sent to
@@ -634,40 +639,61 @@
<tbody>
<row>
- <entry>&a.cvsall.name;</entry>
- <entry><filename>/usr/(CVSROOT|doc|ports)</filename></entry>
- <entry>All changes to any place in the tree (superset of other CVS commit lists)</entry>
+ <entry>&a.svn-doc-all.name;</entry>
+ <entry><filename>/usr/doc</filename></entry>
+ <entry>All changes to the doc Subversion repository (except
+ for <filename>user</filename>,
+ <filename>projects</filename>
+ and <filename>translations</filename>)</entry>
+ </row>
+
+ <row>
+ <entry>&a.svn-doc-head.name;</entry>
+ <entry><filename>/usr/doc</filename></entry>
+ <entry>All changes to the <quote>head</quote> branch of
+ the doc Subversion repository</entry>
+ </row>
+
+ <row>
+ <entry>&a.svn-doc-projects.name;</entry>
+ <entry><filename>/usr/doc/projects</filename></entry>
+ <entry>All changes to the <filename>projects</filename>
+ area of the doc Subversion repository</entry>
</row>
<row>
- <entry>&a.cvs-doc.name;</entry>
- <entry><filename>/usr/(doc|www)</filename></entry>
- <entry>All changes to the doc and www trees</entry>
+ <entry>&a.svn-doc-svnadmin.name;</entry>
+ <entry><filename>/usr/doc</filename></entry>
+ <entry>All changes to the administrative scripts, hooks,
+ and other configuration data of the doc Subversion
+ repository</entry>
</row>
<row>
- <entry>&a.cvs-ports.name;</entry>
+ <entry>&a.svn-ports-all.name;</entry>
<entry><filename>/usr/ports</filename></entry>
- <entry>All changes to the ports tree</entry>
+ <entry>All changes to the ports Subversion repository</entry>
</row>
<row>
- <entry>&a.cvs-projects.name;</entry>
- <entry><filename>/usr/projects</filename></entry>
- <entry>All changes to the projects tree</entry>
+ <entry>&a.svn-ports-head.name;</entry>
+ <entry><filename>/usr/ports</filename></entry>
+ <entry>All changes to the <quote>head</quote> branch of
+ the ports Subversion repository</entry>
</row>
<row>
- <entry>&a.cvs-src.name;</entry>
- <entry><filename>/usr/src</filename></entry>
- <entry>All changes to the src tree (generated by the svn-to-cvs
- importer commits)</entry>
+ <entry>&a.svn-ports-svnadmin.name;</entry>
+ <entry><filename>/usr/ports</filename></entry>
+ <entry>All changes to the administrative scripts, hooks,
+ and other configuration data of the ports Subversion
+ repository</entry>
</row>
<row>
<entry>&a.svn-src-all.name;</entry>
<entry><filename>/usr/src</filename></entry>
- <entry>All changes to the Subversion repository (except
+ <entry>All changes to the src Subversion repository (except
for <filename>user</filename>
and <filename>projects</filename>)</entry>
</row>
@@ -676,7 +702,7 @@
<entry>&a.svn-src-head.name;</entry>
<entry><filename>/usr/src</filename></entry>
<entry>All changes to the <quote>head</quote> branch of
- the Subversion repository (the &os;-CURRENT
+ the src Subversion repository (the &os;-CURRENT
branch)</entry>
</row>
diff --git a/en_US.ISO8859-1/books/handbook/filesystems/chapter.sgml b/en_US.ISO8859-1/books/handbook/filesystems/chapter.sgml
index 3f6ab55101..12e186855f 100644
--- a/en_US.ISO8859-1/books/handbook/filesystems/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/filesystems/chapter.sgml
@@ -769,12 +769,12 @@ errors: No known data errors</screen>
<para>First, load the kernel loadable module:</para>
- <screen>kldload ext2fs</screen>
+ <screen>&prompt.root; <userinput>kldload ext2fs</userinput></screen>
<para>Then, to mount an &man.ext2fs.5; volume located on
<filename>/dev/ad1s1</filename>:</para>
- <screen><userinput>mount -t ext2fs /dev/ad1s1 /mnt</userinput></screen>
+ <screen>&prompt.root; <userinput>mount -t ext2fs /dev/ad1s1 /mnt</userinput></screen>
</sect2>
<sect2>
<title>XFS</title>
@@ -791,7 +791,7 @@ errors: No known data errors</screen>
<para>To load <acronym>XFS</acronym> as a kernel-loadable
module:</para>
- <screen>kldload xfs</screen>
+ <screen>&prompt.root; <userinput>kldload xfs</userinput></screen>
<para>The &man.xfs.5; driver lets the &os; kernel access
XFS filesystems. However, at present only read-only
@@ -801,7 +801,7 @@ errors: No known data errors</screen>
<para>To mount a &man.xfs.5; volume located on
<filename>/dev/ad1s1</filename>, do the following:</para>
- <screen><userinput>mount -t xfs /dev/as1s1 /mnt</userinput></screen>
+ <screen>&prompt.root; <userinput>mount -t xfs /dev/as1s1 /mnt</userinput></screen>
<para>Also useful to note is that the
<filename role="package">sysutils/xfsprogs</filename> port
@@ -828,12 +828,12 @@ errors: No known data errors</screen>
<para>First, the kernel-loadable module needs to be loaded:</para>
- <screen>kldload reiserfs</screen>
+ <screen>&prompt.root; <userinput>kldload reiserfs</userinput></screen>
<para>Then, to mount a ReiserFS volume located on
<filename>/dev/ad1s1</filename>:</para>
- <screen><userinput>mount -t reiserfs /dev/ad1s1 /mnt</userinput></screen>
+ <screen>&prompt.root; <userinput>mount -t reiserfs /dev/ad1s1 /mnt</userinput></screen>
</sect2>
</sect1>
diff --git a/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml b/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml
index 68e90c31d3..5ba27303cc 100644
--- a/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml
@@ -2132,8 +2132,7 @@ pass in quick on rl0 proto tcp from any to any port = 20 flags S keep state</pro
run time loadable module. The system will dynamically load the
kernel module when the <filename>rc.conf</filename> statement
<literal>firewall_enable="YES"</literal> is used. There is no
- need to compile IPFW into the &os; kernel unless
- <acronym>NAT</acronym> functionality is desired.</para>
+ need to compile IPFW into the &os; kernel.</para>
<para>After rebooting your system with
<literal>firewall_enable="YES"</literal> in
@@ -2181,9 +2180,8 @@ net.inet.ip.fw.verbose_limit=5</programlisting>
</indexterm>
<para>It is not a mandatory requirement to enable IPFW by
- compiling the following options into the &os; kernel, unless
- <acronym>NAT</acronym> functionality is required. It is presented here
- as background information.</para>
+ compiling the following options into the &os; kernel. It is
+ presented here as background information only.</para>
<programlisting>options IPFIREWALL</programlisting>
diff --git a/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml b/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml
index 9e1955cc04..c826d91bce 100644
--- a/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml
@@ -811,23 +811,27 @@
The switch was deemed necessary, as the technical limitations
imposed by <application>CVS</application> were becoming obvious
due to the rapid expansion of the source tree and the amount
- of history already stored. While the base repository now uses
+ of history already stored. The Documentation Project
+ and Ports Collection repositories also moved from
+ <application>CVS</application> to
+ <application>SVN</application> in May 2012 and July
+ 2012, respectively.</para>
+
+ <para>While the <literal>src/</literal> and
+ <literal>ports/</literal> repositories now use
<application>SVN</application>, client side tools like
<application>csup</application> that depend on the older
<application>CVS</application> infrastructure, continue to
work normally &mdash; changes in the
<application>SVN</application> repository are backported to
- <application>CVS</application> for this purpose.</para>
-
- <para>In May 2012, the Documentation Project repository
- also moved from <application>CVS</application> to
- <application>SVN</application>. Unlike the base system,
+ <application>CVS</application> for this purpose.
+ Unlike <literal>src/</literal> and
+ <literal>ports/</literal>,
the documentation <application>SVN</application>
repository is not backported to
<application>CVS</application>.</para>
- <para>The Ports repository is
- currently using <application>CVS</application>. The primary
+ <para>The primary <application>CVS</application>
<ulink
url="http://www.FreeBSD.org/cgi/cvsweb.cgi">repository</ulink>
resides on a machine in Santa Clara CA, USA
@@ -878,7 +882,7 @@
is one of the functions of the core team, as is the
recruitment of new core team members as others move on.
The current core team was elected from a pool of committer
- candidates in July 2010. Elections are held
+ candidates in July 2012. Elections are held
every 2 years.</para>
<para>Some core team members also have specific areas of
diff --git a/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml b/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml
index 040d416838..59336ff9fc 100644
--- a/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml
@@ -724,8 +724,11 @@ options NFS_ROOT # NFS usable as /, requires NFSCLIENT</progra
<programlisting>options GEOM_PART_GPT # GUID Partition Tables.</programlisting>
- <para>This option brings the ability to have a large number of
- partitions on a single disk.</para>
+ <para>Adds support for <ulink
+ url="http://en.wikipedia.org/wiki/GUID_Partition_Table">GUID
+ Partition Tables</ulink>. GPT provides the ability to have a
+ large number of partitions per disk, 128 in the standard
+ configuration.</para>
<programlisting>options COMPAT_43 # Compatible with BSD 4.3 [KEEP THIS!]</programlisting>
diff --git a/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml b/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
index 2fb48a8f5c..c458ffe084 100644
--- a/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
@@ -21,13 +21,6 @@
<itemizedlist>
<listitem>
<address>
- <otheraddr>CompUSA</otheraddr>
- WWW: <otheraddr><ulink url="http://www.compusa.com/"></ulink></otheraddr>
- </address>
- </listitem>
-
- <listitem>
- <address>
<otheraddr>Frys Electronics</otheraddr>
WWW: <otheraddr><ulink url="http://www.frys.com/"></ulink></otheraddr>
</address>
@@ -68,16 +61,6 @@
<listitem>
<address>
- <otheraddr>Ikarios</otheraddr>
- <street>22-24 rue Voltaire</street>
- <postcode>92000</postcode> <city>Nanterre</city>
- <country>France</country>
- WWW: <otheraddr><ulink url="http://ikarios.com/form/#freebsd"></ulink></otheraddr>
- </address>
- </listitem>
-
- <listitem>
- <address>
<otheraddr>JMC Software</otheraddr>
<country>Ireland</country>
Phone: <phone>353 1 6291282</phone>
@@ -158,19 +141,6 @@
please contact a distributor:</para>
<itemizedlist>
- <listitem>
- <address>
- <otheraddr>Cylogistics</otheraddr>
- <street>809B Cuesta Dr., #2149</street>
- <city>Mountain View</city>, <state>CA</state> <postcode>94040</postcode>
- <country>USA</country>
- Phone: <phone>+1 650 694-4949</phone>
- Fax: <fax>+1 650 694-4953</fax>
- Email: <email>sales@cylogistics.com</email>
- WWW: <otheraddr><ulink url="http://www.cylogistics.com/"></ulink></otheraddr>
- </address>
- </listitem>
-
<listitem>
<address>
<otheraddr>Ingram Micro</otheraddr>
@@ -206,18 +176,6 @@
WWW: <otheraddr><ulink url="http://linuxcenter.ru/freebsd"></ulink></otheraddr>
</address>
</listitem>
-
- <listitem>
- <address>
- <otheraddr>Navarre Corp</otheraddr>
- <street>7400 49th Ave South</street>
- <city>New Hope</city>, <state>MN</state> <postcode>55428</postcode>
- <country>USA</country>
- Phone: <phone>+1 763 535-8333</phone>
- Fax: <fax>+1 763 535-0341</fax>
- WWW: <otheraddr><ulink url="http://www.navarre.com/"></ulink></otheraddr>
- </address>
- </listitem>
</itemizedlist>
</sect2>
</sect1>
diff --git a/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml b/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml
index ba3c98b137..654a57b607 100644
--- a/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml
@@ -8,7 +8,7 @@
Do not edit this file except as instructed by the addkey.sh script.
- See the README file in doc/share/pgpkeys for instructions.
+ See the README file in head/share/pgpkeys for instructions.
-->
<appendix id="pgpkeys">
diff --git a/en_US.ISO8859-1/books/handbook/ports/chapter.sgml b/en_US.ISO8859-1/books/handbook/ports/chapter.sgml
index c1e7dbc677..1738a2d6af 100644
--- a/en_US.ISO8859-1/books/handbook/ports/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/ports/chapter.sgml
@@ -274,11 +274,11 @@
</listitem>
<listitem>
- <indexterm><primary>FreshMeat</primary></indexterm>
+ <indexterm><primary>Freecode</primary></indexterm>
<para>If you do not know the name of the application you want,
- try using a site like FreshMeat (<ulink
- url="http://www.freshmeat.net/"></ulink>) to find an
+ try using a site like Freecode (<ulink
+ url="http://www.freecode.com/"></ulink>) to find an
application, then check back at the FreeBSD site to see if
the application has been ported yet.</para>
</listitem>
diff --git a/en_US.ISO8859-1/books/handbook/users/chapter.sgml b/en_US.ISO8859-1/books/handbook/users/chapter.sgml
index ddc97babed..3b0f588d73 100644
--- a/en_US.ISO8859-1/books/handbook/users/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/users/chapter.sgml
@@ -821,7 +821,7 @@ passwd: done</screen>
&man.mlock.2;). Some system-critical programs, such as
&man.amd.8;, lock into main memory such that in the event
of being swapped out, they do not contribute to
- a system's trashing in time of trouble.</para>
+ a system's thrashing in time of trouble.</para>
</listitem>
</varlistentry>
diff --git a/en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml b/en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml
index d5c85acbd5..6a904673cf 100644
--- a/en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml
@@ -1115,8 +1115,7 @@ EndSection</programlisting>
<application>VMware</application> (like
<filename role="package">emulators/vmware3</filename>), which
utilized the &linux; binary compatibility layer. Shortly after
- the release of &os;&nbsp;7.2, the Open Source Edition
- (<acronym>OSE</acronym>) of Sun's
+ the release of &os;&nbsp;7.2, Sun's
<application>&virtualbox;</application> appeared in the
Ports&nbsp;Collection as a native &os; program.</para>
@@ -1124,14 +1123,13 @@ EndSection</programlisting>
developed, complete virtualization package, that is available
for most operating systems including &windows;, &macos;, &linux;
and &os;. It is equally capable at running &windows; or &unix;
- like guests. It comes in two flavors, an open source and a
- proprietary edition. From the user's point of view, perhaps the
- most important limitation of the <acronym>OSE</acronym> is the
- lack of USB support. Other differences may be found in the
- <quote>Editions</quote> page of the
- <application>&virtualbox;</application> wiki, at
- <ulink url="http://www.virtualbox.org/wiki/Editions"></ulink>.
- Currently, only the OSE is available for &os;.</para>
+ like guests. It is released as open source software, but with
+ 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
+ <ulink url="http://www.virtualbox.org/wiki/Downloads"></ulink>.
+ Currently, these extensions are not available for &os;.</para>
<sect2 id="virtualization-virtualbox-install">
<title>Installing &virtualbox;</title>
diff --git a/en_US.ISO8859-1/books/handbook/x11/chapter.sgml b/en_US.ISO8859-1/books/handbook/x11/chapter.sgml
index ec397c1aaf..ba9cf67779 100644
--- a/en_US.ISO8859-1/books/handbook/x11/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/x11/chapter.sgml
@@ -365,36 +365,47 @@
<sect2>
<title>Before Starting</title>
- <para>Before configuration of X11
- the following information about the target system is needed:</para>
+ <para>In most cases, X11 is self-configuring. Those with older
+ or unusual equipment may find it helpful to gather some
+ hardware information before beginning configuration.</para>
<itemizedlist>
- <listitem><para>Monitor specifications</para></listitem>
- <listitem><para>Video Adapter chipset</para></listitem>
- <listitem><para>Video Adapter memory</para></listitem>
+ <listitem><para>Monitor sync frequencies</para></listitem>
+ <listitem><para>Video card chipset</para></listitem>
+ <listitem><para>Video card memory</para></listitem>
</itemizedlist>
- <indexterm><primary>horizontal scan rate</primary></indexterm>
- <indexterm><primary>vertical scan rate</primary></indexterm>
-
- <para>The specifications for the monitor are used by
- X11 to determine the resolution and
- refresh rate to run at. These specifications can usually be
- obtained from the documentation that came with the monitor or from
- the manufacturer's website. There are two ranges of numbers that
- are needed, the horizontal scan rate and the vertical synchronization
- rate.</para>
-
- <para>The video adapter's chipset defines what driver module
- X11 uses to talk to the graphics
- hardware. With most chipsets, this can be automatically
- determined, but it is still useful to know in case the automatic
- detection does not work correctly.</para>
-
- <para>Video memory on the graphic adapter determines the
- resolution and color depth which the system can run at. This is
- important to know so the user knows the limitations of the
- system.</para>
+ <indexterm>
+ <primary>horizontal sync frequency</primary>
+ </indexterm>
+ <indexterm>
+ <primary>horizontal scan rate</primary>
+ <see>horizontal sync frequency</see>
+ </indexterm>
+ <indexterm><primary>refresh rate</primary></indexterm>
+ <indexterm>
+ <primary>vertical sync frequency</primary>
+ <see>refresh rate</see>
+ </indexterm>
+ <indexterm>
+ <primary>vertical scan rate</primary>
+ <see>refresh rate</see>
+ </indexterm>
+
+ <para>Screen resolution and refresh rate are determined by the
+ monitor's horizontal and vertical sync frequencies. Almost
+ all monitors support electronic autodetection of these values.
+ A few monitors do not provide these values, and the
+ specifications must be determined from the printed manual
+ or manufacturer web site.</para>
+
+ <para>The video card chipset is also autodetected, and used to
+ select the proper video driver. It is beneficial for the user
+ to be aware of which chipset is installed for when
+ autodetection does not provide the desired result.</para>
+
+ <para>Video card memory determines the maximum resolution and
+ color depth which can be displayed.</para>
</sect2>
<sect2>
@@ -585,12 +596,12 @@ dbus_enable="YES"</programlisting>
<indexterm><primary>X11 tuning</primary></indexterm>
- <para>Next, tune the <filename>xorg.conf.new</filename>
- configuration file to taste. Open the file in a text editor such
- as &man.emacs.1; or &man.ee.1;. First, add the
- frequencies for the target system's monitor. These are usually
- expressed as a horizontal and vertical synchronization rate. These
- values are added to the <filename>xorg.conf.new</filename> file
+ <para>The <filename>xorg.conf.new</filename>
+ configuration file may now be tuned to taste. Open the file in a text editor such
+ as &man.emacs.1; or &man.ee.1;. If the monitor is an older
+ or unusual model that does not support autodetection of
+ sync frequencies, those settings can
+ be added to <filename>xorg.conf.new</filename>
under the <literal>"Monitor"</literal> section:</para>
<programlisting>Section "Monitor"
@@ -601,14 +612,11 @@ dbus_enable="YES"</programlisting>
VertRefresh 48-120
EndSection</programlisting>
- <para>The <literal>HorizSync</literal> and
- <literal>VertRefresh</literal> keywords may be missing in the
- configuration file. If they are, they need to be added, with
- the correct horizontal synchronization rate placed after the
- <literal>HorizSync</literal> keyword and the vertical
- synchronization rate after the <literal>VertRefresh</literal>
- keyword. In the example above the target monitor's rates were
- entered.</para>
+ <para>Most monitors support sync frequency autodetection, making
+ manual entry of these values unnecessary. For the few
+ monitors that do not support autodetection, avoid potential
+ damage by only entering values provided by the
+ manufacturer.</para>
<para>X allows DPMS (Energy Star) features to be used with capable
monitors. The &man.xset.1; program controls the time-outs and can force
@@ -685,7 +693,7 @@ EndSection</programlisting>
<title>Advanced Configuration Topics</title>
<sect3>
- <title>Configuration with &intel; i810 Graphics Chipsets</title>
+ <title>Configuration with &intel; <literal>i810</literal> Graphics Chipsets</title>
<indexterm><primary>Intel i810 graphic chipset</primary></indexterm>