[llvm-branch-commits] [cfe-branch] r227128 - Merge r227127 doc link fix into 36 release branch

[Reid Kleckner]

Author: rnk
Date: Mon Jan 26 13:56:36 2015
New Revision: 227128

URL: http://llvm.org/viewvc/llvm-project?rev=227128&view=rev
Log:
Merge r227127 doc link fix into 36 release branch

Modified:
    cfe/branches/release_36/docs/   (props changed)
    cfe/branches/release_36/docs/ReleaseNotes.rst

Propchange: cfe/branches/release_36/docs/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Jan 26 13:56:36 2015
@@ -0,0 +1,4 @@
+/cfe/branches/type-system-rewrite/docs:134693-134817
+/cfe/trunk/docs:226008,226049,226136,226282,226624,226707,226754,226863,226877,227127
+/cfe/trunk/test/SemaTemplate/docs:126920
+/cfe/trunk/test/docs:170344

Modified: cfe/branches/release_36/docs/ReleaseNotes.rst
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_36/docs/ReleaseNotes.rst?rev=227128&r1=227127&r2=227128&view=diff
==============================================================================
--- cfe/branches/release_36/docs/ReleaseNotes.rst (original)
+++ cfe/branches/release_36/docs/ReleaseNotes.rst Mon Jan 26 13:56:36 2015
@@ -12,7 +12,7 @@ Written by the `LLVM Team <http://llvm.o
 
    These are in-progress notes for the upcoming Clang 3.6 release. You may
    prefer the `Clang 3.5 Release Notes
-   <http://llvm.org/releases/3.5/tools/clang/docs/ReleaseNotes.html>`_.
+   <http://llvm.org/releases/3.5.0/tools/clang/docs/ReleaseNotes.html>`_.
 
 Introduction
 ============