svn commit: r46049 - in head/en_US.ISO8859-1/books/handbook: basics config eresources filesystems firewalls l10n mail mirrors multimedia network-servers ppp-and-slip preface security serialcomms x11
Benedict Reuschling
bcr at FreeBSD.org
Tue Dec 2 12:00:37 UTC 2014
Author: bcr
Date: Tue Dec 2 12:00:32 2014
New Revision: 46049
URL: https://svnweb.freebsd.org/changeset/doc/46049
Log:
Make a big sweep for overlong lines in the handbook and fix them.
Translators can ignore this.
Obtained from: igor(8) output
Modified:
head/en_US.ISO8859-1/books/handbook/basics/chapter.xml
head/en_US.ISO8859-1/books/handbook/config/chapter.xml
head/en_US.ISO8859-1/books/handbook/eresources/chapter.xml
head/en_US.ISO8859-1/books/handbook/filesystems/chapter.xml
head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml
head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml
head/en_US.ISO8859-1/books/handbook/mail/chapter.xml
head/en_US.ISO8859-1/books/handbook/mirrors/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/ppp-and-slip/chapter.xml
head/en_US.ISO8859-1/books/handbook/preface/preface.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/x11/chapter.xml
Modified: head/en_US.ISO8859-1/books/handbook/basics/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/basics/chapter.xml Tue Dec 2 11:56:06 2014 (r46048)
+++ head/en_US.ISO8859-1/books/handbook/basics/chapter.xml Tue Dec 2 12:00:32 2014 (r46049)
@@ -3421,8 +3421,8 @@ Swap: 2048M Total, 2048M Free
<primary>Free Software Foundation</primary>
</indexterm>
- <para>&os; includes several applications and utilities produced by
- the Free Software Foundation (FSF). In addition to manual
+ <para>&os; includes several applications and utilities produced
+ by the Free Software Foundation (FSF). In addition to manual
pages, these programs may include hypertext documents called
<literal>info</literal> files. These can be viewed using
&man.info.1; or, if <package>editors/emacs</package> is
Modified: head/en_US.ISO8859-1/books/handbook/config/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/config/chapter.xml Tue Dec 2 11:56:06 2014 (r46048)
+++ head/en_US.ISO8859-1/books/handbook/config/chapter.xml Tue Dec 2 12:00:32 2014 (r46049)
@@ -2768,7 +2768,8 @@ kern.maxvnodes: 100000</screen>
a custom kernel.</para>
<example xml:id="swapfile-10-and-later">
- <title>Creating a Swap File on &os; 10.<replaceable>X</replaceable> and Later</title>
+ <title>Creating a Swap File on
+ &os; 10.<replaceable>X</replaceable> and Later</title>
<procedure>
<step>
@@ -2804,7 +2805,8 @@ kern.maxvnodes: 100000</screen>
</example>
<example xml:id="swapfile-9-and-earlier">
- <title>Creating a Swap File on &os; 9.<replaceable>X</replaceable> and Earlier</title>
+ <title>Creating a Swap File on
+ &os; 9.<replaceable>X</replaceable> and Earlier</title>
<procedure>
<step>
Modified: head/en_US.ISO8859-1/books/handbook/eresources/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/eresources/chapter.xml Tue Dec 2 11:56:06 2014 (r46048)
+++ head/en_US.ISO8859-1/books/handbook/eresources/chapter.xml Tue Dec 2 12:00:32 2014 (r46049)
@@ -284,8 +284,9 @@
<row>
<entry>&a.enlightenment.name;</entry>
- <entry>Porting <application>Enlightenment</application> and
- <application>Enlightenment</application> applications</entry>
+ <entry>Porting <application>Enlightenment</application>
+ and <application>Enlightenment</application>
+ applications</entry>
</row>
<row>
@@ -1075,8 +1076,8 @@
<para>This is the mailing list for reporting bugs in &os;.
Whenever possible, bugs should be submitted using the
- &man.send-pr.1; command or the
- <link xlink:href="https://bugs.freebsd.org/bugzilla/enter_bug.cgi">WEB
+ &man.send-pr.1; command or the <link
+ xlink:href="https://bugs.freebsd.org/bugzilla/enter_bug.cgi">WEB
interface</link> to it.</para>
</listitem>
</varlistentry>
@@ -1269,9 +1270,10 @@
<para><emphasis>Enlightenment</emphasis></para>
<para>Discussions concerning the
- <application>Enlightenment</application> Desktop Environment
- for &os; systems. This is a technical mailing list
- for which strictly technical content is expected.</para>
+ <application>Enlightenment</application> Desktop
+ Environment for &os; systems. This is a technical
+ mailing list for which strictly technical content is
+ expected.</para>
</listitem>
</varlistentry>
Modified: head/en_US.ISO8859-1/books/handbook/filesystems/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/filesystems/chapter.xml Tue Dec 2 11:56:06 2014 (r46048)
+++ head/en_US.ISO8859-1/books/handbook/filesystems/chapter.xml Tue Dec 2 12:00:32 2014 (r46049)
@@ -24,13 +24,13 @@
</indexterm>
<para>File systems are an integral part of any operating system.
- They allow users to upload and store files, provide access
- to data, and make hard drives useful. Different operating
- systems differ in their native file system. Traditionally, the
- native &os; file system has been the Unix File System
+ They allow users to upload and store files, provide access to
+ data, and make hard drives useful. Different operating systems
+ differ in their native file system. Traditionally, the native
+ &os; file system has been the Unix File System
<acronym>UFS</acronym> which has been modernized as
- <acronym>UFS2</acronym>. Since &os; 7.0, the Z File
- System (<acronym>ZFS</acronym>) is also available as a native file
+ <acronym>UFS2</acronym>. Since &os; 7.0, the Z File System
+ (<acronym>ZFS</acronym>) is also available as a native file
system. See <xref linkend="zfs"/> for more information.</para>
<para>In addition to its native file systems, &os; supports a
Modified: head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml Tue Dec 2 11:56:06 2014 (r46048)
+++ head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml Tue Dec 2 12:00:32 2014 (r46049)
@@ -1702,8 +1702,9 @@ options IPDIVERT # enables NAT</pro
firewall rules.</para>
</listitem>
<listitem>
- <para><filename><replaceable>filename</replaceable></filename>: full path of the file
- containing the firewall ruleset.</para>
+ <para><filename><replaceable>filename</replaceable></filename>:
+ full path of the file containing the firewall
+ ruleset.</para>
</listitem>
</itemizedlist>
Modified: head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml Tue Dec 2 11:56:06 2014 (r46048)
+++ head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml Tue Dec 2 12:00:32 2014 (r46049)
@@ -322,7 +322,8 @@ me:\
new users or specified for an individual user.</para>
<para>If all new users use the same language, set
- <literal>defaultclass = <replaceable>language</replaceable></literal> in
+ <literal>defaultclass =
+ <replaceable>language</replaceable></literal> in
<filename>/etc/adduser.conf</filename>.</para>
<para>To override this setting when creating a user, either
Modified: head/en_US.ISO8859-1/books/handbook/mail/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/mail/chapter.xml Tue Dec 2 11:56:06 2014 (r46048)
+++ head/en_US.ISO8859-1/books/handbook/mail/chapter.xml Tue Dec 2 12:00:32 2014 (r46049)
@@ -532,13 +532,14 @@ postmaster at example.com postmast
<listitem>
<para>In a default &os; installation,
<application>Sendmail</application> is configured to only
- send mail from the host it is running on. For example,
- if a <acronym>POP</acronym> server is available, users
- will be able to check mail from remote locations but they
- will not be able to send outgoing emails from outside
+ send mail from the host it is running on. For example, if
+ a <acronym>POP</acronym> server is available, users will
+ be able to check mail from remote locations but they will
+ not be able to send outgoing emails from outside
locations. Typically, a few moments after the attempt, an
email will be sent from <literal>MAILER-DAEMON</literal>
- with a <errorname>5.7 Relaying Denied</errorname> message.</para>
+ with a <errorname>5.7 Relaying Denied</errorname>
+ message.</para>
<para>The most straightforward solution is to add the
<acronym>ISP</acronym>'s <acronym>FQDN</acronym> to
Modified: head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml Tue Dec 2 11:56:06 2014 (r46048)
+++ head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml Tue Dec 2 12:00:32 2014 (r46049)
@@ -722,9 +722,9 @@ Comment out for now until these can be v
middle</quote> attack) or otherwise trying to send bad
content to the end user.</para>
- <para xml:id="svn-mirrors-fingerprint">On the first connection to an <acronym>HTTPS</acronym>
- mirror, the user will be asked to verify the server
- <emphasis>fingerprint</emphasis>:</para>
+ <para xml:id="svn-mirrors-fingerprint">On the first connection
+ to an <acronym>HTTPS</acronym> mirror, the user will be asked
+ to verify the server <emphasis>fingerprint</emphasis>:</para>
<screen>Error validating server certificate for 'https://svn0.us-west.freebsd.org:443':
- The certificate is not issued by a trusted authority. Use the
Modified: head/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml Tue Dec 2 11:56:06 2014 (r46048)
+++ head/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml Tue Dec 2 12:00:32 2014 (r46049)
@@ -680,10 +680,10 @@ MPEG 1.0 layer III, 128 kbit/s, 44100 Hz
</procedure>
<para>Both the <acronym>WAV</acronym> and <acronym>PCM</acronym>
- formats can be used with <application>cdrecord</application>. When using
- <acronym>WAV</acronym> files, there will be a small tick sound
- at the beginning of each track. This sound is the header of
- the <acronym>WAV</acronym> file. The
+ formats can be used with <application>cdrecord</application>.
+ When using <acronym>WAV</acronym> files, there will be a small
+ tick sound at the beginning of each track. This sound is the
+ header of the <acronym>WAV</acronym> file. The
<package>audio/sox</package> port or package can be used to
remove the header:</para>
Modified: head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml Tue Dec 2 11:56:06 2014 (r46048)
+++ head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml Tue Dec 2 12:00:32 2014 (r46049)
@@ -930,9 +930,9 @@ Exports list on foobar:
with other SVR4 automounters, such as the ones in Solaris,
MacOS X, and Linux.</para>
- <para>The &man.autofs.5; virtual filesystem is mounted on specified
- mountpoints by &man.automount.8;, usually invoked during
- boot.</para>
+ <para>The &man.autofs.5; virtual filesystem is mounted on
+ specified mountpoints by &man.automount.8;, usually invoked
+ during boot.</para>
<para>Whenever a process attempts to access file within the
&man.autofs.5; mountpoint, the kernel will notify
Modified: head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml Tue Dec 2 11:56:06 2014 (r46048)
+++ head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml Tue Dec 2 12:00:32 2014 (r46049)
@@ -168,8 +168,9 @@
<listitem>
<para>The subnet mask. If the <acronym>ISP</acronym> has not
- provided one, <systemitem class="netmask">255.255.255.255</systemitem> will be used in
- the &man.ppp.8; configuration file.</para>
+ provided one, <systemitem
+ class="netmask">255.255.255.255</systemitem> will be used
+ in the &man.ppp.8; configuration file.</para>
</listitem>
<listitem>
@@ -189,7 +190,8 @@
for common <acronym>PPP</acronym> connection scenarios. The
required configuration file is
<filename>/etc/ppp/ppp.conf</filename> and additional files and
- examples are available in <filename>/usr/share/examples/ppp/</filename>.</para>
+ examples are available in
+ <filename>/usr/share/examples/ppp/</filename>.</para>
<note>
<para>Throughout this section, many of the file examples
@@ -277,8 +279,9 @@
<listitem>
<para>Identifies the device to which the modem is
connected, where <filename>COM1</filename> is
- <filename>/dev/cuau0</filename>
- and <filename>COM2</filename> is <filename>/dev/cuau1</filename>.</para>
+ <filename>/dev/cuau0</filename> and
+ <filename>COM2</filename> is
+ <filename>/dev/cuau1</filename>.</para>
</listitem>
</varlistentry>
@@ -410,7 +413,8 @@
gateway. If the <acronym>ISP</acronym> has only
provided a static <acronym>IP</acronym> address
without a gateway address, replace
- <replaceable>y.y.y.y</replaceable> with <systemitem class="netmask">10.0.0.2/0</systemitem>.</para>
+ <replaceable>y.y.y.y</replaceable> with <systemitem
+ class="netmask">10.0.0.2/0</systemitem>.</para>
<para>If the <acronym>IP</acronym> address changes
whenever a connection is made, change this line to
@@ -465,8 +469,8 @@
<para>By default, the <command>ppp</command> command must be
run as the <systemitem class="username">root</systemitem>
user. To change this default, add the account of the user
- who should run <command>ppp</command> to the
- <systemitem class="groupname">network</systemitem> group in
+ who should run <command>ppp</command> to the <systemitem
+ class="groupname">network</systemitem> group in
<filename>/etc/group</filename>.</para>
<para>Then, give the user access to one or more entries in
@@ -991,22 +995,23 @@ ifconfig_tun0=</programlisting>
<acronym>PPP</acronym> streams, allowing clients
scriptless access to the server.</para>
- <para>Refer to <link xlink:href="http://mgetty.greenie.net/doc/mgetty_toc.html">http://mgetty.greenie.net/doc/mgetty_toc.html</link>
- for more
- information on <command>mgetty</command>.</para>
-
- <para>By default the <package>comms/mgetty+sendfax</package> port
- comes with the <literal>AUTO_PPP</literal> option enabled
- allowing <command>mgetty</command> to detect the LCP
- phase of <acronym>PPP</acronym> connections and
+ <para>Refer to <link
+ xlink:href="http://mgetty.greenie.net/doc/mgetty_toc.html">http://mgetty.greenie.net/doc/mgetty_toc.html</link>
+ for more information on <command>mgetty</command>.</para>
+
+ <para>By default the <package>comms/mgetty+sendfax</package>
+ port comes with the <literal>AUTO_PPP</literal> option
+ enabled allowing <command>mgetty</command> to detect the
+ LCP phase of <acronym>PPP</acronym> connections and
automatically spawn off a ppp shell. However, since the
default login/password sequence does not occur it is
necessary to authenticate users using either PAP or
CHAP.</para>
<para>This section assumes the user has successfully
- compiled, and installed the <package>comms/mgetty+sendfax</package> port on
- his system.</para>
+ compiled, and installed the
+ <package>comms/mgetty+sendfax</package> port on his
+ system.</para>
<para>Ensure that
<filename>/usr/local/etc/mgetty+sendfax/login.config</filename>
@@ -1213,13 +1218,14 @@ OK
<para>If everything went good we should now have an active
connection to the Internet, which could be thrown into the
- background using <keycombo action="simul"><keycap>CTRL</keycap>
- <keycap>z</keycap></keycombo> If
- <command>PPP</command> returns to <command>ppp</command> then
- the connection has bee lost. This is good to know because it
- shows the connection status. Capital P's represent a
- connection to the <acronym>ISP</acronym> and lowercase p's
- show that the connection has been lost.</para>
+ background using <keycombo
+ action="simul"><keycap>CTRL</keycap>
+ <keycap>z</keycap></keycombo> If <command>PPP</command>
+ returns to <command>ppp</command> then the connection has bee
+ lost. This is good to know because it shows the connection
+ status. Capital P's represent a connection to the
+ <acronym>ISP</acronym> and lowercase p's show that the
+ connection has been lost.</para>
</sect2>
<sect2>
@@ -1337,7 +1343,8 @@ name_of_service_provider:
set login
add default HISADDR</programlisting>
- <para>As <systemitem class="username">root</systemitem>, run:</para>
+ <para>As <systemitem class="username">root</systemitem>,
+ run:</para>
<screen>&prompt.root; <userinput>ppp -ddial name_of_service_provider</userinput></screen>
@@ -1360,10 +1367,11 @@ ppp_profile="name_of_service_provider"</
<para>Any required service tag information should be in the
documentation provided by the <acronym>ISP</acronym>.</para>
- <para>As a last resort, one could try installing the <package>net/rr-pppoe</package> package or port.
- Bear in mind however, this may de-program your modem and
- render it useless, so think twice before doing it. Simply
- install the program shipped with the modem. Then, access the
+ <para>As a last resort, one could try installing the
+ <package>net/rr-pppoe</package> package or port. Bear in mind
+ however, this may de-program your modem and render it useless,
+ so think twice before doing it. Simply install the program
+ shipped with the modem. Then, access the
<guimenu>System</guimenu> menu from the program. The name of
the profile should be listed there. It is usually
<emphasis>ISP</emphasis>.</para>
@@ -1382,9 +1390,9 @@ ppp_profile="name_of_service_provider"</
<para>Do not forget to change <replaceable>ISP</replaceable> to
the profile.</para>
- <para>For additional information, refer to <link xlink:href="http://renaud.waldura.com/doc/freebsd/pppoe/">Cheaper
- Broadband with &os; on DSL</link> by Renaud
- Waldura.</para>
+ <para>For additional information, refer to <link
+ xlink:href="http://renaud.waldura.com/doc/freebsd/pppoe/">Cheaper
+ Broadband with &os; on DSL</link> by Renaud Waldura.</para>
</sect2>
<sect2 xml:id="ppp-3com">
@@ -1394,7 +1402,8 @@ ppp_profile="name_of_service_provider"</
Modem Dual Link</title>
<para>This modem does not follow the PPPoE specification defined
- in <link xlink:href="http://www.faqs.org/rfcs/rfc2516.html">RFC
+ in <link
+ xlink:href="http://www.faqs.org/rfcs/rfc2516.html">RFC
2516</link>.</para>
<para>In order to make &os; capable of communicating with this
@@ -1409,9 +1418,10 @@ ppp_profile="name_of_service_provider"</
<screen>&prompt.root; <userinput>sysctl net.graph.nonstandard_pppoe=1</userinput></screen>
<para>Unfortunately, because this is a system-wide setting, it
- is not possible to talk to a normal PPPoE client or server
- and a &tm.3com; <trademark class="registered">HomeConnect</trademark> ADSL Modem at
- the same time.</para>
+ is not possible to talk to a normal PPPoE client or server and
+ a &tm.3com; <trademark
+ class="registered">HomeConnect</trademark> ADSL Modem at the
+ same time.</para>
</sect2>
</sect1>
@@ -1489,16 +1499,17 @@ ppp_profile="adsl"</programlisting>
<para>The <application>mpd</application> application can be used
to connect to a variety of services, in particular PPTP
- services. It can be installed using the <package>net/mpd5</package> package or port. Many
- ADSL modems require that a PPTP tunnel is created between the
- modem and computer.</para>
+ services. It can be installed using the
+ <package>net/mpd5</package> package or port. Many ADSL modems
+ require that a PPTP tunnel is created between the modem and
+ computer.</para>
<para>Once installed, configure <application>mpd</application>
to suit the provider's settings. The port places a set of
sample configuration files which are well documented in
- <filename>/usr/local/etc/mpd/</filename>.
- A complete guide to configure <application>mpd</application>
- is available in HTML format in <filename>/usr/ports/share/doc/mpd/</filename>.
+ <filename>/usr/local/etc/mpd/</filename>. A complete guide to
+ configure <application>mpd</application> is available in HTML
+ format in <filename>/usr/ports/share/doc/mpd/</filename>.
Here is a sample configuration for connecting to an ADSL
service with <application>mpd</application>. The configuration
is spread over two files, first the
@@ -1563,7 +1574,8 @@ adsl:
</callout>
<callout arearefs="co-mpd-ex-peer">
<para>The <acronym>IP</acronym> address of the ADSL modem.
- The Alcatel &speedtouch; Home defaults to <systemitem class="ipaddress">10.0.0.138</systemitem>.</para>
+ The Alcatel &speedtouch; Home defaults to <systemitem
+ class="ipaddress">10.0.0.138</systemitem>.</para>
</callout>
</calloutlist>
@@ -1629,9 +1641,9 @@ ng0: flags=88d1<UP,POINTOPOINT,RUNNIN
session to the DSL router. Ethernet DSL modems have a
preconfigured LAN <acronym>IP</acronym> address to connect to.
In the case of the Alcatel &speedtouch; Home, this address is
- <systemitem class="ipaddress">10.0.0.138</systemitem>. The router's
- documentation should list the address the device uses. To
- open the tunnel and start a <acronym>PPP</acronym>
+ <systemitem class="ipaddress">10.0.0.138</systemitem>. The
+ router's documentation should list the address the device
+ uses. To open the tunnel and start a <acronym>PPP</acronym>
session:</para>
<screen>&prompt.root; <userinput>pptp <replaceable>address</replaceable> <replaceable>adsl</replaceable></userinput></screen>
Modified: head/en_US.ISO8859-1/books/handbook/preface/preface.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/preface/preface.xml Tue Dec 2 11:56:06 2014 (r46048)
+++ head/en_US.ISO8859-1/books/handbook/preface/preface.xml Tue Dec 2 12:00:32 2014 (r46049)
@@ -101,8 +101,8 @@
</listitem>
<listitem>
- <para>A troubleshooting section has been added to <xref linkend="ppp-and-slip"/>.</para>
- </listitem>
+ <para>A troubleshooting section has been added to <xref
+ linkend="ppp-and-slip"/>.</para> </listitem>
<listitem>
<para><xref linkend="mail"/> has been expanded with new
@@ -118,7 +118,8 @@
the <application>Apache HTTP Server</application>,
<application>ftpd</application>, and setting up a server for
µsoft; &windows; clients with
- <application>Samba</application>. Some sections from <xref linkend="advanced-networking"/> were moved here to improve
+ <application>Samba</application>. Some sections from <xref
+ linkend="advanced-networking"/> were moved here to improve
the presentation.</para>
</listitem>
@@ -141,8 +142,8 @@
</listitem>
</itemizedlist>
- <bridgehead xml:id="preface-changes" renderas="sect1">Changes from the
- First Edition (2001)</bridgehead>
+ <bridgehead xml:id="preface-changes" renderas="sect1">Changes from
+ the First Edition (2001)</bridgehead>
<para>The second edition was the culmination of over two years of
work by the dedicated members of the &os; Documentation Project.
@@ -210,8 +211,8 @@
updated.</para>
</listitem>
<listitem>
- <para>Many new sections have been added to <xref linkend="advanced-networking"/>.</para>
- </listitem>
+ <para>Many new sections have been added to <xref
+ linkend="advanced-networking"/>.</para> </listitem>
<listitem>
<para><xref linkend="mail"/> has been expanded to include more
information about configuring
@@ -237,8 +238,8 @@
</listitem>
</itemizedlist>
- <bridgehead xml:id="preface-overview" renderas="sect1">Organization of
- This Book</bridgehead>
+ <bridgehead xml:id="preface-overview"
+ renderas="sect1">Organization of This Book</bridgehead>
<para>This book is split into five logically distinct sections.
The first section, <emphasis>Getting Started</emphasis>, covers
@@ -307,9 +308,9 @@
<varlistentry>
<term><emphasis><xref linkend="x11"/></emphasis></term>
<listitem>
- <para>Describes the X Window System in general and using
- X11 on &os; in particular. Also describes common
- desktop environments such as <application>KDE</application> and
+ <para>Describes the X Window System in general and using X11
+ on &os; in particular. Also describes common desktop
+ environments such as <application>KDE</application> and
<application>GNOME</application>.</para>
</listitem>
</varlistentry>
@@ -362,8 +363,8 @@
<!-- Part III - System Administration -->
<varlistentry>
- <term><emphasis><xref linkend="config-tuning"/></emphasis></term>
- <listitem>
+ <term><emphasis><xref
+ linkend="config-tuning"/></emphasis></term> <listitem>
<para>Describes the parameters available for system
administrators to tune a &os; system for optimum
performance. Also describes the various configuration files
@@ -433,8 +434,8 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><emphasis><xref linkend="virtualization"/></emphasis></term>
- <listitem>
+ <term><emphasis><xref
+ linkend="virtualization"/></emphasis></term> <listitem>
<para>Describes what virtualization systems offer, and how
they can be used with &os;.</para>
</listitem>
@@ -448,7 +449,8 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><emphasis><xref linkend="updating-upgrading"/></emphasis></term>
+ <term><emphasis><xref
+ linkend="updating-upgrading"/></emphasis></term>
<listitem>
<para>Explains the differences between &os;-STABLE,
&os;-CURRENT, and &os; releases. Describes which users
@@ -495,8 +497,8 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><emphasis><xref linkend="network-servers"/></emphasis></term>
- <listitem>
+ <term><emphasis><xref
+ linkend="network-servers"/></emphasis></term> <listitem>
<para>Provides detailed instructions and example configuration
files to set up your &os; machine as a network filesystem
server, domain name server, network information system
@@ -512,7 +514,8 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><emphasis><xref linkend="advanced-networking"/></emphasis></term>
+ <term><emphasis><xref
+ linkend="advanced-networking"/></emphasis></term>
<listitem>
<para>Describes many networking topics, including sharing an
Internet connection with other computers on your LAN,
@@ -563,8 +566,8 @@
<para>To provide a consistent and easy to read text, several
conventions are followed throughout the book.</para>
- <bridgehead xml:id="preface-conv-typographic" renderas="sect2">Typographic
- Conventions</bridgehead>
+ <bridgehead xml:id="preface-conv-typographic"
+ renderas="sect2">Typographic Conventions</bridgehead>
<variablelist>
<varlistentry>
@@ -594,7 +597,8 @@
</variablelist>
<!-- Var list -->
- <bridgehead xml:id="preface-conv-commands" renderas="sect2">User Input</bridgehead>
+ <bridgehead xml:id="preface-conv-commands" renderas="sect2">User
+ Input</bridgehead>
<para>Keys are shown in <keycap>bold</keycap> to stand out from
other text. Key combinations that are meant to be typed
@@ -629,7 +633,8 @@
keys simultaneously.</para>
<!-- How to type in key stokes, etc.. -->
- <bridgehead xml:id="preface-conv-examples" renderas="sect2">Examples</bridgehead>
+ <bridgehead xml:id="preface-conv-examples"
+ renderas="sect2">Examples</bridgehead>
<para>Examples starting with <filename>C:\></filename>
indicate a &ms-dos; command. Unless otherwise noted, these
@@ -654,7 +659,8 @@
<screen>&prompt.user; <userinput>top</userinput></screen>
- <bridgehead xml:id="preface-acknowledgements" renderas="sect1">Acknowledgments</bridgehead>
+ <bridgehead xml:id="preface-acknowledgements"
+ renderas="sect1">Acknowledgments</bridgehead>
<para>The book you are holding represents the efforts of many
hundreds of people around the world. Whether they sent in fixes
@@ -664,16 +670,17 @@
<para>Several companies have supported the development of this
document by paying authors to work on it full-time, paying for
publication, etc. In particular, BSDi (subsequently acquired by
- <link xlink:href="http://www.windriver.com">Wind River Systems</link>)
- paid members of the &os; Documentation Project to work on
- improving this book full time leading up to the publication of the
- first printed edition in March 2000 (ISBN 1-57176-241-8). Wind
- River Systems then paid several additional authors to make a
- number of improvements to the print-output infrastructure and
- to add additional chapters to the text. This work culminated in
- the publication of the second printed edition in November 2001
- (ISBN 1-57176-303-1). In 2003-2004, <link xlink:href="http://www.freebsdmall.com">&os; Mall, Inc</link>, paid
- several contributors to improve the Handbook in preparation for
- the third printed edition.</para>
+ <link xlink:href="http://www.windriver.com">Wind River
+ Systems</link>) paid members of the &os; Documentation Project
+ to work on improving this book full time leading up to the
+ publication of the first printed edition in March 2000 (ISBN
+ 1-57176-241-8). Wind River Systems then paid several additional
+ authors to make a number of improvements to the print-output
+ infrastructure and to add additional chapters to the text. This
+ work culminated in the publication of the second printed edition
+ in November 2001 (ISBN 1-57176-303-1). In 2003-2004, <link
+ xlink:href="http://www.freebsdmall.com">&os; Mall, Inc</link>,
+ paid several contributors to improve the Handbook in preparation
+ for the third printed edition.</para>
</preface>
Modified: head/en_US.ISO8859-1/books/handbook/security/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/security/chapter.xml Tue Dec 2 11:56:06 2014 (r46048)
+++ head/en_US.ISO8859-1/books/handbook/security/chapter.xml Tue Dec 2 12:00:32 2014 (r46049)
@@ -1968,10 +1968,10 @@ Email Address []:<userinput><replaceable
information on certificate installation.</para>
</note>
- <para>In &os; 10.0-RELEASE and above, it is possible to create
- a self-signed certificate for <application>Sendmail</application>
- automatically. To enable this, add the
- following lines to
+ <para>In &os; 10.0-RELEASE and above, it is possible to create a
+ self-signed certificate for
+ <application>Sendmail</application> automatically. To enable
+ this, add the following lines to
<filename>/etc/rc.conf</filename>:</para>
<programlisting>sendmail_enable="YES"
Modified: head/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml Tue Dec 2 11:56:06 2014 (r46048)
+++ head/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml Tue Dec 2 12:00:32 2014 (r46049)
@@ -1391,13 +1391,12 @@ AT&B2&W</programlisting>
<para>If the second column contains a <literal>d0</literal>
instead of a <literal>??</literal> and the modem has not
- accepted a call yet, this means
- that <command>getty</command> has completed its open on the
- communications port. This could indicate a problem with the
- cabling or a misconfigured modem because
- <command>getty</command> should not be able to open the
- communications port until the carrier detect signal has been asserted by
- the modem.</para>
+ accepted a call yet, this means that <command>getty</command>
+ has completed its open on the communications port. This could
+ indicate a problem with the cabling or a misconfigured modem
+ because <command>getty</command> should not be able to open
+ the communications port until the carrier detect signal has
+ been asserted by the modem.</para>
<para>If no <command>getty</command> processes are waiting to
open the port, double-check that the entry for the port is
Modified: head/en_US.ISO8859-1/books/handbook/x11/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/x11/chapter.xml Tue Dec 2 11:56:06 2014 (r46048)
+++ head/en_US.ISO8859-1/books/handbook/x11/chapter.xml Tue Dec 2 12:00:32 2014 (r46049)
@@ -397,31 +397,32 @@ dbus_enable="YES"</programlisting>
<itemizedlist>
<listitem>
- <para>Intel: as of &os; 9.3 and &os; 10.1, 3D acceleration on most
- Intel graphics, including IronLake, SandyBridge, and
- IvyBridge, is supported. Support for switching between X
- and virtual consoles is provided by &man.vt.4;.</para>
+ <para>Intel: as of &os; 9.3 and &os; 10.1, 3D
+ acceleration on most Intel graphics, including IronLake,
+ SandyBridge, and IvyBridge, is supported. Support for
+ switching between X and virtual consoles is provided by
+ &man.vt.4;.</para>
</listitem>
<listitem>
- <para>ATI/Radeon: 2D and 3D acceleration is supported on most
- Radeon cards up to the HD6000 series.</para>
+ <para>ATI/Radeon: 2D and 3D acceleration is supported on
+ most Radeon cards up to the HD6000 series.</para>
</listitem>
<listitem>
<para>NVIDIA: several NVIDIA drivers are available in the
- <filename>x11</filename> category of the Ports Collection. Install
- the driver that matches the video card.</para>
+ <filename>x11</filename> category of the Ports Collection.
+ Install the driver that matches the video card.</para>
</listitem>
<listitem>
<para>Optimus: currently there is no switching support
between the two graphics adapters provided by Optimus.
- Optimus implementations vary, and &os; will not
- be able to drive all versions of the
- hardware. Some computers provide a <acronym>BIOS</acronym>
- option to disable one of the graphics adapters or
- select a <emphasis>discrete</emphasis> mode.</para>
+ Optimus implementations vary, and &os; will not be able to
+ drive all versions of the hardware. Some computers
+ provide a <acronym>BIOS</acronym> option to disable one of
+ the graphics adapters or select a
+ <emphasis>discrete</emphasis> mode.</para>
</listitem>
</itemizedlist>
</sect2>
@@ -630,8 +631,8 @@ dbus_enable="YES"</programlisting>
<filename>/usr/local/lib/X11/fonts/TrueType</filename>) and
copy all of the &truetype; fonts into this directory. Keep in
mind that &truetype; fonts cannot be directly taken from an
- &apple; &mac;; they must be in &unix;/&ms-dos;/&windows; format
- for use by <application>&xorg;</application>. Once the
+ &apple; &mac;; they must be in &unix;/&ms-dos;/&windows;
+ format for use by <application>&xorg;</application>. Once the
files have been copied into this directory, use
<application>ttmkfdir</application> to create a
<filename>fonts.dir</filename> file, so that the X font
More information about the svn-doc-head
mailing list