summaryrefslogtreecommitdiff
path: root/libraries/base/Control
diff options
context:
space:
mode:
authorSergey Vinokurov <serg.foo@gmail.com>2018-02-07 21:10:17 +0000
committerBen Gamari <ben@smart-cactus.org>2018-02-14 17:06:36 -0500
commitdf449e1744d59eef7f41e09196629bc01815e984 (patch)
tree55f3cdaf89cfdf5e6d47c383fd096e5f8b352879 /libraries/base/Control
parent8936ab69d18669bab3ca4edf40458f88ae5903f0 (diff)
downloadhaskell-df449e1744d59eef7f41e09196629bc01815e984.tar.gz
Various documentation improvements
* Fix missing code example in changelog for 8.4.1 * List 'setEnv' as opposite of 'getEnv' It seems best to direct users to use 'System.Environment.setEnv' rather than 'System.Posix.Env.putEnv'. This is due to 'setEnv' being located in the same module as 'getEnv' and my virtue of working on Windows platform, whereas 'putEnv' does not have that quality because it's part of the 'unix' package. * Reflect in docs the fact that 'readMVar' is not a composition of 'takeMVVar' and 'putMVar' any more
Diffstat (limited to 'libraries/base/Control')
-rw-r--r--libraries/base/Control/Concurrent/MVar.hs4
1 files changed, 2 insertions, 2 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