From ba1a2437cff225257c99a3c3139e0edf2571d567 Mon Sep 17 00:00:00 2001
From: Marshall Clow <marshall@idio.com>
Date: Thu, 14 Jun 2012 16:01:03 +0000
Subject: [PATCH] Merge doc changes to release; fixes #6988

[SVN r78948]
---
 doc/array.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/array.xml b/doc/array.xml
index fca63a6..62bf7c2 100644
--- a/doc/array.xml
+++ b/doc/array.xml
@@ -70,6 +70,11 @@
     Technical Report, which will extend the C++ Standard (see
     <ulink url="http://std.dkuug.dk/jtc1/sc22/wg21/docs/papers/2003/n1548.htm">http://std.dkuug.dk/jtc1/sc22/wg21/docs/papers/2003/n1548.htm</ulink>).</para>
 
+    <para>Update: <code>std::array</code> is (as of C++11) part of the C++ standard.
+    The differences between <code>boost::array</code> and <code>std::array</code> are minimal.
+    If you are using C++11, you should consider using <code>std::array</code> instead of <code>boost::array</code>.
+    </para>
+
     <para>Class <code><classname>array</classname></code> fulfills most
     but not all of the requirements of "reversible containers" (see
     Section 23.1, [lib.container.requirements] of the C++