Index: TODO
===================================================================
--- TODO	(revision b5e36ddb93501b95509805b31cdef6f4662fae64)
+++ TODO	(revision d78d84d8840338cc6f4b4444ab80d72ded570d3d)
@@ -6,10 +6,7 @@
   * libidn-1.24
   * lzo-2.06 (Low priority)
-  * nano-2.3.1
-  * openldap-2.4.31 (Don't forget to mark it as checked)
   * sg3_utils-1.33
   * tcl-8.5.11
   * tk-8.5.11
-  * unixODBC-2.3.1 (Don't forget to mark it as checked)
 
   * Check libdaemon-0.14
Index: general.ent
===================================================================
--- general.ent	(revision b5e36ddb93501b95509805b31cdef6f4662fae64)
+++ general.ent	(revision d78d84d8840338cc6f4b4444ab80d72ded570d3d)
@@ -156,5 +156,5 @@
 <!ENTITY vim-version                  "7.3">
 <!ENTITY emacs-version                "23.4">
-<!ENTITY nano-version                 "2.1.10">
+<!ENTITY nano-version                 "2.3.1">
 <!ENTITY joe-version                  "3.7">
 <!ENTITY ed-version                   "1.5">
@@ -301,5 +301,5 @@
 <!ENTITY xscreensaver-version         "5.15">
 <!ENTITY pilot-link-version           "0.12.2">
-<!ENTITY unixodbc-version             "2.3.0">
+<!ENTITY unixodbc-version             "2.3.1">
 <!ENTITY libiodbc-version             "3.52.7">
 <!ENTITY graphviz-version             "2.28.0">
Index: general/genutils/unixodbc.xml
===================================================================
--- general/genutils/unixodbc.xml	(revision b5e36ddb93501b95509805b31cdef6f4662fae64)
+++ general/genutils/unixodbc.xml	(revision d78d84d8840338cc6f4b4444ab80d72ded570d3d)
@@ -7,8 +7,8 @@
   <!ENTITY unixodbc-download-http "http://www.unixodbc.org/unixODBC-&unixodbc-version;.tar.gz">
   <!ENTITY unixodbc-download-ftp  "&gentoo-ftp-repo;/unixODBC-&unixodbc-version;.tar.gz">
-  <!ENTITY unixodbc-md5sum        "f2ad22cbdffe836c58987ed2332c2e99">
+  <!ENTITY unixodbc-md5sum        "86788d4006620fa1f171c13d07fdcaab">
   <!ENTITY unixodbc-size          "1.8 MB">
   <!ENTITY unixodbc-buildsize     "30 MB">
-  <!ENTITY unixodbc-time          "0.5 SBU (includes building the GUI tools)">
+  <!ENTITY unixodbc-time          "0.5 SBU">
 ]>
 
@@ -30,41 +30,49 @@
     <title>Introduction to unixODBC</title>
 
-    <para>The <application>unixODBC</application> package is an Open Source
-    ODBC (Open DataBase Connectivity) sub-system and an ODBC SDK for Linux, Mac
-    OSX, and UNIX. ODBC is an open specification for providing application
-    developers with a predictable API with which to access data sources. Data
-    sources include optional SQL Servers and any data source with an ODBC Driver.
-    <application>unixODBC</application> contains the following components used
-    to assist with the manipulation of ODBC data sources: a driver manager, an
-    installer library and command line tool, command line tools to help install
-    a driver and work with SQL, drivers and driver setup libraries.</para>
-
-    <para>Two major components of previous versions of
-    <application>unixODBC</application> have been moved to separate projects.
-    The GUI tools and libraries are now located at
-    <ulink url="http://sourceforge.net/projects/unixodbc-gui-qt"/>. The
-    <application>Qt</application> based ODBC test tool and autotest framework
-    are now located at
-    <ulink url="http://sourceforge.net/projects/unixodbc-test"/></para>
+    <para>
+      The <application>unixODBC</application> package is an Open Source
+      ODBC (Open DataBase Connectivity) sub-system and an ODBC SDK for Linux, Mac
+      OSX, and UNIX. ODBC is an open specification for providing application
+      developers with a predictable API with which to access data sources. Data
+      sources include optional SQL Servers and any data source with an ODBC Driver.
+      <application>unixODBC</application> contains the following components used
+      to assist with the manipulation of ODBC data sources: a driver manager, an
+      installer library and command line tool, command line tools to help install
+      a driver and work with SQL, drivers and driver setup libraries.
+    </para>
+
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&unixodbc-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&unixodbc-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &unixodbc-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &unixodbc-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &unixodbc-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &unixodbc-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&unixodbc-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&unixodbc-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &unixodbc-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &unixodbc-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &unixodbc-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &unixodbc-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -73,6 +81,8 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="pth"/> and
-    <ulink url="http://www.hughes.com.au/products/msql/">Mini SQL</ulink></para>
+    <para role="optional">
+      <ulink url="http://www.hughes.com.au/products/msql/">Mini SQL</ulink> and
+      <xref linkend="pth"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -84,14 +94,20 @@
     <title>Installation of unixODBC</title>
 
-    <para>Install <application>unixODBC</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>unixODBC</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>./configure --prefix=/usr \
-            --sysconfdir=/etc/unixodbc &amp;&amp;
+            --sysconfdir=/etc/unixODBC &amp;&amp;
 make</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      This package does not come with a test suite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install &amp;&amp;
@@ -108,10 +124,14 @@
     <title>Command Explanations</title>
 
-    <para><option>--enable-drivers</option>: This parameter enables building
-    the drivers that were installed by default in previous versions.</para>
-
-    <para><option>--enable-drivers-conf</option>: This parameter enables
-    building the driver configuration libraries that were installed by default
-    in previous versions.</para>
+    <para>
+      <option>--enable-drivers</option>: This parameter enables building
+      the drivers that were installed by default in previous versions.
+    </para>
+
+    <para>
+      <option>--enable-drivers-conf</option>: This parameter enables
+      building the driver configuration libraries that were installed 
+      by default in previous versions.
+    </para>
 
   </sect2>
@@ -122,8 +142,8 @@
     <sect3 id="unixodbc-config">
       <title>Config Files</title>
-      <para><filename>/etc/unixodbc/*</filename></para>
+      <para><filename>/etc/unixODBC/*</filename></para>
 
       <indexterm zone="unixodbc unixodbc-config">
-        <primary sortas="e-etc-unixodbc-">/etc/unixodbc/*</primary>
+        <primary sortas="e-etc-unixODBC-">/etc/unixODBC/*</primary>
       </indexterm>
     </sect3>
@@ -131,24 +151,28 @@
     <sect3><title>Configuration Information</title>
 
-      <para>The files in <filename class='directory'>/etc/unixodbc</filename>
-      are meant to be configured by the system administrator (or the ODBC site
-      administrator if appropriate privileges are granted to
-      <filename class='directory'>/etc/unixodbc</filename>). These files
-      are not meant to be directly edited. The ODBC installer library is
-      responsible for reading and writing the
-      <application>unixODBC</application> config files.</para>
-
-      <para>Unfortunately, there are no <command>man</command> or
-      <command>info</command> pages for the various programs available in the
-      <application>unixODBC</application> package. Along with the information
-      in the <quote>Short Descriptions</quote> below and the documentation
-      installed in <filename
-      class='directory'>/usr/share/doc/unixODBC-&unixodbc-version;</filename>,
-      there are many <filename>README</filename> files throughout the source
-      tree where the use and functionality of the programs can be found.
-      Additionally, you can use the parameter <option>-?</option> for syntax
-      and usage information. Lastly, the <application>unixODBC</application>
-      web site at <ulink url="http://www.unixodbc.org/"/> has very good
-      information.</para>
+      <para>
+        The files in <filename class='directory'>/etc/unixODBC</filename>
+        are meant to be configured by the system administrator (or the ODBC site
+        administrator if appropriate privileges are granted to
+        <filename class='directory'>/etc/unixODBC</filename>). These files
+        are not meant to be directly edited. The ODBC installer library is
+        responsible for reading and writing the
+        <application>unixODBC</application> config files.
+      </para>
+
+      <para>
+        Unfortunately, there are no <command>man</command> or
+        <command>info</command> pages for the various programs available in the
+        <application>unixODBC</application> package. Along with the information
+        in the <quote>Short Descriptions</quote> below and the documentation
+        installed in <filename
+        class='directory'>/usr/share/doc/unixODBC-&unixodbc-version;</filename>,
+        there are many <filename>README</filename> files throughout the source
+        tree where the use and functionality of the programs can be found.
+        Additionally, you can use the parameter <option>-?</option> for syntax
+        and usage information. Lastly, the <application>unixODBC</application>
+        web site at <ulink url="http://www.unixodbc.org/"/> has very good
+        information.
+      </para>
 
     </sect3>
@@ -165,7 +189,14 @@
 
       <seglistitem>
-        <seg>dltest, isql, iusql, odbc_config, and odbcinst</seg>
-        <seg>libodbc.so, libodbccr.so, and libodbcinst.so</seg>
-        <seg>/etc/unixodbc and /usr/share/doc/unixODBC-&unixodbc-version;</seg>
+        <seg>
+          dltest, isql, iusql, odbc_config and odbcinst
+        </seg>
+        <seg>
+          libodbc.so, libodbccr.so and libodbcinst.so
+        </seg>
+        <seg>
+          /etc/unixODBC and
+          /usr/share/doc/unixODBC-&unixodbc-version;
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -179,6 +210,8 @@
         <term><command>dltest</command></term>
         <listitem>
-          <para>is a utility used to check a share library to see if it can be
-          loaded and if a given symbol exists in it.</para>
+          <para>
+            is a utility used to check a share library to see if it can be
+            loaded and if a given symbol exists in it.
+          </para>
           <indexterm zone="unixodbc dltest">
             <primary sortas="b-dltest">dltest</primary>
@@ -190,7 +223,9 @@
         <term><command>isql</command></term>
         <listitem>
-          <para>is a utility which can be used to submit SQL to a data source
-          and to format/output results. It can be used in batch or interactive
-          mode.</para>
+          <para>
+            is an utility which can be used to submit SQL to a data source and
+            to format/output results. It can be used in batch or interactive
+            mode.
+          </para>
           <indexterm zone="unixodbc isql">
             <primary sortas="b-isql">isql</primary>
@@ -202,6 +237,8 @@
         <term><command>iusql</command></term>
         <listitem>
-          <para>provides the same functionality as the <command>isql</command>
-          program.</para>
+          <para>
+            provides the same functionality as the <command>isql</command>
+            program.
+          </para>
           <indexterm zone="unixodbc iusql">
             <primary sortas="b-iusql">iusql</primary>
@@ -213,6 +250,8 @@
         <term><command>odbc_config</command></term>
         <listitem>
-          <para>is used to find out details about the installation of
-          the <application>unixODBC</application> package.</para>
+          <para>
+            is used to find out details about the installation of
+            the <application>unixODBC</application> package.
+          </para>
           <indexterm zone="unixodbc odbc_config">
             <primary sortas="b-odbc_config">odbc_config</primary>
@@ -224,9 +263,11 @@
         <term><command>odbcinst</command></term>
         <listitem>
-          <para> is a utility created for install script/RPM writers. It is a
-          command line interface to key functionality in the
-          <filename class='libraryfile'>libodbcinst</filename> library. It does
-          not copy any files (i.e., libraries) but it will modify the ODBC
-          System Information for the user.</para>
+          <para>
+            is an utility created for install script/RPM writers. It is a
+            command line interface to key functionality in the
+            <filename class='libraryfile'>libodbcinst</filename> library. It does
+            not copy any files (i.e., libraries) but it will modify the ODBC
+            System Information for the user.
+          </para>
           <indexterm zone="unixodbc odbcinst">
             <primary sortas="b-odbcinst">odbcinst</primary>
@@ -234,4 +275,5 @@
         </listitem>
       </varlistentry>
+
     </variablelist>
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision b5e36ddb93501b95509805b31cdef6f4662fae64)
+++ introduction/welcome/changelog.xml	(revision d78d84d8840338cc6f4b4444ab80d72ded570d3d)
@@ -46,5 +46,11 @@
       <itemizedlist>
         <listitem>
+          <para>[krejzi] - Nano 2.3.1.</para>
+        </listitem>
+        <listitem>
           <para>[krejzi] - OpenLDAP 2.4.31.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - unixODBC 2.3.1.</para>
         </listitem>
       </itemizedlist>
Index: postlfs/editors/nano.xml
===================================================================
--- postlfs/editors/nano.xml	(revision b5e36ddb93501b95509805b31cdef6f4662fae64)
+++ postlfs/editors/nano.xml	(revision d78d84d8840338cc6f4b4444ab80d72ded570d3d)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY nano-download-http "http://www.nano-editor.org/dist/v2.1/nano-&nano-version;.tar.gz">
+  <!ENTITY nano-download-http "http://ftp.gnu.org/gnu/nano/nano-&nano-version;.tar.gz">
   <!ENTITY nano-download-ftp  "ftp://ftp.gnu.org/gnu/nano/nano-&nano-version;.tar.gz">
-  <!ENTITY nano-md5sum        "f55bd9efeccf9da98950b54a4b0d872e">
-  <!ENTITY nano-size          "1.4 MB">
-  <!ENTITY nano-buildsize     "9 MB">
-  <!ENTITY nano-time          "less than 0.1 SBU">
+  <!ENTITY nano-md5sum        "af09f8828744b0ea0808d6c19a2b4bfd">
+  <!ENTITY nano-size          "1.5 MB">
+  <!ENTITY nano-buildsize     "11 MB">
+  <!ENTITY nano-time          "0.2 SBU">
 ]>
 
@@ -30,29 +30,43 @@
     <title>Introduction to Nano</title>
 
-    <para>The <application>nano</application> package contains a small,
-    simple text editor which aims to replace <application>Pico</application>,
-    the default editor in the <application>Pine</application> package.</para>
-
-    &lfs65_checked;
+    <para>
+      The <application>Nano</application> package contains a small,
+      simple text editor which aims to replace <application>Pico</application>,
+      the default editor in the <application>Pine</application> package.
+    </para>
+
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&nano-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&nano-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &nano-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &nano-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &nano-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &nano-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&nano-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&nano-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &nano-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &nano-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &nano-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &nano-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -61,5 +75,7 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="slang"/></para>
+    <para role="optional">
+      <xref linkend="slang"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -71,17 +87,22 @@
     <title>Installation of Nano</title>
 
-    <para>Install <application>nano</application> by running the following
+    <para>Install <application>Nano</application> by running the following
     commands:</para>
 
-<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc/nano \
-    --enable-color --enable-multibuffer --enable-nanorc &amp;&amp;
+<screen><userinput>./configure --prefix=/usr \
+            --sysconfdir=/etc \
+            --enable-utf8 &amp;&amp;
 make</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      This package does not come with a test suite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install &amp;&amp;
-install -v -m644 -D doc/nanorc.sample /etc/nano/nanorc.sample &amp;&amp;
+install -v -m644 doc/nanorc.sample /etc &amp;&amp;
 install -v -m755 -d /usr/share/doc/nano-&nano-version; &amp;&amp;
 install -v -m644 doc/{,man/,texinfo/}*.html /usr/share/doc/nano-&nano-version;</userinput></screen>
@@ -92,7 +113,9 @@
     <title>Command Explanations</title>
 
-    <para><option>--with-slang=/usr/lib</option>: This forces
-    <application>Nano</application> to detect <application>S-Lang</application>.
-    Use this if installed.</para>
+    <para>
+      <parameter>--with-slang=/usr</parameter>: This forces
+      <application>Nano</application> to use <application>S-Lang</application>.
+      Use this if installed.
+    </para>
 
   </sect2>
@@ -104,9 +127,9 @@
       <title>Config Files</title>
 
-      <para><filename>/etc/nano/nanorc</filename> and
+      <para><filename>/etc/nanorc</filename> and
       <filename>~/.nanorc</filename></para>
 
       <indexterm zone="nano nano-config">
-        <primary sortas="e-etc-nano-nanorc">/etc/nano/nanorc</primary>
+        <primary sortas="e-etc-nanorc">/etc/nanorc</primary>
       </indexterm>
 
@@ -120,7 +143,9 @@
       <title>Configuration Information</title>
 
-      <para>Example configuration (create as a system-wide
-      <filename>/etc/nano/nanorc</filename> or a personal
-      <filename>~/.nanorc</filename> file)</para>
+      <para>
+        Example configuration (create as a system-wide
+        <filename>/etc/nanorc</filename> or a personal
+        <filename>~/.nanorc</filename> file)
+      </para>
 
 <screen><literal>set autoindent
@@ -134,8 +159,10 @@
 set suspend</literal></screen>
 
-      <para>Another example is the <filename>nanorc.sample</filename> file
-      in the <filename class="directory">/etc/nano</filename> directory.
-      It includes color configurations and has some documentation included
-      in the comments.</para>
+      <para>
+        Another example is the <filename>nanorc.sample</filename> file
+        in the <filename class="directory">/etc</filename> directory.
+        It includes color configurations and has some documentation included
+        in the comments.
+      </para>
 
     </sect3>
@@ -148,12 +175,14 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>nano and rnano</seg>
-        <seg>None</seg>
-        <seg>/etc/nano, /usr/share/nano and
-        /usr/share/doc/nano-&nano-version;</seg>
+        <seg>
+          nano and rnano
+        </seg>
+        <seg>
+          /usr/share/nano and
+          /usr/share/doc/nano-&nano-version;
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -167,7 +196,9 @@
         <term><command>nano</command></term>
         <listitem>
-          <para>is a small, simple text editor which aims to replace
-          <application>Pico</application>, the default editor in the
-          <application>Pine</application> package.</para>
+          <para>
+            is a small, simple text editor which aims to replace
+            <application>Pico</application>, the default editor in the
+            <application>Pine</application> package.
+          </para>
           <indexterm zone="nano nano-prog">
             <primary sortas="b-nano">nano</primary>
@@ -179,5 +210,7 @@
         <term><command>rnano</command></term>
         <listitem>
-          <para>is a restricted mode for <command>nano</command>.</para>
+          <para>
+            is a restricted mode for <command>nano</command>.
+          </para>
           <indexterm zone="nano rnano-prog">
             <primary sortas="b-rnano">rnano</primary>
