Index: head/en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml
===================================================================
--- head/en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml	(revision 52525)
+++ head/en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml	(revision 52526)
@@ -1,170 +1,169 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
      (SGML HTML, PDF, PostScript, RTF and so forth) with or without
      modification, are permitted provided that the following conditions
      are met:
 
       1. Redistributions of source code (SGML DocBook) must retain the above
          copyright notice, this list of conditions and the following
          disclaimer as the first lines of this file unmodified.
 
       2. Redistributions in compiled form (transformed to other DTDs,
          converted to PDF, PostScript, RTF and other formats) must reproduce
          the above copyright notice, this list of conditions and the
          following disclaimer in the documentation and/or other materials
          provided with the distribution.
 
      THIS DOCUMENTATION IS PROVIDED BY NIK CLAYTON "AS IS" AND ANY EXPRESS OR
      IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
      OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
      DISCLAIMED. IN NO EVENT SHALL NIK CLAYTON BE LIABLE FOR ANY DIRECT,
      INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
      (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
      SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
      HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
      STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
      ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE
      POSSIBILITY OF SUCH DAMAGE.
 
 -->
 <chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="psgml-mode">
   <title>Using <literal>sgml-mode</literal> with
     <application>Emacs</application></title>
 
-  <para>Recent versions of <application>Emacs</application> or
-    <application>XEmacs</application> (available from the Ports
-    Collection) contain a very useful package called PSGML (can be
-    installed from <package>editors/psgml</package>).
+  <para>Recent versions of <application>Emacs</application> (available
+    from the Ports Collection) contain a very useful package called
+    PSGML (can be installed from <package>editors/psgml</package>).
     Automatically invoked when a file with the
     <filename>.xml</filename> extension is loaded, or by typing
     <command>M-x sgml-mode</command>, it is a major mode for dealing
     with SGML files, elements and attributes.</para>
 
   <para>An understanding of some of the commands provided by this mode
     can make working with SGML documents such as the Handbook much
     easier.</para>
 
   <variablelist>
     <varlistentry>
       <term><command>C-c C-e</command></term>
 
       <listitem>
 	<para>Runs <function>sgml-insert-element</function>.  You will
 	  be prompted for the name of the element to insert at the
 	  current point.  You can use the <keycap>Tab</keycap> key to
 	  complete the element.  Elements that are not valid at the
 	  current point will be disallowed.</para>
 
 	<para>The start and end tags for the element will be inserted.
 	  If the element contains other, mandatory, elements then
 	  these will be inserted as well.</para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
       <term><command>C-c =</command></term>
 
       <listitem>
 	<para>Runs <function>sgml-change-element-name</function>.
 	  Place the point within an element and run this command.  You
 	  will be prompted for the name of the element to change to.
 	  Both the start and end tags of the current element will be
 	  changed to the new element.</para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
       <term><command>C-c C-r</command></term>
 
       <listitem>
 	<para>Runs <function>sgml-tag-region</function>. Select some
 	  text (move to start of text, <command>C-space</command>,
 	  move to end of text, <command>C-space</command>) and then
 	  run this command.  You will be prompted for the element to
 	  use.  This element will then be inserted immediately before
 	  and after your marked region.</para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
       <term><command>C-c -</command></term>
 
       <listitem>
 	<para>Runs <function>sgml-untag-element</function>.  Place the
 	  point within the start or end tag of an element you want to
 	  remove, and run this command.  The element's start and end
 	  tags will be removed.</para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
       <term><command>C-c C-q</command></term>
 
       <listitem>
 	<para>Runs <function>sgml-fill-element</function>.  Will
 	  recursively fill (i.e., reformat) content from the current
 	  element in.  The filling <emphasis>will</emphasis> affect
 	  content in which whitespace is significant, such as within
 	  <tag>programlisting</tag> elements, so run this
 	  command with care.</para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
       <term><command>C-c C-a</command></term>
 
       <listitem>
 	<para>Runs <function>sgml-edit-attributes</function>.  Opens a
 	  second buffer containing a list of all the attributes for
 	  the closest enclosing element, and their current values.
 	  Use <keycap>Tab</keycap> to navigate between attributes,
 	  <command>C-k</command> to remove an existing value and
 	  replace it with a new one, <command>C-c C-c</command> to
 	  close this buffer and return to the main document.</para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
       <term><command>C-c C-v</command></term>
 
       <listitem>
 	<para>Runs <function>sgml-validate</function>. Prompts you to
 	  save the current document (if necessary) and then runs an
 	  SGML validator.  The output from the validator is captured
 	  into a new buffer, and you can then navigate from one
 	  troublespot to the next, fixing markup errors as you
 	  go.</para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
       <term><command>C-c /</command></term>
 
       <listitem>
 	<para>Runs <function>sgml-insert-end-tag</function>.  Inserts
 	  the end tag for the current open element.</para>
       </listitem>
     </varlistentry>
   </variablelist>
 
   <para>Doubtless there are other useful functions of this mode, but
     those are the ones I use most often.</para>
 
   <para>You can also use the following entries in
     <filename>.emacs</filename> to set proper spacing, indentation,
     and column width for working with the Documentation
     Project.</para>
 
   <programlisting>    (defun local-sgml-mode-hook
       (setq fill-column 70
             indent-tabs-mode nil
             next-line-add-newlines nil
             standard-indent 4
             sgml-indent-data t)
       (auto-fill-mode t)
       (setq sgml-catalog-files '("/usr/local/share/xml/catalog")))
     (add-hook 'psgml-mode-hook
       '(lambda () (local-psgml-mode-hook)))</programlisting>
 </chapter>
Index: head/en_US.ISO8859-1/books/fdp-primer/tools/chapter.xml
===================================================================
--- head/en_US.ISO8859-1/books/fdp-primer/tools/chapter.xml	(revision 52525)
+++ head/en_US.ISO8859-1/books/fdp-primer/tools/chapter.xml	(revision 52526)
@@ -1,143 +1,141 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
      (SGML, HTML, PDF, PostScript, RTF and so forth) with or without
      modification, are permitted provided that the following conditions
      are met:
 
       1. Redistributions of source code (SGML DocBook) must retain the above
          copyright notice, this list of conditions and the following
          disclaimer as the first lines of this file unmodified.
 
       2. Redistributions in compiled form (transformed to other DTDs,
          converted to PDF, PostScript, RTF and other formats) must reproduce
          the above copyright notice, this list of conditions and the
          following disclaimer in the documentation and/or other materials
          provided with the distribution.
 
      THIS DOCUMENTATION IS PROVIDED BY NIK CLAYTON "AS IS" AND ANY EXPRESS OR
      IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
      OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
      DISCLAIMED. IN NO EVENT SHALL NIK CLAYTON BE LIABLE FOR ANY DIRECT,
      INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
      (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
      SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
      HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
      STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
      ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE
      POSSIBILITY OF SUCH DAMAGE.
 
 -->
 <chapter xmlns="http://docbook.org/ns/docbook"
   xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
   xml:id="tools">
   <title>Tools</title>
 
   <para>Several software tools are used to manage the FreeBSD
     documentation and render it to different output formats.  Some of
     these tools are required and must be installed before working
     through the examples in the following chapters.  Some are
     optional, adding capabilities or making the job of creating
     documentation less demanding.</para>
 
   <sect1 xml:id="tools-required">
     <title>Required Tools</title>
 
     <para>Install
       <package>textproc/docproj</package> from the
       Ports Collection.  This <emphasis>meta-port</emphasis> installs
       all the applications required to do useful work with the &os;
       documentation.  Some further notes on particular components are
       given below.</para>
 
     <sect2 xml:id="tools-required-dtd-entities">
       <title><acronym>DTD</acronym>s and
 	<acronym>Entities</acronym></title>
 
       <para>&os; documentation uses several Document Type Definitions
 	(<acronym>DTD</acronym>s) and sets of <acronym>XML</acronym>
 	entities.  These are all installed by the
 	<package>textproc/docproj</package>
 	port.</para>
 
       <variablelist>
 	<varlistentry>
 	  <term><acronym>XHTML</acronym> <acronym>DTD</acronym>
 	    (<package>textproc/xhtml</package>)</term>
 
 	  <listitem>
 	    <para><acronym>XHTML</acronym> is the markup language of
 	      choice for the World Wide Web, and is used throughout
 	      the &os; web site.</para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry>
 	  <term>DocBook <acronym>DTD</acronym>
 	    (<package>textproc/docbook-xml</package>)</term>
 
 	  <listitem>
 	    <para>DocBook is designed for marking up technical
 	      documentation.  Most of the &os; documentation is
 	      written in DocBook.</para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry>
 	  <term>ISO 8879 entities
 	    (<package>textproc/iso8879</package>)</term>
 
 	  <listitem>
 	    <para>Character entities from the ISO 8879:1986 standard
 	      used by many <acronym>DTD</acronym>s.  Includes named
 	      mathematical symbols, additional characters in the Latin
 	      character set (accents, diacriticals, and so on), and
 	      Greek symbols.</para>
 	  </listitem>
 	</varlistentry>
       </variablelist>
     </sect2>
   </sect1>
 
   <sect1 xml:id="tools-optional">
     <title>Optional Tools</title>
 
     <para>These applications are not required, but can make working on
       the documentation easier or add capabilities.</para>
 
     <sect2 xml:id="tools-optional-software">
       <title>Software</title>
 
       <variablelist>
 
 	<varlistentry>
 	  <term><application>Vim</application>
 	  (<package>editors/vim</package>)</term>
 
 	  <listitem>
 	    <para>A popular editor for working with
 	      <acronym>XML</acronym> and derived documents, like
 	      DocBook <acronym>XML</acronym>.</para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry>
-	  <term><application>Emacs</application> or
-	    <application>XEmacs</application>
-	    (<package>editors/emacs</package> or
-	    <package>editors/xemacs</package>)</term>
+	  <term><application>Emacs</application>
+	    (<package>editors/emacs</package>)</term>
 
 	  <listitem>
 	    <para>Both of these editors include a special mode for
 	      editing documents marked up according to an
 	      <acronym>XML</acronym> <acronym>DTD</acronym>.  This
 	      mode includes commands to reduce the amount of typing
 	      needed, and help reduce the possibility of
 	      errors.</para>
 	  </listitem>
 	</varlistentry>
       </variablelist>
     </sect2>
   </sect1>
 </chapter>
Index: head/en_US.ISO8859-1/htdocs/applications.xml
===================================================================
--- head/en_US.ISO8859-1/htdocs/applications.xml	(revision 52525)
+++ head/en_US.ISO8859-1/htdocs/applications.xml	(revision 52526)
@@ -1,148 +1,148 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
 "http://www.FreeBSD.org/XML/share/xml/xhtml10-freebsd.dtd" [
 <!ENTITY title "About Applications for FreeBSD">
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
       <title>&title;</title>
 
       <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
     </head>
 
     <body class="navinclude.about">
 
     <h2>Experience the possibilities with FreeBSD</h2>
 
       <p>FreeBSD can handle nearly any task you would expect of a &unix;
 	workstation, as well as many you might not expect:</p>
 
     <h2>FreeBSD is a true open system with full
 	source code.</h2>
 
       <p>There is no doubt that so-called open systems are <i>the</i>
 	requirement for today's computing applications.  But no commercial
 	vendor-supplied solution is more open than one which includes full
 	source code to the entire operating system, including the kernel and
 	all of the system daemons, programs, and utilities.  You can modify
 	any part of FreeBSD to suit your personal, organizational, or
 	corporate needs.</p>
 
       <p>With its generous <a
 	  href="&base;/copyright/freebsd-license.html">licensing policy</a>,
 	you can use FreeBSD as the basis for any number of free <i>or
 	  commercial </i>applications.</p>
 
     <h2>FreeBSD&nbsp;runs thousands of
 	applications.</h2>
 
       <p>Because FreeBSD is based on 4.4BSD, an industry-standard version of
 	UNIX, it is easy to compile and run programs.  FreeBSD also includes
 	an extensive <a href="&base;/where.html">packages collection </a>and <a
 	  href="&base;/ports/index.html">ports collection</a> that bring
 	precompiled and easy-to-build software right to your desktop or
 	enterprise server.  There is also a growing number of <a
 	  href="&base;/commercial/software.html">commercial applications</a>
 	written for FreeBSD.</p>
 
       <p>Here are some examples of the environments in which FreeBSD is
 	used:</p>
 
       <ul>
 	<li><b>Internet services. </b>Many Internet Service Providers (ISPs)
 	  find FreeBSD ideal, running WWW, Usenet news, FTP, Email, and other
 	  services.  Ready-to-run software like the <a
 	    href="http://nginx.org">nginx</a> or <a
 	    href="http://www.apache.org/">Apache</a> web server or the
 	  <a href="http://proftpd.org/">ProFTPD</a>
 	  or <a href="http://security.appspot.com/vsftpd.html">vsftpd</a>
 	  FTP&nbsp;server make it easy to set up a business or
 	  community-centered ISP.  Of course, with FreeBSD's unbeatable <a
 	    href="&base;/internet.html">networking</a>, your users will enjoy
 	  high speed, reliable services.</li>
 
 	<li><b>X Window workstation. </b>From an inexpensive X terminal to an
 	  advanced X display, FreeBSD works quite well.  Free X software (<a
 	    href="http://x.org/">X.Org</a>&trade;) comes with the
 	  system. <a href="http://www.nvidia.com/">nVidia</a> offers native
 	  drivers for their high-performance graphics hardware,
 	  and the industry standard
 	  <a href="http://www.opengroup.org/motif/">Motif</a>&reg; and
 	  <a href="http://www.opengl.org/">OpenGL</a>&reg;
 	  libraries are supported.  The <a
 	    href="http://xfce.org/">Xfce</a> and <a
 	    href="http://lxde.org/">LXDE</a> products provide a desktop
 	  environment.  The <a
 	    href="http://www.kde.org">KDE</a> and <a
 	    href="http://www.gnome.org">GNOME</a> desktop environments also
 	  enjoy full support and provide office suite functionality, with
 	  further good functionality available in the <a
 	    href="https://www.libreoffice.org/">LibreOffice</a>, <a
 	    href="http://www.openoffice.org/">OpenOffice.Org</a> and
 	  <a href="http://www.softmaker.com/en/">TextMaker</a>
 	  products.</li>
 
 	<li><b>Networking. </b>From packet filtering to routing to name
 	  service, FreeBSD can turn any PC into a Internet firewall, email
 	  host, print server, PC/NFS server, and more.</li>
 
 	<li><b>Software development.</b> A suite of development tools comes
 	  with FreeBSD, including the GNU C/C++ compiler and debugger.
 	  The LLVM-based clang suite is also provided and will eventually
 	  replace the GNU suite.
 	  &java; and Tcl/Tk development are also
 	  possible for example, and more esoteric programming
 	  languages like Icon work just fine, too.  And FreeBSD's shared
 	  libraries have always been easy to make and use.  You can also
 	  choose from a wide range of popular and powerful editors, such as
-	  XEmacs and Vim.</li>
+	  Emacs and Vim.</li>
 
 	<li><b>Net surfing.</b> A real UNIX workstation makes a great Internet
 	  surfboard. FreeBSD versions of <a
 	    href="http://www.chromium.org/Home">Chromium</a>, <a
 	    href="http://www.mozilla.org/firefox/">Firefox</a>
 	  and <a href="http://www.opera.com/">Opera</a> are available
 	  for serious web users.  Surf the web,
 	  publish your own web pages, read Usenet news, and send and receive
 	  email with a FreeBSD system on your desktop.</li>
 
 	<li><b>Education and research.</b> &nbsp;FreeBSD makes an excellent
 	  research platform because it includes complete source code.
 	  Students and researchers of operating systems or other computer
 	  science fields can benefit greatly from such an open and
 	  well-documented system.</li>
 
 	<li><b>And much more. </b>Accounting, action games,
 	  MIS&nbsp;databases, scientific visualization, video conferencing,
 	  Internet relay chat (IRC), home automation, multiuser dungeons,
 	  bulletin board systems, image scanning, and more are all real uses
 	  for FreeBSD today.</li>
       </ul>
 
     <h2>FreeBSD is an operating system that will grow with
 	your needs.</h2>
 
       <p>Though FreeBSD is free software, it is also <i>user supported
 	</i>software.  Any questions you have can be posted to hundreds of
 	FreeBSD developers and users simply by e-mailing the <a
 	  href="mailto:freebsd-questions@FreeBSD.org">freebsd-questions@FreeBSD.org</a>
 	mailing list.</p>
 
       <p>FreeBSD also has a worldwide group of programmers and writers who fix
 	bugs, add new features and document the system.  Support for new
 	devices or special features is an almost constant development process,
 	and the team keeps a special eye out for problems which affect system
 	stability.  FreeBSD users are quite proud of not only how fast but how
 	reliable their systems are.</p>
 
     <h2>What experts have to say . . .</h2>
 
       <p><i>``FreeBSD handles [our] heavy load quite well and it is nothing
 	  short of amazing.  Salutations to the FreeBSD team.''</i></p>
 
       <div align="right"><p>---Mark Hittinger, administrator of WinNet
 	  Communications, Inc.</p></div>
 
   </body>
 </html>