summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--doc/manual/procs.txt8
-rw-r--r--todo.txt1
2 files changed, 4 insertions, 5 deletions
diff --git a/doc/manual/procs.txt b/doc/manual/procs.txt
index ee74b2ea6..654893286 100644
--- a/doc/manual/procs.txt
+++ b/doc/manual/procs.txt
@@ -236,8 +236,6 @@ executable code.
 Do notation
 -----------
 
-**Note:** The future of the ``do`` notation is uncertain.
-
 As a special more convenient notation, proc expressions involved in procedure
 calls can use the ``do`` keyword:
 
@@ -251,10 +249,12 @@ calls can use the ``do`` keyword:
 ``do`` is written after the parentheses enclosing the regular proc params.
 The proc expression represented by the do block is appended to them.
 
-More than one ``do`` block can appear in a single call:
+``do`` with parentheses is an anonymous ``proc``; however a ``do`` without
+parentheses is just a block of code. The ``do`` notation can be used to
+pass multiple blocks to a macro:
 
 .. code-block:: nim
-  proc performWithUndo(task: proc(), undo: proc()) = ...
+  macro performWithUndo(task, undo: untyped) = ...
 
   performWithUndo do:
     # multiple-line block of code
diff --git a/todo.txt b/todo.txt
index ac2041f66..ca8d60762 100644
--- a/todo.txt
+++ b/todo.txt
@@ -4,7 +4,6 @@ essential for 1.0
 - introduce newSeqOfCap(10)
 - annotation support for getType()
 - overloading of `()` needs to be in .experimental
-- do notation needs to be documented properly
 - find a solution for the  x.f[T](y)  gotcha
 - ``concept`` needs to be refined, a nice name for the feature is not enough.
 - Destructors need to be refined.