svn commit: r42988 - in head/en_US.ISO8859-1/books/handbook: ppp-and-slip preface

Dru Lavigne dru at FreeBSD.org
Thu Oct 17 19:25:29 UTC 2013


Author: dru
Date: Thu Oct 17 19:25:29 2013
New Revision: 42988
URL: http://svnweb.freebsd.org/changeset/doc/42988

Log:
  Rename PPP and SLIP chapter to PPP.
  
  While in preface.xml, fix xref tags and incorrect link to the GEOM chapter.
  
  This is to be followed by a whitespace fix.

Modified:
  head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
  head/en_US.ISO8859-1/books/handbook/preface/preface.xml

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	Thu Oct 17 18:49:26 2013	(r42987)
+++ head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml	Thu Oct 17 19:25:29 2013	(r42988)
@@ -17,7 +17,7 @@
     </authorgroup>
   </chapterinfo>
 
-  <title>PPP and SLIP</title>
+  <title>PPP</title>
 
   <sect1 id="ppp-and-slip-synopsis">
     <title>Synopsis</title>

Modified: head/en_US.ISO8859-1/books/handbook/preface/preface.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/preface/preface.xml	Thu Oct 17 18:49:26 2013	(r42987)
+++ head/en_US.ISO8859-1/books/handbook/preface/preface.xml	Thu Oct 17 19:25:29 2013	(r42988)
@@ -36,32 +36,31 @@
 
   <itemizedlist>
     <listitem>
-      <para><xref linkend="dtrace"/>, &dtrace;, has been added with
+      <para><xref linkend="dtrace"/> has been added with
 	information about the powerful &dtrace; performance analysis
 	tool.</para>
     </listitem>
 
     <listitem>
-      <para><xref linkend="filesystems"/>, File Systems Support, has
+      <para><xref linkend="filesystems"/> has
 	been added with information about non-native file systems in
 	&os;, such as ZFS from &sun;.</para>
     </listitem>
 
     <listitem>
-      <para><xref linkend="audit"/>, Security Event Auditing, has
+      <para><xref linkend="audit"/> has
 	been added to cover the new auditing capabilities in &os;
 	and explain its use.</para>
     </listitem>
 
     <listitem>
-      <para><xref linkend="virtualization"/>, Virtualization, has
+      <para><xref linkend="virtualization"/> has
 	been added with information about installing &os; on
 	virtualization software.</para>
     </listitem>
 
     <listitem>
-      <para><xref linkend="bsdinstall"/>, Installing
-	&os; 9.<replaceable>x</replaceable> and Later, has been
+      <para><xref linkend="bsdinstall"/> has been
 	added to cover installation of &os; using the new
 	installation utility,
 	<application>bsdinstall</application>.</para>
@@ -79,29 +78,29 @@
 
   <itemizedlist>
     <listitem>
-      <para><xref linkend="config-tuning"/>, Configuration and
-	Tuning, has been expanded with new information about the
+      <para><xref linkend="config-tuning"/>
+	has been expanded with new information about the
 	ACPI power and resource management, the
 	<command>cron</command> system utility, and more kernel
 	tuning options.</para>
     </listitem>
 
     <listitem>
-      <para><xref linkend="security"/>, Security, has been expanded
+      <para><xref linkend="security"/> has been expanded
 	with new information about virtual private networks (VPNs),
 	file system access control lists (ACLs), and security
 	advisories.</para>
     </listitem>
 
     <listitem>
-      <para><xref linkend="mac"/>, Mandatory Access Control (MAC),
+      <para><xref linkend="mac"/>
 	is a new chapter with this edition.  It explains what MAC is
 	and how this mechanism can be used to secure a &os;
 	system.</para>
     </listitem>
 
     <listitem>
-      <para><xref linkend="disks"/>, Storage, has been expanded with
+      <para><xref linkend="disks"/> has been expanded with
 	new information about USB storage devices, file system
 	snapshots, file system quotas, file and network backed
 	filesystems, and encrypted disk partitions.</para>
@@ -109,11 +108,11 @@
 
     <listitem>
       <para>A troubleshooting section has been added to <xref
-	  linkend="ppp-and-slip"/>, PPP and SLIP.</para>
+	  linkend="ppp-and-slip"/>.</para>
     </listitem>
 
     <listitem>
-      <para><xref linkend="mail"/>, Electronic Mail, has been
+      <para><xref linkend="mail"/> has been
 	expanded with new information about using alternative
 	transport agents, SMTP authentication, UUCP,
 	<application>fetchmail</application>,
@@ -122,19 +121,19 @@
     </listitem>
 
     <listitem>
-      <para><xref linkend="network-servers"/>, Network Servers, is
+      <para><xref linkend="network-servers"/> is
 	all new with this edition.  This chapter includes
 	information about setting up 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"/>, Advanced Networking,
+	<xref linkend="advanced-networking"/>
 	were moved here to improve the presentation.</para>
     </listitem>
 
     <listitem>
-      <para><xref linkend="advanced-networking"/>, Advanced
-	Networking, has been expanded with new information about
+      <para><xref linkend="advanced-networking"/>
+	has been expanded with new information about
 	using &bluetooth; devices with &os;, setting up wireless
 	networks, and Asynchronous Transfer Mode (ATM)
 	networking.</para>
@@ -182,35 +181,35 @@
 	  <quote>Appendices</quote>.</para>
       </listitem>
       <listitem>
-	<para><xref linkend="install"/> (<quote>Installing
-	    &os;</quote>) was completely rewritten with many
+	<para><xref linkend="install"/>
+	  was completely rewritten with many
 	  screenshots to make it much easier for new users to grasp
 	  the text.</para>
       </listitem>
       <listitem>
-	<para><xref linkend="basics"/> (<quote>&unix; Basics</quote>)
+	<para><xref linkend="basics"/>
 	  has been expanded to contain additional information about
 	  processes, daemons, and signals.</para>
       </listitem>
       <listitem>
-	<para><xref linkend="ports"/> (<quote>Installing
-	    Applications</quote>) has been expanded to contain
+	<para><xref linkend="ports"/>
+	  has been expanded to contain
 	  additional information about binary package
 	  management.</para>
       </listitem>
       <listitem>
-	<para><xref linkend="x11"/> (<quote>The X Window
-	    System</quote>) has been completely rewritten with an
+	<para><xref linkend="x11"/>
+	  has been completely rewritten with an
 	  emphasis on using modern desktop technologies such as
 	  <application>KDE</application> and
 	  <application>GNOME</application> on &xfree86; 4.X.</para>
       </listitem>
       <listitem>
-	<para><xref linkend="boot"/> (<quote>The &os; Booting
-	    Process</quote>) has been expanded.</para>
+	<para><xref linkend="boot"/>
+	  has been expanded.</para>
       </listitem>
       <listitem>
-	<para><xref linkend="disks"/> (<quote>Storage</quote>) has
+	<para><xref linkend="disks"/> has
 	  been written from what used to be two separate chapters on
 	  <quote>Disks</quote> and <quote>Backups</quote>.  We feel
 	  that the topics are easier to comprehend when presented as
@@ -218,27 +217,26 @@
 	  software) has also been added.</para>
       </listitem>
       <listitem>
-	<para><xref linkend="serialcomms"/> (<quote>Serial
-	    Communications</quote>) has been completely
+	<para><xref linkend="serialcomms"/>
+	  has been completely
 	  reorganized and updated for &os; 4.X/5.X.</para>
       </listitem>
       <listitem>
-	<para><xref linkend="ppp-and-slip"/> (<quote>PPP and
-	    SLIP</quote>) has been substantially updated.</para>
+	<para><xref linkend="ppp-and-slip"/> has
+	  been substantially updated.</para>
       </listitem>
       <listitem>
 	<para>Many new sections have been added to
-	  <xref linkend="advanced-networking"/>
-	  (<quote>Advanced Networking</quote>).</para>
+	  <xref linkend="advanced-networking"/>.</para>
       </listitem>
       <listitem>
-	<para><xref linkend="mail"/> (<quote>Electronic Mail</quote>)
+	<para><xref linkend="mail"/>
 	  has been expanded to include more information about
 	  configuring <application>sendmail</application>.</para>
       </listitem>
       <listitem>
-	<para><xref linkend="linuxemu"/> (<quote>&linux;
-	    Compatibility</quote>) has been expanded to include
+	<para><xref linkend="linuxemu"/>
+	  has been expanded to include
 	  information about installing
 	  <application>&oracle;</application> and
 	  <application>&sap.r3;</application>.</para>
@@ -248,11 +246,11 @@
 	  edition:</para>
 	<itemizedlist>
 	  <listitem>
-	    <para>Configuration and Tuning (<xref
-		linkend="config-tuning"/>).</para>
+	    <para><xref
+		linkend="config-tuning"/>.</para>
 	  </listitem>
 	  <listitem>
-	    <para>Multimedia (<xref linkend="multimedia"/>)</para>
+	    <para><xref linkend="multimedia"/>.</para>
 	  </listitem>
 	</itemizedlist>
       </listitem>
@@ -284,8 +282,7 @@
 <!-- Part I - Introduction -->
 
     <varlistentry>
-      <term><emphasis><xref linkend="introduction"/>,
-	Introduction</emphasis></term>
+      <term><emphasis><xref linkend="introduction"/></emphasis></term>
       <listitem>
 	<para>Introduces &os; to a new user.  It describes the
 	  history of the &os; Project, its goals and development
@@ -293,9 +290,7 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="bsdinstall"/>, Installation of
-	&os; 9.<replaceable>x</replaceable> and
-	Later</emphasis></term>
+      <term><emphasis><xref linkend="bsdinstall"/></emphasis></term>
       <listitem>
 	<para>Walks a user through the entire installation process of
 	  &os; 9.<replaceable>x</replaceable> and later using
@@ -303,9 +298,7 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="install"/>, Installation of
-	&os; 8.<replaceable>x</replaceable> and
-	Earlier</emphasis></term>
+      <term><emphasis><xref linkend="install"/></emphasis></term>
       <listitem>
 	<para>Walks a user through the entire installation process of
 	  &os; 8.<replaceable>x</replaceable> and earlier using
@@ -315,8 +308,7 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="basics"/>, &unix;
-	Basics</emphasis></term>
+      <term><emphasis><xref linkend="basics"/></emphasis></term>
       <listitem>
 	<para>Covers the basic commands and functionality of the
 	  &os; operating system.  If you are familiar with &linux;
@@ -325,8 +317,7 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="ports"/>, Installing
-	Applications</emphasis></term>
+      <term><emphasis><xref linkend="ports"/></emphasis></term>
       <listitem>
 	<para>Covers the installation of third-party software with
 	  both &os;'s innovative <quote>Ports Collection</quote> and
@@ -334,8 +325,7 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="x11"/>, The X Window
-	System</emphasis></term>
+      <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
@@ -347,8 +337,7 @@
 <!-- Part II Common Tasks -->
 
     <varlistentry>
-      <term><emphasis><xref linkend="desktop"/>, Desktop
-	Applications</emphasis></term>
+      <term><emphasis><xref linkend="desktop"/></emphasis></term>
       <listitem>
 	<para>Lists some common desktop applications, such as web
 	  browsers and productivity suites, and describes how to
@@ -356,8 +345,7 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="multimedia"/>,
-	Multimedia</emphasis></term>
+      <term><emphasis><xref linkend="multimedia"/></emphasis></term>
       <listitem>
 	<para>Shows how to set up sound and video playback support
 	  for your system.  Also describes some sample audio and video
@@ -365,8 +353,7 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="kernelconfig"/>, Configuring
-	the &os; Kernel</emphasis></term>
+      <term><emphasis><xref linkend="kernelconfig"/></emphasis></term>
       <listitem>
 	<para>Explains why you might need to configure a new kernel
 	  and provides detailed instructions for configuring,
@@ -374,8 +361,7 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="printing"/>,
-	Printing</emphasis></term>
+      <term><emphasis><xref linkend="printing"/></emphasis></term>
       <listitem>
 	<para>Describes managing printers on &os;, including
 	  information about banner pages, printer accounting, and
@@ -383,8 +369,7 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="linuxemu"/>, &linux; Binary
-	Compatibility</emphasis></term>
+      <term><emphasis><xref linkend="linuxemu"/></emphasis></term>
       <listitem>
 	<para>Describes the &linux; compatibility features of &os;.
 	  Also provides detailed installation instructions for many
@@ -397,8 +382,7 @@
 <!-- Part III - System Administration -->
 
     <varlistentry>
-      <term><emphasis><xref linkend="config-tuning"/>, Configuration
-	and Tuning</emphasis></term>
+      <term><emphasis><xref linkend="config-tuning"/></emphasis></term>
       <listitem>
 	<para>Describes the parameters available for system
 	  administrators to tune a &os; system for optimum
@@ -407,8 +391,7 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="boot"/>, Booting
-	Process</emphasis></term>
+      <term><emphasis><xref linkend="boot"/></emphasis></term>
       <listitem>
 	<para>Describes the &os; boot process and explains
 	  how to control this process with configuration
@@ -416,8 +399,7 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="security"/>,
-	Security</emphasis></term>
+      <term><emphasis><xref linkend="security"/></emphasis></term>
       <listitem>
 	<para>Describes many different tools available to help keep
 	  your &os; system secure, including Kerberos, IPsec and
@@ -425,15 +407,14 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="jails"/>, Jails</emphasis></term>
+      <term><emphasis><xref linkend="jails"/></emphasis></term>
       <listitem>
 	<para>Describes the jails framework, and the improvements of
 	  jails over the traditional chroot support of &os;.</para>
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="mac"/>, Mandatory Access
-	Control</emphasis></term>
+      <term><emphasis><xref linkend="mac"/></emphasis></term>
       <listitem>
 	<para>Explains what Mandatory Access Control (MAC) is and
 	  how this mechanism can be used to secure a &os;
@@ -441,8 +422,7 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="audit"/>, Security Event
-	Auditing</emphasis></term>
+      <term><emphasis><xref linkend="audit"/></emphasis></term>
       <listitem>
 	<para>Describes what &os; Event Auditing is, how it can be
 	  installed, configured, and how audit trails can be inspected
@@ -451,8 +431,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term><emphasis><xref linkend="disks"/>,
-	Storage</emphasis></term>
+      <term><emphasis><xref linkend="disks"/></emphasis></term>
       <listitem>
 	<para>Describes how to manage storage media and filesystems
 	  with &os;.  This includes physical disks, RAID arrays,
@@ -461,32 +440,28 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="geom-synopsis"/>,
-	GEOM</emphasis></term>
+      <term><emphasis><xref linkend="geom"/></emphasis></term>
       <listitem>
 	<para>Describes what the GEOM framework in &os; is and how
 	  to configure various supported RAID levels.</para>
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="filesystems"/>, File Systems
-	Support</emphasis></term>
+      <term><emphasis><xref linkend="filesystems"/></emphasis></term>
       <listitem>
 	<para>Examines support of non-native file systems in &os;,
 	  like the Z File System from &sun;.</para>
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="virtualization"/>,
-	Virtualization</emphasis></term>
+      <term><emphasis><xref linkend="virtualization"/></emphasis></term>
       <listitem>
 	<para>Describes what virtualization systems offer, and how
 	  they can be used with &os;.</para>
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="l10n"/>,
-	Localization</emphasis></term>
+      <term><emphasis><xref linkend="l10n"/></emphasis></term>
       <listitem>
 	<para>Describes how to use &os; in languages other than
 	  English.  Covers both system and application level
@@ -494,8 +469,7 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="updating-upgrading"/>, Updating
-	and Upgrading &os;</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
@@ -506,8 +480,7 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="dtrace"/>,
-	  &dtrace;</emphasis></term>
+      <term><emphasis><xref linkend="dtrace"/></emphasis></term>
       <listitem>
 	<para>Describes how to configure and use the &dtrace; tool
 	  from &sun; in &os;.  Dynamic tracing can help locate
@@ -519,8 +492,7 @@
 <!-- Part IV - Network Communications -->
 
     <varlistentry>
-      <term><emphasis><xref linkend="serialcomms"/>, Serial
-	Communications</emphasis></term>
+      <term><emphasis><xref linkend="serialcomms"/></emphasis></term>
       <listitem>
 	<para>Explains how to connect terminals and modems to your
 	  &os; system for both dial in and dial out
@@ -528,16 +500,14 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="ppp-and-slip"/>, PPP and
-	SLIP</emphasis></term>
+      <term><emphasis><xref linkend="ppp-and-slip"/></emphasis></term>
       <listitem>
-	<para>Describes how to use PPP, SLIP, or PPP over Ethernet to
+	<para>Describes how to use PPP to
 	  connect to remote systems with &os;.</para>
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="mail"/>, Electronic
-	Mail</emphasis></term>
+      <term><emphasis><xref linkend="mail"/></emphasis></term>
       <listitem>
 	<para>Explains the different components of an email server
 	  and dives into simple configuration topics for the most
@@ -546,8 +516,7 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="network-servers"/>, Network
-	Servers</emphasis></term>
+      <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
@@ -556,8 +525,7 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="firewalls"/>,
-	Firewalls</emphasis></term>
+      <term><emphasis><xref linkend="firewalls"/></emphasis></term>
       <listitem>
 	<para>Explains the philosophy behind software-based firewalls
 	  and provides detailed information about the configuration
@@ -565,8 +533,7 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="advanced-networking"/>, 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,
@@ -578,8 +545,7 @@
 <!-- Part V - Appendices -->
 
     <varlistentry>
-      <term><emphasis><xref linkend="mirrors"/>, Obtaining &os;
-	</emphasis></term>
+      <term><emphasis><xref linkend="mirrors"/></emphasis></term>
       <listitem>
 	<para>Lists different sources for obtaining &os; media on
 	  CDROM or DVD as well as different sites on the Internet
@@ -587,8 +553,7 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="bibliography"/>,
-	  Bibliography</emphasis></term>
+      <term><emphasis><xref linkend="bibliography"/></emphasis></term>
       <listitem>
 	<para>This book touches on many different subjects that may
 	  leave you hungry for a more detailed explanation.  The
@@ -597,8 +562,7 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="eresources"/>, Resources on the
-	Internet</emphasis></term>
+      <term><emphasis><xref linkend="eresources"/></emphasis></term>
       <listitem>
 	<para>Describes the many forums available for &os; users to
 	  post questions and engage in technical conversations about
@@ -606,8 +570,7 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="pgpkeys"/>, PGP
-	Keys</emphasis></term>
+      <term><emphasis><xref linkend="pgpkeys"/></emphasis></term>
       <listitem>
 	<para>Lists the PGP fingerprints of several &os;
 	  Developers.</para>


More information about the svn-doc-all mailing list