From c32a53240a1f2272155b08c5a1dd506df05f0e11 Mon Sep 17 00:00:00 2001
From: Chris Lattner <sabre@nondot.org>
Date: Wed, 30 Sep 2009 06:27:22 +0000
Subject: [PATCH] add macruby, fix a validation problem.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@83142 91177308-0d34-0410-b5e6-96231b3b80d8
---
 docs/ReleaseNotes-2.6.html | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/docs/ReleaseNotes-2.6.html b/docs/ReleaseNotes-2.6.html
index 1de4ae949c6..98e3565e78c 100644
--- a/docs/ReleaseNotes-2.6.html
+++ b/docs/ReleaseNotes-2.6.html
@@ -119,7 +119,7 @@ list</a>.</p>
 
 <ul>
 <li>Something wonderful!</li>
-<li>AuroraUX / FreeBSD & OpenBSD Toolchain support.</li>
+<li>AuroraUX / FreeBSD &amp; OpenBSD Toolchain support.</li>
 <li>Many many bugs are fixed and many features have been added.</li>
 </ul>
 </div>
@@ -176,6 +176,29 @@ bug fixes, cleanup and new features. The major changes are:</p>
 </div>
 <!-- *********************************************************************** -->
 
+
+<!--=========================================================================-->
+<div class="doc_subsection">
+<a name="macruby">MacRuby</a>
+</div>
+
+<div class="doc_text">
+
+<p>
+<a href="http://macruby.org">MacRuby</a> is an implementation of Ruby on top of
+core Mac OS X technologies, such as the Objective-C common runtime and garbage
+collector, and the CoreFoundation framework. It is principally developed by
+Apple and aims at enabling the creation of full-fledged Mac OS X applications.
+</p>
+
+<p>
+MacRuby uses LLVM for optimization passes, JIT and AOT compilation of Ruby
+expressions. It also uses zero-cost DWARF exceptions to implement Ruby exception
+handling.</p>
+
+</div>
+
+
 <!--=========================================================================-->
 <div class="doc_subsection">
 <a name="pure">Pure</a>
-- 
2.34.1