summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/Samba3-Developers-Guide/internals.xml2
-rw-r--r--docs/manpages-3/ntlm_auth.1.xml10
-rw-r--r--docs/manpages-3/winbindd.8.xml2
-rw-r--r--docs/smbdotconf/security/algorithmicridbase.xml2
-rw-r--r--docs/smbdotconf/security/passwdchatdebug.xml2
5 files changed, 9 insertions, 9 deletions
diff --git a/docs/Samba3-Developers-Guide/internals.xml b/docs/Samba3-Developers-Guide/internals.xml
index 6178028600..be271217e7 100644
--- a/docs/Samba3-Developers-Guide/internals.xml
+++ b/docs/Samba3-Developers-Guide/internals.xml
@@ -285,7 +285,7 @@ remote api.
</para></listitem>
<listitem><para>
rparam: a pointer to a pointer which will be set to point to the returned
- paramters. The caller of call_api() must deallocate this memory.
+ parameters. The caller of call_api() must deallocate this memory.
</para></listitem>
<listitem><para>
rdata: a pointer to a pointer which will be set to point to the returned
diff --git a/docs/manpages-3/ntlm_auth.1.xml b/docs/manpages-3/ntlm_auth.1.xml
index 54fdb04e44..ce46f63900 100644
--- a/docs/manpages-3/ntlm_auth.1.xml
+++ b/docs/manpages-3/ntlm_auth.1.xml
@@ -100,12 +100,12 @@
<varlistentry>
<term>ntlmssp-client-1</term>
<listitem><para>
- Client-side helper for use with arbitary external
+ Client-side helper for use with arbitrary external
programs that may wish to use Samba's NTLMSSP
authentication knowledge. </para>
<para>This helper is a client, and as such may be run by any
user. The protocol used is
- effectivly the reverse of the previous protocol. A
+ effectively the reverse of the previous protocol. A
<command>YR</command> command (without any arguments)
starts the authentication exchange.
</para>
@@ -145,8 +145,8 @@
RADIUS server or the 'winbind' plugin for pppd, for
the provision of MSCHAP and MSCHAPv2 authentication.
</para>
- <para>This protocol consists of lines in for form:
- <command>Parameter: value</command> and <command>Paramter::
+ <para>This protocol consists of lines in the form:
+ <command>Parameter: value</command> and <command>Parameter::
Base64-encode value</command>. The presence of a single
period <command>.</command> indicates that one side has
finished supplying data to the other. (Which in turn
@@ -309,7 +309,7 @@
not specified on the command line, this is prompted for when
required. </para>
- <para>For the NTLMSSP based server roles, this paramter
+ <para>For the NTLMSSP based server roles, this parameter
specifies the expected password, allowing testing without
winbindd operational.</para>
</listitem>
diff --git a/docs/manpages-3/winbindd.8.xml b/docs/manpages-3/winbindd.8.xml
index 337cdb0e8c..3efeece93b 100644
--- a/docs/manpages-3/winbindd.8.xml
+++ b/docs/manpages-3/winbindd.8.xml
@@ -36,7 +36,7 @@
<para><command>winbindd</command> is a daemon that provides
a number of services to the Name Service Switch capability found
- in most modern C libraries, to arbitary applications via PAM
+ in most modern C libraries, to arbitrary applications via PAM
and <command>ntlm_auth</command> and to Samba itself.</para>
<para>Even if winbind is not used for nsswitch, it still provides a
diff --git a/docs/smbdotconf/security/algorithmicridbase.xml b/docs/smbdotconf/security/algorithmicridbase.xml
index b854bc7214..24a3150024 100644
--- a/docs/smbdotconf/security/algorithmicridbase.xml
+++ b/docs/smbdotconf/security/algorithmicridbase.xml
@@ -18,7 +18,7 @@
the correct operation of ACLs on the server. As such the algorithmic
mapping can't be 'turned off', but pushing it 'out of the way' should
resolve the issues. Users and groups can then be assigned 'low' RIDs
- in arbitary-rid supporting backends.
+ in arbitrary-rid supporting backends.
</para>
</description>
diff --git a/docs/smbdotconf/security/passwdchatdebug.xml b/docs/smbdotconf/security/passwdchatdebug.xml
index 78714ab8b5..24bcbdba10 100644
--- a/docs/smbdotconf/security/passwdchatdebug.xml
+++ b/docs/smbdotconf/security/passwdchatdebug.xml
@@ -16,7 +16,7 @@
when calling the <parameter moreinfo="none">passwd program</parameter> and should
be turned off after this has been done. This option has no effect if the
<smbconfoption name="pam password change"/>
- paramter is set. This parameter is off by default.</para>
+ parameter is set. This parameter is off by default.</para>
</description>
<related>passwd chat</related>