summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs-xml/smbdotconf/base/interfaces.xml2
-rw-r--r--docs-xml/smbdotconf/filename/mapreadonly.xml4
-rw-r--r--docs-xml/smbdotconf/security/checkpasswordscript.xml11
3 files changed, 11 insertions, 6 deletions
diff --git a/docs-xml/smbdotconf/base/interfaces.xml b/docs-xml/smbdotconf/base/interfaces.xml
index 2b13200ea6..8c3684ff0f 100644
--- a/docs-xml/smbdotconf/base/interfaces.xml
+++ b/docs-xml/smbdotconf/base/interfaces.xml
@@ -6,7 +6,7 @@
<description>
<para>This option allows you to override the default
network interfaces list that Samba will use for browsing, name
- registration and other NBT traffic. By default Samba will query
+ registration and other NetBIOS over TCP/IP (NBT) traffic. By default Samba will query
the kernel for the list of all active interfaces and use any
interfaces except 127.0.0.1 that are broadcast capable.</para>
diff --git a/docs-xml/smbdotconf/filename/mapreadonly.xml b/docs-xml/smbdotconf/filename/mapreadonly.xml
index 3ec2d3bf27..33f840d8c5 100644
--- a/docs-xml/smbdotconf/filename/mapreadonly.xml
+++ b/docs-xml/smbdotconf/filename/mapreadonly.xml
@@ -22,6 +22,10 @@
<constant>Yes</constant> - The read only DOS attribute is mapped to the inverse of the user
or owner write bit in the unix permission mode set. If the owner write bit is not set, the
read only attribute is reported as being set on the file.
+If the read only DOS attribute gets set, Samba sets the owner, group and
+others write bits to zero. Write bits set in an ACL are ignored by Samba.
+If the read only DOS attribute gets unset, Samba simply sets the write bit of the
+owner to one.
</para></listitem>
<listitem><para>
diff --git a/docs-xml/smbdotconf/security/checkpasswordscript.xml b/docs-xml/smbdotconf/security/checkpasswordscript.xml
index 9169891c29..152632ce5f 100644
--- a/docs-xml/smbdotconf/security/checkpasswordscript.xml
+++ b/docs-xml/smbdotconf/security/checkpasswordscript.xml
@@ -5,14 +5,15 @@
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>The name of a program that can be used to check password
- complexity. The password is sent to the program's standrad input.</para>
+ complexity. The password is sent to the program's standard input.</para>
- <para>The program must return 0 on good password any other value otherwise.
- In case the password is considered weak (the program do not return 0) the
+ <para>The program must return 0 on a good password, or any other value
+ if the password is bad.
+ In case the password is considered weak (the program does not return 0) the
user will be notified and the password change will fail.</para>
- <para>Note: In the example directory there is a sample program called crackcheck
- that uses cracklib to checkpassword quality.</para>
+ <para>Note: In the example directory is a sample program called <command moreinfo="none">crackcheck</command>
+ that uses cracklib to check the password quality.</para>
</description>