X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=examples%2Fsmb.conf.default;h=971ca19c830f7c629b3176a68d8364d01165e20a;hb=f14e833c53cffc51439013930fd78c2e9fe47a2d;hp=839fede123357ef2202df733b413ea40692916c5;hpb=a7e2a1a9193478b8002ddd55256468a7924d9bb1;p=samba.git

diff --git a/examples/smb.conf.default b/examples/smb.conf.default
index 839fede1233..971ca19c830 100644
--- a/examples/smb.conf.default
+++ b/examples/smb.conf.default
@@ -4,7 +4,12 @@
 # many!) most of which are not shown in this example
 #
 # For a step to step guide on installing, configuring and using samba, 
-# read the Samba HOWTO Collection.
+# read the Samba-HOWTO-Collection. This may be obtained from:
+#  http://www.samba.org/samba/docs/Samba-HOWTO-Collection.pdf
+#
+# Many working examples of smb.conf files can be found in the 
+# Samba-Guide which is generated daily and can be downloaded from: 
+#  http://www.samba.org/samba/docs/Samba-Guide.pdf
 #
 # Any line which starts with a ; (semi-colon) or a # (hash) 
 # is a comment and is ignored. In this example we will use a #
@@ -17,7 +22,7 @@
 #======================= Global Settings =====================================
 [global]
 
-# workgroup = NT-Domain-Name or Workgroup-Name, eg: REDHAT4
+# workgroup = NT-Domain-Name or Workgroup-Name, eg: MIDEARTH
    workgroup = MYGROUP
 
 # server string is the equivalent of the NT Description field
@@ -25,7 +30,7 @@
 
 # Security mode. Defines in which mode Samba will operate. Possible 
 # values are share, user, server, domain and ads. Most people will want 
-# user level security. See the HOWTO Collection for details.
+# user level security. See the Samba-HOWTO-Collection for details.
    security = user
 
 # This option is important for security. It allows you to restrict
@@ -86,13 +91,6 @@
 #       this line.  The included file is read at that point.
 ;   include = /usr/local/samba/lib/smb.conf.%m
 
-# Most people will find that this option gives better performance.
-# See the chapter 'Samba performance issues' in the Samba HOWTO Collection
-# and the manual pages for details.
-# You may want to add the following on a Linux system:
-#         SO_RCVBUF=8192 SO_SNDBUF=8192
-   socket options = TCP_NODELAY 
-
 # Configure Samba to use multiple interfaces
 # If you have multiple network interfaces then you must list them
 # here. See the man page for details.