Merge branch 'master' into debug-serialusb.

Chose debug-serialusb version in cases of conflict.

Conflicts:
	libmaple/usb/usb_callbacks.c

1 files changed, 25 insertions, 0 deletions

diff --git a/docs/source/lang/cpp/semicolon.rst b/docs/source/lang/cpp/semicolon.rst
new file mode 100644
index 0000000..8164616
--- /dev/null
+++ b/docs/source/lang/cpp/semicolon.rst
@@ -0,0 +1,25 @@
+.. highlight:: cpp
+
+.. _lang-semicolon:
+
+Semicolon (``;``)
+=================
+
+Used to end a line of code.  Example::
+
+    int a = 13;
+
+Tip
+---
+
+Forgetting to end a line in a semicolon will result in a compiler
+error. The error text may be obvious, and refer to a missing
+semicolon, or it may not. If an impenetrable or seemingly illogical
+compiler error comes up, one of the first things to check is a
+missing semicolon, in the immediate vicinity, preceding the line at
+which the compiler complained.
+
+
+
+
+.. include:: cc-attribution.txt