summary refs log tree commit diff stats
path: root/doc
diff options
context:
space:
mode:
authorAndreas Rumpf <rumpf_a@web.de>2018-12-12 16:29:46 +0100
committerGitHub <noreply@github.com>2018-12-12 16:29:46 +0100
commita1bf9fd2b6525e613899c5dc0380fb80021ee3e7 (patch)
treed2bdb332c973d2f6d43391369229cc732642c74d /doc
parenta38f35359738534ba856d02f3564d5fbc2dfc822 (diff)
parent070bcf4cea28a3238089379f5884787b2084b2de (diff)
downloadNim-a1bf9fd2b6525e613899c5dc0380fb80021ee3e7.tar.gz
Merge branch 'devel' into sorted_deduplicate
Diffstat (limited to 'doc')
-rw-r--r--doc/advopt.txt4
-rw-r--r--doc/contributing.rst11
-rw-r--r--doc/lib.rst4
3 files changed, 8 insertions, 11 deletions
diff --git a/doc/advopt.txt b/doc/advopt.txt
index 7cd72f6c3..60cae7fd0 100644
--- a/doc/advopt.txt
+++ b/doc/advopt.txt
@@ -11,8 +11,9 @@ Advanced commands:
   //buildIndex              build an index for the whole documentation
   //run                     run the project (with Tiny C backend; buggy!)
   //genDepend               generate a DOT file containing the
-                            module dependency graph
+                          module dependency graph
   //dump                    dump all defined conditionals and search paths
+                            see also: --dump.format:json (useful with: ` | jq`)
   //check                   checks the project for syntax and semantic
 
 Advanced options:
@@ -103,6 +104,7 @@ Advanced options:
                             value = number of processors (0 for auto-detect)
   --incremental:on|off      only recompile the changed modules (experimental!)
   --verbosity:0|1|2|3       set Nim's verbosity level (1 is default)
+  --errorMax:N              stop compilation after N errors; 0 means unlimited
   --experimental:$1
                             enable experimental language feature
   -v, --version             show detailed version information
diff --git a/doc/contributing.rst b/doc/contributing.rst
index a2c95db74..e3ab697d3 100644
--- a/doc/contributing.rst
+++ b/doc/contributing.rst
@@ -263,17 +263,8 @@ Take advantage of no implicit bool conversion
   doAssert isValid() == true
   doAssert isValid() # preferred
 
-.. _immediately_invoked_lambdas:
-Immediately invoked lambdas (https://en.wikipedia.org/wiki/Immediately-invoked_function_expression)
-
-.. code-block:: nim
-
-  let a = (proc (): auto = getFoo())()
-  let a = block:  # preferred
-    getFoo()
-
 .. _design_for_mcs:
-Design with method call syntax (UFCS in other languages) chaining in mind
+Design with method call syntax chaining in mind
 
 .. code-block:: nim
 
diff --git a/doc/lib.rst b/doc/lib.rst
index 46e1f9d19..c0119d36d 100644
--- a/doc/lib.rst
+++ b/doc/lib.rst
@@ -154,6 +154,10 @@ String handling
 * `std/wordwrap <wordwrap.html>`_
   This module contains an algorithm to wordwrap a Unicode string.
 
+* `std/diff <diff.html>`_
+  This module contains an algorithm to compute the famous "diff"
+  of two texts by line.
+
 
 Generic Operating System Services
 ---------------------------------