summary refs log tree commit diff stats
path: root/doc
diff options
context:
space:
mode:
authorAndreas Rumpf <rumpf_a@web.de>2009-05-10 22:35:58 +0200
committerAndreas Rumpf <rumpf_a@web.de>2009-05-10 22:35:58 +0200
commitc7e144f97810630d8ab4f396f299c6355fc93ba7 (patch)
treef013e592eb209b66d3b56401e8c96d58929d57b1 /doc
parentd54b333e7e3df82732b70cade2e4b8591e4c2572 (diff)
downloadNim-c7e144f97810630d8ab4f396f299c6355fc93ba7.tar.gz
added missing files;change config for bug #374441
Diffstat (limited to 'doc')
-rw-r--r--doc/tut1.txt8
-rw-r--r--doc/tut2.txt4
2 files changed, 6 insertions, 6 deletions
diff --git a/doc/tut1.txt b/doc/tut1.txt
index 58a56e8f1..237663cdc 100644
--- a/doc/tut1.txt
+++ b/doc/tut1.txt
@@ -522,7 +522,7 @@ Result variable
 ---------------
 A procedure that returns a value has an implicit ``result`` variable that
 represents the return value. A ``return`` statement with no expression is a
-shorthand for ``return result``. So all tree code snippets are equivalent:
+shorthand for ``return result``. So all three code snippets are equivalent:
 
 .. code-block:: nimrod
   return 42
@@ -556,7 +556,7 @@ caller, a ``var`` parameter can be used:
 
 In the example, ``res`` and ``remainder`` are `var parameters`.
 Var parameters can be modified by the procedure and the changes are
-visible to the caller. 
+visible to the caller.
 
 
 Discard statement
@@ -952,8 +952,8 @@ Operation             Comment
 ``dec(x, n)``         decrements `x` by `n`; `n` is an integer
 ``succ(x)``           returns the successor of `x`
 ``succ(x, n)``        returns the `n`'th successor of `x`
-``succ(x)``           returns the predecessor of `x`
-``succ(x, n)``        returns the `n`'th predecessor of `x`
+``prec(x)``           returns the predecessor of `x`
+``pred(x, n)``        returns the `n`'th predecessor of `x`
 -----------------     --------------------------------------------------------
 
 The ``inc dec succ pred`` operations can fail by raising an `EOutOfRange` or
diff --git a/doc/tut2.txt b/doc/tut2.txt
index 6d2fd3094..114039887 100644
--- a/doc/tut2.txt
+++ b/doc/tut2.txt
@@ -34,7 +34,7 @@ While Nimrod's support for object oriented programming (OOP) is minimalistic,
 powerful OOP technics can be used. OOP is seen as *one* way to design a 
 program, not *the only* way. Often a procedural approach leads to simpler
 and more efficient code. In particular, prefering aggregation over inheritance
-often yields to a better design.
+often results in a better design.
 
 
 Objects
@@ -422,7 +422,7 @@ containers:
     else:
       var it = root
       while it != nil:
-        # compare the data items; uses the generic ``cmd`` proc
+        # compare the data items; uses the generic ``cmp`` proc
         # that works for any type that has a ``==`` and ``<`` operator
         var c = cmp(it.data, n.data) 
         if c < 0: