summaryrefslogtreecommitdiff
path: root/libraries
diff options
context:
space:
mode:
Diffstat (limited to 'libraries')
-rw-r--r--libraries/base/Control/Concurrent/MVar.hs4
-rw-r--r--libraries/base/GHC/MVar.hs2
-rw-r--r--libraries/base/System/Environment.hs4
3 files changed, 5 insertions, 5 deletions
diff --git a/libraries/base/Control/Concurrent/MVar.hs b/libraries/base/Control/Concurrent/MVar.hs
index 393fca89e2..fa99361fb1 100644
--- a/libraries/base/Control/Concurrent/MVar.hs
+++ b/libraries/base/Control/Concurrent/MVar.hs
@@ -41,8 +41,8 @@
-- atomic operations such as reading from multiple variables: use 'STM'
-- instead.
--
--- In particular, the "bigger" functions in this module ('readMVar',
--- 'swapMVar', 'withMVar', 'modifyMVar_' and 'modifyMVar') are simply
+-- In particular, the "bigger" functions in this module ('swapMVar',
+-- 'withMVar', 'modifyMVar_' and 'modifyMVar') are simply
-- the composition of a 'takeMVar' followed by a 'putMVar' with
-- exception safety.
-- These only have atomicity guarantees if all other threads
diff --git a/libraries/base/GHC/MVar.hs b/libraries/base/GHC/MVar.hs
index f334ddb48c..aa5900200a 100644
--- a/libraries/base/GHC/MVar.hs
+++ b/libraries/base/GHC/MVar.hs
@@ -90,7 +90,7 @@ takeMVar :: MVar a -> IO a
takeMVar (MVar mvar#) = IO $ \ s# -> takeMVar# mvar# s#
-- |Atomically read the contents of an 'MVar'. If the 'MVar' is
--- currently empty, 'readMVar' will wait until its full.
+-- currently empty, 'readMVar' will wait until it is full.
-- 'readMVar' is guaranteed to receive the next 'putMVar'.
--
-- 'readMVar' is multiple-wakeup, so when multiple readers are
diff --git a/libraries/base/System/Environment.hs b/libraries/base/System/Environment.hs
index 343b7722c6..5604ca2b03 100644
--- a/libraries/base/System/Environment.hs
+++ b/libraries/base/System/Environment.hs
@@ -123,8 +123,8 @@ basename f = go f f
-- | Computation 'getEnv' @var@ returns the value
--- of the environment variable @var@. For the inverse, POSIX users
--- can use 'System.Posix.Env.putEnv'.
+-- of the environment variable @var@. For the inverse, the
+-- `System.Environment.setEnv` function can be used.
--
-- This computation may fail with:
--