[llvm-branch-commits] [cfe-branch] r196234 - Merging r196215:

[Bill Wendling]

Author: void
Date: Tue Dec  3 01:40:27 2013
New Revision: 196234

URL: http://llvm.org/viewvc/llvm-project?rev=196234&view=rev
Log:
Merging r196215:
------------------------------------------------------------------------
r196215 | alp | 2013-12-02 22:53:39 -0800 (Mon, 02 Dec 2013) | 1 line

Documentation typo corrections
------------------------------------------------------------------------

Modified:
    cfe/branches/release_34/   (props changed)
    cfe/branches/release_34/docs/LanguageExtensions.rst
    cfe/branches/release_34/www/cxx_dr_status.html

Propchange: cfe/branches/release_34/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec  3 01:40:27 2013
@@ -1,4 +1,4 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:195126,195128,195135-195136,195146,195149,195154,195158,195163,195168,195174,195249,195268,195283,195303,195326,195329,195367,195384,195409,195420,195422,195501,195547,195556,195558,195587,195620,195635,195669,195687,195693,195710,195713,195716,195756,195760,195768,195777,195789,195792,195804,195827,195843-195844,195877,195887-195888,195897,195903,195905-195906,195932,195936-195943,195970,195983,196045,196048,196050,196058,196114-196115,196153,196206
+/cfe/trunk:195126,195128,195135-195136,195146,195149,195154,195158,195163,195168,195174,195249,195268,195283,195303,195326,195329,195367,195384,195409,195420,195422,195501,195547,195556,195558,195587,195620,195635,195669,195687,195693,195710,195713,195716,195756,195760,195768,195777,195789,195792,195804,195827,195843-195844,195877,195887-195888,195897,195903,195905-195906,195932,195936-195943,195970,195983,196045,196048,196050,196058,196114-196115,196153,196206,196215
 /cfe/trunk/test:170344
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_34/docs/LanguageExtensions.rst
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_34/docs/LanguageExtensions.rst?rev=196234&r1=196233&r2=196234&view=diff
==============================================================================
--- cfe/branches/release_34/docs/LanguageExtensions.rst (original)
+++ cfe/branches/release_34/docs/LanguageExtensions.rst Tue Dec  3 01:40:27 2013
@@ -1908,8 +1908,8 @@ ARM Language Extensions
 Interrupt attribute
 ^^^^^^^^^^^^^^^^^^^
 
-Clang supports the GNU style ``__attribite__((interrupt("TYPE")))`` attribute on
-ARM targets. This attribute may be attached to a function definiton and
+Clang supports the GNU style ``__attribute__((interrupt("TYPE")))`` attribute on
+ARM targets. This attribute may be attached to a function definition and
 instructs the backend to generate appropriate function entry/exit code so that
 it can be used directly as an interrupt service routine.
 

Modified: cfe/branches/release_34/www/cxx_dr_status.html
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_34/www/cxx_dr_status.html?rev=196234&r1=196233&r2=196234&view=diff
==============================================================================
--- cfe/branches/release_34/www/cxx_dr_status.html (original)
+++ cfe/branches/release_34/www/cxx_dr_status.html Tue Dec  3 01:40:27 2013
@@ -523,7 +523,7 @@
   <tr>
     <td><a href="http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_closed.html#81">81</a></td>
     <td>NAD</td>
-    <td>Null pointers and C compatability</td>
+    <td>Null pointers and C compatibility</td>
     <td class="na" align="center">N/A</td>
   </tr>
   <tr>