summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs-xml/Samba3-Developers-Guide/unix-smb.xml2
-rw-r--r--source3/smbd/statvfs.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/docs-xml/Samba3-Developers-Guide/unix-smb.xml b/docs-xml/Samba3-Developers-Guide/unix-smb.xml
index 6964b7fb2e..3412019fe1 100644
--- a/docs-xml/Samba3-Developers-Guide/unix-smb.xml
+++ b/docs-xml/Samba3-Developers-Guide/unix-smb.xml
@@ -206,7 +206,7 @@ Unix has no equivalent notion. To implement this Samba uses either lock
files based on the files inode and placed in a separate lock
directory or a shared memory implementation. The lock file method
is clumsy and consumes processing and file resources,
-the shared memory implementation is vastly prefered and is turned on
+the shared memory implementation is vastly preferred and is turned on
by default for those systems that support it.
</para>
diff --git a/source3/smbd/statvfs.c b/source3/smbd/statvfs.c
index 94ec2d5146..f9f2211030 100644
--- a/source3/smbd/statvfs.c
+++ b/source3/smbd/statvfs.c
@@ -151,7 +151,7 @@ static int linux_statvfs(const char *path, vfs_statvfs_struct *statbuf)
sys_statvfs() is an abstraction layer over system-dependent statvfs()/statfs()
for particular POSIX systems. Due to controversy of what is considered more important
between LSB and FreeBSD/POSIX.1 (IEEE Std 1003.1-2001) we need to abstract the interface
- so that particular OS would use its prefered interface.
+ so that particular OS would use its preferred interface.
*/
int sys_statvfs(const char *path, vfs_statvfs_struct *statbuf)
{