[Pkg-samba-maint] r1997 - branches/samba/experimental/debian

[bubulle at alioth.debian.org]

Author: bubulle
Date: 2008-07-06 07:31:55 +0000 (Sun, 06 Jul 2008)
New Revision: 1997

Modified:
   branches/samba/experimental/debian/smb.conf
Log:
Merge r1823

Modified: branches/samba/experimental/debian/smb.conf
===================================================================
--- branches/samba/experimental/debian/smb.conf	2008-07-06 07:31:17 UTC (rev 1996)
+++ branches/samba/experimental/debian/smb.conf	2008-07-06 07:31:55 UTC (rev 1997)
@@ -7,8 +7,8 @@
 # here. Samba has a huge number of configurable options most of which 
 # are not shown in this example
 #
-# Some options that are considered worth to be considered for tuning
-# have been added, but commented, in this file.
+# Some options that are often worth tuning have been included as
+# commented-out examples in this file.
 #  - When such options are commented with ";", the proposed setting
 #    differs from the default Samba behaviour
 #  - When commented with "#", the proposed setting is the default
@@ -18,11 +18,11 @@
 # NOTE: Whenever you modify this file you should run the command
 # "testparm" to check that you have not made any basic syntactic 
 # errors. 
-# A well established practice is to name the original file
-# "smb.conf.master" and create the "real" master file with
+# A well-established practice is to name the original file
+# "smb.conf.master" and create the "real" config file with
 # testparm -s smb.conf.master >smb.conf
 # This minimizes the size of the really used smb.conf file
-# which, according to the Samba Team, has performance impacts
+# which, according to the Samba Team, impacts performance
 #
 
 #======================= Global Settings =======================
@@ -50,7 +50,7 @@
 
 # What naming service and in what order should we use to resolve host names
 # to IP addresses
-#   name resolve order = lmhosts host wins bcast
+;   name resolve order = lmhosts host wins bcast
 
 #### Networking ####