Index: general.ent
===================================================================
--- general.ent	(revision ba1be62e99f0f4d4bc59d386aee5b3f16ba7b124)
+++ general.ent	(revision 4e9f28df268e60c9d1c9b528624ebf05a9c017b5)
@@ -466,5 +466,5 @@
 <!ENTITY rpcbind-version              "0.2.0">
 <!ENTITY rsync-version                "3.0.9">
-<!ENTITY samba3-version               "3.6.8">
+<!ENTITY samba3-version               "3.6.10">
 <!ENTITY wget-version                 "1.14">
 <!ENTITY wireless-tools-version       "29">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision ba1be62e99f0f4d4bc59d386aee5b3f16ba7b124)
+++ introduction/welcome/changelog.xml	(revision 4e9f28df268e60c9d1c9b528624ebf05a9c017b5)
@@ -48,4 +48,7 @@
       <para>January 10th, 2013</para>
       <itemizedlist>
+        <listitem>
+          <para>[Randy] - Updated to Samba-3.6.10.</para>
+        </listitem>
         <listitem>
           <para>[Randy] - Added dependencies to the Guile and GnuTLS
Index: networking/netprogs/samba3.xml
===================================================================
--- networking/netprogs/samba3.xml	(revision ba1be62e99f0f4d4bc59d386aee5b3f16ba7b124)
+++ networking/netprogs/samba3.xml	(revision 4e9f28df268e60c9d1c9b528624ebf05a9c017b5)
@@ -7,8 +7,8 @@
   <!ENTITY samba3-download-http "http://ftp.samba.org/pub/samba/stable/samba-&samba3-version;.tar.gz">
   <!ENTITY samba3-download-ftp  "ftp://ftp.samba.org/pub/samba/stable/samba-&samba3-version;.tar.gz">
-  <!ENTITY samba3-md5sum        "fbb245863eeef2fffe172df779a217be">
-  <!ENTITY samba3-size          "32.5 MB">
-  <!ENTITY samba3-buildsize     "472 MB">
-  <!ENTITY samba3-time          "2.4 SBU">
+  <!ENTITY samba3-md5sum        "b5f0560c216122529b1c3b7f41c62567">
+  <!ENTITY samba3-size          "34 MB">
+  <!ENTITY samba3-buildsize     "535 MB (includes running the test suite)">
+  <!ENTITY samba3-time          "2.7 SBU (additionall 1.4 SBU to run the test suite)">
 ]>
 
@@ -85,5 +85,6 @@
     <xref linkend="mitkrb"/>,
     <xref linkend="python2"/> (used only in parts of the test suite),
-    <ulink url="http://tdb.samba.org/">tdb</ulink> (version 1.2.1),
+    <ulink url="http://tdb.samba.org/">tdb</ulink>,
+    <ulink url="http://ctdb.samba.org/">ctdb</ulink>,
     <xref linkend="libcap2"/>,
     <ulink url="http://www.nongnu.org/libunwind/">libunwind</ulink>,
@@ -96,8 +97,8 @@
     on using your system to join a Windows NT domain.</para>
 
-    <bridgehead renderas="sect4">Optional for Samba4 Support</bridgehead>
+    <!-- <bridgehead renderas="sect4">Optional for Samba4 Support</bridgehead>
     <para role="optional"><xref linkend="gnutls"/> (recommended),
     <xref linkend="python2"/>, and
-    <xref linkend="sqlite"/></para>
+    <xref linkend="sqlite"/></para> -->
 
     <para condition="html" role="usernotes">User Notes:
@@ -135,11 +136,10 @@
 make</userinput></screen>
 
-<!--
     <para>To test the results, issue: <command>make test</command>. If you have
     <application>Linux-PAM</application> installed and built the PAM library
     modules, you can perform a dlopen test by issuing:
     <command>make test_pam_modules</command>.</para>
--->
-    <para>This program dose not come with a functional test suite.</para>
+
+    <!-- <para>This program dose not come with a functional test suite.</para> -->
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
@@ -173,6 +173,6 @@
     <title>Command Explanations</title>
 
-    <para><option>--enable-merged-build</option>: Use this parameter to build
-    the (alpha) Samba4 components (GnuTLS is recommended).</para>
+    <!-- <para><option>-enable-merged-build</option>: Use this parameter to build
+    the (alpha) Samba4 components (GnuTLS is recommended).</para> -->
 
     <para><parameter>--sysconfdir=/etc</parameter>: Sets the configuration
@@ -660,5 +660,6 @@
         filesystem and support modules.</seg>
         <seg>/etc/samba, /usr/lib/samba, /usr/share/doc/samba-&samba3-version;,
-        /usr/share/samba, /var/lib/samba and (if configured) /var/log/samba</seg>
+        /usr/share/samba, /var/lib/samba, /var/log/samba (if configured), and
+        /var/nmbd</seg>
       </seglistitem>
     </segmentedlist>
