Move override/final to the approved C++11 features section.

styleguide/c++/c++11.html

Index: styleguide/c++/c++11.html
diff --git a/styleguide/c++/c++11.html b/styleguide/c++/c++11.html
index edebb9a727913e1e7f991892c61589253da2612a..51097c4611f3ddc31ca5eccde7e29237cf631509 100644
--- a/styleguide/c++/c++11.html
+++ b/styleguide/c++/c++11.html
@@ -66,6 +66,14 @@ C++ Templates Angle Brackets Pitfall</a></td>
 </tr>
 
 <tr>
+<td>Final Specifier</td>
+<td><code>final</code></td>
+<td> Indicates that a class or function is final and cannot be overridden</td>
+<td><a href="http://en.cppreference.com/w/cpp/language/final">final Language Reference</a></td>
+<td>All uses of the old <code>FINAL</code> macro will be replaced throughout the codebase. Uses should conform to the <a href="http://google-styleguide.googlecode.com/svn/trunk/cppguide.html#Inheritance">C++ style guide</a>.

[Nico, 2014/09/24 21:46:14]

Add "Recommended for new code." at the beginning, to make that clear.

Add a link to the discussion thread somewhere, like in the nullptr row.

[dcheng, 2014/09/24 21:50:50]

I've replaced this text to indicate that we prefer this in new code, but I've
removed the style guide reference, since our chrome plugin doesn't actually let
us follow the style guide atm.
Done.

+</tr>
+
+<tr>
 <td>Local Types as Template Arguments</td>
 <td></td>
 <td>Allows local and unnamed types as template arguments</td>
@@ -75,16 +83,6 @@ Local types, types without linkage and unnamed types as template arguments</a></
 </tr>
 
 <tr>
-<td>Standard Integers</td>
-<td>Typedefs within <code>&lt;stdint.h&gt;</code>
-and <code>&lt;inttypes&gt;</code></td>
-<td>Provides fixed-size integers independent of platforms</td>
-<td><a href="http://www.cplusplus.com/reference/cstdint/">
-&lt;stdint.h&gt; (cstdint)</a></td>
-<td>Already in common use in the codebase. Approved without discussion.</td>
-</tr>
-
-<tr>
 <td>Null Pointer Constant</td>
 <td><code>nullptr</code></td>
 <td>Declares a type-safe null pointer</td>
@@ -96,6 +94,24 @@ Note: <code>std::nullptr_t</code> is a library feature and not available.
 </td>
 </tr>
 
+<tr>
+<td>Override Specifier</td>
+<td><code>override</code></td>
+<td>Indicates that a class or function overrides a base implementation</td>
+<td><a href="http://en.cppreference.com/w/cpp/language/override">override Language Reference</a></td>
+<td>All uses of the old <code>OVERRIDE</code> macro will be replaced throughout the codebase. Uses should conform to the <a href="http://google-styleguide.googlecode.com/svn/trunk/cppguide.html#Inheritance">C++ style guide</a>.
+</tr>
+
+<tr>
+<td>Standard Integers</td>
+<td>Typedefs within <code>&lt;stdint.h&gt;</code>
+and <code>&lt;inttypes&gt;</code></td>
+<td>Provides fixed-size integers independent of platforms</td>
+<td><a href="http://www.cplusplus.com/reference/cstdint/">
+&lt;stdint.h&gt; (cstdint)</a></td>
+<td>Already in common use in the codebase. Approved without discussion.</td>
+</tr>
+
 </tbody>
 </table>
 
@@ -267,14 +283,6 @@ explicit specifier</a></td>
 </tr>
 
 <tr>
-<td>Final Declarations</td>
-<td><code>final</code></td>
-<td>Indicates that a class or function is final and cannot be overridden</td>
-<td>TODO: documentation link</td>
-<td><code>FINAL</code> is already widely used in the codebase.</td>
-</tr>
-
-<tr>
 <td>Function Local Variable</td>
 <td><code>__func__</code></td>
 <td>Provides a local variable of the name of the enclosing
@@ -343,14 +351,6 @@ Non-static data members</a></td>
 </tr>
 
 <tr>
-<td>Overrides</td>
-<td><code>override</code></td>
-<td>Indicates that a class or function overrides a base implementation</td>
-<td>TODO: documentation link</td>
-<td><code>OVERRIDE</code> is already widely used in the codebase.</td>
-</tr>
-
-<tr>
 <td>Range-Based For Loops</td>
 <td><code>for (<i>type</i> <i>var</i> : <i>range</i>)</code></td>
 <td>Facilitates a more concise syntax for iterating over the elements