[llvm-branch-commits] [cfe-branch] r215877 - Merging r215808:

[Bill Wendling]

Author: void
Date: Mon Aug 18 00:15:34 2014
New Revision: 215877

URL: http://llvm.org/viewvc/llvm-project?rev=215877&view=rev
Log:
Merging r215808:
------------------------------------------------------------------------
r215808 | nicholas | 2014-08-15 19:14:37 -0700 (Fri, 15 Aug 2014) | 2 lines

Clarify.

------------------------------------------------------------------------

Modified:
    cfe/branches/release_35/   (props changed)
    cfe/branches/release_35/docs/AttributeReference.rst

Propchange: cfe/branches/release_35/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 18 00:15:34 2014
@@ -1,4 +1,4 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:213609,213611,213613,213741,213834,213840,213902,213912-213913,213993,213998-213999,214008,214050,214060,214119,214208,214222,214369,214390,214471,214734-214735,214777,215046,215229,215245,215806-215807
+/cfe/trunk:213609,213611,213613,213741,213834,213840,213902,213912-213913,213993,213998-213999,214008,214050,214060,214119,214208,214222,214369,214390,214471,214734-214735,214777,215046,215229,215245,215806-215808
 /cfe/trunk/test:170344
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_35/docs/AttributeReference.rst
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_35/docs/AttributeReference.rst?rev=215877&r1=215876&r2=215877&view=diff
==============================================================================
--- cfe/branches/release_35/docs/AttributeReference.rst (original)
+++ cfe/branches/release_35/docs/AttributeReference.rst Mon Aug 18 00:15:34 2014
@@ -238,8 +238,8 @@ enable_if
 
 .. Note:: Some features of this attribute are experimental. The meaning of
   multiple enable_if attributes on a single declaration is subject to change in
-  a future version of clang. Also, the ABI is not standardized and the mangled
-  name produced may change. To avoid that, use asm labels.
+  a future version of clang. Also, the ABI is not standardized and the name
+  mangling may change in future versions. To avoid that, use asm labels.
 
 The ``enable_if`` attribute can be placed on function declarations to control
 which overload is selected based on the values of the function's arguments.