diff options
| author | Bill Wendling <isanbard@gmail.com> | 2013-12-03 07:40:27 +0000 |
|---|---|---|
| committer | Bill Wendling <isanbard@gmail.com> | 2013-12-03 07:40:27 +0000 |
| commit | 479ed0b9b43779ac82126206a79f8dc77e2653f8 (patch) | |
| tree | d9083217b8adf08df51930823a7c24482d3ee4d9 | |
| parent | 2045e7beeb8eebda41141746d5abecb99820f315 (diff) | |
Merging r196215:llvmorg-3.4.0-rc2
------------------------------------------------------------------------
r196215 | alp | 2013-12-02 22:53:39 -0800 (Mon, 02 Dec 2013) | 1 line
Documentation typo corrections
------------------------------------------------------------------------
llvm-svn: 196234
| -rw-r--r-- | clang/docs/LanguageExtensions.rst | 4 | ||||
| -rw-r--r-- | clang/www/cxx_dr_status.html | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/clang/docs/LanguageExtensions.rst b/clang/docs/LanguageExtensions.rst index ca1b7ea364a4..7a4b31e7acc0 100644 --- a/clang/docs/LanguageExtensions.rst +++ b/clang/docs/LanguageExtensions.rst @@ -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. diff --git a/clang/www/cxx_dr_status.html b/clang/www/cxx_dr_status.html index 94510d496ebf..68255e387e03 100644 --- a/clang/www/cxx_dr_status.html +++ b/clang/www/cxx_dr_status.html @@ -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> |