Debian updates. Brings files in packaging/Debian on par with the

latest Debian official packages for Debian unstable. Also fixes
patches that got out of date in the beta2->beta3 development process.
(This used to be commit 03871fd574bf9c0f6d88c96423f77e9ada7b16f7)

1 files changed, 5 insertions, 6 deletions

diff --git a/packaging/Debian/debian/smb.conf b/packaging/Debian/debian/smb.conf
index 6d8852958b..8a75979945 100644
--- a/packaging/Debian/debian/smb.conf
+++ b/packaging/Debian/debian/smb.conf
@@ -30,7 +30,7 @@
    server string = %h server (Samba %v)
 
 # Windows Internet Name Serving Support Section:
-# WINS Support - Tells the NMBD component of Samba to enable it's WINS Server
+# WINS Support - Tells the NMBD component of Samba to enable its WINS Server
 ;   wins support = no
 
 # WINS Server - Tells the NMBD components of Samba to be a WINS Client
@@ -71,12 +71,12 @@
 
 # "security = user" is always a good idea. This will require a Unix account
 # in this server for every user accessing the server. See
-# security_level.txt for details.
+# /usr/share/doc/samba-doc/htmldocs/ServerType.html in the samba-doc
+# package for details.
 ;   security = user
 
-# You may wish to use password encryption. Please read ENCRYPTION.html,
-# Win95.txt and WinNT.txt in the Samba documentation. Do not enable this
-# option unless you have read those documents
+# You may wish to use password encryption.  See the section on
+# 'encrypt passwords' in the smb.conf(5) manpage before enabling.
    encrypt passwords = no
 
 # If you are using encrypted passwords, Samba will need to know what
@@ -153,7 +153,6 @@
 # working to ease installation and configuration of linpopup and samba.
 ;   message command = /bin/sh -c '/usr/bin/linpopup "%f" "%m" %s; rm %s' &
 
-
 # Domain Master specifies Samba to be the Domain Master Browser. If this
 # machine will be configured as a BDC (a secondary logon server), you
 # must set this to 'no'; otherwise, the default behavior is recommended.