7 files changed, 58 insertions, 3 deletions
diff --git a/doc/classes/@GlobalScope.xml b/doc/classes/@GlobalScope.xml
index 709863b70f..d647621362 100644
--- a/doc/classes/@GlobalScope.xml
+++ b/doc/classes/@GlobalScope.xml
@@ -1209,6 +1209,7 @@
 			The [ResourceSaver] singleton.
 		</member>
 		<member name="ResourceUID" type="ResourceUID" setter="" getter="">
+			The [ResourceUID] singleton.
 		</member>
 		<member name="TextServerManager" type="TextServerManager" setter="" getter="">
 			The [TextServerManager] singleton.
diff --git a/doc/classes/DisplayServer.xml b/doc/classes/DisplayServer.xml
index cec504584c..d5db7da1f0 100644
--- a/doc/classes/DisplayServer.xml
+++ b/doc/classes/DisplayServer.xml
@@ -1049,7 +1049,7 @@
 			<return type="int" enum="DisplayServer.VSyncMode" />
 			<argument index="0" name="window_id" type="int" default="0" />
 			<description>
-				Returns the VSync mode of the given window.
+				Returns the V-Sync mode of the given window.
 			</description>
 		</method>
 		<method name="window_move_to_foreground">
@@ -1234,7 +1234,7 @@
 			<argument index="0" name="vsync_mode" type="int" enum="DisplayServer.VSyncMode" />
 			<argument index="1" name="window_id" type="int" default="0" />
 			<description>
-				Sets the VSync mode of the given window.
+				Sets the V-Sync mode of the given window.
 				See [enum DisplayServer.VSyncMode] for possible values and how they affect the behavior of your application.
 				Depending on the platform and used renderer, the engine will fall back to [constant VSYNC_ENABLED], if the desired mode is not supported.
 			</description>
diff --git a/doc/classes/PhysicsRayQueryParameters2D.xml b/doc/classes/PhysicsRayQueryParameters2D.xml
index 36933ef9a2..1cfc6caadf 100644
--- a/doc/classes/PhysicsRayQueryParameters2D.xml
+++ b/doc/classes/PhysicsRayQueryParameters2D.xml
@@ -8,6 +8,22 @@
 	</description>
 	<tutorials>
 	</tutorials>
+	<methods>
+		<method name="create" qualifiers="static">
+			<return type="PhysicsRayQueryParameters2D" />
+			<argument index="0" name="from" type="Vector2" />
+			<argument index="1" name="to" type="Vector2" />
+			<argument index="2" name="collision_mask" type="int" default="4294967295" />
+			<argument index="3" name="exclude" type="Array" default="[]" />
+			<description>
+				Returns a new, pre-configured [PhysicsRayQueryParameters2D] object. Use it to quickly create query parameters using the most common options.
+				[codeblock]
+				var query = PhysicsRayQueryParameters2D.create(global_position, global_position + Vector2(0, 100))
+				var collision = get_world_2d().direct_space_state.intersect_ray(query)
+				[/codeblock]
+			</description>
+		</method>
+	</methods>
 	<members>
 		<member name="collide_with_areas" type="bool" setter="set_collide_with_areas" getter="is_collide_with_areas_enabled" default="false">
 			If [code]true[/code], the query will take [Area2D]s into account.
diff --git a/doc/classes/PhysicsRayQueryParameters3D.xml b/doc/classes/PhysicsRayQueryParameters3D.xml
index 4244ec785f..e9216a8300 100644
--- a/doc/classes/PhysicsRayQueryParameters3D.xml
+++ b/doc/classes/PhysicsRayQueryParameters3D.xml
@@ -8,6 +8,22 @@
 	</description>
 	<tutorials>
 	</tutorials>
+	<methods>
+		<method name="create" qualifiers="static">
+			<return type="PhysicsRayQueryParameters3D" />
+			<argument index="0" name="from" type="Vector3" />
+			<argument index="1" name="to" type="Vector3" />
+			<argument index="2" name="collision_mask" type="int" default="4294967295" />
+			<argument index="3" name="exclude" type="Array" default="[]" />
+			<description>
+				Returns a new, pre-configured [PhysicsRayQueryParameters3D] object. Use it to quickly create query parameters using the most common options.
+				[codeblock]
+				var query = PhysicsRayQueryParameters3D.create(position, position + Vector3(0, -10, 0))
+				var collision = get_world_3d().direct_space_state.intersect_ray(query)
+				[/codeblock]
+			</description>
+		</method>
+	</methods>
 	<members>
 		<member name="collide_with_areas" type="bool" setter="set_collide_with_areas" getter="is_collide_with_areas_enabled" default="false">
 			If [code]true[/code], the query will take [Area3D]s into account.
diff --git a/doc/classes/ProjectSettings.xml b/doc/classes/ProjectSettings.xml
index ae0ec64c27..40477d27d4 100644
--- a/doc/classes/ProjectSettings.xml
+++ b/doc/classes/ProjectSettings.xml
@@ -588,7 +588,7 @@
 			[b]Note:[/b] By default, or when set to 0, the initial window width is the viewport [member display/window/size/viewport_width]. This setting is ignored on iOS, Android, and HTML5.
 		</member>
 		<member name="display/window/vsync/vsync_mode" type="int" setter="" getter="" default="1">
-			Sets the VSync mode for the main game window.
+			Sets the V-Sync mode for the main game window.
 			See [enum DisplayServer.VSyncMode] for possible values and how they affect the behavior of your application.
 			Depending on the platform and used renderer, the engine will fall back to [code]Enabled[/code], if the desired mode is not supported.
 		</member>
diff --git a/doc/classes/ResourceUID.xml b/doc/classes/ResourceUID.xml
index f91c39b512..782a8a2968 100644
--- a/doc/classes/ResourceUID.xml
+++ b/doc/classes/ResourceUID.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <class name="ResourceUID" inherits="Object" version="4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
+		Singleton for managing a cache of resource UIDs within a project.
 	</brief_description>
 	<description>
+		Resources can not only be referenced using their resource paths [code]res://[/code], but alternatively through a unique identifier specified via [code]uid://[/code].
+		Using UIDs allows for the engine to keep references between resources intact, even if the files get renamed or moved.
+		This singleton is responsible for keeping track of all registered resource UIDs of a project, generating new UIDs and converting between the string and integer representation.
 	</description>
 	<tutorials>
 	</tutorials>
@@ -12,35 +16,45 @@
 			<argument index="0" name="id" type="int" />
 			<argument index="1" name="path" type="String" />
 			<description>
+				Adds a new UID value which is mapped to the given resource path.
+				Fails with an error if the UID already exists, so be sure to check [method has_id] beforehand, or use [method set_id] instead.
 			</description>
 		</method>
 		<method name="create_id">
 			<return type="int" />
 			<description>
+				Generates a random resource UID which is guaranteed to be unique within the list of currently loaded UIDs.
+				In order for this UID to be registered, you must call [method add_id] or [method set_id].
 			</description>
 		</method>
 		<method name="get_id_path" qualifiers="const">
 			<return type="String" />
 			<argument index="0" name="id" type="int" />
 			<description>
+				Returns the path that the given UID value refers to.
+				Fails with an error if the UID does not exist, so be sure to check [method has_id] beforehand.
 			</description>
 		</method>
 		<method name="has_id" qualifiers="const">
 			<return type="bool" />
 			<argument index="0" name="id" type="int" />
 			<description>
+				Returns whether the given UID value is known to the cache.
 			</description>
 		</method>
 		<method name="id_to_text" qualifiers="const">
 			<return type="String" />
 			<argument index="0" name="id" type="int" />
 			<description>
+				Converts the given UID to a [code]uid://[/code] string value.
 			</description>
 		</method>
 		<method name="remove_id">
 			<return type="void" />
 			<argument index="0" name="id" type="int" />
 			<description>
+				Removes a loaded UID value from the cache.
+				Fails with an error if the UID does not exist, so be sure to check [method has_id] beforehand.
 			</description>
 		</method>
 		<method name="set_id">
@@ -48,17 +62,22 @@
 			<argument index="0" name="id" type="int" />
 			<argument index="1" name="path" type="String" />
 			<description>
+				Updates the resource path of an existing UID.
+				Fails with an error if the UID does not exist, so be sure to check [method has_id] beforehand, or use [method add_id] instead.
 			</description>
 		</method>
 		<method name="text_to_id" qualifiers="const">
 			<return type="int" />
 			<argument index="0" name="text_id" type="String" />
 			<description>
+				Extracts the UID value from the given [code]uid://[/code] string.
 			</description>
 		</method>
 	</methods>
 	<constants>
 		<constant name="INVALID_ID" value="-1">
+			The value to use for an invalid UID, for example if the resource could not be loaded.
+			Its text representation is [code]uid://&lt;invalid&gt;[/code].
 		</constant>
 	</constants>
 </class>
diff --git a/doc/classes/TextServer.xml b/doc/classes/TextServer.xml
index 9f35ddc353..b54536f897 100644
--- a/doc/classes/TextServer.xml
+++ b/doc/classes/TextServer.xml
@@ -1679,6 +1679,9 @@
 		<constant name="GRAPHEME_IS_CONNECTED" value="1024" enum="GraphemeFlag" is_bitfield="true">
 			Grapheme is connected to the previous grapheme. Breaking line before this grapheme is not safe.
 		</constant>
+		<constant name="GRAPHEME_IS_SAFE_TO_INSERT_TATWEEL" value="2048" enum="GraphemeFlag" is_bitfield="true">
+			It is safe to insert a U+0640 before this grapheme for elongation.
+		</constant>
 		<constant name="HINTING_NONE" value="0" enum="Hinting">
 			Disables font hinting (smoother but less crisp).
 		</constant>