summaryrefslogtreecommitdiff
path: root/community/gsoc/project_ideas/file_locking.mdwn
diff options
context:
space:
mode:
authorThomas Schwinge <thomas@schwinge.name>2010-03-28 21:48:46 +0200
committerThomas Schwinge <thomas@schwinge.name>2010-03-28 21:48:46 +0200
commit4b35fc7bdd7ab723cb3db8e9122ed08d996f33b4 (patch)
treee4bb2ffadd136ab05b8abc3c0fa9f305f8c360fe /community/gsoc/project_ideas/file_locking.mdwn
parent34794c7002f679ab9c2d076284ff58288224c47d (diff)
parent96611f76b833159bafeab3443229dfa690178d92 (diff)
Merge commit '96611f76b833159bafeab3443229dfa690178d92' into master-news_next
Conflicts: news/2010-03-31.mdwn
Diffstat (limited to 'community/gsoc/project_ideas/file_locking.mdwn')
-rw-r--r--community/gsoc/project_ideas/file_locking.mdwn2
1 files changed, 1 insertions, 1 deletions
diff --git a/community/gsoc/project_ideas/file_locking.mdwn b/community/gsoc/project_ideas/file_locking.mdwn
index af010c98..0159b091 100644
--- a/community/gsoc/project_ideas/file_locking.mdwn
+++ b/community/gsoc/project_ideas/file_locking.mdwn
@@ -10,7 +10,7 @@ is included in the section entitled
[[!meta title="Fix and Complete File Locking Support"]]
-Over the years, [[UNIX]] has aquired a host of different file locking mechanisms.
+Over the years, [[UNIX]] has acquired a host of different file locking mechanisms.
Some of them work on the Hurd, while others are buggy or only partially
implemented. This breaks many applications.