Keep the "socket options" setting

Prepare release


git-svn-id: svn://svn.debian.org/svn/pkg-samba/trunk/samba/debian@1851 fc4039ab-9d04-0410-8cac-899223bdd6b0

2 files changed, 9 insertions, 4 deletions

diff --git a/changelog b/changelog
index ee28a3fd47..aaa0f5dc33 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-samba (1:3.0.28a-3) UNRELEASED; urgency=low
+samba (1:3.0.28a-3) unstable; urgency=low
 
   * The "bug hunting at SambaXP" release
   * Drop "invalid users = root" from the default smb.conf file
@@ -25,9 +25,7 @@ samba (1:3.0.28a-3) UNRELEASED; urgency=low
   * Update copyright and README.debian information for current and past
     maintainers. Remove redundant mention of Tridge (the copyright is enough)
   * Add doc-base files for samba-doc-pdf. Closes: #451685
-  * Remove "socket options" from smb.conf (the value that was set
-    is the default value). Closes: #476104
-  * Kurdish. Closes: #480151
+  * Kurdish debconf translation. Closes: #480151
 
  -- Christian Perrier <bubulle@debian.org>  Wed, 16 Apr 2008 23:14:46 +0200
 
diff --git a/smb.conf b/smb.conf
index f2332b6eba..4780718c48 100644
--- a/smb.conf
+++ b/smb.conf
@@ -182,6 +182,13 @@
 # of the machine that is connecting
 ;   include = /home/samba/etc/smb.conf.%m
 
+# Most people will find that this option gives better performance.
+# See smb.conf(5) and /usr/share/doc/samba-doc/htmldocs/Samba3-HOWTO/speed.html
+# for details
+# You may want to add the following on a Linux system:
+#         SO_RCVBUF=8192 SO_SNDBUF=8192
+#   socket options = TCP_NODELAY
+
 # The following parameter is useful only if you have the linpopup package
 # installed. The samba maintainer and the linpopup maintainer are
 # working to ease installation and configuration of linpopup and samba.