Merge branch 'master' into debug-serialusb.

Chose debug-serialusb version in cases of conflict.

Conflicts:
	libmaple/usb/usb_callbacks.c

1 files changed, 27 insertions, 0 deletions

diff --git a/docs/source/lang/cpp/dowhile.rst b/docs/source/lang/cpp/dowhile.rst
new file mode 100644
index 0000000..fe92226
--- /dev/null
+++ b/docs/source/lang/cpp/dowhile.rst
@@ -0,0 +1,27 @@
+.. highlight:: cpp
+
+.. _lang-dowhile:
+
+``do``/``while``
+================
+
+A ``do`` loop works in the same manner as a :ref:`while
+<lang-while>` loop, with the exception that the condition is tested
+at the end of the loop, so the ``do`` loop will *always* run at least
+once.
+
+This is the basic syntax::
+
+    do {
+        // statement block
+    } while (test condition);
+
+Example::
+
+    do {
+      delay(50);          // wait for sensors to stabilize
+      x = readSensors();  // check the sensors
+    } while (x < 100);
+
+
+.. include:: cc-attribution.txt