diff options
| author | Araq <rumpf_a@web.de> | 2014-10-20 08:44:00 +0200 |
|---|---|---|
| committer | Araq <rumpf_a@web.de> | 2014-10-20 08:44:00 +0200 |
| commit | 53a9d6f5cd199382957188cd8a1a7f0aa5035033 (patch) | |
| tree | 9873032461904538e21cbff3417882d1b54ef881 /doc | |
| parent | c7570dcd3e4202bd339a2ebbc09952a546c62269 (diff) | |
| parent | b0179f9af5c5ed3cc63c5cd3b9d1055b742a3b79 (diff) | |
| download | Nim-53a9d6f5cd199382957188cd8a1a7f0aa5035033.tar.gz | |
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
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/manual.txt | 1 | ||||
| -rw-r--r-- | doc/tut2.txt | 12 |
2 files changed, 1 insertions, 12 deletions
diff --git a/doc/manual.txt b/doc/manual.txt index 5c6f64344..2dbbf0447 100644 --- a/doc/manual.txt +++ b/doc/manual.txt @@ -12,6 +12,7 @@ Nim Manual user to one/some of the other players, but the total amount seems to remain pretty much constant for a given task. -- Ran + .. include:: manual/about.txt .. include:: manual/definitions.txt .. include:: manual/lexing.txt diff --git a/doc/tut2.txt b/doc/tut2.txt index 651c38838..34f59b1cb 100644 --- a/doc/tut2.txt +++ b/doc/tut2.txt @@ -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 --------------------------------------- |