posix locking parameter added(thought I already had) and

update to dos filemode

1 files changed, 50 insertions, 12 deletions

diff --git a/docs/htmldocs/smb.conf.5.html b/docs/htmldocs/smb.conf.5.html
index d7344543396..914e2304656 100644
--- a/docs/htmldocs/smb.conf.5.html
+++ b/docs/htmldocs/smb.conf.5.html
@@ -2938,6 +2938,15 @@ CLASS="PARAMETER"
 ><TT
 CLASS="PARAMETER"
 ><I
+>posix locking</I
+></TT
+></P
+></LI
+><LI
+><P
+><TT
+CLASS="PARAMETER"
+><I
 >postexec</I
 ></TT
 ></P
@@ -3352,7 +3361,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN1095"
+NAME="AEN1098"
 ></A
 ><H2
 >EXPLANATION OF EACH PARAMETER</H2
@@ -6236,13 +6245,15 @@ NAME="DOSFILEMODE"
 ><DD
 ><P
 > The default behavior in Samba is to provide 
-		UNIX-like behavor that unless a user is the the owner of a 
-		file or directory, he or she will not be able to modify the 
-		object's permissions.  This is often confusing to  DOS/Windows 
-		users.  Enabling this parameter allows a user who would not 
-		otherwise be allowed to modify these permissions, to make 
-		changes.  Ownership of the file/directory is not changed,
-		only the permissions are modified.</P
+		UNIX-like behavor where only the owner of a file/directory is 
+		able to change the permissions on it.  However, this behavior
+		is often confusing to  DOS/Windows users.  Enabling this parameter 
+		allows a user who has write access to the file (by whatever 
+		means) to modify the permissions on it.  Note that a user
+		belonging to the group owning the file will not be allowed to
+		change permissions if the group is only granted read access.
+		Ownership of the file/directory is not changed, only the permissions 
+		are modified.</P
 ><P
 >Default: <B
 CLASS="COMMAND"
@@ -11810,6 +11821,33 @@ CLASS="COMMAND"
 ></DD
 ><DT
 ><A
+NAME="POSIXLOCKING"
+></A
+>posix locking (S)</DT
+><DD
+><P
+>The <A
+HREF="smbd.8.html"
+TARGET="_top"
+><B
+CLASS="COMMAND"
+>smbd(8)</B
+></A
+>
+		daemon maintains an database of file locks obtained by SMB clients.
+		The default behavior is to map this internal database to POSIX
+		locks.  This means that file locks obtained by SMB clients are 
+		consistent with those seen by POSIX compliant applications accessing 
+		the files via a non-SMB method (e.g. NFS or local file access).  
+		You should never need to disable this parameter.</P
+><P
+>Default: <B
+CLASS="COMMAND"
+>posix locking = yes</B
+></P
+></DD
+><DT
+><A
 NAME="POSTEXEC"
 ></A
 >postexec (S)</DT
@@ -17046,7 +17084,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN5372"
+NAME="AEN5384"
 ></A
 ><H2
 >WARNINGS</H2
@@ -17076,7 +17114,7 @@ TARGET="_top"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN5378"
+NAME="AEN5390"
 ></A
 ><H2
 >VERSION</H2
@@ -17087,7 +17125,7 @@ NAME="AEN5378"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN5381"
+NAME="AEN5393"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -17166,7 +17204,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN5401"
+NAME="AEN5413"
 ></A
 ><H2
 >AUTHOR</H2