summary refs log tree commit diff stats
path: root/doc
diff options
context:
space:
mode:
authorAndreas Rumpf <rumpf_a@web.de>2020-04-15 20:03:25 +0200
committerGitHub <noreply@github.com>2020-04-15 20:03:25 +0200
commit3a2697dd731cb8fcfd0d279bb856090eca5028ee (patch)
tree971390193c83b0d14045f535a06bfc18071a741b /doc
parent04b6e9cf3e6e1113cb5989a82878e525a7f0891f (diff)
downloadNim-3a2697dd731cb8fcfd0d279bb856090eca5028ee.tar.gz
drnim: tiny progress (#13882)
* drnim: tiny progress
* refactoring complete
* drnim: prove .ensures annotations
* Moved code around to avoid code duplication
* drnim: first implementation of the 'old' property
* drnim: be precise about the assignment statement
* first implementation of --assumeUnique
* progress on forall/exists handling
Diffstat (limited to 'doc')
-rw-r--r--doc/contributing.rst8
-rw-r--r--doc/drnim.rst3
2 files changed, 6 insertions, 5 deletions
diff --git a/doc/contributing.rst b/doc/contributing.rst
index 64732970d..39a44fb2b 100644
--- a/doc/contributing.rst
+++ b/doc/contributing.rst
@@ -265,7 +265,7 @@ the first is preferred.
 
 
 Best practices
-=============
+==============
 
 Note: these are general guidelines, not hard rules; there are always exceptions.
 Code reviews can just point to a specific section here to save time and
@@ -361,8 +361,10 @@ General commit rules
 
 1. Important, critical bugfixes that have a tiny chance of breaking
    somebody's code should be backported to the latest stable release
-   branch (currently 1.0.x). The commit message should contain ``[backport]``
-   then.
+   branch (currently 1.2.x) and maybe also to the 1.0 branch.
+   The commit message should contain the tag ``[backport]`` for "backport to all
+   stable releases" and the tag ``[backport:$VERSION]`` for backporting to the
+   given $VERSION.
 
 2. If you introduce changes which affect backwards compatibility,
    make breaking changes, or have PR which is tagged as ``[feature]``,
diff --git a/doc/drnim.rst b/doc/drnim.rst
index a9ae9baeb..5351daac9 100644
--- a/doc/drnim.rst
+++ b/doc/drnim.rst
@@ -120,8 +120,7 @@ you assume.
 Example: insertionSort
 ======================
 
-**Note**: This example does not yet work with DrNim. ``forall`` and ``exists``
-are not implemented.
+**Note**: This example does not yet work with DrNim.
 
 .. code-block:: nim