summary refs log tree commit diff stats
path: root/doc
diff options
context:
space:
mode:
authorAraq <rumpf_a@web.de>2014-10-04 14:23:17 +0200
committerAraq <rumpf_a@web.de>2014-10-04 14:23:17 +0200
commit4616a1e006f0b909d204d8e8f1ad3cd43d8db556 (patch)
treeed52a49b30dd546df671bd6166c500842b287bd3 /doc
parente65c296bcca4bf0f690e026374c900e33e885a93 (diff)
downloadNim-4616a1e006f0b909d204d8e8f1ad3cd43d8db556.tar.gz
updated some tests
Diffstat (limited to 'doc')
-rw-r--r--doc/manual/locking.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/manual/locking.txt b/doc/manual/locking.txt
index b646f0cee..1a6d2783c 100644
--- a/doc/manual/locking.txt
+++ b/doc/manual/locking.txt
@@ -19,7 +19,7 @@ Guards and the locks section
 Protecting global variables
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Global variables and object fields can be annotated via an ``guard`` pragma: 
+Object fields and global variables can be annotated via a ``guard`` pragma:
 
 .. code-block:: nim
   var glock: TLock
@@ -161,7 +161,9 @@ single ``locks`` section:
     ...
 
 
-So here is how a typical multilock statement can be implemented in Nim:
+Here is how a typical multilock statement can be implemented in Nim. Note how
+the runtime check is required to ensure a global ordering for two locks ``a``
+and ``b`` of the same lock level:
 
 .. code-block:: nim
   template multilock(a, b: ptr TLock; body: stmt) =