Merge branch 'devel' into bigbreak

Conflicts:
	compiler/nim.ini
	doc/manual.txt
	doc/tut2.txt
	koch.nim
	lib/system/channels.nim
	readme.txt
	tools/niminst/niminst.nim
	tools/nimweb.nim
	web/download.txt
	web/news.txt
This commit is contained in:
Araq 2014-10-20 08:44:00 +02:00
commit 53a9d6f5cd
24 changed files with 814 additions and 278 deletions

View file

@ -438,18 +438,6 @@ module. Example:
echo "Got exception ", repr(e), " with message ", msg
Exception hierarchy
-------------------
If you want to create your own exceptions you can inherit from ``system.Exception``,
but you can also inherit from one of the existing exceptions if they fit your
purpose. The exception tree is:
.. include:: exception_hierarchy_fragment.txt
See the `system <system.html>`_ module for a description of each exception.
Annotating procs with raised exceptions
---------------------------------------