From owner-svn-doc-all@FreeBSD.ORG  Wed Jul 24 23:52:06 2013
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 0322A5B0;
 Wed, 24 Jul 2013 23:52:06 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id E403D2208;
 Wed, 24 Jul 2013 23:52:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6ONq5Xp064051;
 Wed, 24 Jul 2013 23:52:05 GMT (envelope-from wblock@svn.freebsd.org)
Received: (from wblock@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6ONq5nY064050;
 Wed, 24 Jul 2013 23:52:05 GMT (envelope-from wblock@svn.freebsd.org)
Message-Id: <201307242352.r6ONq5nY064050@svn.freebsd.org>
From: Warren Block <wblock@FreeBSD.org>
Date: Wed, 24 Jul 2013 23:52:05 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42426 -
 head/en_US.ISO8859-1/books/fdp-primer/editor-config
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 24 Jul 2013 23:52:06 -0000

Author: wblock
Date: Wed Jul 24 23:52:05 2013
New Revision: 42426
URL: http://svnweb.freebsd.org/changeset/doc/42426

Log:
  Simplify and improve the nano config section.

Modified:
  head/en_US.ISO8859-1/books/fdp-primer/editor-config/chapter.xml

Modified: head/en_US.ISO8859-1/books/fdp-primer/editor-config/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/fdp-primer/editor-config/chapter.xml	Wed Jul 24 20:07:50 2013	(r42425)
+++ head/en_US.ISO8859-1/books/fdp-primer/editor-config/chapter.xml	Wed Jul 24 23:52:05 2013	(r42426)
@@ -84,27 +84,36 @@ augroup END</programlisting>
       <filename role="package">editors/nano</filename> or
       <filename role="package">editors/nano-devel</filename>.</para>
 
-    <para>Configuration:</para>
+    <sect2 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>Use <command>printf</command> to add lines to the
-      configuration file.  Some have embedded <keycap>Tab</keycap>
-      characters, making this easier than editing the file
-      directly:</para>
-
-    <screen>&prompt.user; <userinput>printf '# trailing whitespace\n'                           >> ~/.nanorc</userinput>
-&prompt.user; <userinput>printf 'color ,blue "[[:space:]]+$"\n'                     >> ~/.nanorc</userinput>
-&prompt.user; <userinput>printf '# multiples of eight spaces at the start a line\n' >> ~/.nanorc</userinput>
-&prompt.user; <userinput>printf '# (after zero or more tabs) should be a tab\n'     >> ~/.nanorc</userinput>
-&prompt.user; <userinput>printf 'color ,blue "^([\t]*[ ]{8})+"\n'                   >> ~/.nanorc</userinput>
-&prompt.user; <userinput>printf '# tabs after spaces\n'                             >> ~/.nanorc</userinput>
-&prompt.user; <userinput>printf 'color ,yellow "( )+\t"\n'                          >> ~/.nanorc</userinput>
-&prompt.user; <userinput>printf '# lines longer than 70 characters\n'               >> ~/.nanorc</userinput>
-&prompt.user; <userinput>printf 'color ,red "^(([ ]{2})+|(\t+))*[ ]{1}[^ ]{1}"\n'   >> ~/.nanorc</userinput></screen>
+    <para>Add these lines to the new <filename>~/.nanorc</filename>.</para>
 
+    <programlisting># 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 id="editor-config-nano-use">
+      <title>Use</title>
     <para>Specify additional helpful options when running the
-      editor.</para>
+      editor:</para>
 
     <screen>&prompt.user; <userinput>nano -AKipwz -r 70 -T8 <replaceable>chapter.xml</replaceable></userinput></screen>
 
@@ -117,5 +126,6 @@ augroup END</programlisting>
       automatically:</para>
 
     <screen>&prompt.user; <userinput>nano <replaceable>chapter.xml</replaceable></userinput></screen>
+    </sect2>
   </sect1>
 </chapter>