summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarolin Seeger <ks@samba.org>2007-05-07 10:40:00 +0000
committerGerald W. Carter <jerry@samba.org>2008-04-23 08:47:32 -0500
commit6c2656bc4f7cd0cd78ab983ec74bad966cbf6799 (patch)
tree0a6f48da1ff09679c4826f36aa360352e3d0d3f6
parenta4b639f0514e1329323afb27c72c604d25cde534 (diff)
downloadsamba-6c2656bc4f7cd0cd78ab983ec74bad966cbf6799.tar.gz
samba-6c2656bc4f7cd0cd78ab983ec74bad966cbf6799.tar.bz2
samba-6c2656bc4f7cd0cd78ab983ec74bad966cbf6799.zip
Clarify the description of "inherit acls" in smb.conf manpage (hopefully fixing bugs #1806 and #1809)
(This used to be commit 1d87278d38d10f947a450058e5ef47493d99b710)
-rw-r--r--docs/smbdotconf/security/inheritacls.xml7
1 files changed, 4 insertions, 3 deletions
diff --git a/docs/smbdotconf/security/inheritacls.xml b/docs/smbdotconf/security/inheritacls.xml
index ac176ab361..44afa8a3e2 100644
--- a/docs/smbdotconf/security/inheritacls.xml
+++ b/docs/smbdotconf/security/inheritacls.xml
@@ -5,9 +5,10 @@
<description>
<para>This parameter can be used to ensure that if default acls
exist on parent directories, they are always honored when creating a
- subdirectory. The default behavior is to use the mode specified when
- creating the directory. Enabling this option sets the mode to 0777,
- thus guaranteeing that default directory acls are propagated.
+ new file or subdirectory in these parent directories. The default
+ behavior is to use the unix mode specified when creating the directory.
+ Enabling this option sets the unix mode to 0777, thus guaranteeing that
+ default directory acls are propagated.
</para>
</description>