Index: head/en_US.ISO8859-1/books/fdp-primer/editor-config/chapter.xml
===================================================================
--- head/en_US.ISO8859-1/books/fdp-primer/editor-config/chapter.xml	(revision 46951)
+++ head/en_US.ISO8859-1/books/fdp-primer/editor-config/chapter.xml	(revision 46952)
@@ -1,179 +1,178 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Copyright (c) 2013 Warren Block
     All rights reserved.
 
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions
     are met:
     1. Redistributions of source code must retain the above copyright
     notice, this list of conditions and the following disclaimer.
     2. Redistributions in binary form 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 SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``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 THE
     AUTHORS OR CONTRIBUTORS 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 SOFTWARE,
     EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
     $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook"
   xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
   xml:id="editor-config">
 
   <title>Editor Configuration</title>
 
   <para>Adjusting text editor configuration can make working on
     document files quicker and easier, and help documents conform to
     <acronym>FDP</acronym> guidelines.</para>
 
   <sect1 xml:id="editor-config-vim">
     <title><application>Vim</application></title>
 
     <para>Install from <package>editors/vim</package>
       or <package>editors/vim-lite</package>.</para>
 
     <sect2 xml:id="editor-config-vim-config">
       <title>Configuration</title>
 
       <para>Edit <filename>~/.vimrc</filename>, adding these
 	lines:</para>
 
       <programlisting>if has("autocmd")
     au BufNewFile,BufRead *.sgml,*.ent,*.xsl,*.xml call Set_SGML()
     au BufNewFile,BufRead *.[1-9] call ShowSpecial()
 endif " has(autocmd)
 
 function Set_Highlights()
     "match ExtraWhitespace /^\s* \s*\|\s\+$/
     highlight default link OverLength ErrorMsg
     match OverLength /\%71v.\+/
     return 0
 endfunction
 
 function ShowSpecial()
     setlocal list listchars=tab:>>,trail:*,eol:$
     hi def link nontext ErrorMsg
     return 0
 endfunction " ShowSpecial()
 
 function Set_SGML()
     setlocal number
     syn match sgmlSpecial "&amp;[^;]*;"
     setlocal syntax=sgml
     setlocal filetype=xml
     setlocal shiftwidth=2
     setlocal textwidth=70
     setlocal tabstop=8
     setlocal softtabstop=2
     setlocal formatprg="fmt -p"
     setlocal autoindent
     setlocal smartindent
     " Rewrap paragraphs
     noremap P gqj
     " Replace spaces with tabs
     noremap T :s/        /\t/&lt;CR&gt;
     call ShowSpecial()
     call Set_Highlights()
     return 0
 endfunction " Set_SGML()</programlisting>
     </sect2>
 
     <sect2 xml:id="editor-config-vim-use">
       <title>Use</title>
 
       <para>Press <keycap>P</keycap> to reformat paragraphs or text that has been selected in Visual mode.  Press
 	<keycap>T</keycap> to replace groups of eight spaces with a
 	tab.</para>
     </sect2>
   </sect1>
 
   <sect1 xml:id="editor-config-emacs">
     <title><application>Emacs</application></title>
 
     <para>Install from
       <package>editors/emacs</package>
       or <package>editors/xemacs</package>.</para>
 
     <para>Edit <filename>~/.emacs</filename>, adding these
       lines:</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>
+    <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 #'local-psgml-mode-hook)</programlisting>
   </sect1>
 
   <sect1 xml:id="editor-config-nano">
     <title><application>nano</application></title>
 
     <para>Install from
       <package>editors/nano</package> or
       <package>editors/nano-devel</package>.</para>
 
     <sect2 xml:id="editor-config-nano-config">
       <title>Configuration</title>
 
       <para>Copy the sample <acronym>XML</acronym> syntax highlight
 	file to the user's home directory:</para>
 
       <screen>&prompt.user; <userinput>cp /usr/local/share/nano/xml.nanorc ~/.nanorc</userinput></screen>
 
       <para>Add these lines to the new
 	<filename>~/.nanorc</filename>.</para>
 
       <programlisting>syntax "xml" "\.([jrs]html?|xml|xslt?)$"
 # trailing whitespace
 color ,blue "[[:space:]]+$"
 # multiples of eight spaces at the start a line
 # (after zero or more tabs) should be a tab
 color ,blue "^([TAB]*[ ]{8})+"
 # tabs after spaces
 color ,yellow "( )+TAB"
 # highlight indents that have an odd number of spaces
 color ,red "^(([ ]{2})+|(TAB+))*[ ]{1}[^ ]{1}"
 # lines longer than 70 characters
 color ,yellow "^(.{71})|(TAB.{63})|(TAB{2}.{55})|(TAB{3}.{47}).+$"</programlisting>
 
       <para>Process the file to create embedded tabs:</para>
 
       <screen>&prompt.user; <userinput>perl -i'' -pe 's/TAB/\t/g' ~/.nanorc</userinput></screen>
     </sect2>
 
     <sect2 xml:id="editor-config-nano-use">
       <title>Use</title>
 
       <para>Specify additional helpful options when running the
 	editor:</para>
 
       <screen>&prompt.user; <userinput>nano -AKipwz -r 70 -T8 <replaceable>chapter.xml</replaceable></userinput></screen>
 
       <para>Users of &man.csh.1; can define an alias in
 	<filename>~/.cshrc</filename> to automate these
 	options:</para>
 
       <programlisting>alias nano "nano -AKipwz -r 70 -T8"</programlisting>
 
       <para>After the alias is defined, the options will be added
 	automatically:</para>
 
       <screen>&prompt.user; <userinput>nano <replaceable>chapter.xml</replaceable></userinput></screen>
     </sect2>
   </sect1>
 </chapter>