Merge branch 'master' into debug-serialusb.

Chose debug-serialusb version in cases of conflict.

Conflicts:
	libmaple/usb/usb_callbacks.c

1 files changed, 34 insertions, 0 deletions

diff --git a/docs/source/lang/cpp/byte.rst b/docs/source/lang/cpp/byte.rst
new file mode 100644
index 0000000..45c9d5f
--- /dev/null
+++ b/docs/source/lang/cpp/byte.rst
@@ -0,0 +1,34 @@
+.. highlight:: cpp
+
+.. _lang-byte:
+
+byte
+====
+
+The ``byte`` type stores a 1-byte (8-bit) unsigned integer number,
+from 0 to 255.
+
+.. warning::
+
+   The ``byte`` type is provided for compatibility with Arduino.
+   However, it is a non-standard extension.  The standard C++ type for
+   storing an 8-bit unsigned integer is ``unsigned char``; we
+   recommend using that instead.  (Your code will still work on an
+   Arduino).
+
+
+Example
+-------
+
+::
+
+        byte b = 134;
+
+See Also
+--------
+
+-  :ref:`byte() <lang-bytecast>` (casting a value to a byte)
+-  :ref:`Variables <lang-variables>`
+
+
+.. include:: cc-attribution.txt