svn commit: r48529 - in head/en_US.ISO8859-1/books/handbook: audit boot config cutting-edge desktop disks filesystems introduction mail multimedia network-servers pgpkeys security serialcomms virtu...
Warren Block
wblock at FreeBSD.org
Sun Apr 3 18:57:17 UTC 2016
Author: wblock
Date: Sun Apr 3 18:57:15 2016
New Revision: 48529
URL: https://svnweb.freebsd.org/changeset/doc/48529
Log:
Whitespace-only fixes, translators please ignore.
Modified:
head/en_US.ISO8859-1/books/handbook/audit/chapter.xml
head/en_US.ISO8859-1/books/handbook/boot/chapter.xml
head/en_US.ISO8859-1/books/handbook/config/chapter.xml
head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
head/en_US.ISO8859-1/books/handbook/desktop/chapter.xml
head/en_US.ISO8859-1/books/handbook/disks/chapter.xml
head/en_US.ISO8859-1/books/handbook/filesystems/chapter.xml
head/en_US.ISO8859-1/books/handbook/introduction/chapter.xml
head/en_US.ISO8859-1/books/handbook/mail/chapter.xml
head/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml
head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
head/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.xml
head/en_US.ISO8859-1/books/handbook/security/chapter.xml
head/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml
head/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml
head/en_US.ISO8859-1/books/handbook/x11/chapter.xml
Modified: head/en_US.ISO8859-1/books/handbook/audit/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/audit/chapter.xml Sun Apr 3 16:40:49 2016 (r48528)
+++ head/en_US.ISO8859-1/books/handbook/audit/chapter.xml Sun Apr 3 18:57:15 2016 (r48529)
@@ -82,8 +82,8 @@ requirements. -->
<itemizedlist>
<listitem>
- <para>Understand &unix; and &os; basics (<xref
- linkend="basics"/>).</para>
+ <para>Understand &unix; and &os; basics
+ (<xref linkend="basics"/>).</para>
</listitem>
<listitem>
Modified: head/en_US.ISO8859-1/books/handbook/boot/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/boot/chapter.xml Sun Apr 3 16:40:49 2016 (r48528)
+++ head/en_US.ISO8859-1/books/handbook/boot/chapter.xml Sun Apr 3 18:57:15 2016 (r48529)
@@ -638,27 +638,27 @@ console none
</sect3>
</sect2>
</sect1>
-<!--
- <sect2 id="boot-kernel-userconfig">
+ <!--
+ <sect2 id="boot-kernel-userconfig">
<title>UserConfig: the Boot-time Kernel Configurator</title>
<para> </para>
- </sect2> -->
+ </sect2> -->
<sect1 xml:id="boot-splash">
<info>
- <title>Configuring Boot Time Splash Screens</title>
+ <title>Configuring Boot Time Splash Screens</title>
- <authorgroup>
- <author>
- <personname>
- <firstname>Joseph J.</firstname>
- <surname>Barbish</surname>
- </personname>
- <contrib>Contributed by </contrib>
- </author>
- </authorgroup>
- </info>
+ <authorgroup>
+ <author>
+ <personname>
+ <firstname>Joseph J.</firstname>
+ <surname>Barbish</surname>
+ </personname>
+ <contrib>Contributed by </contrib>
+ </author>
+ </authorgroup>
+ </info>
<para>Typically when a &os; system boots, it displays its progress
as a series of messages at the console. A boot splash screen
@@ -895,8 +895,8 @@ bitmap_name="/boot/<replaceable>splash.b
&man.reboot.8;. Refer to their manual pages and to
&man.shutdown.8; for more information.</para>
- <para>Modify group membership by referring to
- <xref linkend="users-synopsis"/>.</para>
+ <para>Modify group membership by referring to
+ <xref linkend="users-synopsis"/>.</para>
<note>
<para>Power management requires &man.acpi.4; to be loaded as
Modified: head/en_US.ISO8859-1/books/handbook/config/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/config/chapter.xml Sun Apr 3 16:40:49 2016 (r48528)
+++ head/en_US.ISO8859-1/books/handbook/config/chapter.xml Sun Apr 3 18:57:15 2016 (r48529)
@@ -976,8 +976,8 @@ lo0: flags=8049<UP,LOOPBACK,RUNNING,M
<para>Replace <filename>dc0</filename> with the correct value
for the system.</para>
- <para>The line added, then, follow the instructions given in <xref
- linkend="config-network-testing"/>.</para>
+ <para>The line added, then, follow the instructions given in
+ <xref linkend="config-network-testing"/>.</para>
<note>
<para>If the network was configured during installation, some
@@ -2534,14 +2534,14 @@ device_probe_and_attach: cbb0 attach ret
<primary><varname>kern.ipc.soacceptqueue</varname></primary>
</indexterm>
- <para>The <varname>kern.ipc.soacceptqueue</varname> &man.sysctl.8;
- variable limits the size of the listen queue for accepting
- new <literal>TCP</literal> connections. The default value
- of <literal>128</literal> is typically too low for robust
- handling of new connections on a heavily loaded web server.
- For such environments, it is recommended to increase this
- value to <literal>1024</literal> or higher. A service
- such as &man.sendmail.8;, or
+ <para>The <varname>kern.ipc.soacceptqueue</varname>
+ &man.sysctl.8; variable limits the size of the listen queue
+ for accepting new <literal>TCP</literal> connections. The
+ default value of <literal>128</literal> is typically too low
+ for robust handling of new connections on a heavily loaded
+ web server. For such environments, it is recommended to
+ increase this value to <literal>1024</literal> or higher. A
+ service such as &man.sendmail.8;, or
<application>Apache</application> may itself limit the
listen queue size, but will often have a directive in its
configuration file to adjust the queue size. Large listen
Modified: head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml Sun Apr 3 16:40:49 2016 (r48528)
+++ head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml Sun Apr 3 18:57:15 2016 (r48529)
@@ -682,7 +682,7 @@ before running "/usr/sbin/freebsd-update
<para>For information on editing and submitting corrections to the
documentation, refer to the &os; Documentation Project Primer
for New Contributors (<link
- xlink:href="&url.books.fdp-primer;">http://www.freebsd.org/doc/en_US.ISO8859-1/books/fdp-primer/</link>).</para>
+ xlink:href="&url.books.fdp-primer;">http://www.freebsd.org/doc/en_US.ISO8859-1/books/fdp-primer/</link>).</para>
<sect2 xml:id="updating-installed-documentation">
<title>Updating Documentation from Source</title>
@@ -1034,8 +1034,8 @@ before running "/usr/sbin/freebsd-update
<para>Synchronize with the &os.current; sources. Typically,
<link linkend="svn">svn</link> is used to check out the
-CURRENT code from the <literal>head</literal> branch of
- one of the Subversion mirror
- sites listed in <xref linkend="svn-mirrors"/>.</para>
+ one of the Subversion mirror sites listed in
+ <xref linkend="svn-mirrors"/>.</para>
<para>Users with very slow or limited Internet connectivity
can instead use CTM as described in <xref linkend="ctm"/>,
@@ -1673,24 +1673,24 @@ Script started, output file is /var/tmp/
<sect2 xml:id="mergemaster">
<info>
- <title>Merging Configuration Files</title>
+ <title>Merging Configuration Files</title>
- <authorgroup>
- <author>
- <personname>
- <firstname>Tom</firstname>
- <surname>Rhodes</surname>
- </personname>
- <contrib>Contributed by </contrib>
- </author>
- </authorgroup>
- </info>
-
- <indexterm>
- <primary>
- <command>mergemaster</command>
- </primary>
- </indexterm>
+ <authorgroup>
+ <author>
+ <personname>
+ <firstname>Tom</firstname>
+ <surname>Rhodes</surname>
+ </personname>
+ <contrib>Contributed by </contrib>
+ </author>
+ </authorgroup>
+ </info>
+
+ <indexterm>
+ <primary>
+ <command>mergemaster</command>
+ </primary>
+ </indexterm>
<para>&os; provides the &man.mergemaster.8; Bourne script to aid
in determining the differences between the configuration files
Modified: head/en_US.ISO8859-1/books/handbook/desktop/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/desktop/chapter.xml Sun Apr 3 16:40:49 2016 (r48528)
+++ head/en_US.ISO8859-1/books/handbook/desktop/chapter.xml Sun Apr 3 18:57:15 2016 (r48529)
@@ -35,9 +35,9 @@
<note>
<para>Users who prefer to install a pre-built desktop version
of FreeBSD rather than configuring one from scratch should
- refer to the <link
- xlink:href="http://www.pcbsd.org/">pcbsd.org
- website.</link></para>
+ refer to the
+ <link xlink:href="http://www.pcbsd.org/">pcbsd.org
+ website.</link></para>
</note>
<para>Readers of this chapter should know how to:</para>
@@ -49,8 +49,8 @@
</listitem>
<listitem>
- <para>Install X and a window manager as described in <xref
- linkend="x11"/>.</para>
+ <para>Install X and a window manager as described in
+ <xref linkend="x11"/>.</para>
</listitem>
</itemizedlist>
@@ -400,25 +400,25 @@
<filename>/usr/local/bin/chromium</filename>.</para>
</note>
- <sect3 xml:id="chromium-java-plugin">
- <title>Chromium and &java; Plugin</title>
+ <sect3 xml:id="chromium-java-plugin">
+ <title>Chromium and &java; Plugin</title>
- <para>The installation of
- <application>Chromium</application> does not include &java;
- support. To install &java; plugin support, follow the
- instructions in <xref linkend="moz-java-plugin"/>.</para>
-
- <para>Once &java; support is installed, start
- <application>Chromium</application> and enter
- <literal>about:plugins</literal> in the address bar.
- IcedTea-Web should be listed as one of the installed
- plugins.</para>
-
- <para>If <application>Chromium</application> does not display
- the IcedTea-Web plugin, run the following commands and
- restart the web browser:</para>
+ <para>The installation of
+ <application>Chromium</application> does not include &java;
+ support. To install &java; plugin support, follow the
+ instructions in <xref linkend="moz-java-plugin"/>.</para>
+
+ <para>Once &java; support is installed, start
+ <application>Chromium</application> and enter
+ <literal>about:plugins</literal> in the address bar.
+ IcedTea-Web should be listed as one of the installed
+ plugins.</para>
+
+ <para>If <application>Chromium</application> does not display
+ the IcedTea-Web plugin, run the following commands and
+ restart the web browser:</para>
- <screen>&prompt.root; <userinput>mkdir -p /usr/local/share/chromium/plugins
+ <screen>&prompt.root; <userinput>mkdir -p /usr/local/share/chromium/plugins
&prompt.root; ln -s /usr/local/lib/IcedTeaPlugin.so \
/usr/local/share/chromium/plugins/</userinput></screen>
</sect3>
Modified: head/en_US.ISO8859-1/books/handbook/disks/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/disks/chapter.xml Sun Apr 3 16:40:49 2016 (r48528)
+++ head/en_US.ISO8859-1/books/handbook/disks/chapter.xml Sun Apr 3 18:57:15 2016 (r48529)
@@ -515,12 +515,12 @@ da0: <STECH Simple Drive 1.04> s/n
<title>Automounting Removable Media</title>
<note>
- <para>&man.autofs.5; supports automatic mounting of
+ <para>&man.autofs.5; supports automatic mounting of
removable media starting with &os; 10.2-RELEASE.</para>
</note>
<para><acronym>USB</acronym> devices can be automatically
- mounted by uncommenting this line in
+ mounted by uncommenting this line in
<filename>/etc/auto_master</filename>:</para>
<screen>/media -media -nosuid</screen>
@@ -536,18 +536,18 @@ da0: <STECH Simple Drive 1.04> s/n
</screen>
<para>Reload the configuration if &man.autofs.5;
- and &man.devd.8; are already running:</para>
+ and &man.devd.8; are already running:</para>
<screen>&prompt.root; <userinput>service automount reload</userinput>
&prompt.root; <userinput>service devd restart</userinput></screen>
<para>&man.autofs.5; can be set to start at boot by adding this
- line to <filename>/etc/rc.conf</filename>:</para>
+ line to <filename>/etc/rc.conf</filename>:</para>
<programlisting>autofs_enable="YES"</programlisting>
<para>&man.autofs.5; requires &man.devd.8; to be enabled, as it
- is by default.</para>
+ is by default.</para>
<para>Start the services immediately with:</para>
@@ -557,18 +557,18 @@ da0: <STECH Simple Drive 1.04> s/n
&prompt.root; <userinput>service devd start</userinput></screen>
<para>Each file system that can be automatically mounted appears
- as a directory in <filename>/media/</filename>. The directory
+ as a directory in <filename>/media/</filename>. The directory
is named after the file system label. If the label is
missing, the directory is named after the device node.</para>
<para>The file system is transparently mounted on the first
- access, and unmounted after a period of inactivity.
+ access, and unmounted after a period of inactivity.
Automounted drives can also be unmounted manually:</para>
<screen>&prompt.root; <userinput>automount -fu</userinput></screen>
<para>This mechanism is typically used for memory cards and
- <acronym>USB</acronym> memory sticks. It can be used with
+ <acronym>USB</acronym> memory sticks. It can be used with
any block device, including optical drives or
<acronym>iSCSI</acronym> <acronym>LUN</acronym>s.</para>
</sect2>
Modified: head/en_US.ISO8859-1/books/handbook/filesystems/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/filesystems/chapter.xml Sun Apr 3 16:40:49 2016 (r48528)
+++ head/en_US.ISO8859-1/books/handbook/filesystems/chapter.xml Sun Apr 3 18:57:15 2016 (r48529)
@@ -70,8 +70,8 @@
<itemizedlist>
<listitem>
- <para>Understand &unix; and <link
- linkend="basics">&os; basics</link>.</para>
+ <para>Understand &unix; and
+ <link linkend="basics">&os; basics</link>.</para>
</listitem>
<listitem>
Modified: head/en_US.ISO8859-1/books/handbook/introduction/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/introduction/chapter.xml Sun Apr 3 16:40:49 2016 (r48528)
+++ head/en_US.ISO8859-1/books/handbook/introduction/chapter.xml Sun Apr 3 18:57:15 2016 (r48529)
@@ -67,9 +67,9 @@
and &itanium;), AMD64, Sun &ultrasparc; computers. Ports to
other architectures are also under way. You can also read about
<link linkend="history">the history of &os;</link>, or the
- <link xlink:href="&url.base;/releases">current release</link>. If you are
- interested in contributing something to the Project (code,
- hardware, funding), see the <link
+ <link xlink:href="&url.base;/releases">current release</link>.
+ If you are interested in contributing something to the Project
+ (code, hardware, funding), see the <link
xlink:href="&url.articles.contributing;/index.html">Contributing
to &os;</link> article.</para>
@@ -733,12 +733,12 @@
xlink:href="http://www.opnsense.org/">OPNSense</link>
<indexterm>
<primary>OPNsense</primary>
- </indexterm> - OPNsense is an open source, easy-to-use and
- easy-to-build FreeBSD based firewall and routing platform.
- OPNsense includes most of the features available in expensive
- commercial firewalls, and more in many cases. It brings the
- rich feature set of commercial offerings with the benefits of
- open and verifiable sources.</para>
+ </indexterm> - OPNsense is an open source, easy-to-use and
+ easy-to-build FreeBSD based firewall and routing platform.
+ OPNsense includes most of the features available in
+ expensive commercial firewalls, and more in many cases.
+ It brings the rich feature set of commercial offerings
+ with the benefits of open and verifiable sources.</para>
</listitem>
<listitem>
Modified: head/en_US.ISO8859-1/books/handbook/mail/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/mail/chapter.xml Sun Apr 3 16:40:49 2016 (r48528)
+++ head/en_US.ISO8859-1/books/handbook/mail/chapter.xml Sun Apr 3 18:57:15 2016 (r48529)
@@ -284,12 +284,17 @@ FreeBSD.org mail is handled by 10 mx1.Fr
<sect1 xml:id="sendmail">
<info>
- <title><application>Sendmail</application> Configuration
- Files</title>
+ <title><application>Sendmail</application> Configuration
+ Files</title>
<authorgroup>
- <author><personname><firstname>Christopher</firstname><surname>Shumway</surname></personname><contrib>Contributed
- by </contrib></author>
+ <author>
+ <personname>
+ <firstname>Christopher</firstname>
+ <surname>Shumway</surname>
+ </personname>
+ <contrib>Contributed by </contrib>
+ </author>
</authorgroup>
</info>
@@ -553,7 +558,7 @@ other.isp.example.net
users-isp.example.org
www.example.org</programlisting>
- <para>After creating or editing this file, restart
+ <para>After creating or editing this file, restart
<application>Sendmail</application> with
<command>service sendmail restart</command>.</para>
@@ -569,16 +574,26 @@ www.example.org</programlisting>
<sect1 xml:id="mail-changingmta">
<info>
- <title>Changing the Mail Transfer Agent</title>
+ <title>Changing the Mail Transfer Agent</title>
<authorgroup>
- <author><personname><firstname>Andrew</firstname><surname>Boothman</surname></personname><contrib>Written
- by </contrib></author>
+ <author>
+ <personname>
+ <firstname>Andrew</firstname>
+ <surname>Boothman</surname>
+ </personname>
+ <contrib>Written by </contrib>
+ </author>
</authorgroup>
+
<authorgroup>
- <author><personname><firstname>Gregory</firstname><surname>Neil
- Shapiro</surname></personname><contrib>Information taken
- from emails written by </contrib></author>
+ <author>
+ <personname>
+ <firstname>Gregory</firstname>
+ <surname>Neil Shapiro</surname>
+ </personname>
+ <contrib>Information taken from emails written by </contrib>
+ </author>
</authorgroup>
</info>
@@ -798,65 +813,67 @@ purgestat /usr/libexec/sendmail/se
</answer>
</qandaentry>
- <qandaentry>
- <question>
- <para>How can I run a mail server on a dial-up PPP
- host?</para>
- </question>
-
- <answer>
- <para>Connect to a &os; mail gateway on the LAN. The PPP
- connection is non-dedicated.</para>
-
- <para>One way to do this is to get a full-time Internet server
- to provide secondary <acronym>MX</acronym><indexterm>
- <primary>MX record</primary></indexterm> services for the
- domain. In this example, the domain is <systemitem
- class="fqdomainname">example.com</systemitem> and the ISP
- has configured <systemitem
- class="fqdomainname">example.net</systemitem> to provide
- secondary <acronym>MX</acronym> services to the
- domain:</para>
+ <qandaentry>
+ <question>
+ <para>How can I run a mail server on a dial-up PPP
+ host?</para>
+ </question>
+
+ <answer>
+ <para>Connect to a &os; mail gateway on the LAN. The PPP
+ connection is non-dedicated.</para>
+
+ <para>One way to do this is to get a full-time Internet
+ server to provide secondary
+ <acronym>MX</acronym>
+ <indexterm><primary>MX record</primary></indexterm>
+ services for the domain. In this example, the domain is
+ <systemitem class="fqdomainname">example.com</systemitem>
+ and the ISP has configured
+ <systemitem class="fqdomainname">example.net</systemitem>
+ to provide secondary <acronym>MX</acronym> services to the
+ domain:</para>
- <programlisting>example.com. MX 10 example.com.
+ <programlisting>example.com. MX 10 example.com.
MX 20 example.net.</programlisting>
- <para>Only one host should be specified as the final
- recipient. For <application>Sendmail</application>, add
- <literal>Cw example.com</literal> in
- <filename>/etc/mail/sendmail.cf</filename> on <systemitem
- class="fqdomainname">example.com</systemitem>.</para>
-
- <para>When the sending <acronym>MTA</acronym> attempts
- to deliver mail, it will try to connect to the system,
- <systemitem class="fqdomainname">example.com</systemitem>,
- over the PPP link. This will time out if the destination is
- offline. The <acronym>MTA</acronym> will automatically
- deliver it to the secondary <acronym>MX</acronym> site at
- the Internet Service Provider (<acronym>ISP</acronym>),
- <systemitem class="fqdomainname">example.net</systemitem>.
- The secondary <acronym>MX</acronym> site will periodically
- try to connect to the primary <acronym>MX</acronym> host,
- <systemitem
- class="fqdomainname">example.com</systemitem>.</para>
+ <para>Only one host should be specified as the final
+ recipient. For <application>Sendmail</application>, add
+ <literal>Cw example.com</literal> in
+ <filename>/etc/mail/sendmail.cf</filename> on <systemitem
+ class="fqdomainname">example.com</systemitem>.</para>
+
+ <para>When the sending <acronym>MTA</acronym> attempts
+ to deliver mail, it will try to connect to the system,
+ <systemitem class="fqdomainname">example.com</systemitem>,
+ over the PPP link. This will time out if the destination
+ is offline. The <acronym>MTA</acronym> will automatically
+ deliver it to the secondary <acronym>MX</acronym> site at
+ the Internet Service Provider (<acronym>ISP</acronym>),
+ <systemitem class="fqdomainname">example.net</systemitem>.
+ The secondary <acronym>MX</acronym> site will periodically
+ try to connect to the primary <acronym>MX</acronym> host,
+ <systemitem
+ class="fqdomainname">example.com</systemitem>.</para>
- <para>Use something like this as a login script:</para>
+ <para>Use something like this as a login script:</para>
- <programlisting>#!/bin/sh
+ <programlisting>#!/bin/sh
# Put me in /usr/local/bin/pppmyisp
( sleep 60 ; /usr/sbin/sendmail -q ) &
/usr/sbin/ppp -direct pppmyisp</programlisting>
- <para>When creating a separate login script for users, instead
- use <command>sendmail -qRexample.com</command> in the script
- above. This will force all mail in the queue for
- <systemitem class="fqdomainname">example.com</systemitem> to
- be processed immediately.</para>
+ <para>When creating a separate login script for users,
+ instead use <command>sendmail -qRexample.com</command> in
+ the script above. This will force all mail in the queue
+ for
+ <systemitem class="fqdomainname">example.com</systemitem>
+ to be processed immediately.</para>
- <para>A further refinement of the situation can be seen from
- this example from the &a.isp;:</para>
+ <para>A further refinement of the situation can be seen from
+ this example from the &a.isp;:</para>
- <programlisting>> we provide the secondary MX for a customer. The customer connects to
+ <programlisting>> we provide the secondary MX for a customer. The customer connects to
> our services several times a day automatically to get the mails to
> his primary MX (We do not call his site when a mail for his domains
> arrived). Our sendmail sends the mailqueue every 30 minutes. At the
@@ -952,9 +969,9 @@ example.FreeBSD.org
&prompt.root; <userinput>host example.FreeBSD.org</userinput>
example.FreeBSD.org has address 204.216.27.XX</screen>
- <para>In this example, mail sent directly to <email
- role="nolink">yourlogin at example.FreeBSD.org</email> should
- work without problems, assuming
+ <para>In this example, mail sent directly to
+ <email role="nolink">yourlogin at example.FreeBSD.org</email>
+ should work without problems, assuming
<application>Sendmail</application> is running correctly on
<systemitem
class="fqdomainname">example.FreeBSD.org</systemitem>.</para>
@@ -1073,11 +1090,16 @@ freefall MX 20 who.cdrom.com</programli
<sect1 xml:id="outgoing-only">
<info>
- <title>Setting Up to Send Only</title>
+ <title>Setting Up to Send Only</title>
<authorgroup>
- <author><personname><firstname>Bill</firstname><surname>Moran</surname></personname><contrib>Contributed
- by </contrib></author>
+ <author>
+ <personname>
+ <firstname>Bill</firstname>
+ <surname>Moran</surname>
+ </personname>
+ <contrib>Contributed by </contrib>
+ </author>
</authorgroup>
</info>
@@ -1237,11 +1259,16 @@ define(`confDELIVERY_MODE',`deferred')dn
<sect1 xml:id="SMTP-Auth">
<info>
- <title>SMTP Authentication</title>
+ <title>SMTP Authentication</title>
<authorgroup>
- <author><personname><firstname>James</firstname><surname>Gorham</surname></personname><contrib>Written
- by </contrib></author>
+ <author>
+ <personname>
+ <firstname>James</firstname>
+ <surname>Gorham</surname>
+ </personname>
+ <contrib>Written by </contrib>
+ </author>
</authorgroup>
</info>
@@ -1373,11 +1400,16 @@ define(`confAUTH_MECHANISMS', `GSSAPI DI
<sect1 xml:id="mail-agents">
<info>
- <title>Mail User Agents</title>
+ <title>Mail User Agents</title>
<authorgroup>
- <author><personname><firstname>Marc</firstname><surname>Silver</surname></personname><contrib>Contributed
- by </contrib></author>
+ <author>
+ <personname>
+ <firstname>Marc</firstname>
+ <surname>Silver</surname>
+ </personname>
+ <contrib>Contributed by </contrib>
+ </author>
</authorgroup>
</info>
@@ -1729,11 +1761,16 @@ EOT</screen>
<sect1 xml:id="mail-fetchmail">
<info>
- <title>Using <application>fetchmail</application></title>
+ <title>Using <application>fetchmail</application></title>
<authorgroup>
- <author><personname><firstname>Marc</firstname><surname>Silver</surname></personname><contrib>Contributed
- by </contrib></author>
+ <author>
+ <personname>
+ <firstname>Marc</firstname>
+ <surname>Silver</surname>
+ </personname>
+ <contrib>Contributed by </contrib>
+ </author>
</authorgroup>
</info>
@@ -1789,9 +1826,9 @@ EOT</screen>
<para>The following <filename>.fetchmailrc</filename> serves as an
example for downloading a single user mailbox using
<acronym>POP</acronym>. It tells
- <application>fetchmail</application> to connect to <systemitem
- class="fqdomainname">example.com</systemitem> using a
- username of <systemitem class="username">joesoap</systemitem>
+ <application>fetchmail</application> to connect to
+ <systemitem class="fqdomainname">example.com</systemitem> using
+ a username of <systemitem class="username">joesoap</systemitem>
and a password of <literal>XXX</literal>. This example assumes
that the user <systemitem class="username">joesoap</systemitem>
exists on the local system.</para>
@@ -1825,11 +1862,16 @@ user "john", with password "XXXXX", is "
<sect1 xml:id="mail-procmail">
<info>
- <title>Using <application>procmail</application></title>
+ <title>Using <application>procmail</application></title>
<authorgroup>
- <author><personname><firstname>Marc</firstname><surname>Silver</surname></personname><contrib>Contributed
- by </contrib></author>
+ <author>
+ <personname>
+ <firstname>Marc</firstname>
+ <surname>Silver</surname>
+ </personname>
+ <contrib>Contributed by </contrib>
+ </author>
</authorgroup>
</info>
Modified: head/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml Sun Apr 3 16:40:49 2016 (r48528)
+++ head/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml Sun Apr 3 18:57:15 2016 (r48529)
@@ -13,9 +13,9 @@
<authorgroup>
<author>
- <personname>
- <firstname>Ross</firstname>
- <surname>Lippert</surname>
+ <personname>
+ <firstname>Ross</firstname>
+ <surname>Lippert</surname>
</personname>
<contrib>Edited by </contrib>
</author>
@@ -96,22 +96,23 @@
<sect1 xml:id="sound-setup">
<info>
- <title>Setting Up the Sound Card</title>
+ <title>Setting Up the Sound Card</title>
<authorgroup>
<author>
- <personname>
- <firstname>Moses</firstname>
- <surname>Moore</surname>
- </personname>
- <contrib>Contributed by </contrib> <!-- in November 2000-->
+ <personname>
+ <firstname>Moses</firstname>
+ <surname>Moore</surname>
+ </personname>
+ <contrib>Contributed by </contrib> <!-- in November 2000-->
</author>
</authorgroup>
+
<authorgroup>
<author>
- <personname>
- <firstname>Marc</firstname>
- <surname>Fonvieille</surname>
+ <personname>
+ <firstname>Marc</firstname>
+ <surname>Fonvieille</surname>
</personname>
<contrib>Enhanced by </contrib> <!--in September 2004-->
</author>
@@ -387,107 +388,105 @@ pcm7: <HDA Realtek ALC889 PCM #3 Digi
<filename>/etc/sysctl.conf</filename>:</para>
<programlisting>hw.snd.default_unit=<replaceable>4</replaceable></programlisting>
- </sect2>
-
- <sect2 xml:id="sound-multiple-sources">
- <info>
- <title>Utilizing Multiple Sound Sources</title>
-
- <authorgroup>
- <author>
- <personname>
- <firstname>Munish</firstname>
- <surname>Chopra</surname>
- </personname>
- <contrib>Contributed by </contrib>
- </author>
- </authorgroup>
- </info>
+ </sect2>
- <para>It is often desirable to have multiple sources of sound that
- are able to play simultaneously. &os; uses <quote>Virtual
- Sound Channels</quote> to multiplex the sound card's playback
- by mixing sound in the kernel.</para>
+ <sect2 xml:id="sound-multiple-sources">
+ <info>
+ <title>Utilizing Multiple Sound Sources</title>
+
+ <authorgroup>
+ <author>
+ <personname>
+ <firstname>Munish</firstname>
+ <surname>Chopra</surname>
+ </personname>
+ <contrib>Contributed by </contrib>
+ </author>
+ </authorgroup>
+ </info>
+
+ <para>It is often desirable to have multiple sources of sound
+ that are able to play simultaneously. &os; uses
+ <quote>Virtual Sound Channels</quote> to multiplex the sound
+ card's playback by mixing sound in the kernel.</para>
- <para>Three &man.sysctl.8; knobs are available for configuring
- virtual channels:</para>
+ <para>Three &man.sysctl.8; knobs are available for configuring
+ virtual channels:</para>
- <screen>&prompt.root; <userinput>sysctl dev.pcm.0.play.vchans=4</userinput>
+ <screen>&prompt.root; <userinput>sysctl dev.pcm.0.play.vchans=4</userinput>
&prompt.root; <userinput>sysctl dev.pcm.0.rec.vchans=4</userinput>
&prompt.root; <userinput>sysctl hw.snd.maxautovchans=4</userinput></screen>
- <para>This example allocates four virtual channels, which is a
- practical number for everyday use. Both
- <varname>dev.pcm.0.play.vchans=4</varname> and
- <varname>dev.pcm.0.rec.vchans=4</varname> are configurable after
- a device has been attached and represent the number of virtual
- channels <filename>pcm0</filename> has for playback and
- recording. Since the <filename>pcm</filename> module can be
- loaded independently of the hardware drivers,
- <varname>hw.snd.maxautovchans</varname> indicates how many
- virtual channels will be given to an audio device when it is
- attached. Refer to &man.pcm.4; for more information.</para>
-
- <note>
- <para>The number of virtual channels for a device cannot be
- changed while it is in use. First, close any programs using
- the device, such as music players or sound daemons.</para>
- </note>
-
- <para>
- The correct <filename>pcm</filename> device will
- automatically be allocated transparently to a program that
- requests <filename>/dev/dsp0</filename>.</para>
- </sect2>
+ <para>This example allocates four virtual channels, which is a
+ practical number for everyday use. Both
+ <varname>dev.pcm.0.play.vchans=4</varname> and
+ <varname>dev.pcm.0.rec.vchans=4</varname> are configurable
+ after a device has been attached and represent the number of
+ virtual channels <filename>pcm0</filename> has for playback
+ and recording. Since the <filename>pcm</filename> module can
+ be loaded independently of the hardware drivers,
+ <varname>hw.snd.maxautovchans</varname> indicates how many
+ virtual channels will be given to an audio device when it is
+ attached. Refer to &man.pcm.4; for more information.</para>
+
+ <note>
+ <para>The number of virtual channels for a device cannot be
+ changed while it is in use. First, close any programs using
+ the device, such as music players or sound daemons.</para>
+ </note>
+
+ <para>The correct <filename>pcm</filename> device will
+ automatically be allocated transparently to a program that
+ requests <filename>/dev/dsp0</filename>.</para>
+ </sect2>
+
+ <sect2>
+ <info>
+ <title>Setting Default Values for Mixer Channels</title>
+
+ <authorgroup>
+ <author>
+ <personname>
+ <firstname>Josef</firstname>
+ <surname>El-Rayes</surname>
+ </personname>
+ <contrib>Contributed by </contrib>
+ </author>
+ </authorgroup>
+ </info>
+
+ <para>The default values for the different mixer channels are
+ hardcoded in the source code of the &man.pcm.4; driver. While
+ sound card mixer levels can be changed using &man.mixer.8; or
+ third-party applications and daemons, this is not a permanent
+ solution. To instead set default mixer values at the driver
+ level, define the appropriate values in
+ <filename>/boot/device.hints</filename>, as seen in this
+ example:</para>
+
+ <programlisting>hint.pcm.0.vol="50"</programlisting>
+
+ <para>This will set the volume channel to a default value of
+ <literal>50</literal> when the &man.pcm.4; module is
+ loaded.</para>
+ </sect2>
+ </sect1>
- <sect2>
+ <sect1 xml:id="sound-mp3">
<info>
- <title>Setting Default Values for Mixer Channels</title>
+ <title>MP3 Audio</title>
<authorgroup>
<author>
- <personname>
- <firstname>Josef</firstname>
- <surname>El-Rayes</surname>
- </personname>
- <contrib>Contributed by </contrib>
+ <personname>
+ <firstname>Chern</firstname>
+ <surname>Lee</surname>
+ </personname>
+ <contrib>Contributed by </contrib> <!--in Sept 2001-->
</author>
</authorgroup>
</info>
-
- <para>The default values for the different mixer channels are
- hardcoded in the source code of the &man.pcm.4; driver. While
- sound card mixer levels can be changed using &man.mixer.8; or
- third-party applications and daemons, this is not a permanent
- solution. To instead set default mixer values at the driver
- level, define the appropriate values in
- <filename>/boot/device.hints</filename>, as seen in this
- example:</para>
-
- <programlisting>hint.pcm.0.vol="50"</programlisting>
-
- <para>This will set the volume channel to a default value of
- <literal>50</literal> when the &man.pcm.4; module is
- loaded.</para>
- </sect2>
-</sect1>
-
-<sect1 xml:id="sound-mp3">
- <info>
- <title>MP3 Audio</title>
-
- <authorgroup>
- <author>
- <personname>
- <firstname>Chern</firstname>
- <surname>Lee</surname>
- </personname>
- <contrib>Contributed by </contrib> <!--in Sept 2001-->
- </author>
- </authorgroup>
- </info>
-
<para>This section describes some <acronym>MP3</acronym>
players available for &os;, how to rip audio
<acronym>CD</acronym> tracks, and how to encode and decode
@@ -540,16 +539,16 @@ MPEG 1.0 layer III, 128 kbit/s, 44100 Hz
<acronym>CD</acronym>s.</para>
<para>With the audio <acronym>CD</acronym> in the drive, the
- following command can be issued as <systemitem
- class="username">root</systemitem> to rip an entire
- <acronym>CD</acronym> into individual, per track,
+ following command can be issued as
+ <systemitem class="username">root</systemitem> to rip an
+ entire <acronym>CD</acronym> into individual, per track,
<acronym>WAV</acronym> files:</para>
<screen>&prompt.root; <userinput>cdda2wav -D <replaceable>0,1,0</replaceable> -B</userinput></screen>
- <para>In this example, the <option>-D
- <replaceable>0,1,0</replaceable></option> indicates the
- <acronym>SCSI</acronym> device <filename>0,1,0</filename>
+ <para>In this example, the
+ <option>-D <replaceable>0,1,0</replaceable></option> indicates
+ the <acronym>SCSI</acronym> device <filename>0,1,0</filename>
containing the <acronym>CD</acronym> to rip. Use
<command>cdrecord -scanbus</command> to determine the correct
device parameters for the system.</para>
@@ -580,8 +579,7 @@ MPEG 1.0 layer III, 128 kbit/s, 44100 Hz
<sect2 xml:id="mp3-encoding">
<title>Encoding and Decoding MP3s</title>
- <para>
- <application>Lame</application> is a popular
+ <para><application>Lame</application> is a popular
<acronym>MP3</acronym> encoder which can be installed from the
<package>audio/lame</package> port. Due to patent issues, a
package is not available.</para>
@@ -598,12 +596,13 @@ MPEG 1.0 layer III, 128 kbit/s, 44100 Hz
<acronym>MP3</acronym> bitrate while the 160 and 192 bitrates
provide higher quality. The higher the bitrate, the larger
the size of the resulting <acronym>MP3</acronym>. The
- <option>-h</option> turns on the <quote>higher quality but a
- little slower</quote> mode. The options beginning with
- <option>--t</option> indicate <acronym>ID3</acronym> tags,
- which usually contain song information, to be embedded within
- the <acronym>MP3</acronym> file. Additional encoding options
- can be found in the <application>lame</application> manual
+ <option>-h</option> turns on the
+ <quote>higher quality but a little slower</quote>
+ mode. The options beginning with <option>--t</option>
+ indicate <acronym>ID3</acronym> tags, which usually contain
+ song information, to be embedded within the
+ <acronym>MP3</acronym> file. Additional encoding options can
+ be found in the <application>lame</application> manual
page.</para>
<para>In order to burn an audio <acronym>CD</acronym> from
@@ -695,13 +694,13 @@ MPEG 1.0 layer III, 128 kbit/s, 44100 Hz
<sect1 xml:id="video-playback">
<info>
- <title>Video Playback</title>
+ <title>Video Playback</title>
<authorgroup>
<author>
- <personname>
- <firstname>Ross</firstname>
- <surname>Lippert</surname>
+ <personname>
+ <firstname>Ross</firstname>
+ <surname>Lippert</surname>
</personname>
<contrib>Contributed by </contrib> <!--in June 2002-->
</author>
@@ -1152,27 +1151,28 @@ zoom=yes</programlisting>
<sect1 xml:id="tvcard">
<info>
- <title>TV Cards</title>
+ <title>TV Cards</title>
- <authorgroup>
- <author>
- <personname>
- <firstname>Josef</firstname>
- <surname>El-Rayes</surname>
- </personname>
- <contrib>Original contribution by </contrib>
- </author>
- </authorgroup>
- <authorgroup>
- <author>
- <personname>
- <firstname>Marc</firstname>
- <surname>Fonvieille</surname>
- </personname>
- <contrib>Enhanced and adapted by </contrib> <!-- in January 2004-->
- </author>
- </authorgroup>
- </info>
+ <authorgroup>
+ <author>
+ <personname>
+ <firstname>Josef</firstname>
+ <surname>El-Rayes</surname>
+ </personname>
+ <contrib>Original contribution by </contrib>
+ </author>
+ </authorgroup>
+
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-doc-all
mailing list