improve OS.get_name classref, misc/scripts fixes, remove trailing quote

6 files changed, 11 insertions, 12 deletions

diff --git a/doc/classes/OS.xml b/doc/classes/OS.xml
index bc9bfc9676..b2e325d226 100644
--- a/doc/classes/OS.xml
+++ b/doc/classes/OS.xml
@@ -278,7 +278,7 @@
 			<return type="String" />
 			<description>
 				Returns the name of the host OS.
-				On Windows, this is [code]"Windows"[/code] or [code]"UWP"[/code] (Universal Windows Platform) if exported thereon.
+				On Windows, this is [code]"Windows"[/code] or [code]"UWP"[/code] if exported on Universal Windows Platform.
 				On macOS, this is [code]"macOS"[/code].
 				On Linux-based operating systems, this is [code]"Linux"[/code].
 				On BSD-based operating systems, this is [code]"FreeBSD"[/code], [code]"NetBSD"[/code], [code]"OpenBSD"[/code], or [code]"BSD"[/code] as a fallback.
diff --git a/misc/scripts/black_format.sh b/misc/scripts/black_format.sh
index 99343f1c5a..f6fac58e50 100755
--- a/misc/scripts/black_format.sh
+++ b/misc/scripts/black_format.sh
@@ -11,13 +11,13 @@ black -l 120 $PY_FILES
 
 diff=$(git diff --color)
 
-# If no patch has been generated all is OK, clean up, and exit.
+# If no diff has been generated all is OK, clean up, and exit.
 if [ -z "$diff" ] ; then
     printf "Files in this commit comply with the black style rules.\n"
     exit 0
 fi
 
-# A patch has been created, notify the user, clean up, and exit.
+# A diff has been created, notify the user, clean up, and exit.
 printf "\n*** The following differences were found between the code "
 printf "and the formatting rules:\n\n"
 echo "$diff"
diff --git a/misc/scripts/clang_format.sh b/misc/scripts/clang_format.sh
index 5ab9c1bbb9..1c0c7e3856 100755
--- a/misc/scripts/clang_format.sh
+++ b/misc/scripts/clang_format.sh
@@ -30,13 +30,13 @@ done
 
 diff=$(git diff --color)
 
-# If no patch has been generated all is OK, clean up, and exit.
+# If no diff has been generated all is OK, clean up, and exit.
 if [ -z "$diff" ] ; then
-    printf "Files in this commit comply with the clang-tidy style rules.\n"
+    printf "Files in this commit comply with the clang-format style rules.\n"
     exit 0
 fi
 
-# A patch has been created, notify the user, clean up, and exit.
+# A diff has been created, notify the user, clean up, and exit.
 printf "\n*** The following changes have been made to comply with the formatting rules:\n\n"
 echo "$diff"
 printf "\n*** Please fix your commit(s) with 'git commit --amend' or 'git rebase -i <hash>'\n"
diff --git a/misc/scripts/clang_tidy.sh b/misc/scripts/clang_tidy.sh
index e49f6ac9f4..63c1b10042 100755
--- a/misc/scripts/clang_tidy.sh
+++ b/misc/scripts/clang_tidy.sh
@@ -18,13 +18,13 @@ done
 
 diff=$(git diff --color)
 
-# If no patch has been generated all is OK, clean up, and exit.
+# If no diff has been generated all is OK, clean up, and exit.
 if [ -z "$diff" ] ; then
     printf "Files in this commit comply with the clang-tidy style rules.\n"
     exit 0
 fi
 
-# A patch has been created, notify the user, clean up, and exit.
+# A diff has been created, notify the user, clean up, and exit.
 printf "\n*** The following changes have been made to comply with the formatting rules:\n\n"
 echo "$diff"
 printf "\n*** Please fix your commit(s) with 'git commit --amend' or 'git rebase -i <hash>'\n"
diff --git a/misc/scripts/file_format.sh b/misc/scripts/file_format.sh
index 0c7235817d..c767d3f8a0 100755
--- a/misc/scripts/file_format.sh
+++ b/misc/scripts/file_format.sh
@@ -49,14 +49,13 @@ done
 
 diff=$(git diff --color)
 
-# If no patch has been generated all is OK, clean up, and exit.
+# If no diff has been generated all is OK, clean up, and exit.
 if [ -z "$diff" ] ; then
     printf "Files in this commit comply with the formatting rules.\n"
-    rm -f patch.patch
     exit 0
 fi
 
-# A patch has been created, notify the user, clean up, and exit.
+# A diff has been created, notify the user, clean up, and exit.
 printf "\n*** The following differences were found between the code "
 printf "and the formatting rules:\n\n"
 echo "$diff"
diff --git a/modules/gdscript/gdscript_tokenizer.cpp b/modules/gdscript/gdscript_tokenizer.cpp
index d3287ab345..63fad0d9bb 100644
--- a/modules/gdscript/gdscript_tokenizer.cpp
+++ b/modules/gdscript/gdscript_tokenizer.cpp
@@ -1493,7 +1493,7 @@ GDScriptTokenizer::Token GDScriptTokenizer::scan() {
 			}
 
 		default:
-			return make_error(vformat(R"(Unknown character "%s".")", String(&c, 1)));
+			return make_error(vformat(R"(Unknown character "%s".)", String(&c, 1)));
 	}
 }