Merge branch 'master' into debug-serialusb.

Chose debug-serialusb version in cases of conflict.

Conflicts:
	libmaple/usb/usb_callbacks.c

1 files changed, 28 insertions, 0 deletions

diff --git a/docs/source/lang/cpp/floatcast.rst b/docs/source/lang/cpp/floatcast.rst
new file mode 100644
index 0000000..4766478
--- /dev/null
+++ b/docs/source/lang/cpp/floatcast.rst
@@ -0,0 +1,28 @@
+.. highlight:: cpp
+
+.. _lang-floatcast:
+
+``float()`` (cast)
+==================
+
+Converts a value to the :ref:`float <lang-float>` data type.  Here is
+an example (see the :ref:`constants reference <lang-constants-fp>` for
+an explanation of the "2.0f")::
+
+   int x = 2;
+   float f = float(x);  // f now holds 2.0f, a float value
+
+The value ``x`` can be of any type.  However, if ``x`` is not a number
+(like an ``int``), you will get strange results.
+
+See the :ref:`float <lang-float>` reference for details about the
+precision and limitations of ``float`` values on the Maple.
+
+See Also
+--------
+
+-  :ref:`float <lang-float>`
+-  :ref:`double <lang-double>`
+-  :ref:`double() <lang-doublecast>`
+
+.. include:: cc-attribution.txt