1 files changed, 57 insertions, 4 deletions
diff --git a/docs/library/builtins.rst b/docs/library/builtins.rst
index 46f762660..365248dc7 100644
--- a/docs/library/builtins.rst
+++ b/docs/library/builtins.rst
@@ -1,8 +1,11 @@
-Builtin Functions
-=================
+Builtin functions and exceptions
+================================
 
-All builtin functions are described here. They are also available via
-``builtins`` module.
+All builtin functions and exceptions are described here. They are also
+available via ``builtins`` module.
+
+Functions and types
+-------------------
 
 .. function:: abs()
 
@@ -18,6 +21,8 @@ All builtin functions are described here. They are also available via
 
 .. class:: bytes()
 
+    |see_cpython| `python:bytes`.
+
 .. function:: callable()
 
 .. function:: chr()
@@ -144,3 +149,51 @@ All builtin functions are described here. They are also available via
 .. function:: type()
 
 .. function:: zip()
+
+
+Exceptions
+----------
+
+.. exception:: AssertionError
+
+.. exception:: AttributeError
+
+.. exception:: Exception
+
+.. exception:: ImportError
+
+.. exception:: IndexError
+
+.. exception:: KeyboardInterrupt
+
+.. exception:: KeyError
+
+.. exception:: MemoryError
+
+.. exception:: NameError
+
+.. exception:: NotImplementedError
+
+.. exception:: OSError
+
+    |see_cpython| `python:OSError`. MicroPython doesn't implement ``errno``
+    attribute, instead use the standard way to access exception arguments:
+    ``exc.args[0]``.
+
+.. exception:: RuntimeError
+
+.. exception:: StopIteration
+
+.. exception:: SyntaxError
+
+.. exception:: SystemExit
+
+    |see_cpython| `python:SystemExit`.
+
+.. exception:: TypeError
+
+    |see_cpython| `python:TypeError`.
+
+.. exception:: ValueError
+
+.. exception:: ZeroDivisionError