From f827b116295aa37539aa55483eedea97c31aae17 Mon Sep 17 00:00:00 2001
From: Alejandro Exojo <suy@badopi.org>
Date: Sun, 2 Nov 2025 09:21:20 +0100
Subject: [PATCH 1/2] [ruby/erb] Fix typo in documentation
 (https://github.com/ruby/erb/pull/91)

https://github.com/ruby/erb/commit/6bceee7d6e
---
 lib/erb.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/erb.rb b/lib/erb.rb
index 884a63035c1564..d3bbc4979c9375 100644
--- a/lib/erb.rb
+++ b/lib/erb.rb
@@ -467,7 +467,7 @@
 # ```
 #
 # You can give `trim_mode: '>'` to suppress the trailing newline
-# for each line that ends with `'%<'` (regardless of its beginning):
+# for each line that ends with `'%>'` (regardless of its beginning):
 #
 # ```
 # ERB.new(template, trim_mode: '>').result.lines.each {|line| puts line.inspect }

From bd51b20c50a9a05c9fcea8025b223892eed4165b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20D=C3=BCrst?= <duerst@it.aoyama.ac.jp>
Date: Sun, 2 Nov 2025 19:22:22 +0900
Subject: [PATCH 2/2] minor code allignment (related to bug 21559)

---
 lib/unicode_normalize/normalize.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/unicode_normalize/normalize.rb b/lib/unicode_normalize/normalize.rb
index 611f43ef2aa0ad..0447df8de7010a 100644
--- a/lib/unicode_normalize/normalize.rb
+++ b/lib/unicode_normalize/normalize.rb
@@ -117,7 +117,7 @@ def self.nfc_one(string)
       if last_class<accent_class and composite = COMPOSITION_TABLE[start+accent]
         start = composite
       elsif accent_class == 0
-        result += start+accents
+        result << start << accents
         start = accent
         accents = ''
         last_class = -1