Merge with Linux 2.4.0-test6-pre1.

1 files changed, 2 insertions, 2 deletions

diff --git a/Documentation/filesystems/vfs.txt b/Documentation/filesystems/vfs.txt
index 7d1f5ca72..9d91d1210 100644
--- a/Documentation/filesystems/vfs.txt
+++ b/Documentation/filesystems/vfs.txt
@@ -24,7 +24,7 @@ What is it?                                                           <section>
 
 The Virtual File System (otherwise known as the Virtual Filesystem
 Switch) is the software layer in the kernel that provides the
-filesystem interface to userspace programmes. It also provides an
+filesystem interface to userspace programs. It also provides an
 abstraction within the kernel which allows different filesystem
 implementations to co-exist.
 
@@ -34,7 +34,7 @@ A Quick Look At How It Works                                          <section>
 
 In this section I'll briefly describe how things work, before
 launching into the details. I'll start with describing what happens
-when user programmes open and manipulate files, and then look from the
+when user programs open and manipulate files, and then look from the
 other view which is how a filesystem is supported and subsequently
 mounted.