merge revision(s) 5917f49ad03cd3b2c13d3eea85c969a113b83bf8: [Backport #18436]

	Fix documentation for Dir.glob

	Dir.glob("*", File::FNM_DOTMATCH) no longer includes ".." in the
	returned array as of Ruby 3.1.

	Fixes [Bug #18436]
	---
	 dir.rb | 2 +-
	 1 file changed, 1 insertion(+), 1 deletion(-)

2 files changed, 2 insertions, 2 deletions

diff --git a/dir.rb b/dir.rb
index bf6556db96..115f068771 100644
--- a/dir.rb
+++ b/dir.rb
@@ -200,7 +200,7 @@ class Dir
   #    Dir.glob("*.[^r]*")                 #=> ["config.h"]
   #    Dir.glob("*.{rb,h}")                #=> ["main.rb", "config.h"]
   #    Dir.glob("*")                       #=> ["config.h", "main.rb"]
-  #    Dir.glob("*", File::FNM_DOTMATCH)   #=> [".", "..", "config.h", "main.rb"]
+  #    Dir.glob("*", File::FNM_DOTMATCH)   #=> [".", "config.h", "main.rb"]
   #    Dir.glob(["*.rb", "*.h"])           #=> ["main.rb", "config.h"]
   #
   #    Dir.glob("**/*.rb")                 #=> ["main.rb",
diff --git a/version.h b/version.h
index fabee0ba11..603c189000 100644
--- a/version.h
+++ b/version.h
@@ -11,7 +11,7 @@
 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
 #define RUBY_VERSION_TEENY 0
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 3
+#define RUBY_PATCHLEVEL 4
 
 #define RUBY_RELEASE_YEAR 2022
 #define RUBY_RELEASE_MONTH 1