X-Git-Url: http://git.samba.org/?p=samba.git;a=blobdiff_plain;f=NEWS;h=dd01091921066e3801e9998a148f312a1c166787;hp=5316168c6bf93e0e680069f2935c9c46eef4beac;hb=39f03829a626388e8396a14c265d2f95520b0e98;hpb=15421cd7a2ce4dd4a79d5d8bee72f5b71b5b4104

diff --git a/NEWS b/NEWS
index 5316168c6bf..dd010919210 100644
--- a/NEWS
+++ b/NEWS
@@ -12,7 +12,7 @@ from Samba 3 is available in source/setup/upgrade.
 
 Removal of nmbd and introduction of process models
 ==================================================
-smbd now implements several network protocols other then just CIFS and 
+smbd now implements several network protocols other than just CIFS and 
 DCE/RPC. nmbd's functionality has been merged into smbd. smbd supports 
 various 'process models' that specify how concurrent connections are 
 handled (when to fork, use threads, etc). 
@@ -24,7 +24,7 @@ called LDB (see ldb(7) for more info).
 
 Much improved SWAT
 ==================
-SWAT has had some rather large improvements and is now more then just a 
+SWAT has had some rather large improvements and is now more than just a 
 direct editor for smb.conf. Its layout has been improved. SWAT can now also 
 be used for editing run-time data - maintaining user information, provisioning,
 etc. TLS is supported out of the box.
@@ -55,7 +55,7 @@ The 'security' parameter has been split up. It is now only used to choose
 between the 'user' and 'share' security levels (the latter is not supported 
 in Samba 4 yet). The other values of this option and the 'domain master' and 
 'domain logons' parameters have been merged into a 'server role' parameter 
-that can be either 'bdc', 'pdc', 'member server' or 'standalone'. Note that 
+that can be either 'domain controller', 'member server' or 'standalone'. Note that 
 member server support does not work yet.
 
 The following parameters have been removed:
@@ -242,7 +242,6 @@ The following parameters have been removed:
 - domain master
 - browse list
 - enhanced browsing
-- dns proxy
 - wins proxy
 - wins hook
 - wins partners
@@ -369,7 +368,7 @@ The following parameters have been added:
 	Default: Set at compile-time
 	
 + ntvfs handler
-	Backend to the NT VFS to use (more then one can be specified). Available
+	Backend to the NT VFS to use (more than one can be specified). Available
 	backends include: 
 	
 	- posix:
@@ -434,7 +433,7 @@ The following parameters have been added:
 	
 + client use spnego principal
 	Tells the client to use the Kerberos service principal specified by the 
-	server during the security protocol negotation rather then 
+	server during the security protocol negotation rather than 
 	looking up the principal itself (cifs/hostname).
 
 	Default: false