Merge branch 'master' into debug-serialusb.

Chose debug-serialusb version in cases of conflict.

Conflicts:
	libmaple/usb/usb_callbacks.c

1 files changed, 33 insertions, 0 deletions

diff --git a/docs/source/lang/cpp/void.rst b/docs/source/lang/cpp/void.rst
new file mode 100644
index 0000000..88c9c64
--- /dev/null
+++ b/docs/source/lang/cpp/void.rst
@@ -0,0 +1,33 @@
+.. highlight:: cpp
+
+.. _lang-void:
+
+``void``
+========
+
+.. cpp:type:: void
+
+   The ``void`` keyword is used in function declarations. It indicates
+   that the function is expected to return no information to the
+   function from which it was called, or that it expects no arguments
+   from its caller.
+
+Example
+-------
+
+::
+
+    // actions are performed in the functions "setup" and "loop"
+    // but  no information is reported to the larger program
+
+    void setup() {
+      // ...
+    }
+
+    void loop() {
+      // ...
+    }
+
+.. TODO doc page on function declaration?
+
+.. include:: cc-attribution.txt