[SCM] Samba Shared Repository - branch v3-6-test updated
Karolin Seeger
kseeger at samba.org
Tue May 8 06:44:02 MDT 2012
The branch, v3-6-test has been updated
via 3522cbb s3-docs: Fix several typos.
via 6b48902 s3-docs: overrided -> overridden
from 9fd8692 s3/ldap: remove outdated netscape ds 5 schema file
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit 3522cbb537069286b55264bfdd5484c278d76181
Author: Karolin Seeger <kseeger at samba.org>
Date: Tue May 8 12:01:28 2012 +0200
s3-docs: Fix several typos.
Part of a fix for bug #7938. Based on a patch provided by John Bradshaw
<john at johnbradshaw.org>.
Karolin
commit 6b4890246ddbd606484e7247bea86c238cc0a057
Author: Karolin Seeger <kseeger at samba.org>
Date: Tue May 8 11:05:37 2012 +0200
s3-docs: overrided -> overridden
Fix typo. Part of a fix for bug #7938. Based on a patch provided by John
Bradshaw <john at johnbradshaw.org>.
-----------------------------------------------------------------------
Summary of changes:
docs-xml/Samba3-ByExample/SBE-MakingHappyUsers.xml | 2 +-
docs-xml/Samba3-Developers-Guide/unix-smb.xml | 2 +-
docs-xml/Samba3-HOWTO/TOSHARG-AccessControls.xml | 2 +-
docs-xml/Samba3-HOWTO/TOSHARG-TDBFiles.xml | 2 +-
docs-xml/Samba3-HOWTO/TOSHARG-VFS.xml | 2 +-
docs-xml/manpages-3/idmap_nss.8.xml | 2 +-
docs-xml/manpages-3/libsmbclient.7.xml | 2 +-
docs-xml/manpages-3/net.8.xml | 2 +-
docs-xml/manpages-3/ntlm_auth.1.xml | 12 ++++++------
docs-xml/manpages-3/pdbedit.8.xml | 20 ++++++++++----------
docs-xml/manpages-3/smbclient.1.xml | 6 +++---
docs-xml/manpages-3/smbcontrol.1.xml | 2 +-
docs-xml/manpages-3/smbcquotas.1.xml | 2 +-
docs-xml/manpages-3/smbd.8.xml | 8 ++++----
docs-xml/manpages-3/tdbbackup.8.xml | 4 ++--
docs-xml/manpages-3/testparm.1.xml | 2 +-
docs-xml/manpages-3/vfs_readonly.8.xml | 2 +-
docs-xml/manpages-3/vfs_shadow_copy2.8.xml | 2 +-
docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml | 6 +++---
docs-xml/smbdotconf/filename/maxstatcachesize.xml | 2 +-
docs-xml/using_samba/ch07.xml | 2 +-
21 files changed, 43 insertions(+), 43 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/Samba3-ByExample/SBE-MakingHappyUsers.xml b/docs-xml/Samba3-ByExample/SBE-MakingHappyUsers.xml
index 9ea5004..3cacc71 100644
--- a/docs-xml/Samba3-ByExample/SBE-MakingHappyUsers.xml
+++ b/docs-xml/Samba3-ByExample/SBE-MakingHappyUsers.xml
@@ -3881,7 +3881,7 @@ HKEY_LOCAL_MACHINE\Default\Software\Microsoft\Windows\
Note: If MS Outlook has been configured to use an IMAP account configuration there may be problems
following these instructions. Feedback from users suggests that where IMAP is used the PST
file is used to store rules and filters. When the PST store is relocated it appears to break
- MS Outlook's Send/Receive button. If anyone has sucessfully relocated PST files where IMAP is
+ MS Outlook's Send/Receive button. If anyone has successfully relocated PST files where IMAP is
used please email <literal>jht at samba.org</literal> with useful tips and suggestions so that
this warning can be removed or modified.
</para></step>
diff --git a/docs-xml/Samba3-Developers-Guide/unix-smb.xml b/docs-xml/Samba3-Developers-Guide/unix-smb.xml
index b700dfc..ae6bdcd 100644
--- a/docs-xml/Samba3-Developers-Guide/unix-smb.xml
+++ b/docs-xml/Samba3-Developers-Guide/unix-smb.xml
@@ -299,7 +299,7 @@ doesn't support them all.
Samba currently supports up to the "NT LM 0.12" protocol, which is the
one preferred by Win95 and WinNT3.5. Luckily this protocol level has a
"capabilities" field which specifies which super-duper new-fangled
-options the server suports. This helps to make the implementation of
+options the server supports. This helps to make the implementation of
this protocol level much easier.
</para>
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-AccessControls.xml b/docs-xml/Samba3-HOWTO/TOSHARG-AccessControls.xml
index 0a50698..6096975 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-AccessControls.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-AccessControls.xml
@@ -1380,7 +1380,7 @@ mystic:/home/hannibal > rm filename
Samba has to deal with the complicated matter of handling the challenge of the Windows
ACL that implements <emphasis>inheritance</emphasis>, a concept not anticipated by POSIX
ACLs as implemented in UNIX file systems. Samba provides support for <emphasis>masks</emphasis>
- that permit normal ugo and ACLs functionality to be overrided. This further complicates
+ that permit normal ugo and ACLs functionality to be overridden. This further complicates
the way in which Windows ACLs must be implemented.
</para>
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-TDBFiles.xml b/docs-xml/Samba3-HOWTO/TOSHARG-TDBFiles.xml
index 2a4bfb9..9bda64d 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-TDBFiles.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-TDBFiles.xml
@@ -24,7 +24,7 @@
<para>
<indexterm><primary>tdb</primary></indexterm>
-<indexterm><primary>currupted</primary></indexterm>
+<indexterm><primary>corrupted</primary></indexterm>
<indexterm><primary>backup</primary></indexterm>
<indexterm><primary>restore</primary></indexterm>
Those who package Samba for commercial distribution with operating systems and appliances would do well to take
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-VFS.xml b/docs-xml/Samba3-HOWTO/TOSHARG-VFS.xml
index 91e9712..933efb5 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-VFS.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-VFS.xml
@@ -916,7 +916,7 @@ max lru files entries = 100
lru file entry lifetime = 5
; exclude files from being scanned based on the MIME-type! Semi-colon
-; seperated list (default: empty list). Use this with care!
+; separated list (default: empty list). Use this with care!
exclude file types =
; socket name of clamd (default: /var/run/clamd). Setting will be ignored if
diff --git a/docs-xml/manpages-3/idmap_nss.8.xml b/docs-xml/manpages-3/idmap_nss.8.xml
index 576eef6..565019c 100644
--- a/docs-xml/manpages-3/idmap_nss.8.xml
+++ b/docs-xml/manpages-3/idmap_nss.8.xml
@@ -20,7 +20,7 @@
<title>DESCRIPTION</title>
<para>The idmap_nss plugin provides a means to map Unix users and groups
- to Windows accounts and obseletes the "winbind trusted domains only"
+ to Windows accounts and obsoletes the "winbind trusted domains only"
smb.conf option. This provides a simple means of ensuring that the SID
for a Unix user named jsmith is reported as the one assigned to
DOMAIN\jsmith which is necessary for reporting ACLs on files and printers
diff --git a/docs-xml/manpages-3/libsmbclient.7.xml b/docs-xml/manpages-3/libsmbclient.7.xml
index 2e54aa0..277caf3 100644
--- a/docs-xml/manpages-3/libsmbclient.7.xml
+++ b/docs-xml/manpages-3/libsmbclient.7.xml
@@ -71,7 +71,7 @@
responsibility of the application that calls this library to set this to a sensible value. This
is a compile-time option. This value determines the maximum number of local master browsers to
query for the list of workgroups. In order to ensure that the list is complete for those present
- on the network, all master browsers must be querried. If there are a large number of workgroups
+ on the network, all master browsers must be queried. If there are a large number of workgroups
on the network, the time spent querying will be significant. For small networks (just a few
workgroups), it is suggested to set this value to 0, instructing libsmbclient to query all local
master browsers. In an environment that has many workgroups a more reasonable setting may be around 3.
diff --git a/docs-xml/manpages-3/net.8.xml b/docs-xml/manpages-3/net.8.xml
index 5c16408..65f1272 100644
--- a/docs-xml/manpages-3/net.8.xml
+++ b/docs-xml/manpages-3/net.8.xml
@@ -2105,7 +2105,7 @@ Joins a computer into a domain. This command supports the following additional p
<listitem><para><replaceable>DOMAIN</replaceable> can be a NetBIOS domain name (also known as short domain name) or a DNS domain name for Active Directory Domains. As in Windows, it is also possible to control which Domain Controller to use. This can be achieved by appending the DC name using the \ separator character. Example: MYDOM\MYDC. The <replaceable>DOMAIN</replaceable> parameter cannot be NULL.</para></listitem>
-<listitem><para><replaceable>OU</replaceable> can be set to a RFC 1779 LDAP DN, like <emphasis>ou=mymachines,cn=Users,dc=example,dc=com</emphasis> in order to create the machine account in a non-default LDAP containter. This optional parameter is only supported when joining Active Directory Domains.</para></listitem>
+<listitem><para><replaceable>OU</replaceable> can be set to a RFC 1779 LDAP DN, like <emphasis>ou=mymachines,cn=Users,dc=example,dc=com</emphasis> in order to create the machine account in a non-default LDAP container. This optional parameter is only supported when joining Active Directory Domains.</para></listitem>
<listitem><para><replaceable>ACCOUNT</replaceable> defines a domain account that will be used to join the machine to the domain. This domain account needs to have sufficient privileges to join machines.</para></listitem>
diff --git a/docs-xml/manpages-3/ntlm_auth.1.xml b/docs-xml/manpages-3/ntlm_auth.1.xml
index 69264d7..dcf9b42 100644
--- a/docs-xml/manpages-3/ntlm_auth.1.xml
+++ b/docs-xml/manpages-3/ntlm_auth.1.xml
@@ -199,7 +199,7 @@
MSCHAPv2) generated in some way by both the server and
the client.
</para>
- <para><example>LANMAN-Challege: 0102030405060708</example></para>
+ <para><example>LANMAN-Challenge: 0102030405060708</example></para>
</listitem></varlistentry>
<varlistentry>
@@ -239,7 +239,7 @@
<varlistentry>
<term>Request-User-Session-Key</term>
- <listitem><para>Apon sucessful authenticaiton, return
+ <listitem><para>Upon successful authenticaiton, return
the user session key associated with the login.
</para>
<para><example>Request-User-Session-Key: Yes</example></para>
@@ -248,14 +248,14 @@
<varlistentry>
<term>Request-LanMan-Session-Key</term>
- <listitem><para>Apon sucessful authenticaiton, return
+ <listitem><para>Upon successful authenticaiton, return
the LANMAN session key associated with the login.
</para>
<para><example>Request-LanMan-Session-Key: Yes</example></para>
</listitem></varlistentry>
- <para><warning>Implementors should take care to base64 encode
+ <para><warning>Implementers should take care to base64 encode
any data (such as usernames/passwords) that may contain malicous user data, such as
a newline. They may also need to decode strings from
the helper, which likewise may have been base64 encoded.</warning></para>
@@ -319,7 +319,7 @@
<varlistentry>
<term>--request-lm-key</term>
- <listitem><para>Retreive LM session key</para></listitem>
+ <listitem><para>Retrieve LM session key</para></listitem>
</varlistentry>
<varlistentry>
@@ -380,7 +380,7 @@ auth_param basic program ntlm_auth --helper-protocol=squid-2.5-basic --require-m
<title>TROUBLESHOOTING</title>
<para>If you're experiencing problems with authenticating Internet Explorer running
- under MS Windows 9X or Millenium Edition against ntlm_auth's NTLMSSP authentication
+ under MS Windows 9X or Millennium Edition against ntlm_auth's NTLMSSP authentication
helper (--helper-protocol=squid-2.5-ntlmssp), then please read
<ulink url="http://support.microsoft.com/support/kb/articles/Q239/8/69.ASP">
the Microsoft Knowledge Base article #239869 and follow instructions described there</ulink>.
diff --git a/docs-xml/manpages-3/pdbedit.8.xml b/docs-xml/manpages-3/pdbedit.8.xml
index fa8cabc..1d0752e 100644
--- a/docs-xml/manpages-3/pdbedit.8.xml
+++ b/docs-xml/manpages-3/pdbedit.8.xml
@@ -72,7 +72,7 @@
without changing the tool).</para>
<para>There are five main ways to use pdbedit: adding a user account,
- removing a user account, modifing a user account, listing user
+ removing a user account, modifying a user account, listing user
accounts, importing users accounts.</para>
</refsect1>
@@ -162,7 +162,7 @@ samba:45:0F2B255F7B67A7A9AAD3B435B51404EE:
<varlistentry>
<term>-f|--fullname fullname</term>
<listitem><para>This option can be used while adding or
- modifing a user account. It will specify the user's full
+ modifying a user account. It will specify the user's full
name. </para>
<para>Example: <command>-f "Simo Sorce"</command></para>
@@ -172,7 +172,7 @@ samba:45:0F2B255F7B67A7A9AAD3B435B51404EE:
<varlistentry>
<term>-h|--homedir homedir</term>
<listitem><para>This option can be used while adding or
- modifing a user account. It will specify the user's home
+ modifying a user account. It will specify the user's home
directory network path.</para>
<para>Example: <command>-h "\\\\BERSERKER\\sorce"</command>
@@ -183,7 +183,7 @@ samba:45:0F2B255F7B67A7A9AAD3B435B51404EE:
<varlistentry>
<term>-D|--drive drive</term>
<listitem><para>This option can be used while adding or
- modifing a user account. It will specify the windows drive
+ modifying a user account. It will specify the windows drive
letter to be used to map the home directory.</para>
<para>Example: <command>-D "H:"</command>
@@ -195,7 +195,7 @@ samba:45:0F2B255F7B67A7A9AAD3B435B51404EE:
<varlistentry>
<term>-S|--script script</term>
<listitem><para>This option can be used while adding or
- modifing a user account. It will specify the user's logon
+ modifying a user account. It will specify the user's logon
script path.</para>
<para>Example: <command>-S "\\\\BERSERKER\\netlogon\\sorce.bat"</command>
@@ -207,7 +207,7 @@ samba:45:0F2B255F7B67A7A9AAD3B435B51404EE:
<varlistentry>
<term>-p|--profile profile</term>
<listitem><para>This option can be used while adding or
- modifing a user account. It will specify the user's profile
+ modifying a user account. It will specify the user's profile
directory.</para>
<para>Example: <command>-p "\\\\BERSERKER\\netlogon"</command>
@@ -447,7 +447,7 @@ account policy value for bad lockout attempt is now 3
<varlistentry>
<term>-N|--account-desc description</term>
<listitem><para>This option can be used while adding or
- modifing a user account. It will specify the user's description
+ modifying a user account. It will specify the user's description
field.</para>
<para>Example: <command>-N "test description"</command>
@@ -458,7 +458,7 @@ account policy value for bad lockout attempt is now 3
<varlistentry>
<term>-Z|--logon-hours-reset</term>
<listitem><para>This option can be used while adding or
- modifing a user account. It will reset the user's allowed logon
+ modifying a user account. It will reset the user's allowed logon
hours. A user may login at any time afterwards.</para>
<para>Example: <command>-Z</command>
@@ -469,7 +469,7 @@ account policy value for bad lockout attempt is now 3
<varlistentry>
<term>-z|--bad-password-count-reset</term>
<listitem><para>This option can be used while adding or
- modifing a user account. It will reset the stored bad login
+ modifying a user account. It will reset the stored bad login
counter from a specified user.</para>
<para>Example: <command>-z</command>
@@ -490,7 +490,7 @@ account policy value for bad lockout attempt is now 3
<varlistentry>
<term>-I|--domain</term>
<listitem><para>This option can be used while adding or
- modifing a user account. It will specify the user's domain field.</para>
+ modifying a user account. It will specify the user's domain field.</para>
<para>Example: <command>-I "MYDOMAIN"</command>
</para>
diff --git a/docs-xml/manpages-3/smbclient.1.xml b/docs-xml/manpages-3/smbclient.1.xml
index ae11e8a..dfeb6c5 100644
--- a/docs-xml/manpages-3/smbclient.1.xml
+++ b/docs-xml/manpages-3/smbclient.1.xml
@@ -322,7 +322,7 @@
server support the UNIX extensions. Request that the connection be
encrypted. This is new for Samba 3.2 and will only work with Samba
3.2 or above servers. Negotiates SMB encryption using GSSAPI. Uses
- the given credentials for the encryption negotiaion (either kerberos
+ the given credentials for the encryption negotiation (either kerberos
or NTLMv1/v2 if given domain/username/password triple. Fails the
connection if encryption cannot be negotiated.
</para></listitem>
@@ -428,7 +428,7 @@
<para>Restore from tar file <filename>backup.tar</filename> into myshare on mypc
(no password on share). </para>
- <para><command>smbclient //mypc/yshare "" -N -Tx backup.tar
+ <para><command>smbclient //mypc/myshare "" -N -Tx backup.tar
</command></para>
<para>Restore everything except <filename>users/docs</filename>
@@ -634,7 +634,7 @@
<varlistentry>
<term>du <filename></term>
- <listitem><para>Does a directory listing and then prints out the current disk useage and free space on a share.
+ <listitem><para>Does a directory listing and then prints out the current disk usage and free space on a share.
</para></listitem>
</varlistentry>
diff --git a/docs-xml/manpages-3/smbcontrol.1.xml b/docs-xml/manpages-3/smbcontrol.1.xml
index 31c3537..6ffec13 100644
--- a/docs-xml/manpages-3/smbcontrol.1.xml
+++ b/docs-xml/manpages-3/smbcontrol.1.xml
@@ -214,7 +214,7 @@
<para>
Note that this message only sends notification that an
- event has occured. It doesn't actually cause the
+ event has occurred. It doesn't actually cause the
event to happen.
</para>
diff --git a/docs-xml/manpages-3/smbcquotas.1.xml b/docs-xml/manpages-3/smbcquotas.1.xml
index a94ceac..de43878 100644
--- a/docs-xml/manpages-3/smbcquotas.1.xml
+++ b/docs-xml/manpages-3/smbcquotas.1.xml
@@ -118,7 +118,7 @@
<refsect1>
- <title>QUOTA_SET_COMAND</title>
+ <title>QUOTA_SET_COMMAND</title>
<para>The format of an the QUOTA_SET_COMMAND is an operation
name followed by a set of parameters specific to that operation.
diff --git a/docs-xml/manpages-3/smbd.8.xml b/docs-xml/manpages-3/smbd.8.xml
index 3d41d74..618ff82 100644
--- a/docs-xml/manpages-3/smbd.8.xml
+++ b/docs-xml/manpages-3/smbd.8.xml
@@ -239,19 +239,19 @@
password), for account checking (is this account disabled?) and for
session management. The degree too which samba supports PAM is restricted
by the limitations of the SMB protocol and the <smbconfoption name="obey pam restrictions"/> <citerefentry><refentrytitle>smb.conf</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry> paramater. When this is set, the following restrictions apply:
+ <manvolnum>5</manvolnum></citerefentry> parameter. When this is set, the following restrictions apply:
</para>
<itemizedlist>
<listitem><para><emphasis>Account Validation</emphasis>: All accesses to a
samba server are checked
- against PAM to see if the account is vaild, not disabled and is permitted to
+ against PAM to see if the account is valid, not disabled and is permitted to
login at this time. This also applies to encrypted logins.
</para></listitem>
<listitem><para><emphasis>Session Management</emphasis>: When not using share
- level secuirty, users must pass PAM's session checks before access
- is granted. Note however, that this is bypassed in share level secuirty.
+ level security, users must pass PAM's session checks before access
+ is granted. Note however, that this is bypassed in share level security.
Note also that some older pam configuration files may need a line
added for session support.
</para></listitem>
diff --git a/docs-xml/manpages-3/tdbbackup.8.xml b/docs-xml/manpages-3/tdbbackup.8.xml
index 78fe32e..93f773f 100644
--- a/docs-xml/manpages-3/tdbbackup.8.xml
+++ b/docs-xml/manpages-3/tdbbackup.8.xml
@@ -54,7 +54,7 @@
<varlistentry>
<term>-s suffix</term>
<listitem><para>
- The <command>-s</command> option allows the adminisistrator to specify a file
+ The <command>-s</command> option allows the administrator to specify a file
backup extension. This way it is possible to keep a history of tdb backup
files by using a new suffix for each backup.
</para> </listitem>
@@ -63,7 +63,7 @@
<varlistentry>
<term>-v</term>
<listitem><para>
- The <command>-v</command> will check the database for damages (currupt data)
+ The <command>-v</command> will check the database for damages (corrupt data)
which if detected causes the backup to be restored.
</para></listitem>
</varlistentry>
diff --git a/docs-xml/manpages-3/testparm.1.xml b/docs-xml/manpages-3/testparm.1.xml
index 4cc4e27..8d7cc22 100644
--- a/docs-xml/manpages-3/testparm.1.xml
+++ b/docs-xml/manpages-3/testparm.1.xml
@@ -93,7 +93,7 @@
Dumps the named parameter. If no section-name is set the view
is limited by default to the global section.
- It is also possible to dump a parametrical option. Therfore
+ It is also possible to dump a parametrical option. Therefore
the option has to be separated by a colon from the
parametername.
</para></listitem>
diff --git a/docs-xml/manpages-3/vfs_readonly.8.xml b/docs-xml/manpages-3/vfs_readonly.8.xml
index 06e5f23..fee947b 100644
--- a/docs-xml/manpages-3/vfs_readonly.8.xml
+++ b/docs-xml/manpages-3/vfs_readonly.8.xml
@@ -32,7 +32,7 @@
<para>The <command>vfs_readonly</command> VFS module marks a share
as read only for all clients connecting within the configured
time period. Clients connecting during this time will be denied
- write access to all files in the share, irrespective of ther
+ write access to all files in the share, irrespective of their
actual access privileges.</para>
<para>This module is stackable.</para>
diff --git a/docs-xml/manpages-3/vfs_shadow_copy2.8.xml b/docs-xml/manpages-3/vfs_shadow_copy2.8.xml
index 9f4ae2b..e5171bb 100644
--- a/docs-xml/manpages-3/vfs_shadow_copy2.8.xml
+++ b/docs-xml/manpages-3/vfs_shadow_copy2.8.xml
@@ -167,7 +167,7 @@
<programlisting>
<smbconfsection name="[homes]"/>
<smbconfoption name="vfs objects">shadow_copy2</smbconfoption>
- <smbconfoption name="shadow:snapdir">/data/snaphots</smbconfoption>
+ <smbconfoption name="shadow:snapdir">/data/snapshots</smbconfoption>
<smbconfoption name="shadow:basedir">/data/home</smbconfoption>
<smbconfoption name="shadow:sort">desc</smbconfoption>
</programlisting>
diff --git a/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml b/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml
index 605e096..861f7a8 100644
--- a/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml
+++ b/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml
@@ -63,7 +63,7 @@
</simplelist>
<para><command>vfs_smb_traffic_analyzer</command> sends the following data
- in a fixed format seperated by a comma through either an internet or a
+ in a fixed format separated by a comma through either an internet or a
unix domain socket:</para>
<programlisting>
BYTES|USER|DOMAIN|READ/WRITE|SHARE|FILENAME|TIMESTAMP
@@ -76,9 +76,9 @@
<listitem><para><command>USER</command> - the user who initiated the operation</para></listitem>
<listitem><para><command>DOMAIN</command> - the domain of the user</para></listitem>
<listitem><para><command>READ/WRITE</command> - either "W" for a write operation or "R" for read</para></listitem>
- <listitem><para><command>SHARE</command> - the name of the share on which the VFS operation occured</para></listitem>
+ <listitem><para><command>SHARE</command> - the name of the share on which the VFS operation occurred</para></listitem>
<listitem><para><command>FILENAME</command> - the name of the file that was used by the VFS operation</para></listitem>
- <listitem><para><command>TIMESTAMP</command> - a timestamp, formatted as "yyyy-mm-dd hh-mm-ss.ms" indicating when the VFS operation occured</para></listitem>
+ <listitem><para><command>TIMESTAMP</command> - a timestamp, formatted as "yyyy-mm-dd hh-mm-ss.ms" indicating when the VFS operation occurred</para></listitem>
<listitem><para><command>IP</command> - The IP Address (v4 or v6) of the client machine that initiated the VFS operation.</para></listitem>
</itemizedlist>
diff --git a/docs-xml/smbdotconf/filename/maxstatcachesize.xml b/docs-xml/smbdotconf/filename/maxstatcachesize.xml
index 590b216..d341beb 100644
--- a/docs-xml/smbdotconf/filename/maxstatcachesize.xml
+++ b/docs-xml/smbdotconf/filename/maxstatcachesize.xml
@@ -9,7 +9,7 @@
to speed up case insensitive name mappings. It represents
the number of kilobyte (1024) units the stat cache can use.
A value of zero, meaning unlimited, is not advisable due to
- increased memory useage. You should not need to change this
+ increased memory usage. You should not need to change this
parameter.
</para>
</description>
diff --git a/docs-xml/using_samba/ch07.xml b/docs-xml/using_samba/ch07.xml
index 9ecdae7..307cab7 100644
--- a/docs-xml/using_samba/ch07.xml
+++ b/docs-xml/using_samba/ch07.xml
@@ -339,7 +339,7 @@ Printer name lp is valid.</programlisting>
<para>A common problem with Samba printer configuration is forgetting to use the full <indexterm id="ch07-idx-956511-0"><primary>pathnames</primary><secondary>printer configuration and</secondary></indexterm>
-<indexterm id="ch07-idx-956511-1"><primary>printing</primary><secondary>pathnames used in comands for</secondary></indexterm>pathnames for commands; simple commands often don't work because the guest account's PATH doesn't include them. Another frequent problem is not having the correct <indexterm id="ch07-idx-956512-0"><primary>permissions</primary><secondary sortas="printing">for printing</secondary></indexterm>
+<indexterm id="ch07-idx-956511-1"><primary>printing</primary><secondary>pathnames used in commands for</secondary></indexterm>pathnames for commands; simple commands often don't work because the guest account's PATH doesn't include them. Another frequent problem is not having the correct <indexterm id="ch07-idx-956512-0"><primary>permissions</primary><secondary sortas="printing">for printing</secondary></indexterm>
<indexterm id="ch07-idx-956512-1"><primary>printing</primary><secondary>permissions for</secondary></indexterm>permissions on the spooling directory.<indexterm id="ch07-idx-956494-0" class="endofrange" startref="ch07-idx-956450-0"/></para>
--
Samba Shared Repository
More information about the samba-cvs
mailing list