mega-merge from 2.2

(This used to be commit c76bf8ed3275e217d1b691879153fe9137bcbe38)

1 files changed, 28 insertions, 23 deletions

diff --git a/docs/htmldocs/UNIX_INSTALL.html b/docs/htmldocs/UNIX_INSTALL.html
index 34f4ed9283..7194e1154e 100644
--- a/docs/htmldocs/UNIX_INSTALL.html
+++ b/docs/htmldocs/UNIX_INSTALL.html
@@ -19,7 +19,7 @@ CLASS="TITLEPAGE"
 ><H1
 CLASS="TITLE"
 ><A
-NAME="AEN1"
+NAME="INSTALL"
 >How to Install and Test SAMBA</A
 ></H1
 ><HR></DIV
@@ -84,7 +84,7 @@ CLASS="USERINPUT"
 ></P
 ><P
 >first to see what special options you can enable.
-	Then exectuting</P
+	Then executing</P
 ><P
 ><TT
 CLASS="PROMPT"
@@ -202,7 +202,7 @@ CLASS="PROGRAMLISTING"
 >which would allow connections by anyone with an 
 	account on the server, using either their login name or 
 	"homes" as the service name. (Note that I also set the 
-	workgroup that Samba is part of. See BROWSING.txt for defails)</P
+	workgroup that Samba is part of. See BROWSING.txt for details)</P
 ><P
 >Note that <B
 CLASS="COMMAND"
@@ -249,7 +249,7 @@ CLASS="FILENAME"
 	not it will give an error message.</P
 ><P
 >Make sure it runs OK and that the services look 
-	resonable before proceeding. </P
+	reasonable before proceeding. </P
 ></DIV
 ><DIV
 CLASS="SECT1"
@@ -358,7 +358,7 @@ CLASS="FILENAME"
 		<TT
 CLASS="FILENAME"
 >/etc/inetd.conf</TT
-> to make them consistant.</P
+> to make them consistent.</P
 ><P
 >NOTE: On many systems you may need to use the 
 		"interfaces" option in smb.conf to specify the IP address 
@@ -371,7 +371,7 @@ CLASS="COMMAND"
 CLASS="COMMAND"
 >nmbd</B
 > tries to determine it at run 
-		time, but fails on somunixes. See the section on "testing nmbd" 
+		time, but fails on some unixes. See the section on "testing nmbd" 
 		for a method of finding if you need to do this.</P
 ><P
 >!!!WARNING!!! Many unixes only accept around 5 
@@ -637,7 +637,7 @@ NAME="AEN162"
 >Diagnosing Problems</A
 ></H2
 ><P
->If you have instalation problems then go to 
+>If you have installation problems then go to 
 		<TT
 CLASS="FILENAME"
 >DIAGNOSIS.txt</TT
@@ -736,20 +736,25 @@ NAME="AEN182"
 		The second is the "deny modes" that are specified when a file 
 		is open.</P
 ><P
->Samba supports "record locking" using the fcntl() unix system
-		call. This is often implemented using rpc calls to a rpc.lockd process
-		running on the system that owns the filesystem. Unfortunately many
-		rpc.lockd implementations are very buggy, particularly when made to
-		talk to versions from other vendors. It is not uncommon for the
-		rpc.lockd to crash.</P
-><P
->There is also a problem translating the 32 bit lock 
-		requests generated by PC clients to 31 bit requests supported 
-		by most unixes. Unfortunately many PC applications (typically 
-		OLE2 applications) use byte ranges with the top bit set 
-		as semaphore sets. Samba attempts translation to support 
-		these types of applications, and the translation has proved 
-		to be quite successful.</P
+>Record locking semantics under Unix is very
+		different from record locking under Windows. Versions
+		of Samba before 2.2 have tried to use the native
+		fcntl() unix system call to implement proper record
+		locking between different Samba clients. This can not
+		be fully correct due to several reasons. The simplest
+		is the fact that a Windows client is allowed to lock a
+		byte range up to 2^32 or 2^64, depending on the client
+		OS. The unix locking only supports byte ranges up to
+		2^31. So it is not possible to correctly satisfy a
+		lock request above 2^31. There are many more
+		differences, too many to be listed here.</P
+><P
+>Samba 2.2 and above implements record locking
+		completely independent of the underlying unix
+		system. If a byte range lock that the client requests
+		happens to fall into the range 0-2^31, Samba hands
+		this request down to the Unix system. All other locks
+		can not be seen by unix anyway.</P
 ><P
 >Strictly a SMB server should check for locks before 
 		every read and write call on a file. Unfortunately with the 
@@ -771,7 +776,7 @@ NAME="AEN182"
 		are set by an application when it opens a file to determine 
 		what types of access should be allowed simultaneously with 
 		its open. A client may ask for DENY_NONE, DENY_READ, DENY_WRITE 
-		or DENY_ALL. There are also special compatability modes called 
+		or DENY_ALL. There are also special compatibility modes called 
 		DENY_FCB and  DENY_DOS.</P
 ><P
 >You can disable share modes using "share modes = no". 
@@ -804,7 +809,7 @@ NAME="AEN195"
 ><P
 >If you have problems using filenames with accented 
 		characters in them (like the German, French or Scandinavian 
-		character sets) then I recommmend you look at the "valid chars" 
+		character sets) then I recommend you look at the "valid chars" 
 		option in smb.conf and also take a look at the validchars 
 		package in the examples directory.</P
 ></DIV