minor language tweaks to preceding change; and our setting for

'name resolve order' is not the upstream default

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

1 files changed, 6 insertions, 6 deletions

diff --git a/smb.conf b/smb.conf
index ea4d171f8c..4780718c48 100644
--- a/smb.conf
+++ b/smb.conf
@@ -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 ####