summaryrefslogtreecommitdiff
path: root/docs-xml
diff options
context:
space:
mode:
Diffstat (limited to 'docs-xml')
-rw-r--r--docs-xml/smbdotconf/base/bindinterfacesonly.xml6
-rw-r--r--docs-xml/smbdotconf/ldap/ldapsameditposix.xml3
-rw-r--r--docs-xml/smbdotconf/printing/addprintercommand.xml10
-rw-r--r--docs-xml/smbdotconf/printing/deleteprintercommand.xml6
-rw-r--r--docs-xml/smbdotconf/security/ntlmauth.xml2
-rw-r--r--docs-xml/smbdotconf/security/passwdchat.xml2
6 files changed, 15 insertions, 14 deletions
diff --git a/docs-xml/smbdotconf/base/bindinterfacesonly.xml b/docs-xml/smbdotconf/base/bindinterfacesonly.xml
index bccac4a0da..6e8321bbca 100644
--- a/docs-xml/smbdotconf/base/bindinterfacesonly.xml
+++ b/docs-xml/smbdotconf/base/bindinterfacesonly.xml
@@ -29,14 +29,14 @@
For file service it causes <citerefentry><refentrytitle>smbd</refentrytitle>
<manvolnum>8</manvolnum></citerefentry> to bind only to the interface list given in the <smbconfoption
name="interfaces"/> parameter. This restricts the networks that <command moreinfo="none">smbd</command> will
- serve to packets coming in those interfaces. Note that you should not use this parameter for machines that
+ serve, to packets coming in on those interfaces. Note that you should not use this parameter for machines that
are serving PPP or other intermittent or non-broadcast network interfaces as it will not cope with
non-permanent interfaces.
</para>
<para>
- If <smbconfoption name="bind interfaces only"/> is set then unless the network address
- <emphasis>127.0.0.1</emphasis> is added to the <smbconfoption name="interfaces"/> parameter list
+ If <smbconfoption name="bind interfaces only"/> is set and the network address
+ <emphasis>127.0.0.1</emphasis> is not added to the <smbconfoption name="interfaces"/> parameter list
<citerefentry><refentrytitle>smbpasswd</refentrytitle> <manvolnum>8</manvolnum></citerefentry> and
<citerefentry><refentrytitle>swat</refentrytitle> <manvolnum>8</manvolnum></citerefentry> may not work as
expected due to the reasons covered below.
diff --git a/docs-xml/smbdotconf/ldap/ldapsameditposix.xml b/docs-xml/smbdotconf/ldap/ldapsameditposix.xml
index ace6c6c64d..c04ecc9cdd 100644
--- a/docs-xml/smbdotconf/ldap/ldapsameditposix.xml
+++ b/docs-xml/smbdotconf/ldap/ldapsameditposix.xml
@@ -48,8 +48,7 @@
idmap gid = 5000-50000
</programlisting>
- This configuration assume the ldap server have been loaded with a base tree like described
- in the following ldif:
+ This configuration assumes a directory layout like described in the following ldif:
<programlisting>
dn: dc=samba,dc=org
diff --git a/docs-xml/smbdotconf/printing/addprintercommand.xml b/docs-xml/smbdotconf/printing/addprintercommand.xml
index ed3c5aa3be..c66f43eb3f 100644
--- a/docs-xml/smbdotconf/printing/addprintercommand.xml
+++ b/docs-xml/smbdotconf/printing/addprintercommand.xml
@@ -1,4 +1,4 @@
-<samba:parameter name="add printer command"
+<samba:parameter name="addprinter command"
context="G"
type="string"
advanced="1" developer="1"
@@ -12,8 +12,9 @@
NT/2000 print server.</para>
<para>For a Samba host this means that the printer must be
- physically added to the underlying printing system. The <parameter moreinfo="none">add
- printer command</parameter> defines a script to be run which
+ physically added to the underlying printing system.
+ The <parameter moreinfo="none">addprinter command</parameter>
+ defines a script to be run which
will perform the necessary operations for adding the printer
to the print system and to add the appropriate service definition
to the <filename moreinfo="none">smb.conf</filename> file in order that it can be
@@ -46,7 +47,8 @@
</command> will return an ACCESS_DENIED error to the client.</para>
<para>
- The &quot;add printer command&quot; program can output a single line of text,
+ The <parameter moreinfo="none">addprinter command</parameter> program
+ can output a single line of text,
which Samba will set as the port the new printer is connected to.
If this line isn't output, Samba won't reload its printer shares.
</para>
diff --git a/docs-xml/smbdotconf/printing/deleteprintercommand.xml b/docs-xml/smbdotconf/printing/deleteprintercommand.xml
index b48ab5700d..d9a3fddfb9 100644
--- a/docs-xml/smbdotconf/printing/deleteprintercommand.xml
+++ b/docs-xml/smbdotconf/printing/deleteprintercommand.xml
@@ -6,11 +6,11 @@
<description>
<para>With the introduction of MS-RPC based printer
support for Windows NT/2000 clients in Samba 2.2, it is now
- possible to delete printer at run time by issuing the
+ possible to a delete printer at run time by issuing the
DeletePrinter() RPC call.</para>
<para>For a Samba host this means that the printer must be
- physically deleted from underlying printing system. The
+ physically deleted from the underlying printing system. The
<smbconfoption name="deleteprinter command"/> defines a script to be run which
will perform the necessary operations for removing the printer
from the print system and from <filename moreinfo="none">smb.conf</filename>.
@@ -22,7 +22,7 @@
<para>Once the <smbconfoption name="deleteprinter command"/> has
been executed, <command moreinfo="none">smbd</command> will reparse the <filename moreinfo="none">
- smb.conf</filename> to associated printer no longer exists.
+ smb.conf</filename> to check that the associated printer no longer exists.
If the sharename is still valid, then <command moreinfo="none">smbd
</command> will return an ACCESS_DENIED error to the client.</para>
</description>
diff --git a/docs-xml/smbdotconf/security/ntlmauth.xml b/docs-xml/smbdotconf/security/ntlmauth.xml
index ebcdad72a1..ec603bbf59 100644
--- a/docs-xml/smbdotconf/security/ntlmauth.xml
+++ b/docs-xml/smbdotconf/security/ntlmauth.xml
@@ -13,7 +13,7 @@
<para>If this option, and <command moreinfo="none">lanman
auth</command> are both disabled, then only NTLMv2 logins will be
permited. Not all clients support NTLMv2, and most will require
- special configuration to us it.</para>
+ special configuration to use it.</para>
</description>
<value type="default">yes</value>
diff --git a/docs-xml/smbdotconf/security/passwdchat.xml b/docs-xml/smbdotconf/security/passwdchat.xml
index da18142dfa..13db519f40 100644
--- a/docs-xml/smbdotconf/security/passwdchat.xml
+++ b/docs-xml/smbdotconf/security/passwdchat.xml
@@ -17,7 +17,7 @@
on what local methods are used for password control (such as NIS
etc).</para>
- <para>Note that this parameter only is only used if the <smbconfoption
+ <para>Note that this parameter only is used if the <smbconfoption
name="unix password sync"/> parameter is set to <constant>yes</constant>. This sequence is
then called <emphasis>AS ROOT</emphasis> when the SMB password in the
smbpasswd file is being changed, without access to the old password