summary refs log tree commit diff stats
path: root/doc/manual
diff options
context:
space:
mode:
authorMark <mark@qtrac.eu>2019-12-08 19:15:19 +0000
committerAndreas Rumpf <rumpf_a@web.de>2019-12-08 20:15:19 +0100
commit0ebc70903709d6f57f5ea9a1f3b378b8d7d39575 (patch)
tree5fa5c94b58a361ecc9a2ac51243c3ec3844fed2c /doc/manual
parent46144a31ab977a05d4c97e51b9676bc925febde8 (diff)
downloadNim-0ebc70903709d6f57f5ea9a1f3b378b8d7d39575.tar.gz
deviated -> derived (#12846) [backport]
Diffstat (limited to 'doc/manual')
-rw-r--r--doc/manual/var_t_return.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/manual/var_t_return.rst b/doc/manual/var_t_return.rst
index b9ff1d892..2235d5aa4 100644
--- a/doc/manual/var_t_return.rst
+++ b/doc/manual/var_t_return.rst
@@ -1,15 +1,15 @@
 Memory safety for returning by ``var T`` is ensured by a simple borrowing
 rule: If ``result`` does not refer to a location pointing to the heap
 (that is in ``result = X`` the ``X`` involves a ``ptr`` or ``ref`` access)
-then it has to be deviated by the routine's first parameter:
+then it has to be derived from the routine's first parameter:
 
 .. code-block:: nim
   proc forward[T](x: var T): var T =
-    result = x # ok, deviated from the first parameter.
+    result = x # ok, derived from the first parameter.
 
   proc p(param: var int): var int =
     var x: int
-    # we know 'forward' provides a view into the location deviated by
+    # we know 'forward' provides a view into the location derived from
     # its first argument 'x'.
     result = forward(x) # Error: location is derived from ``x``
                         # which is not p's first parameter and lives