Index: general.ent
===================================================================
--- general.ent	(revision b37c8dea2f6979b0c4b33651c605f92a732303ba)
+++ general.ent	(revision 8a8b05eb38b6c83926458ca58c2cfd49f3f6945f)
@@ -1,5 +1,5 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "23">                   <!-- Always 2 digits -->
+<!ENTITY day          "24">                   <!-- Always 2 digits -->
 <!ENTITY month        "10">                   <!-- Always 2 digits -->
 <!ENTITY year         "2013">
@@ -7,5 +7,5 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "October 23rd, &year;">
+<!ENTITY releasedate  "October 24th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
@@ -485,4 +485,9 @@
 
 <!-- Chapter 21 -->
+<!ENTITY dovecot-major                "2">
+<!ENTITY dovecot-minor                "2">
+<!ENTITY dovecot-micro                "6">
+<!ENTITY dovecot-version              "&dovecot-major;.&dovecot-minor;.&dovecot-micro;">
+
 <!ENTITY exim-version                 "4.80.1">
 <!ENTITY postfix-version              "2.10.2">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision b37c8dea2f6979b0c4b33651c605f92a732303ba)
+++ introduction/welcome/changelog.xml	(revision 8a8b05eb38b6c83926458ca58c2cfd49f3f6945f)
@@ -45,4 +45,14 @@
 -->
     <listitem>
+      <para>October 24th, 2013</para>
+      <itemizedlist>
+        <listitem>
+          <para>[igor] - Added dovecot-2.2.6. Fixes
+          <ulink url="&blfs-ticket-root;3967">#3967</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>October 23nd, 2013</para>
       <itemizedlist>
Index: server/mail/dovecot.xml
===================================================================
--- server/mail/dovecot.xml	(revision 8a8b05eb38b6c83926458ca58c2cfd49f3f6945f)
+++ server/mail/dovecot.xml	(revision 8a8b05eb38b6c83926458ca58c2cfd49f3f6945f)
@@ -0,0 +1,335 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY dovecot-download-http
+  "http://www.dovecot.org/releases/&dovecot-major;.&dovecot-minor;/dovecot-&dovecot-version;.tar.gz">
+  <!ENTITY dovecot-download-ftp  " ">
+  <!ENTITY dovecot-md5sum        "db65988ef2e6889dd8b49c132b21fc8f">
+  <!ENTITY dovecot-size          "4.3 MB">
+  <!ENTITY dovecot-buildsize     "198 MB">
+  <!ENTITY dovecot-time          "1.6 SBU">
+]>
+
+<sect1 id="dovecot" xreflabel="Dovecot-&dovecot-version;">
+  <?dbhtml filename="dovecot.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Dovecot-&dovecot-version;</title>
+
+  <indexterm zone="dovecot">
+    <primary sortas="a-Dovecot">Dovecot</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Dovecot</title>
+
+    <para>
+      <application>Dovecot</application> is an Internet Message Access Protocol
+      (IMAP) and Post Office Protocol (POP) server, written primarily with
+      security in mind. <application>Dovecot</application> aims to be
+      lightweight, fast and easy to set up as well as highly configurable and
+      easily extensible with plugins.
+    </para>
+
+    &lfs74_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&dovecot-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&dovecot-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &dovecot-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &dovecot-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &dovecot-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &dovecot-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Dovecot Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="libcap"/>,
+      <xref linkend="openssl"/>,
+      <xref linkend="mitkrb"/>,
+      <xref linkend="linux-pam"/>,
+      <xref linkend="openldap"/>,
+      <xref linkend="postgresql"/>,
+      <xref linkend="mysql"/>,
+      <xref linkend="sqlite"/>, and
+      <xref linkend="clucene"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/dovecot"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Dovecot</title>
+
+    <para>
+      There should be dedicated users and groups for unprivileged Dovecot
+      processes and for processing users' logins. Issue the following commands
+      as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>groupadd -g 42 dovecot &amp;&amp;
+useradd -c "Dovecot unprivileged user" -d /dev/null -u 42 \
+        -g dovecot -s /bin/false dovecot &amp;&amp;
+groupadd -g 43 dovenull &amp;&amp;
+useradd -c "Dovecot login user" -d /dev/null -u 43 \
+        -g dovenull -s /bin/false dovenull</userinput></screen>
+
+    <para>
+      Install <application>Dovecot</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr \
+            --sysconfdir=/etc \
+            --localstatedir=/var \
+            --libexecdir=/usr/lib \
+            --docdir=/usr/share/doc/dovecot-&dovecot-version; \
+            --disable-static &amp;&amp;
+make</userinput></screen>
+
+    <para>To test the results, issue <command>make check</command>.</para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
+    <para>
+      <option>--with-ldap</option>: This switch enables
+      <application>OpenLDAP</application> authentication support.
+    </para>
+      
+    <para>
+      <option>--with-pgsql</option>: This switch enables
+      <application>PostgreSQL</application> authentication support.
+    </para>
+      
+    <para>
+      <option>--with-mysql</option>: This switch enables
+      <application>MySQL</application> authentication support.
+    </para>
+      
+    <para>
+      <option>--with-sqlite</option>: This switch enables
+      <application>SQLite</application> authentication support.
+    </para>
+      
+    <para>
+      <option>--with-lucene</option>: This switch enables
+      <application>CLucene</application> full text search support.
+    </para>
+    
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring Dovecot</title>
+
+    <sect3 id="dovecot-config">
+      <title>Config Files</title>
+
+      <para>
+        <filename>/etc/dovecot/dovecot.conf</filename>,
+        <filename>/etc/dovecot/conf.d/*</filename>, and
+        <filename>/etc/dovecot/local.conf</filename>
+      </para>
+
+      <indexterm zone="dovecot dovecot-config">
+        <primary sortas="e-etc-dovecot-dovecot.conf">/etc/dovecot/dovecot.conf</primary>
+      </indexterm>
+      <indexterm zone="dovecot dovecot-config">
+        <primary sortas="e-etc-dovecot-conf.d">/etc/dovecot/conf.d/*</primary>
+      </indexterm>
+      <indexterm zone="dovecot dovecot-config">
+        <primary sortas="e-etc-dovecot-local.conf">/etc/dovecot/local.conf</primary>
+      </indexterm>
+
+    </sect3>
+
+    <sect3>
+      <title>Configuration Information</title>
+
+      <para>
+        Copy an example configuration, which you can use as a starting point:
+      </para>
+
+<screen role="root"><userinput>cp -rv /usr/share/doc/dovecot-&dovecot-version;/example-config/* /etc/dovecot</userinput></screen>
+
+      <para>
+        The following configuration is a simple proof of concept with IMAP
+        service using local users for authentication and mailbox location.
+        Reading files from the <filename class="directory">conf.d</filename>
+        directory is commented out since the included example configuration
+        requires <application>OpenSSL</application> and
+        <application>Linux PAM</application>.
+      </para>
+
+<screen role="root"><userinput>sed -i '/^\!include / s/^/#/' /etc/dovecot/dovecot.conf &amp;&amp;
+chmod -v 1777 /var/mail &amp;&amp;
+cat &gt; /etc/dovecot/local.conf &lt;&lt; "EOF"
+<literal>protocols = imap
+ssl = no
+mail_location = mbox:~/Mail:INBOX=/var/mail/%u
+userdb {
+  driver = passwd
+}
+passdb {
+  driver = shadow
+}</literal>
+EOF</userinput></screen>
+
+      <para>
+        You will definitely want to read the official documentation at <ulink
+        url="http://wiki2.dovecot.org/"/> if you plan to use
+        <application>Dovecot</application> in production environment.
+      </para>
+
+    </sect3>
+
+    <sect3 id="dovecot-init">
+      <title>Boot Script</title>
+
+      <para>If you want the <application>Dovecot</application> server to
+      start automatically when the system is booted, install the
+      <filename>/etc/rc.d/init.d/dovecot</filename> init script included
+      in the <xref linkend="bootscripts"/> package.</para>
+
+      <indexterm zone="dovecot dovecot-init">
+        <primary sortas="f-dovecot">dovecot</primary>
+      </indexterm>
+
+<screen role="root"><userinput>make install-dovecot</userinput></screen>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          doveadm, doveconf, dovecot, dsync, and various internal programs
+        </seg>
+        <seg>
+          various internal plugins
+        </seg>
+        <seg>
+          /etc/dovecot,
+          /usr/include/dovecot,
+          /usr/lib/dovecot, and
+          /usr/share/doc/dovecot-&dovecot-version;
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="doveadm">
+        <term><command>doveadm</command></term>
+        <listitem>
+          <para>
+            is the <application>Dovecot</application> administration tool.
+          </para>
+          <indexterm zone="dovecot doveadm">
+            <primary sortas="b-doveadm">doveadm</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="doveconf">
+        <term><command>doveconf</command></term>
+        <listitem>
+          <para>
+            is <application>Dovecot</application>'s configuration dumping
+            utility.
+          </para>
+          <indexterm zone="dovecot doveconf">
+            <primary sortas="b-doveconf">doveconf</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="dovecot-prog">
+        <term><command>dovecot</command></term>
+        <listitem>
+          <para>
+            is the IMAP and POP server.
+          </para>
+          <indexterm zone="dovecot dovecot-prog">
+            <primary sortas="b-dovecot">dovecot</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="dsync">
+        <term><command>dsync</command></term>
+        <listitem>
+          <para>
+            is <application>Dovecot</application>'s mailbox synchronization
+            utility.
+          </para>
+          <indexterm zone="dovecot dsync">
+            <primary sortas="b-dsync">dsync</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: server/mail/mail.xml
===================================================================
--- server/mail/mail.xml	(revision b37c8dea2f6979b0c4b33651c605f92a732303ba)
+++ server/mail/mail.xml	(revision 8a8b05eb38b6c83926458ca58c2cfd49f3f6945f)
@@ -23,4 +23,5 @@
   server (Courier-IMAP).</para>
 
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dovecot.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="exim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="postfix.xml"/>
